Merge pull request #14 from codemann8/MSUMuteFix

Fix for boss music not playing in non-DR modes
2021-07-27 08:53:08 -06:00
parent 15337a1382 9cecd30e89
commit fa516b58d4
1 changed files with 5 additions and 6 deletions
--- a/music.asm
+++ b/music.asm
@@ -292,12 +292,11 @@ Underworld_DoorDown_Entry:
    LDA.l DRMode : TAX : LDA $A0 : CPX #0 : BNE .done

 .vanilla ; thing we wrote over
-    LDX #$14 ;: LDA $A0
-    CMP.w #$0012 : BEQ .done
-    
-    LDX.b #$10 ; value for Hyrule Castle music
-    CMP.w #$0002 : BEQ .done
-
+    CMP.w #$0012 : BNE +
+        LDX.b #$14 ; value for Sanc music
+        BRA .done
+    + CMP.w #$0002 : BNE .done
+        LDX.b #$10 ; value for Hyrule Castle music
 .done
    RTL
 ;--------------------------------------------------------------------------------