From 34fa1cd98e854916f5dd81864f6984876e0c6fa9 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
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 c73c23c..782757f 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -2285,6 +2285,10 @@ JSL Overworld_DetermineAndSetMusic : NOP
 ;--------------------------------------------------------------------------------
 org $829253
 JSL FixHalfVolumeOnSpawnExitToOverworld : NOP
+;--------------------------------------------------------------------------------
+org $8292D9
+BRA + : NOP #4 : +
+JSL FixPreAgaMusicFadeOut : db $B0 ; BCS
 ;================================================================================
 
 ;================================================================================
diff --git a/music.asm b/music.asm
index ffe4fd1..3224ea6 100644
--- a/music.asm
+++ b/music.asm
@@ -239,3 +239,12 @@ FixHalfVolumeOnSpawnExitToOverworld:
 .exit
     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
+;--------------------------------------------------------------------------------