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
parent 4c5adfbee2
commit 34fa1cd98e
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

@@ -2285,6 +2285,10 @@ JSL Overworld_DetermineAndSetMusic : NOP
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $829253 org $829253
JSL FixHalfVolumeOnSpawnExitToOverworld : NOP JSL FixHalfVolumeOnSpawnExitToOverworld : NOP
;--------------------------------------------------------------------------------
org $8292D9
BRA + : NOP #4 : +
JSL FixPreAgaMusicFadeOut : db $B0 ; BCS
;================================================================================ ;================================================================================
;================================================================================ ;================================================================================

9
music.asm
View File

@@ -239,3 +239,12 @@ FixHalfVolumeOnSpawnExitToOverworld:
.exit .exit
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
;--------------------------------------------------------------------------------