From 4088698af944119040f2d1b62119298ada54e58f Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Thu, 12 Jun 2025 00:54:23 -0500
Subject: [PATCH] Undo MSU Kak Music Fix

---
 events.asm |  6 ------
 hooks.asm  |  4 ++--
 msu.asm    | 15 +++------------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/events.asm b/events.asm
index 728c725..0891353 100644
--- a/events.asm
+++ b/events.asm
@@ -60,12 +60,6 @@ OnDungeonExit:
         JSL SetSilverBowMode
         PLP : PLA
 RTL
-;--------------------------------------------------------------------------------
-OnSave:
-        JSL MSUResumeReset
-        REP #$30 : LDX.w #$0002
-RTL
-;--------------------------------------------------------------------------------
 OnQuit:
 	JSL SQEGFix
 	LDA.b #$00 : STA.l AltTextFlag ; bandaid patch bug with mirroring away from text
diff --git a/hooks.asm b/hooks.asm
index a0fbe1e..227003c 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -366,8 +366,8 @@ BRA AfterFileWrittenChecks
 org $80881F ; <- Bank00.asm : 1011 (STY $01FE)
 AfterFileWrittenChecks:
 ;--------------------------------------------------------------------------------
-org $80894F ; <- Bank00.asm : 1278 (LDX $1FFE : LDA $00848A, X : TAY : PHY)
-JSL OnSave : NOP
+org $808951 ; <- Bank00.asm : 1278 (LDX $1FFE : LDA $00848A, X : TAY : PHY)
+LDX.w #$0002
 ;--------------------------------------------------------------------------------
 org $8CCE85 ; <- Bank0C.asm : 1953 (LDA $C8 : ASL A : INC #2 : STA $701FFE)
 NOP #4
diff --git a/msu.asm b/msu.asm
index 1b66f16..9ae52a8 100644
--- a/msu.asm
+++ b/msu.asm
@@ -429,7 +429,9 @@ MSUInit:
 
     LDA.b #$00
     STA.l MSULoadedTrack
-    JSL MSUResumeReset
+    STA.l MSUResumeTrack
+    STA.l MSUResumeTime : STA.l MSUResumeTime+1 : STA.l MSUResumeTime+2 : STA.l MSUResumeTime+3
+    STA.l MSUResumeControl
 
     LDA.l NoBGM : BNE .done
 
@@ -494,17 +496,6 @@ 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
 ;--------------------------------------------------------------------------------