Commit Graph
67 Commits
Author SHA1 Message Date
codemann8 ea4f39e116 Corrected some music fade-outs during mosaic transitions 2025-08-19 10:16:16 -05:00
codemann8 34fa1cd98e Fix issue with music silence in DR when straight stairs lead to pre-Aga room 2025-08-19 10:10:08 -05:00
codemann8 4c5adfbee2 Fix issue with LH/BS half volume issue when exiting to Kakariko 2025-08-19 10:08:36 -05:00
codemann8 ed7fb312d5 Fixed some incorrect bunny music behavior 2025-04-30 06:26:33 -05:00
codemann8 23943f2234 Fix some music issues 2024-08-27 07:12:57 -05:00
codemann8 27685ac77d More merge labeling 2024-04-09 13:24:54 -05:00
codemann8 75fd81ab57 Merged in DR v1.4.1.6 2024-02-23 11:11:59 -06:00
Randall Rupper 52325979a7 fix: YA Hera Boss music fix 2023-11-15 15:10:19 -07:00
codemann8 6de8dc606c Fix issue with incorrect track playing on DDM 2023-11-05 08:39:54 -06:00
codemann8 a6507eea6d Fix for Hera boss music fadeout when falling 2023-10-22 16:23:43 -05:00
codemann8 70badade72 Fix for Hera boss music fadeout when falling 2023-10-10 01:26:30 -05:00
aerinon 3f0082a771 Fix merge error on hera boss music 2023-09-20 13:39:19 -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
codemann8 71916fb320 Fixed Hera boss music playing after boss defeated 2023-05-12 20:37:33 -05:00
spannerisms ff88437f8e fixes
turn a bunch of addresses into fast rom
bunch of consistency clean ups in hooks
move zsnes to failures
2022-12-30 03:07:15 -05:00
cassidoxa 69fd6015e6 Some more annotations 2022-11-25 01:08:07 -05:00
cassidoxa 524a27d680 Merge branch 'master' into quickswap 2022-11-24 19:05:24 -05:00
cassidoxa 7426ce5945 More RAM labels
Fixed tablets checking for item collected, uses NpcFlags+1
Deleted mantle.asm, moved to lampmantlecone.asm
2022-11-24 18:34:35 -05:00
cassidoxa 09d15f3294 Another WRAM label pass
Deleted compression.asm
2022-11-22 00:36:39 -05:00
cassidoxa 788cceaab9 Continue labeling and documentation in ram.asm, main rando block
Deleted several unused modules and some commented code
Reorganized some routines to clean up modules
Moved some memory into mirrored WRAM
Refactored NMI hook aux routine
Removed old fake flipper fix
2022-11-16 21:38:28 -05:00
cassidoxa 43f753b517 ram.asm initial commit. Replaced all address defines with labels
Value defines styled without quotes, # moved to load/store/cmp site
Added registers.asm (copied from spannerisms JP disassembly)
Added a bunch of length annotations
Deleted old or trivial commented out code
Deleted: ganonfixes.asm, map.asm, seedtag.asm
Replaced obsolete credits.asm with creditsnew.asm
Moved scratch space at $7F5020-3F to mirrored WRAM (7E1E70-8F)
Moved clock RAM to mirrored WRAM (7E1E90-9F)
dialog.asm: FreeDungeonItemNotice preserves callee-preserved scratch RAM
Toast buffer moved to mirrored WRAM (7E1E0E-0F)
servicerequest.asm: long store to $012E converted to word length store
2022-11-05 00:50:25 -04:00
cassidoxa 6b2e7a5c34 Fix check for Tower of Hera boss defeated
Improve room data documentation
2022-10-25 22:38:19 -04:00
codemann8 7c7664224e Merged DR v1.0.1.0 2022-07-08 05:32:08 -05:00
aerinon e088a040f8 Merge branch 'dr_sram' of https://github.com/cassidoxa/z3randomizer into cassidoxa-dr_sram
# Conflicts:
#	hooks.asm
#	menu/overworldmap.asm
#	music.asm
2022-04-26 11:57:51 -06:00
cassidoxa 9c41ffb55b Merge branch 'sram_rework' into dr_sram 2022-04-20 00:30:35 -04:00
codemann8 436ecbb17d Merged DR v1.0.0.3 2022-04-15 10:34:10 -05:00
aerinon 93fe72466d Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	hooks.asm
#	music.asm
2022-02-09 09:59:56 -07:00
cassidoxa 3e2362b7ca Implement initial SRAM table
Data in initialsramtable.asm gets copied to SRAM on save file init
Frontend will be responsible for setting this, requires frontend changes
Changed some label names to disambiguate WRAM and SRAM labels
Deleted open mode
2022-02-03 20:25:32 -05:00
cassidoxa b91ac58b47 Merge branch 'master' into sram 2022-01-20 11:16:31 -05:00
codemann8 c7718e7a47 Fixed Hera boss music to correctly read boss defeated flag 2022-01-19 14:39:19 -06:00
Catobat f3d1e99421 Fix Tower of Hera boss music bug 2022-01-19 19:52:01 +01:00
codemann8 7633c8b586 Fixed Hera boss music to correctly read boss defeated flag 2022-01-19 02:31:38 -06:00
cassidy fa76b61df0 Change addresses to labels and remove SRAM trace calls 2021-12-16 17:19:54 -05:00
cassidy e4d917c47c First pass-through adding labels
Added items, equipment, and tracking/indicators
Added playername changes
Removed some defines
2021-12-16 17:19:54 -05:00
codemann8 2c6db075a9 Fixed boss music 2021-11-06 16:19:48 -05:00
codemann8 ad5b78b3d1 Preserve Sanc music change in Standard 2021-11-06 16:18:09 -05:00
codemann8 e8d5a9635d Play Sanc music on arrival in Sanc in Standard 2021-11-06 16:17:37 -05:00
codemann8 582abf3d32 Fixed boss music 2021-11-02 17:17:37 -05:00
codemann8 dd57b4be79 Preserve Sanc music change in Standard 2021-11-01 02:09:05 -05:00
codemann8 4bcc76e83b Play Sanc music on arrival in Sanc in Standard 2021-10-31 20:56:27 -05:00
codemann8 53dd7ba820 Fix for TR Pegs issue when fluting direct to TR from a screen with hammerpegs 2021-08-26 00:53:02 -05:00
codemann8 c399f8c77b Separated ambient SFX from music track selection
Fixes issue with ambient SFX stopping and starting
2021-08-11 05:53:27 -05:00
codemann8 677ad64419 Rewrote music calculation 2021-08-01 23:41:24 -05:00
codemann8 9cecd30e89 Fix for boss music not playing in non-DR modes 2021-07-27 02:42:36 -05:00
codemann8 6e721fb069 Fix for boss music not playing in non-DR modes 2021-07-27 02:40:12 -05:00
codemann8 30d8bdd813 Suppressed awkward/abrupt music changes in dungeons when DR is enabled 2021-07-12 19:23:13 -05:00
codemann8 dc2a468acb Suppressed awkward/abrupt music changes in dungeons when DR is enabled 2021-07-12 19:22:57 -05:00
codemann8 9209153643 Supressed awkward/abrupt music changes in dungeons when DR is enabled 2021-07-12 16:44:03 -05:00
codemann8 0bce51af4e Supressed awkward/abrupt music changes in dungeons when DR is enabled 2021-07-12 15:41:59 -05:00
codemann8 195fd74e0b Reverting Dark Bonk Rocks rain state sprite fix 2021-07-08 20:26:18 -05:00