From bb2fdc80411dc95a596ff66010fa2757aedde2a5 Mon Sep 17 00:00:00 2001
From: qwertymodo <qwertymodo@qwertymodo.com>
Date: Thu, 10 Oct 2019 14:57:30 -0700
Subject: [PATCH] Overworld ambient SFX fixes

---
 msu.asm   | 10 ++++++++--
 music.asm | 18 +++++++++++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/msu.asm b/msu.asm
index dd49401..b2f5884 100644
--- a/msu.asm
+++ b/msu.asm
@@ -300,8 +300,14 @@ CheckMusicLoadRequest:
 
 .sfx_outdoors
         SEP #$10
-            LDX.b #$05
-            LDA $8A : CMP.b #$70 : BNE +    ; Misery Mire
+            LDX.b #$09
+
+            LDA $8A             ; Dark Death Mountain
+            CMP.b #$43 : BEQ + : CMP.b #$45 : BEQ + : CMP.b #$47 : BEQ +
+                LDX.b #$05
+            +
+
+            CMP.b #$70 : BNE +    ; Misery Mire
                 LDA $7EF2F0 : AND.b #$20 : BEQ .rain
             +
 
diff --git a/music.asm b/music.asm
index 3c080fe..7e7e6dd 100644
--- a/music.asm
+++ b/music.asm
@@ -216,18 +216,26 @@ BirdTravel_LoadTargetAreaMusic:
     ; if we are in the light world go ahead and set chosen selection
     LDA $7EF3CA : BEQ .checkInverted+4
 
-    LDX.b #$0F ; dark woods theme
+    LDX.b #$09 ; dark overworld theme
 
-    ; This music is used in dark woods
     LDA $8A
-    CMP.b #$40 : BEQ +
-        LDX.b #$0D  ; dark death mountain theme
+    ; Misery Mire rain SFX
+    CMP.b #$70 : BNE ++
+        LDA $7EF2F0 : AND.b #$20 : BNE ++
+            LDA.b #$01 : CMP $0131 : BEQ +
+                STA $012D
+            + : BRA .checkInverted
+    ++
 
     ; This music is used in dark death mountain
     CMP.b #$43 : BEQ + : CMP.b #$45 : BEQ + : CMP.b #$47 : BEQ +
-        LDX.b #$09 ; dark overworld theme
+        LDA.b #$05 : STA $012D
+        BRA .checkInverted
     +
 
+    LDX.b #$0D  ; dark death mountain theme
+    LDA.b #$09 : STA $012D
+
     ; if not inverted and light world, or inverted and dark world, skip moon pearl check
     .checkInverted
     LDA $7EF3CA : CLC : ROL #$03 : CMP InvertedMode : BEQ .lastCheck