From b24e4405978caab945be77298fed43f7fc5d7a97 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 19 Aug 2025 10:10:08 -0500 Subject: [PATCH] Fix issue with music silence in DR when straight stairs lead to pre-Aga room --- hooks.asm | 4 ++++ music.asm | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/hooks.asm b/hooks.asm index e045cca..5e5c224 100644 --- a/hooks.asm +++ b/hooks.asm @@ -2206,6 +2206,10 @@ dl Overworld_FinishMirrorWarp ;-------------------------------------------------------------------------------- org $8AB949 ; <- Bank0A.asm:270 (Different from US ROM) JSL BirdTravel_LoadTargetAreaMusic : NOP #16 +;-------------------------------------------------------------------------------- +org $8292D9 +BRA + : NOP #4 : + +JSL FixPreAgaMusicFadeOut : db $B0 ; BCS ;================================================================================ ;================================================================================ diff --git a/music.asm b/music.asm index 2b2b91a..be6b1e4 100644 --- a/music.asm +++ b/music.asm @@ -293,3 +293,12 @@ FallingMusicFadeOut: .return RTL ;-------------------------------------------------------------------------------- +FixPreAgaMusicFadeOut: + LDA.l DRMode : TAX : CPX.b #$01 : BCS .exit_no_fade+1 + LDA.b RoomIndex : CMP.w #$0030 : BEQ .exit_and_fade ; what we + CMP.w #$0040 : BEQ .exit_and_fade ; wrote over +.exit_no_fade + SEC : RTL +.exit_and_fade + CLC : RTL +;--------------------------------------------------------------------------------