From baec6954a35aaa493565f02b573f4435ab6ccd6d Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Thu, 5 Jun 2025 20:52:13 -0500
Subject: [PATCH] Reset MSU Resume on S+Q

---
 events.asm | 6 +++++-
 hooks.asm  | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/events.asm b/events.asm
index 0f3b39c..728c725 100644
--- a/events.asm
+++ b/events.asm
@@ -61,9 +61,13 @@ OnDungeonExit:
         PLP : PLA
 RTL
 ;--------------------------------------------------------------------------------
+OnSave:
+        JSL MSUResumeReset
+        REP #$30 : LDX.w #$0002
+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/hooks.asm b/hooks.asm
index 227003c..a0fbe1e 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -366,8 +366,8 @@ BRA AfterFileWrittenChecks
 org $80881F ; <- Bank00.asm : 1011 (STY $01FE)
 AfterFileWrittenChecks:
 ;--------------------------------------------------------------------------------
-org $808951 ; <- Bank00.asm : 1278 (LDX $1FFE : LDA $00848A, X : TAY : PHY)
-LDX.w #$0002
+org $80894F ; <- Bank00.asm : 1278 (LDX $1FFE : LDA $00848A, X : TAY : PHY)
+JSL OnSave : NOP
 ;--------------------------------------------------------------------------------
 org $8CCE85 ; <- Bank0C.asm : 1953 (LDA $C8 : ASL A : INC #2 : STA $701FFE)
 NOP #4