diff --git a/hooks.asm b/hooks.asm index 8abb934..1b30c0e 100755 --- a/hooks.asm +++ b/hooks.asm @@ -1671,6 +1671,10 @@ dw !REG_MUSIC_CONTROL org $0CF05F 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 ;-------------------------------------------------------------------------------- ;================================================================================ diff --git a/music.asm b/music.asm index 2375c56..bb747cc 100644 --- a/music.asm +++ b/music.asm @@ -283,3 +283,17 @@ Overworld_MosaicDarkWorldChecks: .done 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 +;--------------------------------------------------------------------------------