From d5661c4f3bc8b514e83b7550fb862a4f16214476 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sun, 25 Aug 2024 08:29:40 -0500
Subject: [PATCH] Skip Pre-Aga music change if DR enabled

---
 Rom.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Rom.py b/Rom.py
index 9454072f..ef379c2e 100644
--- a/Rom.py
+++ b/Rom.py
@@ -492,6 +492,9 @@ def patch_rom(world, rom, player, team, is_mystery=False):
     if world.mapshuffle[player]:
         rom.write_byte(0x155C9, random.choice([0x11, 0x16]))  # Randomize GT music too with map shuffle
 
+    if world.doorShuffle[player] != 'vanilla':
+        rom.write_bytes(snes_to_pc(0x0293FE), [0x80, 0x15])  # skip pre-Aga music change
+
     # fix for swamp drains if necessary
     swamp1location = world.get_location('Swamp Palace - Trench 1 Pot Key', player)
     if not swamp1location.pot.indicator: