alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preserve Sanc music change in Standard

Browse Source
This commit is contained in:
codemann8
2021-11-01 02:09:05 -05:00
parent 4bcc76e83b
commit dd57b4be79
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drhooks.asm
View File

@@ -186,9 +186,9 @@ Main_ShowTextMessage:
; Conditionally disable UW music changes in Door Rando ; Conditionally disable UW music changes in Door Rando
org $028ADB ; <- Bank02.asm:2088-2095 (LDX.b #$14 : LDA $A0 ...) org $028ADB ; <- Bank02.asm:2088-2095 (LDX.b #$14 : LDA $A0 ...)
JSL.l Underworld_DoorDown_Entry : CPX #$10 JSL.l Underworld_DoorDown_Entry : CPX #$FF
db $B0, $21 ; BCS $028B04 BEQ + : db $80, $1C ; BRA $028B04
BRA + : NOP #6 : + NOP #6 : +
org $02C3F2 ; <- Bank02.asm:10521 Unused call org $02C3F2 ; <- Bank02.asm:10521 Unused call
Underworld_DoorDown_Call: Underworld_DoorDown_Call:

5
music.asm
View File

@@ -193,14 +193,15 @@ Overworld_MosaicDarkWorldChecks:
; ;
; On entry, A=16bit XY=8bit, A & X safe to mod, Y unknown ; On entry, A=16bit XY=8bit, A & X safe to mod, Y unknown
Underworld_DoorDown_Entry: Underworld_DoorDown_Entry:
LDA.l $7EF3C5 : TAX : CPX #2 : !BLT .vanilla LDX #$FF ; some junk value to be used later to determine if the below lines will change the track
LDA.l $7EF3C5 : AND.w #$00FF : CMP.w #2 : !BLT .vanilla
LDA.l DRMode : BNE .done LDA.l DRMode : BNE .done
.vanilla ; thing we wrote over .vanilla ; thing we wrote over
LDA $A0 : CMP.w #$0012 : BNE + LDA $A0 : CMP.w #$0012 : BNE +
LDX.b #$14 ; value for Sanc music LDX.b #$14 ; value for Sanc music
BRA .done BRA .done
+ CMP.w #$0002 : BNE .done + LDA $A2 : CMP.w #$0012 : BNE .done
LDX.b #$10 ; value for Hyrule Castle music LDX.b #$10 ; value for Hyrule Castle music
.done .done
RTL RTL