fix: disable flute in rain state (except glitched modes)

fix(msu): GTBK music in DR
2023-11-15 14:30:44 -07:00
parent 1290751307
commit 62356f0159
3 changed files with 24 additions and 1 deletions
--- a/msu.asm
+++ b/msu.asm
@@ -271,7 +271,13 @@ CheckMusicLoadRequest:
            LDA $040C
            CMP.b #$08 : BNE .check_fallback  ; Hyrule Castle 2
 .dungeon
-            LDA $040C : LSR : !ADD.b #33 : STA !REG_MUSIC_CONTROL_REQUEST
+            LDA $040C : CMP.b #$1A : BNE +
+                PHA : LDA.l DRMode : BEQ ++
+                    LDA.w BigKeyField : AND.b #$04 : BEQ ++
+                        ; if door rando and entering GT with BK
+                        PLA : LDA.b #59 : BRA .check_fallback-3
+                ++ PLA
+            + LSR : !ADD.b #33 : STA !REG_MUSIC_CONTROL_REQUEST

 .check_fallback
            LDX !REG_MUSIC_CONTROL_REQUEST