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