alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

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

Browse Source
This commit is contained in:
codemann8
2021-07-12 15:41:59 -05:00
parent 1c9936d231
commit 0bce51af4e
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hooks.asm
View File

@@ -1671,6 +1671,10 @@ dw !REG_MUSIC_CONTROL
org $0CF05F org $0CF05F
dw !REG_MUSIC_CONTROL dw !REG_MUSIC_CONTROL
; Conditionally disable UW music changes in Door Rando
org $028ADB ; <- Bank02.asm:2088 (LDX.b #$14 : LDA $A0)
JSL.l Underworld_DoorDown_Entry
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;================================================================================ ;================================================================================

14
music.asm
View File

@@ -283,3 +283,17 @@ Overworld_MosaicDarkWorldChecks:
.done .done
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;--------------------------------------------------------------------------------
; This is the where the music can change due to an UW transition
;
; On entry, A=16bit XY=8bit, A & X safe to mod, Y unknown
Underworld_DoorDown_Entry:
LDA.l DRMode : TAX : LDA.w #0 : CPX #0 : BNE .done
.vanilla
LDX #$14 : LDA $A0 ; thing we wrote over - prepare Sanc music track, load current room ID
.done
RTL
;--------------------------------------------------------------------------------