Commit Graph

88 Commits

Author SHA1 Message Date
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
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
codemann8
3dfae76275 Play GT2 track in DR if GTBK is collected 2023-11-05 08:44:19 -06:00
codemann8
6de8dc606c Fix issue with incorrect track playing on DDM 2023-11-05 08:39:54 -06:00
codemann8
43552d1a64 Fix Hera music to play correct dungeon track following a floor change 2023-10-24 07:38:06 -05: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
653f66e57a Fix for Hera music silence 2023-07-10 10:28:17 -06:00
codemann8
511cc1af51 Fix for Hera music silence 2023-04-07 15:42:34 -05:00
cassidoxa
69fd6015e6 Some more annotations 2022-11-25 01:08:07 -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
codemann8
bfa105fd62 Minor MSU change for bunny music 2022-08-18 20:48:51 -05:00
codemann8
25761a1aa6 Changed MSU-1 in Inverted to flip the triggers for the secondary OW tracks 2022-07-31 21:11:40 -05:00
codemann8
7c7664224e Merged DR v1.0.1.0 2022-07-08 05:32:08 -05:00
cassidoxa
9c41ffb55b Merge branch 'sram_rework' into dr_sram 2022-04-20 00:30:35 -04: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
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
2215b16240 Merge branch 'DRMain' into OWMain 2021-10-21 21:26:38 -05:00
aerinon
27654b9ac9 Merge remote-tracking branch 'baserom/master' into DRMain
# Conflicts:
#	hooks.asm
#	newhud.asm
#	utilities.asm
2021-10-21 14:15:54 -06:00
qwertymodo
48d9a7d4bc Fix SPC un/mute race condition
Should fix mothula hardlock, for real this time
2021-08-23 11:24:24 -07:00
codemann8
1210264294 Changed LW2 track in MSU-1 to play after Aga1 kill instead of ped pull 2021-08-11 06:04:09 -05:00
codemann8
06a7b7bead Fixed SW MSU track to play regardless of world 2021-08-02 04:20:02 -05:00
aerinon
e9aec2ba86 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	hooks.asm
2021-06-22 13:12:07 -06:00
qwertymodo
cc9c355ef7 More robust bank fix
Shouldn't crash on crystal/pendant anymore
2021-06-21 13:42:16 -07:00
qwertymodo
429fea004f Set DB/DP to 0 in frame hook
Possible fix for hole transition crashes
2021-06-18 16:50:49 -07:00
Bonta
14844400b3 MSU1: Minor tweaks to avoid a long jump in main path 2021-06-13 00:38:00 +02:00
Bonta
183d439ff7 MSU1: Fade in on resume 2021-06-12 23:47:46 +02:00
Bonta
a9a929c6f4 MSU1: Dont resume track from Link's house 2021-06-12 22:35:07 +02:00
Bonta
ce7396ae35 MSU1: Allow resuming any track 2021-06-12 21:14:50 +02:00
Bonta
34bb99b7d0 MSU1: Resume overworld tracks 2021-06-12 21:14:50 +02:00
spannerisms
a378bcf5c5 flag 2021-06-12 13:43:48 -04:00
codemann8
9d64b5edd1 Whoops, lines got swapped 2021-05-19 04:31:55 -05:00
codemann8
6e86c5c9b8 Fixed GT/ToH MSU muting when playing Door Shuffle 2021-05-18 00:21:32 -05:00
spannerisms
c97475f422 BRL -> JMP 2020-12-27 08:04:32 -05:00
Thomas Prescott
5930406ecb Fix S&Q crash for certain SNES users
This was suggested by Kat, and seemed to work for a player who had been experiencing chronic game crashes during an S&Q.
2020-07-17 06:18:11 -05:00
qwertymodo
114ef57fec Don't send fade commands to the SPC twice 2020-06-06 18:01:27 -07:00
qwertymodo
a87af78d1c Fix MSU-1 fade overshoot 2020-06-06 18:01:27 -07:00
qwertymodo
d9481fe346 MSU coding style cleanup 2020-06-06 18:01:27 -07:00
qwertymodo
6259a813b1 Fix title screen delay (bass version) 2020-06-06 18:01:27 -07:00
qwertymodo
762cd5344d Fix SPC crash with certain extended MSU-1 tracks 2019-11-17 03:35:27 -08:00
qwertymodo
3e9e4bdf12 Always reset ambient SFX on entering a dungeon 2019-11-09 11:46:13 -08:00
qwertymodo
57f82dc78f Properly reload expanded MSU-1 tracks after fairy revival 2019-11-09 11:45:20 -08:00
qwertymodo
dd6fd2576f Fix endgame dark woods music 2019-10-12 13:04:45 -07:00
qwertymodo
bb2fdc8041 Overworld ambient SFX fixes 2019-10-12 13:04:45 -07:00
qwertymodo
4e060e7d6d Re-add victory fanfare delay to ensure the track loads 2019-10-12 13:04:45 -07:00