In doors mode, ignore current floor when loading maps

2026-01-06 12:06:04 -06:00
parent d918e571ab
commit 56dd5fbc01
1 changed files with 16 additions and 2 deletions
--- 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