Merge branch 'OWMain' into overworld_kara

This commit is contained in:
2021-07-28 12:54:14 -07:00

View File

@@ -295,12 +295,11 @@ Underworld_DoorDown_Entry:
LDA.l DRMode : TAX : LDA $A0 : CPX #0 : BNE .done LDA.l DRMode : TAX : LDA $A0 : CPX #0 : BNE .done
.vanilla ; thing we wrote over .vanilla ; thing we wrote over
LDX #$14 ;: LDA $A0 CMP.w #$0012 : BNE +
CMP.w #$0012 : BEQ .done LDX.b #$14 ; value for Sanc music
BRA .done
LDX.b #$10 ; value for Hyrule Castle music + CMP.w #$0002 : BNE .done
CMP.w #$0002 : BEQ .done LDX.b #$10 ; value for Hyrule Castle music
.done .done
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------