From 48d9a7d4bcbd2a4ae3e9ff6800f590deda2a5aac Mon Sep 17 00:00:00 2001
From: qwertymodo <qwertymodo@qwertymodo.com>
Date: Mon, 23 Aug 2021 11:24:24 -0700
Subject: [PATCH] Fix SPC un/mute race condition

Should fix mothula hardlock, for real this time
---
 msu.asm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/msu.asm b/msu.asm
index 76fb53c..49b5904 100644
--- a/msu.asm
+++ b/msu.asm
@@ -323,10 +323,8 @@ CheckMusicLoadRequest:
 .load
         REP #$10
         STZ $4200
-        STA !REG_SPC_CONTROL
-        - : CMP !REG_SPC_CONTROL : BNE -    ; Wait until mute/unmute command is ACK'ed
-        STZ !REG_SPC_CONTROL
-        - : LDA !REG_SPC_CONTROL : BNE -    ; Wait until mute/unmute command is completed
+        - : STA !REG_SPC_CONTROL : CMP !REG_SPC_CONTROL : BNE - ; Wait until mute/unmute command is ACK'ed
+        - : STZ !REG_SPC_CONTROL : LDA !REG_SPC_CONTROL : BNE - ; Wait until mute/unmute command is completed
         LDA.b #$81 : STA $4200
 
         LDA !REG_MUSIC_CONTROL_REQUEST : CMP.b #08 : BEQ .done+3    ; No SFX during warp track