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

Fix issue with music silence in DR when straight stairs lead to pre-Aga room

Browse Source
This commit is contained in:
codemann8
2025-08-19 10:10:08 -05:00
committed by aerinon
parent 44b014fc65
commit b24e440597
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hooks.asm
View File

@@ -2206,6 +2206,10 @@ dl Overworld_FinishMirrorWarp
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $8AB949 ; <- Bank0A.asm:270 (Different from US ROM) org $8AB949 ; <- Bank0A.asm:270 (Different from US ROM)
JSL BirdTravel_LoadTargetAreaMusic : NOP #16 JSL BirdTravel_LoadTargetAreaMusic : NOP #16
;--------------------------------------------------------------------------------
org $8292D9
BRA + : NOP #4 : +
JSL FixPreAgaMusicFadeOut : db $B0 ; BCS
;================================================================================ ;================================================================================
;================================================================================ ;================================================================================

9
music.asm
View File

@@ -293,3 +293,12 @@ FallingMusicFadeOut:
.return .return
RTL 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
;--------------------------------------------------------------------------------