From dc2a468acb6d422290a0a0e73d63dc4ec68e7da0 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Mon, 12 Jul 2021 19:22:57 -0500
Subject: [PATCH] Suppressed awkward/abrupt music changes in dungeons when DR
 is enabled

---
 hooks.asm |  6 ++++--
 music.asm | 10 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/hooks.asm b/hooks.asm
index 1b30c0e..da3760e 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -1673,8 +1673,10 @@ org $0CF05F
 dw !REG_MUSIC_CONTROL
 
 ; Conditionally disable UW music changes in Door Rando
-org $028ADB ; <- Bank02.asm:2088 (LDX.b #$14 : LDA $A0)
-JSL.l Underworld_DoorDown_Entry
+org $028ADB ; <- Bank02.asm:2088-2095 (LDX.b #$14 : LDA $A0 ...)
+JSL.l Underworld_DoorDown_Entry : CPX #$10
+db $B0, $21 ; BCS $028B04
+BRA + : NOP #6 : +
 ;--------------------------------------------------------------------------------
 
 ;================================================================================
diff --git a/music.asm b/music.asm
index d9fc61d..8a4e4e1 100644
--- a/music.asm
+++ b/music.asm
@@ -292,10 +292,14 @@ Overworld_MosaicDarkWorldChecks:
 ; 
 ; On entry, A=16bit XY=8bit, A & X safe to mod, Y unknown
 Underworld_DoorDown_Entry:
-    LDA.l DRMode : TAX : LDA.w #0 : CPX #0 : BNE .done
+    LDA.l DRMode : TAX : LDA $A0 : CPX #0 : BNE .done
 
-.vanilla
-    LDX #$14 : LDA $A0  ; thing we wrote over - prepare Sanc music track, load current room ID
+.vanilla ; thing we wrote over
+    LDX #$14 ;: LDA $A0
+    CMP.w #$0012 : BEQ .done
+    
+    LDX.b #$10 ; value for Hyrule Castle music
+    CMP.w #$0002 : BEQ .done
 
 .done
     RTL