From 8b827c374565c15acf3bfac897ce55a917181c2e Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Tue, 27 Aug 2024 07:14:19 -0500
Subject: [PATCH] Attempt to fix issue with no music in LH after S+Q from
 Kakariko

---
 events.asm |  1 +
 msu.asm    | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/events.asm b/events.asm
index 7481dc1..f87d9da 100644
--- a/events.asm
+++ b/events.asm
@@ -63,6 +63,7 @@ RTL
 ;--------------------------------------------------------------------------------
 OnQuit:
 	JSL SQEGFix
+        JSL MSUResumeReset
 	LDA.b #$00 : STA.l AltTextFlag ; bandaid patch bug with mirroring away from text
 	LDA.b #$10 : STA.b MAINDESQ ; thing we wrote over
 RTL
diff --git a/msu.asm b/msu.asm
index 4e1075d..8d30575 100644
--- a/msu.asm
+++ b/msu.asm
@@ -428,9 +428,7 @@ MSUInit:
 
     LDA.b #$00
     STA.l MSULoadedTrack
-    STA.l MSUResumeTrack
-    STA.l MSUResumeTime : STA.l MSUResumeTime+1 : STA.l MSUResumeTime+2 : STA.l MSUResumeTime+3
-    STA.l MSUResumeControl
+    JSL MSUResumeReset
 
     LDA.l NoBGM : BNE .done
 
@@ -495,6 +493,17 @@ MSUInit:
 
 ;--------------------------------------------------------------------------------
 
+;================================================================================
+; Purge MSU Resume values
+;--------------------------------------------------------------------------------
+MSUResumeReset:
+    LDA.b #$00
+    STA.l MSUResumeTrack
+    STA.l MSUResumeTime : STA.l MSUResumeTime+1 : STA.l MSUResumeTime+2 : STA.l MSUResumeTime+3
+    STA.l MSUResumeControl
+RTL
+;--------------------------------------------------------------------------------
+
 ;================================================================================
 ; Stop MSU-1 audio track and save the current position when approriate
 ;--------------------------------------------------------------------------------