From 9209153643e39923d6c88c4afa6020208b1cae75 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Mon, 12 Jul 2021 15:41:59 -0500
Subject: [PATCH] Supressed awkward/abrupt music changes in dungeons when DR is
 enabled

---
 hooks.asm |  4 ++++
 music.asm | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/hooks.asm b/hooks.asm
index 8abb934..1b30c0e 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -1671,6 +1671,10 @@ dw !REG_MUSIC_CONTROL
 
 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
 ;--------------------------------------------------------------------------------
 
 ;================================================================================
diff --git a/music.asm b/music.asm
index cb6bf5c..d9fc61d 100644
--- a/music.asm
+++ b/music.asm
@@ -286,3 +286,17 @@ Overworld_MosaicDarkWorldChecks:
 .done
     RTL
 ;--------------------------------------------------------------------------------
+
+;--------------------------------------------------------------------------------
+; This is the where the music can change due to an UW transition
+; 
+; 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
+
+.vanilla
+    LDX #$14 : LDA $A0  ; thing we wrote over - prepare Sanc music track, load current room ID
+
+.done
+    RTL
+;--------------------------------------------------------------------------------