Re-add victory fanfare delay to ensure the track loads

2019-09-28 18:13:30 -07:00
parent 0c032c7d06
commit 4e060e7d6d
2 changed files with 12 additions and 0 deletions
--- a/hooks.asm
+++ b/hooks.asm
@@ -1470,6 +1470,9 @@ crystal_done:
 org $08C637
 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)
 JSL.l startup_wait

--- a/msu.asm
+++ b/msu.asm
@@ -592,6 +592,15 @@ load_track:
    STA !REG_MUSIC_CONTROL
    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:
    LDA TournamentSeed : BNE .spc
    LDA FastFanfare : BNE .done