alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,890 Commits 19 Branches 2 Tags
274ef3f39d1b501dece0a4eafd36d8960b6b728f
Commit Graph

418 Commits

Author SHA1 Message Date
codemann8
274ef3f39d Improved Psuedoboots 2024-12-13 16:52:20 -06:00
codemann8
9e84707f13 Fixed crash on pedestal pull 2024-09-03 10:02:10 -05:00
codemann8
b3979affc9 Don't delete follower on crystal cutscene if prize shuffle 2024-08-27 07:15:18 -05:00
codemann8
23943f2234 Fix some music issues 2024-08-27 07:12:57 -05:00
codemann8
a5dfd97687 Merged in DR v1.4.5 2024-08-16 23:00:45 -05:00
aerinon
024746d78f Merge remote-tracking branch 'upstream/master' into DRUnstable 2024-06-18 11:50:26 -06:00
aerinon
6e327c951f feat: couple nice to haves for mirror scroll & fake boots 2024-06-14 17:04:30 -06:00
codemann8
879b02387e Fixed issue with HP refill canceling out of post-boss cutscene 2024-05-29 16:16:05 -05:00
codemann8
f9da730caf Initial Prize Shuffle Implementation 2024-05-23 18:23:26 -05:00
codemann8
27685ac77d More merge labeling 2024-04-09 13:24:54 -05:00
codemann8
a70251d2b2 Applied labels and byte designators 2024-04-09 09:26:27 -06:00
codemann8
59eb254116 Merged in DR v1.4.1.6 2024-03-01 13:55:23 -06:00
codemann8
75fd81ab57 Merged in DR v1.4.1.6 2024-02-23 11:11:59 -06:00
aerinon
ed8cefe0c6 fix: bad branch, bad org, dead code, bad args flags 2024-02-07 12:36:54 -07:00
aerinon
fc08fa33c8 Merge branch 'DRVolatile' into DRUnstable 2024-01-22 11:00:36 -07:00
spannerisms
014b3a719a fix things 2024-01-04 06:45:57 -05:00
Randall Rupper
553fb272a0 fix: remove terrorpin ai code 2024-01-03 10:32:47 -07:00
cassidoxa
7001767c9b Fix dungeon prize ancilla spawn regression 2023-12-27 11:39:00 -05:00
Randall Rupper
52325979a7 fix: YA Hera Boss music fix 2023-11-15 15:10:19 -07:00
Randall Rupper
79bdace3b3 fix: disable flute in rain state (except glitched modes) 
fix(msu): GTBK music in DR
 2023-11-15 14:49:29 -07:00
Randall Rupper
62356f0159 fix: disable flute in rain state (except glitched modes) 
fix(msu): GTBK music in DR
 2023-11-15 14:30:44 -07:00
codemann8
70badade72 Fix for Hera boss music fadeout when falling 2023-10-10 01:26:30 -05:00
codemann8
fdd8fedaef New solution for mirror portal disabling in Crossed OWR 2023-09-28 22:01:18 -05:00
Catobat
4c1433464e Fix issue with rooms $0124-$0127 at Tavern Back 2023-09-27 16:15:20 -05:00
codemann8
8e9b4c234b Fix Old Man death putting you on Pyramid 2023-09-27 16:09:45 -05:00
aerinon
4eaa214626 Merge branch 'DRUnstable' into DRVolatile 
# Conflicts:
#	hooks.asm
#	music.asm
#	newhud.asm
 2023-09-20 13:34:52 -06:00
aerinon
a8a1eaa1b9 Fix for counter rolling over 
Fix for Lamp for another player being substituted with standing items
Fix for received keys not being counted correctly
Fix for pendants counting as items
 2023-09-20 12:54:44 -06:00
aerinon
b67e5c8433 Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	npcitems.asm
 2023-09-09 13:13:18 -06:00
aerinon
2561737236 Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	inventory.asm
#	newhud.asm
 2023-09-08 13:49:16 -06:00
cassidoxa
57e537f12d Fix HUD rebuild when releasing fairy 2023-09-08 08:56:23 -04:00
cassidoxa
0f72e6fcec Better solution 2023-09-08 00:21:24 -04:00
cassidoxa
790f3f0ba3 Fix HUD item icon not refreshing after last bomb spent 
Rename UpdateHUD to UpdateHUDFlag, replace with UpdateHUD vanilla JSR
label
 2023-09-07 16:29:45 -04: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
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
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
cassidoxa
52d2616537 RomSpeed option 2023-08-26 23:24:34 -04:00
Catobat
6980d36d27 Fix issue with rooms $0124-$0127 at Tavern Back 2023-08-26 00:52:13 +02:00
cassidoxa
3f5455b647 Fix key palettes 
Fix HUD item counter when releasing bee
 2023-08-25 09:48:29 -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
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
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
cassidoxa
aaf970b837 Heart colors 2023-08-13 13:46:21 -04:00
cassidoxa
103f072cf3 Add back some JP characters and re-arrange player name screen 
Re-arrange a bunch of text-related stuff
Fix post-credits game counter
Fix bows
 2023-08-11 02:10:54 -04:00
cassidoxa
56cb17a0a3 Small fixes 2023-08-08 01:00:49 -04:00
codemann8
8d0585ec33 Fixed Hera boss music playing after boss defeated 
# Conflicts:
#	music.asm
 2023-08-07 12:11:12 -06:00
cassidoxa
87e665965c Free crystals and ability to shuffle dungeon prizes 
Overworld map code via Aerinon
 2023-08-06 23:07:39 -04:00
aerinon
6a22218727 Merge branch 'DRUnstable' into DRVolatile 
# Conflicts:
#	doorrando/bugfix/kholdstare_shell_collision.asm
 2023-08-04 11:32:19 -06:00
cassidoxa
cb16ffc20b Merge branch 'master' into decompressed 
Also some pendant receipt and palette fixes
 2023-08-02 17:40:38 -04:00