alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity
1,415 Commits 6 Branches 1 Tag
e772b4a93169eff7e096c09b71fc5ee6f4666047
Commit Graph

1415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aerinon
e772b4a931 Progressive Shields fix 
Fix for collection rate overflow
Fix for progressive shield standing item (narrow version)
Fix for double key counts
Multiworld item substitution
Made map key coutner not depend on new flag for now
 2023-09-08 13:42:22 -06:00
aerinon
134651e4fb Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	inventory.asm
#	itemdatatables.asm
#	newitems.asm
 2023-09-07 12:21:22 -06:00
Lexi Rose
5a0bd6dbe0 Merge pull request #203 from cassidoxa/v31.2.0-fixes 
Rework bow tracking to assign tracking bits to non-chest sprites
 2023-09-05 03:23:35 -05:00
cassidoxa
f778674b83 Rework bow tracking to assign tracking bits to non-chest sprites 
Fix small key palettes to be consistent with vanilla colors
 2023-09-04 22:29:50 -04:00
Lexi Rose
2e433732f8 Merge pull request #202 from cassidoxa/v31.2.0-fixes 
Fix HUD heart colors on credits end screen
 2023-09-04 15:15:37 -05:00
cassidoxa
4ec523c8b3 Fix HUD heart colors on credits end screen 
Small fix for counting menu HUD keys for "this dungeon"
 2023-09-04 13:28:51 -04:00
Lexi Rose
23b6e1ae6b Merge pull request #201 from cassidoxa/v31.2.0-fixes 
Palette fix for GT Torch/Hera cage items that load new palette
 2023-09-03 16:11:15 -05:00
cassidoxa
9800a86189 Palette fix for GT Torch/Hera cage items that load new palette 2023-09-03 15:39:53 -04:00
Lexi Rose
74a31f5f11 Merge pull request #200 from cassidoxa/v31.2.0-fixes 
Fix active flute standing item gfx
 2023-09-02 23:23:42 -05:00
cassidoxa
73b2a180ba Fix AddInventory/stats tracking with 16 bit item properties 2023-09-02 22:57:50 -04:00
cassidoxa
2cead7ae92 Fix Active flute standing item gfx 
Move setting dungeon completed to prize pickup (or after aga1/aga2)
Fix some inverted tiles
Remove text-related conditional assembly
Make InventoryTable_properties 16 bits wide
Fix expanded save slot writing to cart SRAM
Fix HUD resetting with red potion
 2023-09-02 15:55:37 -04:00
aerinon
9fc85218ae Fixed ExtendedSRAM not saving 
Fix enemy drops and pots with Fairies/Chickens/Big Magic
Fixed Big Magic refill when in chests/standing items
Changed shop code to respect ShopEnableCount flag
 2023-09-01 14:13:01 -06:00
aerinon
aecc65595e Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	bookofmudora.asm
 2023-09-01 11:37:46 -06:00
Lexi Rose
6fbce240b8 Merge pull request #199 from cassidoxa/decompressed 
Fix for item receipt after GT boss heart container collected
 2023-08-31 17:39:17 -05:00
cassidoxa
3a5974b456 Only check if we're getting a chest item if boss heart flag is set 2023-08-31 16:38:53 -04:00
aerinon
5ccdebe09d Fixing crashes 2023-08-31 14:22:46 -06:00
cassidoxa
71e6d54276 Fix for item receipt after GT boss heart container collected 2023-08-31 15:17:07 -04:00
Lexi Rose
139c963e6a Merge pull request #198 from spannerisms/decompressed 
Absorb torch keys if they belong to the dungeon they're in.
 2023-08-31 03:07:31 -05:00
cassidoxa
29176fa194 Absorb torch keys if they belong to the dungeon they're in. 2023-08-30 20:47:06 -04:00
aerinon
b635126e81 Copmass count fix for 2 bytes 2023-08-30 16:16:05 -06:00
aerinon
150adec969 Sewers count fix 2023-08-30 15:25:29 -06:00
aerinon
e21067f0a2 Initial work on new items 2023-08-30 14:35:30 -06:00
aerinon
d09aea3ff9 2 byte compass counts 2023-08-30 12:33:27 -06:00
Lexi Rose
d6ac9feae4 Merge pull request #197 from spannerisms/decompressed 
Glitch fixes
 2023-08-30 11:45:05 -05:00
aerinon
cd67d27798 Hud update flag added for standing items 
Ram addresses updated
Minor multiworld fix
 2023-08-30 10:25:20 -06:00
cassidoxa
90c8e95f9b Fix overworld item duping 
Fix setting dungeon completed when Aga 1 and 2 are defeated (prize drops)
 2023-08-30 01:25:43 -04:00
