From adb4110c6bf79fe308d981833ae7927b24ddece2 Mon Sep 17 00:00:00 2001
From: qwertymodo <qwertymodo@qwertymodo.com>
Date: Fri, 27 Sep 2019 20:34:46 -0700
Subject: [PATCH] Fix dark world OW2 music

---
 msu.asm    | 15 ++++++++++-----
 tables.asm |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/msu.asm b/msu.asm
index d82cd97..4428c4e 100644
--- a/msu.asm
+++ b/msu.asm
@@ -212,16 +212,21 @@ CheckMusicLoadRequest:
                     PLA
                     LDA.b #60 : BRA .check_fallback-3
                 +
-            - : PLA : BRA .check_fallback-3
+            -- : PLA : BRA .check_fallback-3
 .darkworld
             PHA
-                LDA $7EF371 : CMP.b #$7F : BNE -
-            PLA
+                LDA $7EF37A : CMP.b #$7F : BNE --
+            - : PLA
             LDA.b #61 : BRA .check_fallback-3 
 .darkwoods
             PHA
-                LDA $7EF3CA : BEQ -
-                LDA $8A : CMP #$40 : BNE -
+                LDA $7EF37A : CMP.b #$7F : BNE +
+                    LDA !REG_MSU_FALLBACK_TABLE+7 : BIT #$10 : BEQ +
+                    PLA : LDA.b #61 : STA !REG_MUSIC_CONTROL_REQUEST
+                    BRA .mute
+                +
+                LDA $7EF3CA : BEQ --
+                LDA $8A : CMP #$40 : BNE --
             PLA
             LDA.b #15 : BRA .check_fallback-3
 .castle
diff --git a/tables.asm b/tables.asm
index 915102a..dc57559 100644
--- a/tables.asm
+++ b/tables.asm
@@ -1684,7 +1684,7 @@ db $03,$03,$03,$03,$01,$03,$03,$03
 db $01,$01,$03,$03,$03,$03,$03,$03
 db $03,$03,$03,$03,$03,$03,$03,$03
 db $03,$03,$03,$03,$03,$03,$03,$03
-db $03,$03,$03,$03,$00,$00,$00,$00
+db $03,$03,$03,$03,$03,$00,$00,$00
 
 MSUExtendedFallbackList:
 db $01,$02,$03,$04,$05,$06,$07,$08