Merge branch 'OWMain' into overworld_kara

2021-07-28 12:54:14 -07:00
parent 7aac3970d1 6e721fb069
commit 07f0ee9962
1 changed files with 5 additions and 6 deletions
--- a/music.asm
+++ b/music.asm
@@ -295,12 +295,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
 ;--------------------------------------------------------------------------------