alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Re-add victory fanfare delay to ensure the track loads

Browse Source
This commit is contained in:
qwertymodo
2019-09-28 18:13:30 -07:00
parent 0c032c7d06
commit 4e060e7d6d
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hooks.asm
View File

@@ -1470,6 +1470,9 @@ crystal_done:
org $08C637 org $08C637
crystal_continue: crystal_continue:
org $0988A0 ; <- 8D2C01 8009 - ancilla_init.asm:1179 (STA $012C : BRA .doneWithSoundEffects)
JML fanfare_preload : NOP
org $0CC100 ; <- A511 C904 - Bank0C.asm:07 (LDA $11 : CMP.b #$04) org $0CC100 ; <- A511 C904 - Bank0C.asm:07 (LDA $11 : CMP.b #$04)
JSL.l startup_wait JSL.l startup_wait

9
msu.asm
View File

@@ -592,6 +592,15 @@ load_track:
STA !REG_MUSIC_CONTROL STA !REG_MUSIC_CONTROL
JML spc_continue JML spc_continue
fanfare_preload:
STA !REG_MUSIC_CONTROL_REQUEST ; thing we wrote over
PHA
JSL CheckMusicLoadRequest
WAI
PLA
- : CMP !REG_SPC_CONTROL : BNE -
JML AddReceivedItem_doneWithSoundEffects
pendant_fanfare: pendant_fanfare:
LDA TournamentSeed : BNE .spc LDA TournamentSeed : BNE .spc
LDA FastFanfare : BNE .done LDA FastFanfare : BNE .done