From 4c5adfbee212ca23931dbbf82ecf69a1828f6aa0 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 19 Aug 2025 10:08:00 -0500 Subject: [PATCH] Fix issue with LH/BS half volume issue when exiting to Kakariko --- hooks.asm | 3 +++ music.asm | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/hooks.asm b/hooks.asm index 941bdde..c73c23c 100755 --- a/hooks.asm +++ b/hooks.asm @@ -2282,6 +2282,9 @@ JSL Overworld_DetermineAndSetMusic : NOP ;-------------------------------------------------------------------------------- org $9DFD27 JSL Overworld_DetermineAndSetMusic : NOP +;-------------------------------------------------------------------------------- +org $829253 +JSL FixHalfVolumeOnSpawnExitToOverworld : NOP ;================================================================================ ;================================================================================ diff --git a/music.asm b/music.asm index 821970f..ffe4fd1 100644 --- a/music.asm +++ b/music.asm @@ -229,3 +229,13 @@ FallingMusicFadeOut: .return RTL ;-------------------------------------------------------------------------------- +FixHalfVolumeOnSpawnExitToOverworld: + BEQ .exit : STA.w MusicControlRequest ; what we wrote over + LDA.w DungeonID : BNE .exit + LDA.b LinkPosY+1 : ROR : LDA.b LinkPosY : ROR + CMP.b #$DC : BCS .exit ; check if link loading in room from a spawn + ; set queue to half volume to trigger full volume on exit + LDA.b #$F2 : STA.w MusicControlQueue +.exit + RTL +;--------------------------------------------------------------------------------