Commit Graph

66 Commits

Author SHA1 Message Date
f6f6383913 Merge remote-tracking branch 'codemann/OWMain' into overworld_kara 2021-09-21 14:10:23 -07:00
42002ae839 Merge branch 'main' into overworld_kara 2021-08-26 08:44:15 -07: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
qwertymodo
adb4110c6b Fix dark world OW2 music 2019-10-12 13:04:45 -07:00
qwertymodo
4aef32bcca Don't allow SPC mute/unmute commands to be executed during NMI 2019-10-12 13:04:45 -07:00
qwertymodo
df4d663de3 Clean up some old, unused code 2019-10-12 13:04:45 -07:00
qwertymodo
518f01fdcc Skip MSU-1 track reload on mirroring inside a dungeon 2019-10-12 13:04:45 -07:00
qwertymodo
b5f42c706e No more SPC race condition whack-a-mole, just hard sync and be done with it 2019-10-12 13:04:45 -07:00
qwertymodo
60c66a6944 Wait on the startup screen for the SPC to be ready before accepting button inputs 2019-10-12 13:04:45 -07:00
qwertymodo
5adee10378 Add an extra SPC synchronization wait after muting or unmuting before attempting to start the next song 2019-10-12 13:04:45 -07:00
qwertymodo
5be274d69e Fix some off-by-one loads in MSU fallback 2019-10-12 13:04:45 -07:00
qwertymodo
aa1a07f85b Index MSUTrackList from 1 like the other MSU tables to support up to track 64 2019-10-12 13:04:45 -07:00
qwertymodo
ef86915965 Add initial music shuffle table 2019-10-12 13:04:45 -07:00
qwertymodo
ff25bbccd3 Fix SPC crash with the new mute/unmute engine commands and the mirror warp track 2019-10-12 13:04:45 -07:00
qwertymodo
f18d003a2b Change GT2 music to only play upstairs 2019-10-12 13:04:45 -07:00
qwertymodo
9b4eac681a Switch SPC fallback mute/unmute to use the new FA/FB N-SPC commands 2019-10-12 13:04:45 -07:00
qwertymodo
b3299ca27d Fix issue with NoBGM muting 2019-10-12 13:04:45 -07:00
qwertymodo
50f36be621 Disable MSU-1 audio too when Background Music is set to No 2019-10-12 13:04:45 -07:00
qwertymodo
bd3ebb2275 Add special MSU-1 pack indexes for SPC fallback () and NoBGM () 2019-10-12 13:04:45 -07:00
qwertymodo
449043e103 Fix background dungeon lookup for expanded MSU-1 packs 2019-09-06 15:56:22 -07:00
qwertymodo
bebdb1fd61 Re-scan the MSU-1 fallback table on pack switch 2019-09-06 14:47:05 -07:00
qwertymodo
5a20102d08 Add fast fanfare option 2019-08-31 11:55:25 -07:00
qwertymodo
3ab1b329ae Fix ped pull crash 2019-08-30 23:07:47 -07:00
qwertymodo
c005695c18 Fix victory fanfare crash 2019-08-30 22:04:07 -07:00
qwertymodo
fd7d2bba3a MSU-1 fixes and updates 2019-08-28 10:26:00 -07:00