S
c6e586fbb8 Merge pull request #196 from spannerisms/decompressed 
Even more v31.2.0
 2023-08-29 16:40:31 -04:00
cassidoxa
4c98268d81 Various fixes 2023-08-29 16:03:22 -04:00
aerinon
51011dcada Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	events.asm
#	newitems.asm
#	shopkeeper.asm
#	tables.asm

Plus attempt to update standing items
 2023-08-28 12:01:57 -06:00
aerinon
b688149dfa Fix for shops and powder 
Fix for dungeon indicator
 2023-08-28 11:32:46 -06:00
Lexi Rose
e3a35ef5fc Merge pull request #195 from spannerisms/decompressed 
More v31.2.0
 2023-08-26 23:39:21 -05:00
cassidoxa
52d2616537 RomSpeed option 2023-08-26 23:24:34 -04:00
cassidoxa
05a79ad2d9 Fix Ped/GT open modes 
Fix key colors
 2023-08-26 20:29:38 -04:00
cassidoxa
7e513c4696 More sprite fixes 2023-08-26 14:30:39 -04:00
cassidoxa
77e269ff31 Ridiculous game 2023-08-26 01:42:31 -04:00
cassidoxa
90ffa8bd23 Fix cave state item cutscene flag with boss hearts 
Add item substitutions
 2023-08-25 21:11:48 -04:00
cassidoxa
5ac2f8c537 Fix GFX transfer, use stack 
Fix HUD arrow icon after buying shop arrow
 2023-08-25 12:29:52 -04:00
cassidoxa
3f5455b647 Fix key palettes 
Fix HUD item counter when releasing bee
 2023-08-25 09:48:29 -04:00
cassidoxa
1cbcd1d5ff Sprite fixes 2023-08-25 01:38:32 -04:00
aerinon
09702e659d Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	goalitem.asm
#	inventory.asm
#	invertedmaps.asm
#	newhud.asm
#	pendantcrystalhud.asm

Also some bugfixes here and there
 2023-08-24 16:16:31 -06:00
Lexi Rose
188c965fbc Merge pull request #194 from spannerisms/decompressed 
More v31.2.0 fixes
 2023-08-23 21:10:13 -05:00
aerinon
f1dda4a8c0 Attempt to re-write standing items using the new decompressed gfx. 
Fix a few bus left over from merge
 2023-08-23 16:06:31 -06:00
aerinon
2a789b04e4 Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	bookofmudora.asm
#	build.bat
#	catfish.asm
#	compasses.asm
#	contrib.asm
#	darkworldspawn.asm
#	entrances.asm
#	events.asm
#	floodgatesoftlock.asm
#	flute.asm
#	framehook.asm
#	goalitem.asm
#	halfmagicbat.asm
#	heartpieces.asm
#	hooks.asm
#	inventory.asm
#	invertedmaps.asm
#	itemtext_lower.asm
#	lampmantlecone.asm
#	mantle.asm
#	msu.asm
#	music.asm
#	newhud.asm
#	newitems.asm
#	pendantcrystalhud.asm
#	ram.asm
#	rngfixes.asm
#	roomloading.asm
#	shopkeeper.asm
#	stats.asm
#	stats/credits.asm
#	stats/creditsnew.asm
#	stats/statConfig.asm
#	tables.asm
#	tablets.asm
#	utilities.asm
#	zoraking.asm
 2023-08-23 13:02:39 -06:00
cassidoxa
247128b9f6 Move setting DungeonsCompleted bitfield to post-boss/prize transition 2023-08-23 13:24:46 -04:00
cassidoxa
9bde734ca3 Fix current dungeon items in menu 2023-08-22 16:22:39 -04:00
cassidoxa
80f94824f4 Small fixes 2023-08-22 10:18:02 -04:00
cassidoxa
e2525ebdb1 Rework menu dungeon item + select behavior 
Fix colored heart animations
 2023-08-22 01:40:53 -04:00
cassidoxa
66540f2819 Replace GT, Ganon vuln crystal checks, ped check with new system 
InvincibleGanon 0x18003E -> GanonVulnerableMode 0x1801A8-0x1801A9
NumberOfCrystalsRequiredForTower 0x18005E -> GanonsTowerOpenTarget 0x18019A-0x18019B
NumberOfCrystalsRequiredForGanon 0x18005F -> GanonVulnerableTarget 0x1801A6-0x1801A7
Various fixes
Moved CrystalCounter to word length space $7EF471 -> $7EF476
 2023-08-21 20:43:27 -04:00
spannerisms
59b16eeb05 optimize/fix inverted maps 2023-08-21 07:10:26 -04:00
cassidoxa
63ba27e93d Update item gfx/receipt documentation in itemdatatables.asm 2023-08-20 19:59:55 -04:00