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 1/2] 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
 

From e5523473d61006c239ead56a658a492a351c3392 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Tue, 6 Jan 2026 22:40:00 -0600
Subject: [PATCH 2/2] Item category tweaks, fix two phantom chests

---
 dungeon_map/data/item_mapping.asm | 4 ++--
 dungeon_map/hooks.asm             | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dungeon_map/data/item_mapping.asm b/dungeon_map/data/item_mapping.asm
index c9bbd05..bfa49ad 100644
--- a/dungeon_map/data/item_mapping.asm
+++ b/dungeon_map/data/item_mapping.asm
@@ -11,7 +11,7 @@ db $0B ; 09 - Hammer
 db $0B ; 0A - Hookshot
 db $0B ; 0B - Bow
 db $06 ; 0C - Boomerang
-db $06 ; 0D - Powder
+db $0B ; 0D - Powder
 db $02 ; 0E - Bottle Refill (bee)
 db $0B ; 0F - Bombos
 db $0B ; 10 - Ether
@@ -23,7 +23,7 @@ db $0B ; 15 - Somaria
 db $0B ; 16 - Bottle
 db $05 ; 17 - Heartpiece
 db $06 ; 18 - Byrna
-db $06 ; 19 - Cape
+db $0B ; 19 - Cape
 db $0B ; 1A - Mirror
 db $0B ; 1B - Glove
 db $0B ; 1C - Mitts
diff --git a/dungeon_map/hooks.asm b/dungeon_map/hooks.asm
index e35c55f..d3e56ff 100644
--- a/dungeon_map/hooks.asm
+++ b/dungeon_map/hooks.asm
@@ -25,8 +25,15 @@ db $61, $56, $57, $62
 db $61, $56, $57, $62
 db $61, $56, $57, $62
 
+; unused chest data
+org $81E9A5
+dw $00F0 ; freezor room, second chest (only one chest in supertile)
+
+org $81EA6E
+dw $00F0 ; mire spike room, second chest (only one chest in supertile)
+
 org $81EAF8
-dw $00F0 ; mark the chest data in GT climb as being part of unused room
+dw $00F0 ; GT button/switch/bladetrap room (no chest in supertile)
 
 ; Dungeon Map Palettes 2-5 left half
 org $9BE544