From 56dd5fbc01b6e035d7629c3feaacb95674a65c65 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Tue, 6 Jan 2026 12:06:04 -0600
Subject: [PATCH] In doors mode, ignore current floor when loading maps

---
 dungeon_map/dungeon_switch.asm | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/dungeon_map/dungeon_switch.asm b/dungeon_map/dungeon_switch.asm
index c85998c..8c842ce 100644
--- a/dungeon_map/dungeon_switch.asm
+++ b/dungeon_map/dungeon_switch.asm
@@ -99,10 +99,24 @@ SkipMapSprites:
 CacheCurrentDungeon:
 	STA.l $7EC206
 	SEP #$20
-	LDA.w DungeonID
-	STA.l $7EC22A
 	LDA.b $A4
 	STA.l $7EC22B
+
+	LDA.w DungeonID
+	STA.l $7EC22A
+
+	LDA.l DRMode
+	BEQ +
+
+	LDA.w DungeonID
+	PHX
+	ASL A
+	TAX
+	LDA.l DungeonMapData.floor, X
+	STA.b $A4
+	PLX
+
++
 	REP #$20
 	RTL