From 09f27100fcb0c567bfb07822b93e3f5e79496561 Mon Sep 17 00:00:00 2001
From: jeboo <jeb00o@yahoo.com>
Date: Tue, 15 Sep 2026 20:02:55 -0400
Subject: [PATCH] savestate fixes: low health warning sound and no music on
 load

---
 patches/ips/savestate.ips | Bin 1029 -> 1051 bytes
 patches/src/savestate.asm |  21 ++++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/patches/ips/savestate.ips b/patches/ips/savestate.ips
index b0c1fe050e241f62d1604d5a68fc31de848ceb97..e6dc5ad84a94b831883c2833f34a6d5138efc001 100644
GIT binary patch
delta 195
zcmZqWn9X4v;27fU!BBsLfsuph00RS?Ptrl3wTGAva4`Q}`<cC;slH(CSN47uAl1g!
z&sJZMpx`~xSe<!J7T3h6L=mHd)k+8Z8&)#>m&pCh4q`SGPCTzIl(8PD^sGIbL42=0
zTW=d%L-=GKMq>%(2C4Nxqb~6Ger11T(Cfo?$Y8B4TLZ^r7sdp(bqBpy``nzoig7<<
u-sCJMBgT-)bD0#_Pag7Fc~D{D<ReUb7+WVdGHWm{oV<!z3n+V)*#H1s-AI-I

delta 199
zcmbQu(aK>Q;27fU!BBsLfsuph00RS?kIzA$>4%sOa4<h#`<cC;slH(CSN47uAl1g!
z&sJZMpx`mlSbbt_qKNLnYNdny4J#S`OXPlL2QeF}CSKAO3SAFWcGjNFz^B)qt+$P>
z!DTW(qcN+%dY~bbqZkv|W*qch?Q?kY0ml7|5tAF3j5O>HR=0My_OGw{*VH;aVLeBE
zK_?@_2Yv;P1CJECt36gP+I+}o@<D~}$+wvHFy>F5&aA=MJ^28$7Ngzd*USb04Ny%~

diff --git a/patches/src/savestate.asm b/patches/src/savestate.asm
index 718f27eaa..67ef274a2 100644
--- a/patches/src/savestate.asm
+++ b/patches/src/savestate.asm
@@ -27,6 +27,7 @@ org $80ffd8
 !MUSIC_QUEUE_START = $063B
 !MUSIC_ENTRY = $063D
 !MUSIC_TIMER = $063F
+!MSU_MUSIC_TRACK = $064C
 !MUSIC_DATA = $07F3
 !MUSIC_TRACK = $07F5
 !SOUND_TIMER = $0686
@@ -149,6 +150,8 @@ post_load_state:
     BEQ .skip_bg3
     JSL $85A290
 .skip_bg3
+    ; Clear low health sound flag
+    STZ !SAMUS_HEALTH_WARNING
     RTS
 }
 
@@ -231,12 +234,24 @@ post_load_music:
   .queued_music_set_timer
     STA !MUSIC_QUEUE_TIMERS,X : STA !SOUND_TIMER : STA !MUSIC_TIMER
     BRA .done
+   
+  .load_track
+    BRA .load_track2
 
   .check_track
-    LDA !SRAM_MUSIC_TRACK : CMP !MUSIC_TRACK : BEQ .done
+    LDA !SRAM_MUSIC_TRACK : BNE .check_track2   ; music stopped at time of load?
+    STA !MUSIC_TRACK
+    %ai8() : STA !MSU_MUSIC_TRACK : %ai16()     ; msu1.asm checks this
+    LDA !MUSIC_ENTRY                            ; queued music track
+    BRA .call_music
+    
+  .check_track2
+    CMP !MUSIC_TRACK : BEQ .done
 
-  .load_track
-    LDA !MUSIC_TRACK : JSL !MUSIC_ROUTINE
+  .load_track2
+    LDA !MUSIC_TRACK 
+  .call_music
+    JSL !MUSIC_ROUTINE
 
   .done
     RTS