diff --git a/framehook.asm b/framehook.asm
index c4927e3..9fd89f8 100644
--- a/framehook.asm
+++ b/framehook.asm
@@ -22,8 +22,10 @@
 !LOCK_STATS = "$7EF443"
 FrameHookAction:
 	JSL $0080B5 ; Module_MainRouting
-	JSL CheckMusicLoadRequest
-	PHA : PHP
+	PHP : PHB : PHD : REP #$30 : PHA : PHX : PHY
+		LDA #$0000 : TCD : SEP #$20 : PHA : PLB
+		JSL CheckMusicLoadRequest
+
 		;LDA EnableSRAMTrace : AND.l TournamentSeedInverse : BEQ +
 		;	LDA $1A : BNE ++ : JSL.l WriteStatusPreview : ++ ; write every 256 frames
 		;+
@@ -39,7 +41,7 @@ FrameHookAction:
 				+
 			SEP #$20 ; set 8-bit accumulator ?? check this
 		++
-	PLP : PLA
+	REP #$30 : PLY : PLX : PLA : PLD : PLB : PLP
 RTL
 ;--------------------------------------------------------------------------------
 NMIHookAction:
diff --git a/msu.asm b/msu.asm
index e239b52..ca739e5 100644
--- a/msu.asm
+++ b/msu.asm
@@ -186,7 +186,6 @@ RTS
 ; Extended OST/SPC fallback, decide which track to actually play
 ;--------------------------------------------------------------------------------
 CheckMusicLoadRequest:
-    PHP : REP #$10 : PHA : PHX : PHY
         LDA !REG_MUSIC_CONTROL_REQUEST : BEQ .skip+3 : BMI .skip+3
         CMP !REG_CURRENT_COMMAND : BNE .continue
         CMP.b #22 : BNE .skip   ; Check GT when mirroring from upstairs
@@ -196,7 +195,6 @@ CheckMusicLoadRequest:
 .skip
         LDA !REG_MUSIC_CONTROL_REQUEST
         STA !REG_MUSIC_CONTROL : STZ !REG_MUSIC_CONTROL_REQUEST
-    PLY : PLX : PLA : PLP
     RTL
         
 .continue
@@ -357,13 +355,11 @@ CheckMusicLoadRequest:
 
 .done
         LDA !REG_MUSIC_CONTROL_REQUEST : STA !REG_MUSIC_CONTROL : STZ !REG_MUSIC_CONTROL_REQUEST
-    PLY : PLX : PLA : PLP
     RTL
 
 .sfx_indoors
         LDA !REG_MUSIC_CONTROL_REQUEST : STA !REG_MUSIC_CONTROL : STZ !REG_MUSIC_CONTROL_REQUEST
-    PLY : PLX : PLA : PLP
-    PHP : SEP #$20 : LDA.b #$05 : STA $012D : PLP
+    SEP #$20 : LDA.b #$05 : STA $012D ; Vanilla subroutine expects 8-bit A, doesn't use X/Y
     JML Module_PreDungeon_setAmbientSfx
 ;--------------------------------------------------------------------------------