From deafda3471e5b9bfcf76c2bcf7940fac68ad13cb Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Tue, 5 May 2026 19:57:10 +0900
Subject: [PATCH] fix_fast_reload_music.

---
 patches/ips/fast_reload.ips | Bin 672 -> 685 bytes
 patches/src/fast_reload.asm |  24 ++++++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/patches/ips/fast_reload.ips b/patches/ips/fast_reload.ips
index 9fc71b710f492a08f17b1b3796e85320644d9c72..8668e1d63f20044425d5d709f230bf44dd4c4d23 100644
GIT binary patch
delta 23
fcmZ3$x|Vf92T#I$29C7}@)z`8y?V8=U6Kg^ZE^{|

delta 10
RcmZ3>x`1^;$Hu7=OaK<y1JD2f

diff --git a/patches/src/fast_reload.asm b/patches/src/fast_reload.asm
index 20fc559dd..cf6305e76 100644
--- a/patches/src/fast_reload.asm
+++ b/patches/src/fast_reload.asm
@@ -46,7 +46,7 @@ deathhook:
     plp
     rts
     
-warnpc $82DDF1
+assert pc() <= $82DDF1
 
 ; Hook main game loop
 org $82897A
@@ -169,7 +169,7 @@ hook_main:
     pea $f70d    ; $82f70e = rtl
     jml !deathhook82
 
-warnpc !bank_85_free_space_end
+assert pc() <= !bank_85_free_space_end
 
 org !spin_lock_button_combo
     dw $0870
@@ -351,7 +351,7 @@ hook_ship_save:
     jsl $809049
     rtl
 
-warnpc $A18000
+assert pc() <= $A18000
 
 ; load game room pointer hook
 org $80c45e
@@ -377,4 +377,20 @@ hook_room:
     sta $079B  ; replaced code
     rts
 
-warnpc !bank_80_free_space_end
+assert pc() <= !bank_80_free_space_end
+
+
+; quick reload music fix - nn_357
+; ;;; $E09B: Update music track index ;;;
+; Called only by $80:A07B (start gameplay) to set the music track to play when Samus fanfare finishes
+; noted in PJ's bank logs... E0AC..CB can be omitted >_<;
+; could be refined further.. since we currently have no demos I just replace the check if in demo to check if we are in quick reload.
+; it updates the music tracks so the fast reload setup_game_3 doesn't trigger to update the area music.
+
+org $82e09f
+update_music:
+  lda !QUICK_RELOAD
+  bne .return
+  nop #3
+org $82e0d2  
+.return
\ No newline at end of file