From 4e060e7d6de4741f59b31b8f14a3ffee6cd8594b Mon Sep 17 00:00:00 2001
From: qwertymodo <qwertymodo@qwertymodo.com>
Date: Sat, 28 Sep 2019 18:13:30 -0700
Subject: [PATCH] Re-add victory fanfare delay to ensure the track loads

---
 hooks.asm | 3 +++
 msu.asm   | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/hooks.asm b/hooks.asm
index 15ee71d..e43fcdf 100755
--- 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
 
diff --git a/msu.asm b/msu.asm
index 4428c4e..dd49401 100644
--- 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