From f3489488fec592636774b78145606dacd766e35a Mon Sep 17 00:00:00 2001
From: qwertymodo <qwertymodo@qwertymodo.com>
Date: Tue, 23 Oct 2018 12:02:50 -0700
Subject: [PATCH 1/2] Fix MSU-1 pendant softlock on buggy higan RetroArch core

---
 msu.asm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/msu.asm b/msu.asm
index 5d512a7..bd8f653 100644
--- a/msu.asm
+++ b/msu.asm
@@ -176,6 +176,7 @@ pendant_fanfare:
     LDA !REG_MSU_ID_23 : CMP !VAL_MSU_ID_23 : BNE .spc
     LDA !REG_MSU_ID_45 : CMP !VAL_MSU_ID_45 : BNE .spc
     SEP #$20
+    LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_TRACK_MISSING : BNE .spc
     LDA !REG_MSU_LOAD_FLAG : BNE .continue
     LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done
 .continue
@@ -194,6 +195,7 @@ crystal_fanfare:
     LDA !REG_MSU_ID_23 : CMP !VAL_MSU_ID_23 : BNE .spc
     LDA !REG_MSU_ID_45 : CMP !VAL_MSU_ID_45 : BNE .spc
     SEP #$20
+    LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_TRACK_MISSING : BNE .spc
     LDA !REG_MSU_LOAD_FLAG : BNE .continue
     LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done
 .continue    

From 7271b61a278f293aa6d55e6729181da7c3085add Mon Sep 17 00:00:00 2001
From: qwertymodo <qwertymodo@qwertymodo.com>
Date: Tue, 23 Oct 2018 12:04:22 -0700
Subject: [PATCH 2/2] Fix MSU-1 muting issue in enemizer (hobo bridge,
 pedestal)

---
 msu.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msu.asm b/msu.asm
index bd8f653..a25e112 100644
--- a/msu.asm
+++ b/msu.asm
@@ -122,7 +122,6 @@ do_fade:
 .mute
     STZ !REG_CURRENT_VOLUME
     STZ !REG_MSU_CONTROL
-    STZ !REG_CURRENT_MSU_TRACK
     BRA .set
 .increment
     ADC !VAL_VOLUME_INCREMENT : BCC .set
@@ -154,6 +153,7 @@ command_f1:
     CPX !VAL_COMMAND_FADE_OUT : BNE load_track
     STX !REG_SPC_CONTROL
     STZ !REG_TARGET_VOLUME
+    STZ !REG_CURRENT_MSU_TRACK
     JML spc_continue
 
 load_track: