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

Suppressed awkward/abrupt music changes in dungeons when DR is enabled

Browse Source
This commit is contained in:
codemann8
2021-07-12 19:22:57 -05:00
parent 9209153643
commit dc2a468acb
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hooks.asm
View File

@@ -1673,8 +1673,10 @@ org $0CF05F
dw !REG_MUSIC_CONTROL dw !REG_MUSIC_CONTROL
; Conditionally disable UW music changes in Door Rando ; Conditionally disable UW music changes in Door Rando
org $028ADB ; <- Bank02.asm:2088 (LDX.b #$14 : LDA $A0) org $028ADB ; <- Bank02.asm:2088-2095 (LDX.b #$14 : LDA $A0 ...)
JSL.l Underworld_DoorDown_Entry JSL.l Underworld_DoorDown_Entry : CPX #$10
db $B0, $21 ; BCS $028B04
BRA + : NOP #6 : +
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;================================================================================ ;================================================================================

10
music.asm
View File

@@ -292,10 +292,14 @@ 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 DRMode : TAX : LDA.w #0 : CPX #0 : BNE .done LDA.l DRMode : TAX : LDA $A0 : CPX #0 : BNE .done
.vanilla .vanilla ; thing we wrote over
LDX #$14 : LDA $A0 ; thing we wrote over - prepare Sanc music track, load current room ID LDX #$14 ;: LDA $A0
CMP.w #$0012 : BEQ .done
LDX.b #$10 ; value for Hyrule Castle music
CMP.w #$0002 : BEQ .done
.done .done
RTL RTL