diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 7306b72..60450a6 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -210,6 +210,7 @@ incsrc special_weapons.asm
 incsrc variable_ganon_vulnerability.asm
 incsrc pseudoflute.asm
 incsrc dungeon_map/main.asm
+print "End of B9: ", pc
 
 warnpc $B9E000 ; $E000 - EFFF reserved for custom door rando map data
 
diff --git a/bin/linux/compress b/bin/linux/compress
index fb8342d..cef95d0 100644
Binary files a/bin/linux/compress and b/bin/linux/compress differ
diff --git a/bin/linux/decompress b/bin/linux/decompress
index 4e183e5..a62f358 100644
Binary files a/bin/linux/decompress and b/bin/linux/decompress differ
diff --git a/bin/src/compress.c b/bin/src/compress.c
index 0504ad0..4b9bcdb 100644
--- a/bin/src/compress.c
+++ b/bin/src/compress.c
@@ -243,7 +243,7 @@ int main(int argc, char *argv[]) {
     }
 
     fclose(outptr);
-    printf("Input file: %X bytes. Compressed: %X bytes.\n", size, oloc);
+    printf("Input file: %lX bytes. Compressed: %X bytes.\n", size, oloc);
 
     return 0;
 }
diff --git a/bin/src/decompress.c b/bin/src/decompress.c
index e0d12ea..1be2274 100644
--- a/bin/src/decompress.c
+++ b/bin/src/decompress.c
@@ -149,7 +149,7 @@ int main(int argc, char *argv[]) {
     }
 
     fclose(outptr);
-    printf("Input file: %X bytes. Decompressed: %X bytes.\n", size, oloc);
+    printf("Input file: %lX bytes. Decompressed: %X bytes.\n", size, oloc);
 
     return 0;
 }
diff --git a/bin/windows/compress.exe b/bin/windows/compress.exe
index 54c9b39..3366dc6 100644
Binary files a/bin/windows/compress.exe and b/bin/windows/compress.exe differ
diff --git a/bin/windows/decompress.exe b/bin/windows/decompress.exe
index b3e6619..723671a 100644
Binary files a/bin/windows/decompress.exe and b/bin/windows/decompress.exe differ
diff --git a/dungeon_map/blink_loot.asm b/dungeon_map/blink_loot.asm
index db8f671..8df3f0f 100644
--- a/dungeon_map/blink_loot.asm
+++ b/dungeon_map/blink_loot.asm
@@ -20,6 +20,17 @@ BlinkLoot:
 
 StartDoubleWrite:
 	; what we wrote over
+	LDA.l DRMode
+	BEQ .draw
+	LDA.l DungeonMapMode
+	BNE .draw
+
+	INC.w $020D ; next subsubmode
+	PLA : PLA : PLA ; pull our jump to here off the stack
+	PLB
+	RTL
+
+.draw
 	REP #$30
 	STZ.w GFXStripes
 
diff --git a/dungeon_map/check_loot.asm b/dungeon_map/check_loot.asm
index 17bdc26..e35c161 100644
--- a/dungeon_map/check_loot.asm
+++ b/dungeon_map/check_loot.asm
@@ -5,7 +5,7 @@ CheckLoot:
 	REP #$30
 	PHB : PHX : PHY
 
-	STA.b $00
+	STA.b $CA
 
 	LDA.b $06 : PHA
 	LDA.b $0E : PHA
@@ -16,7 +16,8 @@ CheckLoot:
 	AND.w #$00FF
 	STA.b $0E
 
-	LDA.b $00
+	LDA.b $CA
+	AND.w #$00FF
 	ASL A
 	TAX
 
@@ -80,7 +81,9 @@ CheckLoot:
 	RTL
 
 CheckChests:
-	LDA.b $00
+	LDA.b $CA
+	AND.w #$00FF
+	STA.b $00
 	ASL A
 	TAX
 
@@ -90,6 +93,7 @@ CheckChests:
 
 	LDA.w #$0008
 	STA.b $04
+	STZ.b $06
 
 	LDY.w #$FFFD
 .increment_mask
@@ -106,6 +110,11 @@ CheckChests:
 	CMP.b $00
 	BNE .next_chest
 
+	LDA.b $06
+	JSR CheckChestSection
+	INC.b $06
+	BCC .increment_mask
+
 	LDA.l SaveDataWRAM, X
 	AND.b $04
 	BNE .increment_mask ; already got item
@@ -119,6 +128,22 @@ CheckChests:
 	RTS
 
 CheckBoss:
+	; we assume all bosses are in section 1 of split sections
+	; mainly to simplify hera cage key and GT torch
+	; which use the same flow
+	; and bosses are always in their own section anyway
+	LDA.b $CA
+	AND.w #$F000
+	XBA
+	CMP.w #$0020
+	BCC +
+	RTS
+
++
+	LDA.b $CA
+	AND.w #$00FF
+	STA.b $04
+
 	LDX.w #$FFFA
 .next_boss
 	INX #6
@@ -127,7 +152,7 @@ CheckBoss:
 	RTS
 
 .check
-	CMP.b $00
+	CMP.b $04
 	BNE .next_boss
 
 	TXY
@@ -170,6 +195,10 @@ CheckBoss:
 	BRA .next_boss
 
 CheckPrize:
+	LDA.b $CA
+	AND.w #$00FF
+	STA.b $04
+
 	LDX.w #$FFFD
 .next_prize
 	INX #3
@@ -178,7 +207,7 @@ CheckPrize:
 	RTS
 
 .check
-	CMP.b $00
+	CMP.b $04
 	BNE .next_prize
 
 	TXY
@@ -202,7 +231,8 @@ CheckPrize:
 	BRA .next_prize
 
 CheckPots:
-	LDA.b $00
+	LDA.b $CA
+	AND.w #$00FF
 	ASL A
 	TAX
 
@@ -221,6 +251,10 @@ CheckPots:
 	LDA.b [$04], Y
 	AND.w #$00FF
 	CMP.w #$0008 : BEQ .small_key
+	LDA.l PotCountMode
+	BEQ +
+		JSR CheckJunkPot
+	+
 	INY
 	BRA .next_pot
 
@@ -231,18 +265,30 @@ CheckPots:
 	PHX
 	INY
 	BRA .mask_set
+
 .major_item
 	LDA.b [$04], Y
-.continue
 	PHA
 	PHX
 	INY
 	TXA : ASL A
 	TAX
 	LDA.l DungeonMask, X : STA.b $08
+	TXA : LSR A : TAX
 
 .mask_set
-	LDA.b $00 : ASL A : TAX
+	TXA
+	JSR CheckPotSection
+	BCS +
+		PLX
+		PLA
+		BRA .next_pot
++
+
+	LDA.b $CA
+	AND.w #$00FF
+	ASL A
+	TAX
 if !FEATURE_FIX_BASEROM
 	LDA.l SpriteDropData, X
 else
@@ -263,8 +309,50 @@ endif
 .done
 	RTS
 
+CheckJunkPot:
+	LDA.b [$04], Y
+	PHA
+	PHX
+	TXA : ASL A : TAX
+	LDA.l DungeonMask, X : STA.b $08
+	TXA : LSR A
+	JSR CheckPotSection
+	BCS +
+		PLX
+		PLA
+		RTS
+	+
+
+	LDA.b $CA
+	AND.w #$00FF
+	ASL A
+	TAX
+	LDA.l PotCollectionRateTable, X
+	AND.b $08
+	BEQ .not_important
+
+if !FEATURE_FIX_BASEROM
+	LDA.l SpriteDropData, X
+else
+	LDA.l RoomPotData, X
+endif
+	AND.b $08
+	BNE .not_important
+
+	PLX
+	PLA
+	AND.w #$00FF
+	JSR GetPotJunkClass
+	RTS
+
+.not_important
+	PLX
+	PLA
+	RTS
+
 CheckEnemies:
-	LDA.b $00
+	LDA.b $CA
+	AND.w #$00FF
 	ASL A
 	TAX
 
@@ -279,9 +367,14 @@ CheckEnemies:
 .next_enemy
 	LDA.b [$04], Y
 	AND.w #$00FF
-	CMP.w #$00FF : BEQ .done
+	CMP.w #$00FF
+	BNE +
+		JMP .done
+	+
 	LDA.b [$04], Y
-	BIT.w #$8000 : BNE .overlord
+	AND.w #$E000
+	CMP.w #$E000
+	BEQ .overlord
 	INY : INY
 	LDA.b [$04], Y
 	AND.w #$00FF
@@ -331,15 +424,28 @@ CheckEnemies:
 	TXA : ASL A
 	TAX
 	LDA.l DungeonMask, X : STA.b $08
+	TXA : LSR A : TAX
 
 .mask_set
-	LDA.b $00 : ASL A : TAX
+	TXA
+	JSR CheckEnemySection
+	BCS +
+		PLX
+		PLA
+		JMP .next_enemy
++
+
+	LDA.b $CA
+	AND.w #$00FF
+	ASL A
+	TAX
+
 	LDA.l SpriteDropData, X
 	PLX
 	AND.b $08
 	BEQ .not_obtained
 	PLA
-	BRA .next_enemy
+	JMP .next_enemy
 
 .not_obtained
 	PLA
@@ -380,3 +486,148 @@ GetLootClass:
 .done
 	PLX
 	RTS
+
+; A = item id
+; updates "best loot" value if better
+GetPotJunkClass:
+	PHX
+	TAX
+
+	LDA.b $0E
+	BEQ .done
+	CMP.w #$0001
+	BEQ .value_set
+
+	; hardcode as junk for now
+	LDA.w #$0002
+
+.value_set
+	CMP.b $02
+	BCC .done
+	STA.b $02
+
+.done
+	PLX
+	RTS
+
+macro DefineGetFooSection(type, offset)
+Get<type>Section:
+	PHX
+	LDA.b $CA
+	AND.w #$00FF
+	ASL A
+	TAX
+	LDA.l SplitRooms, X
+	TAX
+
+	LDA.l SplitRooms, X
+	AND.w #$00FF
+	STA.b $CE
+	BEQ .found
+
+	INX
+.check_next_section
+	PHX
+	LDA.l SplitRooms+<offset>, X
+	TAX
+-
+	LDA.l SplitRooms, X
+	AND.w #$00FF
+	CMP.w #$00FF
+	BEQ .not_this_section
+	CMP.b $CC
+	BEQ .plx_found
+
+	INX
+	BRA -
+
+.not_this_section
+	PLX
+	TXA : CLC : ADC.w #$000D : TAX
+	DEC.b $CE
+	BNE .check_next_section
+	BRA .found
+
+.plx_found
+	PLX
+
+.found
+	PLX
+	LDA.b $CE
+	RTS
+endmacro
+
+macro DefineCheckFooSection(type)
+Check<type>Section:
+	STA.b $CC
+
+	LDA.b $CB
+	AND.w #$00FF
+	BEQ .yes
+
+	JSR Get<type>Section
+
+	LDA.b $CB
+	AND.w #$00FF
+	LSR A : LSR A : LSR A : LSR A
+	DEC A
+	CMP.b $CE
+	BEQ .yes
+
+.no
+	CLC
+	RTS
+
+.yes
+	SEC
+	RTS
+endmacro
+
+%DefineGetFooSection(Door, 3)
+%DefineGetFooSection(Stair, 5)
+%DefineGetFooSection(Chest, 7)
+%DefineGetFooSection(Pot, 9)
+%DefineGetFooSection(Enemy, 11)
+
+%DefineCheckFooSection(Door)
+%DefineCheckFooSection(Stair)
+%DefineCheckFooSection(Chest)
+%DefineCheckFooSection(Pot)
+%DefineCheckFooSection(Enemy)
+
+GetIncomingStairSection:
+	PHX
+	AND.w #$0300
+	XBA
+	ASL A
+	TAX
+	LDA.l $8098D8, X
+	STA.b $CC
+
+	LDA.b $CA
+	AND.w #$00FF
+	ASL A
+	TAX
+	LDA.l SplitRooms, X
+	TAX
+
+	LDA.l SplitRooms, X
+	AND.w #$00FF
+	STA.b $CE
+	BEQ .found
+
+	INX
+.check_next_section
+	LDA.l SplitRooms+0, X
+	AND.w #$00FF
+	AND.b $CC
+	BNE .found
+	TXA : CLC : ADC.w #$000D : TAX
+	DEC.b $CE
+	BNE .check_next_section
+	BRA .found
+
+.found
+	PLX
+	LDA.b $CE
+	RTS
diff --git a/dungeon_map/current_room_map.asm b/dungeon_map/current_room_map.asm
new file mode 100644
index 0000000..862642c
--- /dev/null
+++ b/dungeon_map/current_room_map.asm
@@ -0,0 +1,2162 @@
+!CenterTile = $026A
+!ConnectorPalette = $1000
+!DoorSlotCount = 25
+
+DrawWackyDoorRandoStuff:
+	JSL DrawTopAreaBorder
+	JSL DrawBottomAreaBorder
+
+	STZ.w GFXStripes
+
+	LDA.l CachedDungeonID
+	AND.w #$00FF
+	CMP.w DungeonID
+	BNE .different_dungeon
+
+	LDA.w EntranceIndex
+	STA.l CurrentDoorEntrance
+
+	JSL DetectLinksSection
+	INC A
+	XBA
+	ASL A : ASL A : ASL A : ASL A
+	ORA.b RoomIndex
+	STA.l CurrentDisplayedRoom
+	BRA DrawCurrentSupertile
+
+.different_dungeon
+	JSL FindFirstEntrance
+	TYA
+	STA.l CurrentDoorEntrance
+
+	ASL A
+	TAX
+	LDA.l EntranceData_room_id, X
+	STA.l CurrentDisplayedRoom
+
+	JSL DetectEntranceSection
+	INC A
+	XBA
+	ASL A : ASL A : ASL A : ASL A
+	ORA.l CurrentDisplayedRoom
+	STA.l CurrentDisplayedRoom
+
+DrawCurrentSupertile:
+	LDA.w #$0000
+	STA.l DoorSlotCursor
+
+	LDA.l CurrentDisplayedRoom
+	STA.b $CA
+	LDX.w #!CenterTile
+	LDY.w #$0000
+	JSL DrawFullRoomTile
+
+	JSL ClearDoorSlotsTable
+	LDA.l CurrentDisplayedRoom
+	STA.l DoorSlots
+
+	; multiply room id by 24 to get index in doors table
+	LDA.l CurrentDisplayedRoom
+	AND.w #$00FF
+	TAX
+	LDA.l DoorOffset, X
+	AND.w #$00FF
+	STA.l DisplayedRoomDoorIndex
+	ASL A
+	CLC : ADC.l DisplayedRoomDoorIndex
+	ASL A : ASL A : ASL A
+	STA.l DisplayedRoomDoorIndex
+
+	JSL DrawConnectedRooms
+
+	SEP #$20
+	LDX.w GFXStripes
+	LDA.b #$FF
+	STA.w GFXStripes+2, X
+
+	LDA.b #$01
+	STA.b NMISTRIPES
+	REP #$20
+
+	RTL
+
+ClearDoorSlotsTable:
+	LDX.w #2*!DoorSlotCount-2
+	LDA.w #$FF0F
+-	STA.l DoorSlots, X
+	DEX : DEX
+	BPL -
+	RTL
+
+ClearDoorSlotScratch:
+	PHX
+	LDX.w #$0004
+	LDA.w #$FF0F
+-	STA.l DoorSlotScratch, X
+	DEX : DEX
+	BPL -
+	PLX
+	RTL
+
+DrawFullRoomTile:
+	LDA.b $CA
+	AND.w #$00FF
+	PHX
+	ASL A
+	TAX
+	LDA.l SaveDataWRAM, X
+	STA.b $0E
+	PLX
+	PHY
+	JSL DrawDungeonMapRoom
+	PLY
+
+	LDA.b $CA
+	AND.w #$0FFF
+
+	CMP.w #$003F : BEQ .top_right
+	CMP.w #$0096 : BEQ .top_right
+	CMP.w #$007E : BEQ .top_left
+	CMP.w #$001B : BEQ .bottom_right
+	BRA +
+
+.top_right
+	LDA.w #$01C0|!ConnectorPalette
+	STA.l $7F0002, X
+	BRA +
+
+.top_left
+	LDA.w #$01C0|!ConnectorPalette
+	STA.l $7F0000, X
+	BRA +
+
+.bottom_right
+	LDA.w #$01C0|!ConnectorPalette
+	STA.l $7F0042, X
+
++
+	LDA.b $00 : PHA
+	LDA.b $02 : PHA
+	LDA.b $06 : PHA
+	LDA.b $08 : PHA
+	LDA.b $0E : PHA
+	JSL DrawSingleRoomLoot
+	PLA : STA.b $0E
+	PLA : STA.b $08
+	PLA : STA.b $06
+	PLA : STA.b $02
+	PLA : STA.b $00
+
+	RTL
+
+DrawSingleRoomLoot:
+	PHX : PHY
+
+	TYX
+
+	LDA.w GFXStripes
+	TAY
+	CLC : ADC.w #$0010
+	STA.w GFXStripes
+
+	LDA.l DoorSlotsBG1, X
+	XBA
+	STA.w GFXStripes+$02, Y
+	XBA
+	CLC : ADC.w #$0020
+	XBA
+	STA.w GFXStripes+$0A, Y
+
+	LDA.w #$0300
+	STA.w GFXStripes+$04, Y
+	STA.w GFXStripes+$0C, Y
+
+	LDA.b $CA
+	JSL CheckLoot
+
+	ASL A : ASL A : ASL A
+
+	TAX
+
+	LDA.l LootTypeIcons+0, X
+	STA.w GFXStripes+$06, Y
+	LDA.l LootTypeIcons+2, X
+	STA.w GFXStripes+$08, Y
+	LDA.l LootTypeIcons+4, X
+	STA.w GFXStripes+$0E, Y
+	LDA.l LootTypeIcons+6, X
+	STA.w GFXStripes+$10, Y
+
+	PLY : PLX
+	RTL
+
+DrawConnectedRooms:
+	PHB : PHK : PLB
+
+	LDA.l ShowRooms_default
+	AND.w #$00FF
+	STA.b $0A
+
+	LDX.w DungeonID
+	LDA.l MapField
+	AND.l DungeonMask, X
+	BEQ +
+	LDA.l ShowRooms_have_map
+	AND.w #$00FF
+	CMP.b $0A
+	BCC +
+	STA.b $0A
++
+
+	LDX.w DungeonID
+	LDA.l CompassField
+	AND.l DungeonMask, X
+	BEQ +
+	LDA.l ShowRooms_have_compass
+	AND.w #$00FF
+	CMP.b $0A
+	BCC +
+	STA.b $0A
++
+
+	LDA.l DisplayedRoomDoorIndex
+	TAX
+	STZ.b $00
+
+.next_side
+	JSR DrawSide
+	INC.b $00
+	LDA.b $00
+	CMP.w #$0004
+	BCC .next_side
+
+	JSR DrawStairs
+	JSR DrawDropOrWarp
+
+	PLB
+	RTL
+
+CheckEdgesTable:
+	LDA.b $00
+	ASL A
+	CLC : ADC.b $00
+	ADC.b $02
+	XBA
+	STA.b $0C
+	LDA.l CurrentDisplayedRoom
+	AND.w #$00FF
+	ORA.b $0C
+	STA.b $0C
+
+	PHX
+	LDX.w #$0000
+-
+	LDA.w EdgeConnectionIndices, X
+	BMI .done
+	CMP.b $0C
+	BEQ .match
+	INX #4
+	BRA -
+
+.match
+	INX #2
+	LDA.w EdgeConnectionIndices, X
+	TAX
+	LDA.l NorthOpenEdge, X
+
+.done
+	PLX
+	RTS
+
+CheckInRoomTable:
+	LDA.b $00
+	ASL A
+	CLC : ADC.b $00
+	ADC.b $02
+	XBA
+	STA.b $0C
+	LDA.l CurrentDisplayedRoom
+	AND.w #$00FF
+	ORA.b $0C
+	STA.b $0C
+
+	PHX
+	LDX.w #$0000
+-
+	LDA.w InRoomConnectionIndices, X
+	BMI .done
+	CMP.b $0C
+	BEQ .match
+	INX #4
+	BRA -
+
+.match
+	INX #2
+	LDA.w InRoomConnectionIndices, X
+	TAX
+	LDA.l InroomStairsTable, X
+
+.done
+	PLX
+	RTS
+
+GetConnection:
+	LDA.b $02
+	STA.b $04
+	LDA.l DoorTable, X
+.found
+	STA.b $08
+	AND.w #$00FF
+	CMP.w #$0003
+	BEQ .not_found
+
+	STA.b $0C
+	STA.b $CA
+	LDA.b $08
+	JSR GetWhichDoorPosition
+	PHA
+	XBA
+	ORA.b $0C
+	STA.b $0C
+
+	PLA
+	CLC : ADC.b $00 : ADC.b $00 : ADC.b $00
+	PHX
+	TAX
+	LDA.l IncomingDoorMap, X
+	AND.w #$00FF
+	PLX
+	STA.b $CC
+	JSR GetDoorSection
+	INC A
+	ASL A : ASL A : ASL A : ASL A
+	XBA
+	ORA.b $0C
+	STA.b $0C
+
+	JSR CheckCanSeeConnector
+	BCC .nope
+
+	LDA.b $0C
+	RTS
+
+.not_found
+	JSR CheckEdgesTable
+	CMP.w #$FFFF
+	BNE .found
+	JSR CheckInRoomTable
+	CMP.w #$FFFF
+	BEQ .nope
+	PHA
+	LDA.w #$0003
+	STA.b $04
+	PLA
+	BRA .found
+
+.nope
+	LDA.w #$FF0F
+	RTS
+
+CheckCanSeeConnector:
+	LDA.b $0A
+	CMP.w #$0001
+	BCS .yep
+
+	PHX
+
+	LDA.b $0C
+	AND.w #$00FF
+	ASL A
+	TAX
+	LDA.l SaveDataWRAM, X
+	AND.w #$000F
+	BEQ .plx_nope
+
+	LDA.l CurrentDisplayedRoom
+	AND.w #$00FF
+	ASL A
+	TAX
+	LDA.l SaveDataWRAM, X
+	AND.w #$000F
+	BEQ .plx_nope
+
+	PLX
+
+.yep
+	SEC
+	RTS
+
+.plx_nope
+	PLX
+	CLC
+	RTS
+
+; $0C - room id
+; $0D - room connection position
+; $0F - side
+GetQuadrantMask:
+	LDA.b $0D
+	AND.w #$0003
+	CMP.w #$0003
+	BNE .normal
+	LDA.b $0C
+	AND.w #$00FF
+	CMP.w #$005E : BEQ .bottom_left
+	CMP.w #$007E : BEQ .bottom_left
+	CMP.w #$000B : BEQ .top_right
+	CMP.w #$001B : BEQ .top_right
+.bottom_right
+	LDA.w #$0001
+	RTS
+.bottom_left
+	LDA.w #$0002
+	RTS
+.top_right
+	LDA.w #$0004
+	RTS
+.normal
+	SEP #$20
+	CLC : ADC.b $0F : ADC.b $0F : ADC.b $0F
+	REP #$20
+	ASL A
+	PHX
+	TAX
+	LDA.l QuadrantMasks, X
+	PLX
+	RTS
+
+
+; $00 - Side
+; $02 - Door position number on side
+; $03 - Door index number on side
+; $04 - Target door position
+; $06 - Number of doors on side
+; $08 - Room Drawn Address
+DrawSide:
+	JSL ClearDoorSlotScratch
+
+	STZ.b $06
+	STZ.b $02
+	LDY.w #$0002
+
+-
+	LDA.l CurrentDisplayedRoom
+	STA.b $CA
+	LDA.b $00
+	ASL A
+	CLC : ADC.b $00
+	ADC.b $02
+	JSR CheckDoorSection
+	BCC +
+
+	JSR GetConnection
+	BMI +
+	INC.b $06
+	PHX
+	PHA
+	LDA.b $02
+	ASL A
+	TAX
+	PLA
+	STA.l DoorSlotScratch, X
+	PLX
++
+	INX : INX
+	INC.b $02
+	DEY
+	BPL -
+
+	PHX
+
+	LDY.b $06
+	LDA.w DoorSlotOffsets, Y
+	AND.w #$00FF
+	STA.b $02
+
+	LDY.b $00
+	LDA.w DoorSlotSides, Y
+	AND.w #$00FF
+	CLC : ADC.b $02
+	TAY
+
+	STZ.b $02
+-
+	LDA.b $02
+	AND.w #$00FF
+	ASL A
+	TAX
+	LDA.l DoorSlotScratch, X
+	BPL .present
+.missing
+	LDA.b $06
+	CMP.w #$0002
+	BNE +
+	JSR DrawDoubleConnectorRoot
+	BRA +
+
+.present
+	TYX
+	STA.l DoorSlots, X
+	JSR DrawSingleConnectedRoom
+	INC.b $03
+	INY : INY
++
+	INC.b $02
+	LDA.b $02
+	AND.w #$00FF
+	CMP.w #$0003
+	BCC -
+
+	LDA.b $06
+	CMP.w #$0002
+	BEQ .two
+	BCS .three
+	BRA .done
+
+.two
+	JSR DrawDoubleConnector
+	BRA .done
+
+.three
+	JSR DrawTripleConnectorRoot
+	JSR DrawTripleConnector
+
+.done
+	PLX
+	RTS
+
+DrawStairs:
+	PHX
+	LDA.l CurrentDisplayedRoom
+	AND.w #$00FF
+	TAX
+	LDA.w SpiralPropsIndex, X
+	AND.w #$00FF
+	TAY
+	LDA.l SpiralOffset, X
+	AND.w #$00FF
+	ASL A : ASL A
+	STA.b $00
+
+	LDA.w SpiralProps, Y
+	AND.w #$00FF
+	STA.b $06
+	BEQ .done
+
+	STZ.b $02
+	INY
+
+.next_room
+	LDA.w SpiralProps, Y
+	AND.w #$00FF
+	ASL A : ASL A
+	CLC : ADC.b $00
+	TAX
+
+	LDA.l CurrentDisplayedRoom
+	STA.b $CA
+	LDA.b $02
+	JSR CheckStairSection
+	BCC .skip
+
+	PHY
+	LDA.b $02
+	CLC : ADC.w #$0015
+	ASL A
+	TAY
+
+	LDA.l SpiralTable, X
+	AND.w #$00FF
+	STA.b $CA
+
+	LDA.l SpiralTable, X
+	JSR GetIncomingStairSection
+	INC A
+	ASL A : ASL A : ASL A : ASL A
+	XBA
+	ORA.b $CA
+	STA.b $CA
+
+	JSR GetSpecificRoomVisibility
+	BNE +
+	LDA.b $0E
+	AND.w #$000F
+	BNE +
+	BRA .ply_skip
++
+
+	TYX
+	LDA.b $CA
+	STA.l DoorSlots, X
+
+	LDA.w DoorSlotsBG2, Y
+	CLC : ADC.w #!CenterTile
+	TAX
+
+	LDA.b $02
+	ASL A
+	CLC : ADC.w #$0DF0
+	STA.l $7F0000-$40, X
+	INC A
+	STA.l $7F0002-$40, X
+	JSL DrawFullRoomTile
+.ply_skip
+	PLY
+
+.skip
+	INY : INY
+	INC.b $02
+	DEC.b $06
+	BNE .next_room
+
+.done
+	PLX
+	RTS
+
+GetCurrentRoomVisibility:
+	LDA.l CurrentDisplayedRoom
+	STA.b $CA
+
+GetSpecificRoomVisibility:
+	PHX
+	LDA.l ShowRooms_default
+	AND.w #$00FF
+	STA.b $0A
+
+	LDX.w DungeonID
+	LDA.l MapField
+	AND.l DungeonMask, X
+	BEQ +
+	LDA.l ShowRooms_have_map
+	AND.w #$00FF
+	CMP.b $0A
+	BCC +
+	STA.b $0A
++
+
+	LDX.w DungeonID
+	LDA.l CompassField
+	AND.l DungeonMask, X
+	BEQ +
+	LDA.l ShowRooms_have_compass
+	AND.w #$00FF
+	CMP.b $0A
+	BCC +
+	STA.b $0A
++
+
+	LDA.b $CA
+	AND.w #$00FF
+	ASL A
+	TAX
+	LDA.l SaveDataWRAM, X
+	AND.w #$000F
+	STA.b $0E
+	BEQ +
+	LDA.l ShowRooms_visited_tile
+	AND.w #$00FF
+	CMP.b $0A
+	BCC +
+	STA.b $0A
++
+
+	PLX
+	LDA.b $0A
+	RTS
+
+DrawDropOrWarp:
+	PHX
+	LDA.l CurrentDisplayedRoom
+	STA.b $00
+
+	LDX.w #$0000
+.check_next_drop
+	LDA.l FallTable, X
+	CMP.w #$FFFF
+	BEQ .no_drop
+	CMP.b $00
+	BEQ .found_drop
+	INX : INX : INX : INX
+	BRA .check_next_drop
+
+.no_drop
+	LDX.w #$0000
+.check_next_warp
+	LDA.l WarpTable, X
+	CMP.w #$FFFF
+	BEQ .done
+	CMP.b $00
+	BEQ .found_warp
+	INX : INX : INX : INX
+	BRA .check_next_warp
+
+.found_drop
+	LDA.w #$0DE0
+	PHA
+	LDA.l FallTable+2, X
+	BRA .draw_room
+
+.found_warp
+	LDA.w #$0DE2
+	PHA
+	LDA.l WarpTable+2, X
+
+.draw_room
+	STA.b $CA
+
+	JSR GetSpecificRoomVisibility
+	BNE +
+	LDA.b $0E
+	AND.w #$000F
+	BNE +
+
+	PLA
+	BRA .done
+
++
+	PLA
+	STA.l $7F0574
+	INC A
+	STA.l $7F0576
+
+	LDX.w #$0030
+	LDA.b $CA
+	STA.l DoorSlots, X
+
+	LDA.w DoorSlotsBG2, X
+	CLC : ADC.w #!CenterTile
+	TXY
+	TAX
+
+	JSL DrawFullRoomTile
+
+.done
+	PLX
+	RTS
+
+DrawSingleConnectedRoom:
+	STA.b $CA
+	LDA.w DoorSlotsBG2, Y
+	CLC : ADC.w #!CenterTile
+	STA.b $08
+	TAX
+	JSL DrawFullRoomTile
+
+	PHY
+
+	TYX
+	LDA.l DoorSlots+1, X
+	AND.w #$000F
+	CMP.w #$0003
+	BNE +
+	LDA.l DoorSlots, X
+	AND.w #$00FF
+	CMP.w #$005E : BEQ .left
+	CMP.w #$007E : BEQ .left
+.right
+	LDA.w #$0002
+	BRA +
+.left
+	LDA.w #$0000
++
+	STA.b $04
+
+	LDA.b $06
+	BEQ ++
+	CMP.w #$0001
+	BNE .draw
+
+.single
+	LDA.b $02
+	ASL A
+	CLC : ADC.b $02
+	CLC : ADC.b $04
+	STA.b $04
+	ASL A
+	CLC : ADC.b $04
+	ASL A : ASL A
+	TAY
+
+.draw
+	LDA.b $00
+	BNE + : JSR DrawNorthConnectors : BRA ++ : +
+	DEC A : BNE + : JSR DrawWestConnectors : BRA ++ : +
+	DEC A : BNE + : JSR DrawSouthConnectors : BRA ++ : +
+	DEC A : BNE + : JSR DrawEastConnectors : BRA ++ : +
+++
+
+	PLY
+.done
+	RTS
+
+GetWhichDoorPosition:
+	BMI .edge
+	AND.w #$0300
+	XBA
+	RTS
+
+.edge
+	AND.w #$0F00
+	XBA
+	PHX
+	PHA
+	PLX
+
+	LDA.b $00
+	BEQ .north
+	DEC A : BEQ .west
+	DEC A : BEQ .south
+
+.east
+	LDA.l EdgePositions_east, X
+	BRA .done
+
+.north
+	LDA.l EdgePositions_north, X
+	BRA .done
+
+.west
+	LDA.l EdgePositions_west, X
+	BRA .done
+
+.south
+	LDA.l EdgePositions_south, X
+
+.done
+	AND.w #$00FF
+	PLX
+	RTS
+
+macro Draw3x2Connector(offset, label)
+	LDA.w SingleEdgeCurrentRoomConnectors_<label>+0, Y
+	EOR.w #!ConnectorPalette
+	STA.l $7F0000+!CenterTile+<offset>+$00
+	LDA.w SingleEdgeCurrentRoomConnectors_<label>+2, Y
+	EOR.w #!ConnectorPalette
+	STA.l $7F0000+!CenterTile+<offset>+$02
+	LDA.w SingleEdgeCurrentRoomConnectors_<label>+4, Y
+	EOR.w #!ConnectorPalette
+	STA.l $7F0000+!CenterTile+<offset>+$04
+	LDA.w SingleEdgeCurrentRoomConnectors_<label>+6, Y
+	EOR.w #!ConnectorPalette
+	STA.l $7F0000+!CenterTile+<offset>+$40
+	LDA.w SingleEdgeCurrentRoomConnectors_<label>+8, Y
+	EOR.w #!ConnectorPalette
+	STA.l $7F0000+!CenterTile+<offset>+$42
+	LDA.w SingleEdgeCurrentRoomConnectors_<label>+10, Y
+	EOR.w #!ConnectorPalette
+	STA.l $7F0000+!CenterTile+<offset>+$44
+endmacro
+
+macro Draw2x3Connector(offset, label)
+	LDA.w SingleEdgeCurrentRoomConnectors_<label>+0, Y
+	EOR.w #!ConnectorPalette
+	STA.l $7F0000+!CenterTile+<offset>+$00
+	LDA.w SingleEdgeCurrentRoomConnectors_<label>+2, Y
+	EOR.w #!ConnectorPalette
+	STA.l $7F0000+!CenterTile+<offset>+$02
+	LDA.w SingleEdgeCurrentRoomConnectors_<label>+4, Y
+	EOR.w #!ConnectorPalette
+	STA.l $7F0000+!CenterTile+<offset>+$40
+	LDA.w SingleEdgeCurrentRoomConnectors_<label>+6, Y
+	EOR.w #!ConnectorPalette
+	STA.l $7F0000+!CenterTile+<offset>+$42
+	LDA.w SingleEdgeCurrentRoomConnectors_<label>+8, Y
+	EOR.w #!ConnectorPalette
+	STA.l $7F0000+!CenterTile+<offset>+$80
+	LDA.w SingleEdgeCurrentRoomConnectors_<label>+10, Y
+	EOR.w #!ConnectorPalette
+	STA.l $7F0000+!CenterTile+<offset>+$82
+endmacro
+
+macro Draw2TileConnector(offset1, offset2, flip, sublabel)
+	LDA.w DoorConnectionTiles_<sublabel>, Y
+	BEQ ?+
+	ORA.w #!ConnectorPalette
+	EOR.w #<flip>
+	STA.l $7F0000+<offset1>, X
+?+
+
+	LDA.w DoorConnectionTiles_<sublabel>+2, Y
+	BEQ ?+
+	ORA.w #!ConnectorPalette
+	EOR.w #<flip>
+	STA.l $7F0000+<offset2>, X
+?+
+endmacro
+
+GetConnectorIndex:
+	LDA.b $03
+	AND.w #$00FF
+	TAY
+	LDA.b $06
+	CMP.w #$0002
+	BEQ +
+	INY : INY
++	LDA.w MultiConnectorMapping, Y
+	AND.w #$00FF
+	INC A
+	CLC : ADC.b $04 : ADC.b $04 : ADC.b $04
+	ASL A : ASL A
+	TAY
+	RTS
+
+DrawDoubleConnectorRoot:
+	LDA.b $02
+	AND.w #$00FF
+	EOR.w #$FFFF
+	CLC : ADC.w #$0010
+	ASL A : ASL A
+	PHY
+	TAY
+	LDX.w #!CenterTile
+	LDA.b $00
+	BNE + : %Draw2TileConnector(-$40, -$3E, $0000, vertical) : BRA ++
++	DEC A : BNE + : %Draw2TileConnector(-$02, $3E, $0000, horizontal) : BRA ++
++	DEC A : BNE + : %Draw2TileConnector($80, $82, $8000, vertical) : BRA ++
++	DEC A : BNE + : %Draw2TileConnector($04, $44, $4000, horizontal) : BRA ++
++
+++
+	PLY
+	RTS
+
+DrawTripleConnectorRoot:
+	LDA.w #$0013
+	ASL A : ASL A
+	PHY
+	TAY
+	LDX.w #!CenterTile
+	LDA.b $00
+	BNE + : %Draw2TileConnector(-$40, -$3E, $0000, vertical) : BRA ++
++	DEC A : BNE + : %Draw2TileConnector(-$02, $3E, $0000, horizontal) : BRA ++
++	DEC A : BNE + : %Draw2TileConnector($80, $82, $8000, vertical) : BRA ++
++	DEC A : BNE + : %Draw2TileConnector($04, $44, $4000, horizontal) : BRA ++
++
+++
+	PLY
+	RTS
+
+DrawEastConnectors:
+	LDA.b $06 : DEC A
+	BNE +
+	%Draw3x2Connector($04, east)
+	RTS
+
++	JSR GetConnectorIndex
+	PHX
+	LDX.b $08
+	%Draw2TileConnector(-$02, $3E, $4000, horizontal)
+	PLX
+	RTS
+	RTS
+
+DrawWestConnectors:
+	LDA.b $06 : DEC A
+	BNE +
+	%Draw3x2Connector(-$06, west)
+	RTS
+
++	JSR GetConnectorIndex
+	PHX
+	LDX.b $08
+	%Draw2TileConnector($04, $44, $0000, horizontal)
+	PLX
+	RTS
+	RTS
+
+DrawNorthConnectors:
+	LDA.b $06 : DEC A
+	BNE +
+	%Draw2x3Connector(-$C0, north)
+	RTS
+
++	JSR GetConnectorIndex
+	PHX
+	LDX.b $08
+	%Draw2TileConnector($80, $82, $0000, vertical)
+	PLX
+	RTS
+
+DrawSouthConnectors:
+	LDA.b $06 : DEC A
+	BNE +
+	%Draw2x3Connector($80, south)
+	RTS
+
++	JSR GetConnectorIndex
+	PHX
+	LDX.b $08
+	%Draw2TileConnector(-$40, -$3E, $8000, vertical)
+	PLX
+	RTS
+
+DrawTopAreaBorder:
+	LDA.w #$0F19
+	STA.l $7F00DE
+	LDA.w #$4F19
+	STA.l $7F00F8
+	LDA.w #$8F19
+	STA.l $7F041E
+	LDA.w #$CF19
+	STA.l $7F0438
+
+	LDX.w #$0016
+-
+	LDA.w #$0F1A
+	STA.l $7F00E0, X
+	LDA.w #$8F1A
+	STA.l $7F0420, X
+	DEX : DEX
+	BPL -
+
+	LDX.w #$02C0
+-
+	LDA.w #$0F1B
+	STA.l $7F011E, X
+	LDA.w #$4F1B
+	STA.l $7F0138, X
+	TXA
+	SEC : SBC.w #$0040
+	TAX
+	BPL -
+
+	RTL
+
+DrawBottomAreaBorder:
+	LDA.w #$0DE4
+	STA.l $7F055E
+	STA.l $7F0572
+	LDA.w #$4DE4
+	STA.l $7F0570
+	STA.l $7F0578
+	LDA.w #$8DE4
+	STA.l $7F061E
+	STA.l $7F0632
+	LDA.w #$CDE4
+	STA.l $7F0630
+	STA.l $7F0638
+
+	LDX.w #$000E
+-
+	LDA.w #$0DE5
+	STA.l $7F0560, X
+	LDA.w #$8DE5
+	STA.l $7F0620, X
+	DEX : DEX
+	BPL -
+
+	LDX.w #$0002
+-
+	LDA.w #$0DE5
+	STA.l $7F0574, X
+	LDA.w #$8DE5
+	STA.l $7F0634, X
+	DEX : DEX
+	BPL -
+
+	LDX.w #$0040
+-
+	LDA.w #$0DE6
+	STA.l $7F059E, X
+	STA.l $7F05B2, X
+	LDA.w #$4DE6
+	STA.l $7F05B0, X
+	STA.l $7F05B8, X
+	TXA
+	SEC : SBC.w #$0040
+	TAX
+	BPL -
+
+	RTL
+
+DrawDoubleConnector:
+	LDA.b $00
+	AND.w #$0001
+	TAY
+	LDA.w MultiConnectorTiles_increment, Y
+	AND.w #$00FF
+	STA.b $0C
+
+	LDA.b $00
+	ASL A
+	TAY
+	LDA.w MultiConnectorTiles_start_offset, Y
+	CLC : ADC.w #!CenterTile
+	TAX
+
+	LDY.b $00
+	LDA.w MultiConnectorTiles_direction_index, Y
+	AND.w #$00FF
+	TAY
+
+	LDA.w #$0003
+	STA.b $0E
+-
+	LDA.w MultiConnectorTiles, Y
+	ORA.w #!ConnectorPalette
+	STA.l $7F0000, X
+	TXA
+	CLC : ADC.b $0C
+	TAX
+	INY : INY
+	DEC.b $0E
+	BPL -
+
+	RTS
+
+DrawTripleConnector:
+	LDA.b $00
+	AND.w #$0001
+	TAY
+	LDA.w MultiConnectorTiles_increment, Y
+	AND.w #$00FF
+	STA.b $0C
+
+	LDA.b $00
+	ASL A
+	TAY
+	LDA.w MultiConnectorTiles_start_offset_three, Y
+	CLC : ADC.w #!CenterTile
+	TAX
+
+	LDY.b $00
+	LDA.w MultiConnectorTiles_direction_index, Y
+	AND.w #$00FF
+	TAY
+
+	LDA.w #$0005
+	STA.b $0E
+-
+	LDA.w MultiConnectorTiles+8, Y
+	ORA.w #!ConnectorPalette
+	STA.l $7F0000, X
+	TXA
+	CLC : ADC.b $0C
+	TAX
+	INY : INY
+	DEC.b $0E
+	BPL -
+
+	RTS
+
+DrawDoorsMapSprites:
+	LDA.l CurrentDisplayedRoom
+	CMP.b RoomIndex
+	BNE +
+	JSR DrawDoorsMapBlinker
++
+	JSR DrawDoorsStairs
+	JSR DrawDoorsMapCursor
+	JSR DrawDoorsEntrances
+
+	REP #$20
+	LDX.w DungeonID
+	LDA.l DungeonMask, X
+	AND.l CompassField
+	BEQ +
+	LDA.l DungeonMapBossRooms, X
+	ASL A
+	TAX
+	LDA.l SaveDataWRAM, X
+	AND.w #$8000
+	BNE +
+	JSR DrawDoorsMapBossRoom
+	JSR DrawDoorsMapBossIcon
++
+	SEP #$20
+	RTL
+
+DrawDoorsMapBlinker:
+	LDX.b $00
+	STZ.w OAMBufferAux, X
+	TXA
+	ASL A : ASL A
+	TAX
+
+	REP #$20
+	LDA.b LinkPosX
+	AND.w #$01E0
+	ASL A : ASL A : ASL A
+	XBA
+	CLC : ADC.w #$00A4
+	STA.w OAMBuffer, X
+
+	LDA.b LinkPosY
+	AND.w #$01E0
+	ASL A : ASL A : ASL A
+	XBA
+	CLC : ADC.w #$0044
+	STA.w OAMBuffer+1, X
+
+	SEP #$20
+	LDA.b FrameCounter
+	AND.b #$0C
+	LSR A : LSR A
+	TAY
+
+	LDA.w $8AEB50
+	STA.w OAMBuffer+2, X
+
+	LDA.w $8AEB58, Y
+	STA.w OAMBuffer+3, X
+
+	INC.b $00
+	RTS
+
+DrawDoorsMapBossRoom:
+	LDX.w DungeonID
+	LDA.l DungeonMapBossRooms, X
+	CMP.w #$000F
+	BNE +
+	RTS
++
+	STA.b $0E
+
+	LDX.b #!DoorSlotCount*2-2
+-
+	LDA.l DoorSlots, X
+	AND.w #$00FF
+	CMP.b $0E
+	BEQ .found
+	DEX : DEX
+	BPL -
+	RTS
+
+.found
+	SEP #$20
+	LDA.b FrameCounter
+	AND.b #$10
+	BNE .draw
+	REP #$20
+	RTS
+
+.draw
+	LDY.b $00
+	LDA.b #$00
+	STA.w OAMBufferAux, Y
+	TYA
+	ASL A : ASL A
+	TAY
+
+	REP #$20
+	LDA.l DoorSlotsSprites, X
+	LDX.w DungeonID
+	XBA
+	CLC : ADC.l $8AEE6D, X
+	DEC A
+	XBA
+	STA.w OAMBuffer, Y
+
+	LDA.w #$3331
+	STA.w OAMBuffer+2, Y
+
+	INC.b $00
+	RTS
+
+DrawDoorsMapBossIcon:
+	LDX.w DungeonID
+	LDA.l DungeonMapBossRooms, X
+	CMP.w #$000F
+	BNE +
+	RTS
++
+
+	SEP #$20
+	LDY.b $00
+	LDA.b #$02
+	STA.w OAMBufferAux, Y
+	TYA
+	ASL A : ASL A
+	TAY
+
+	REP #$20
+	LDA.w #$4830
+	STA.w OAMBuffer, Y
+
+	LDA.w #$3103
+	STA.w OAMBuffer+2, Y
+
+	INC.b $00
+	RTS
+
+DrawDoorsMapCursor:
+	LDA.l DoorSlotCursor
+	ASL A
+	TAX
+	LDA.l DoorSlotsSprites, X
+	STA.b $0E
+	LDA.l DoorSlotsSprites+1, X
+	STA.b $0F
+
+	LDY.b #$03
+
+.next_object
+	LDX.b $00
+	LDA.b #$02
+	STA.w OAMBufferAux, X
+	TXA
+	ASL A : ASL A
+	TAX
+
+	LDA.b $0E
+	CLC : ADC.w $8AEB9A, Y
+	STA.w OAMBuffer, X
+
+	LDA.b $0F
+	CLC : ADC.w $8AEB9E, Y
+	DEC A
+	STA.w OAMBuffer+1, X
+
+	STZ.w OAMBuffer+2, X
+
+	LDA.b FrameCounter
+	AND.b #$04
+	BNE +
+	LDA.b #$05
++
+	ASL A
+	ORA.w $8AEBA2, Y
+	STA.w OAMBuffer+3, X
+
+	INC.b $00
+	DEY
+	BPL .next_object
+
+	RTS
+
+; $00 - direction to move
+; $01 - current spot
+MoveDoorsMapCursor:
+	PHP
+	SEP #$30
+	LDA.l DoorSlotCursor
+	STA.b $01
+
+.move_again
+	LDA.b $01
+	ASL A : ASL A
+	CLC : ADC.b $00
+	TAX
+	LDA.l NextCursorSlot, X
+	BPL .easy
+	CMP.b #$FF
+	BEQ .no_move
+	BIT.b #$40
+	BNE .almost_easy
+
+	AND.b #$0F
+	TAX
+	LDA.l NextCursorSpecial_center_offset, X
+	TAX
+	DEX
+.try_next
+	INX
+	LDA.l NextCursorSpecial_center, X
+	BMI .no_move
+	PHX
+	ASL A
+	TAX
+	LDA.l DoorSlots+1, X
+	PLX
+	CMP.b #$00
+	BMI .try_next
+	LDA.l NextCursorSpecial_center, X
+	STA.b $01
+	BRA .write
+
+.almost_easy
+	BIT.b #$20
+	BNE .from_end
+
+.from_start
+	AND.b #$0F
+	TAX
+	LDA.l NextCursorSpecial_start_direction, X
+	STA.b $00
+	LDA.l NextCursorSpecial_start_index, X
+	BRA .easy
+
+.from_end
+	AND.b #$0F
+	TAX
+	LDA.l NextCursorSpecial_end_direction, X
+	STA.b $00
+	LDA.l NextCursorSpecial_end_index, X
+	BRA .easy
+
+.easy
+	STA.b $01
+
+.check
+	LDA.b $01
+	ASL A
+	TAX
+	LDA.l DoorSlots+1, X
+	BMI .move_again
+
+.write
+	LDA.b $01
+	STA.l DoorSlotCursor
+	LDA.b #$20
+	STA.w $012F
+	BRA .done
+
+.no_move
+	LDA.b #$3C
+	STA.w $012E
+
+.done
+	PLP
+	RTL
+
+DoorsMapSelectCursor:
+	PHP
+	SEP #$30
+
+	LDA.l DoorSlotCursor
+	BEQ .done
+
+	ASL A
+	TAX
+
+	REP #$30
+
+	LDA.l DoorSlots, X
+	AND.w #$F0FF
+	STA.l CurrentDisplayedRoom
+	STZ.w GFXStripes
+	JSL ClearDoorsMapBG1
+	JSL ClearDoorsMapBG2
+	JSL DrawCurrentSupertile
+
+	SEP #$30
+
+	LDA.b #$08
+	STA.b $17
+
+	LDA.b #$20
+	STA.w $012F
+
+.done
+	PLP
+	RTL
+
+DoorsMapCurrentRoom:
+	PHP
+	REP #$30
+
+	JSL DetectLinksSection
+	INC A
+	XBA
+	ASL A : ASL A : ASL A : ASL A
+	ORA.b RoomIndex
+	STA.l CurrentDisplayedRoom
+
+	STZ.w GFXStripes
+	JSL ClearDoorsMapBG1
+	JSL ClearDoorsMapBG2
+	JSL DrawCurrentSupertile
+
+	SEP #$30
+
+	LDA.b #$08
+	STA.b $17
+
+	LDA.b #$20
+	STA.w $012F
+
+	PLP
+	RTL
+
+DoorsMapNextEntrance:
+	PHP
+	REP #$30
+	LDA.l CurrentDoorEntrance
+	TAY
+
+.check_next
+	INY
+	CPY.w #$0085
+	BCC +
+	LDY.w #$0000
++
+	TYA
+	CMP.l CurrentDoorEntrance
+	BNE +
+
+	TYA
+	ASL A
+	TAX
+	LDA.l EntranceData_room_id, X
+	STA.b $CA
+
+	JSR GetSpecificRoomVisibility
+	BNE .acceptable
+	BEQ .done
+
++
+	TYX
+	LDA.l $82D1EF, X
+	AND.w #$00FF
+	CMP.w DungeonID
+
+	BNE .check_next
+
+	TYA
+	ASL A
+	TAX
+	LDA.l EntranceData_room_id, X
+	STA.b $CA
+
+	JSR GetSpecificRoomVisibility
+	BNE .acceptable
+
+	LDA.w #$0001
+	STA.b $00
+
+	LDA.l EntranceData_x_coordinate, X
+	LSR A
+	AND.w #$00FF
+	CMP.w #$0080
+	BCS +
+	LDA.b $00
+	ASL A
+	STA.b $00
++
+
+	LDA.l EntranceData_y_coordinate, X
+	LSR A
+	AND.w #$00FF
+	CMP.w #$0080
+	BCS +
+	LDA.b $00
+	ASL A
+	ASL A
+	STA.b $00
++
+
+	LDA.b $00
+	AND.b $0E
+	BEQ .check_next
+
+.acceptable
+	PHX
+	JSL DetectEntranceSection
+	PLX
+	INC A
+	ASL A : ASL A : ASL A : ASL A
+	XBA
+	ORA.l EntranceData_room_id, X
+	STA.l CurrentDisplayedRoom
+
+	TYA
+	STA.l CurrentDoorEntrance
+
+	STZ.w GFXStripes
+	JSL ClearDoorsMapBG1
+	JSL ClearDoorsMapBG2
+	JSL DrawCurrentSupertile
+
+	SEP #$30
+
+	LDA.b #$08
+	STA.b $17
+
+	LDA.b #$20
+	STA.w $012F
+
+.done
+	PLP
+	RTL
+
+FindFirstEntrance:
+	PHP
+	REP #$30
+	LDY.w #$0000
+
+.check_next
+	INY
+	CPY.w #$0085
+	BCC +
+	LDY.w #$FFFF
+	PLP
+	RTL
++
+
+	TYX
+	LDA.l $82D1EF, X
+	AND.w #$00FF
+	CMP.w DungeonID
+
+	BNE .check_next
+
+	TYA
+	ASL A
+	TAX
+	LDA.l EntranceData_room_id, X
+	STA.b $CA
+
+	JSR GetSpecificRoomVisibility
+	BNE .acceptable
+
+	LDA.w #$0001
+	STA.b $00
+
+	LDA.l EntranceData_x_coordinate, X
+	LSR A
+	AND.w #$00FF
+	CMP.w #$0080
+	BCS +
+	LDA.b $00
+	ASL A
+	STA.b $00
++
+
+	LDA.l EntranceData_y_coordinate, X
+	LSR A
+	AND.w #$00FF
+	CMP.w #$0080
+	BCS +
+	LDA.b $00
+	ASL A
+	ASL A
+	STA.b $00
++
+
+	LDA.b $00
+	AND.b $0E
+	BEQ .check_next
+
+.acceptable
+	PLP
+	RTL
+
+DoorsMapChangeDungeon:
+	PHP
+	SEP #$30
+	LDA.w DungeonID
+	STA.b $00
+
+.next
+	LDA.w DungeonID
+	ASL A
+	TAX
+
+	LDA.b $F6
+	BIT.b #$20
+	BNE +
+	INX
++	LDA.l DungeonMapData.prev, X
+	CMP.b $00
+	BEQ .done
+
+	STA.w DungeonID
+	JSL FindFirstEntrance
+	CPY.b #$FF
+	BEQ .next
+
+	LDA.b #$04
+	STA.w SubModuleInterface
+	REP #$20
+	LDA.w #$0000
+
+.done
+	PLP
+	RTL
+
+ClearDoorsMapBG1:
+	LDA.w #$000B
+	STA.b $00
+	LDA.w #$1090
+	STA.b $02
+	LDA.w GFXStripes
+	TAY
+	CLC : ADC.w #$0054
+	STA.w GFXStripes
+
+.next_row
+	LDA.b $02
+	XBA
+	STA.w GFXStripes+2, Y
+	LDA.w #$1640
+	STA.w GFXStripes+4, Y
+	LDA.w #$0300
+	STA.w GFXStripes+6, Y
+
+	LDA.b $02
+	CLC : ADC.w #$0020
+	STA.b $02
+	INY #6
+	DEC.b $00
+	BPL .next_row
+
+	LDA.w #$D012
+	STA.w GFXStripes+2, Y
+	LDA.w #$F012
+	STA.w GFXStripes+8, Y
+	LDA.w #$1640
+	STA.w GFXStripes+4, Y
+	STA.w GFXStripes+10, Y
+	LDA.w #$0300
+	STA.w GFXStripes+6, Y
+	STA.w GFXStripes+12, Y
+	RTL
+
+ClearDoorsMapBG2:
+; main area
+	LDX.w #$0120
+	LDA.w #$000B
+	STA.b $00
+	STA.b $02
+	LDA.w #$0300
+.next_main
+	STA.l $7F0000, X
+	INX : INX
+	DEC.b $02
+	BPL .next_main
+
+	LDA.w #$000B
+	STA.b $02
+	TXA
+	CLC : ADC.w #$0028
+	TAX
+
+	LDA.w #$0300
+	DEC.b $00
+	BPL .next_main
+
+; stairs area
+	LDX.w #$0560
+	LDA.w #$0007
+	STA.b $02
+.next_stairs
+	LDA.w #$0DE5
+	STA.l $7F0000, X
+	LDA.w #$0300
+	STA.l $7F0040, X
+	STA.l $7F0080, X
+	INX : INX
+	DEC.b $02
+	BPL .next_stairs
+
+; drop area
+	LDX.w #$0574
+	LDA.w #$0DE5
+	STA.l $7F0574
+	STA.l $7F0576
+	LDA.w #$0300
+	STA.l $7F05B4
+	STA.l $7F05B6
+	STA.l $7F05F4
+	STA.l $7F05F6
+
+	RTL
+
+GetRoomEntrance:
+	PHX : PHY
+	LDY.w #$0076 ; entrance IDs 76 - 82 are dropdowns, handle those later
+-
+	DEY
+	BMI .not_found
+
+	TYX
+	LDA.l EntranceData_dungeon_id, X
+	AND.w #$00FF
+	CMP.w DungeonID
+	BNE -
+
+	TYA
+	ASL A
+	TAX
+	LDA.l EntranceData_room_id, X
+	CMP.w $CA
+	BNE -
+
+	LDA.l EntranceData_x_coordinate, X
+	AND.w #$01FF
+	CMP.w #$00B9
+	BCC .left
+	CMP.w #$0149
+	BCC .middle
+
+.right
+	LDA.w #$0004
+	BRA .done
+
+.middle
+	LDA.w #$0002
+	BRA .done
+
+.left
+	LDA.w #$0000
+	BRA .done
+
+.not_found
+	LDA.w #$FFFF
+
+.done
+	PLY : PLX
+	RTS
+
+GetRoomDropdown:
+	PHX : PHY
+	LDY.w #$0083 ; entrance IDs 76 - 82 are dropdowns
+-
+	DEY
+	CPY.w #$0076
+	BCC .not_found
+
+	TYX
+	LDA.l EntranceData_dungeon_id, X
+	AND.w #$00FF
+	CMP.w DungeonID
+	BNE -
+
+	TYA
+	ASL A
+	TAX
+	LDA.l EntranceData_room_id, X
+	CMP.w $CA
+	BNE -
+
+	LDA.l EntranceData_x_coordinate, X
+	AND.w #$01FF
+	CMP.w #$00B9
+	BCC .left
+	CMP.w #$0140
+	BCC .middle
+
+.right
+	LDA.w #$0004
+	BRA .done
+
+.middle
+	LDA.w #$0002
+	BRA .done
+
+.left
+	LDA.w #$0000
+	BRA .done
+
+.not_found
+	LDA.w #$FFFF
+
+.done
+	PLY : PLX
+	RTS
+
+DrawDoorsEntrances:
+	REP #$30
+	LDX.w #!DoorSlotCount*2
+
+.next_room
+	DEX : DEX
+	BPL +
+	JMP .done
++
+
+	LDA.l DoorSlots, X
+	BMI .next_room
+
+	AND.w #$00FF
+	STA.b $CA
+
+	JSR GetRoomEntrance
+	STA.b $02
+	CMP.w #$0000
+	BMI .check_dropdown
+
+	JSR GetSpecificRoomVisibility
+	BNE .draw_entrance
+
+	PHX
+	LDA.b $02
+	TAX
+	LDA.l EntranceQuadrantMasks, X
+	PLX
+	AND.b $0E
+	BEQ .check_dropdown
+
+.draw_entrance
+	SEP #$30
+	LDY.b $00
+	LDA.b #$00
+	STA.w OAMBufferAux, Y
+	TYA
+	ASL A : ASL A
+	TAY
+
+	LDA.l DoorSlotsSprites, X
+	CLC : ADC.b $02 : ADC.b $02
+	STA.w OAMBuffer, Y
+
+	LDA.l DoorSlotsSprites+1, X
+	CLC : ADC.b #$07
+	STA.w OAMBuffer+1, Y
+
+	REP #$30
+	LDA.w #$2333
+	STA.w OAMBuffer+2, Y
+	INC.b $00
+
+.check_dropdown
+	JSR GetRoomDropdown
+	STA.b $02
+	CMP.w #$0000
+	BMI .next_room
+
+	JSR GetSpecificRoomVisibility
+	BNE .draw_dropdown
+
+	PHX
+	LDA.b $02
+	TAX
+	LDA.l DropdownQuadrantMasks, X
+	PLX
+	AND.b $0E
+	BEQ .next_room
+
+.draw_dropdown
+	SEP #$30
+	LDY.b $00
+	LDA.b #$00
+	STA.w OAMBufferAux, Y
+	TYA
+	ASL A : ASL A
+	TAY
+
+	LDA.l DoorSlotsSprites, X
+	CLC : ADC.b $02 : ADC.b $02
+	STA.w OAMBuffer, Y
+
+	LDA.l DoorSlotsSprites+1, X
+	STA.w OAMBuffer+1, Y
+
+	REP #$30
+	LDA.w #$A333
+	STA.w OAMBuffer+2, Y
+	INC.b $00
+
+	JMP .next_room
+
+.done
+	SEP #$30
+	RTS
+
+DrawDoorsStairs:
+	LDA.l CurrentDisplayedRoom
+	TAX
+	LDA.l SpiralPropsIndex, X
+	TAX
+	LDA.l SpiralProps, X
+	BNE +
+	JMP .done
++
+
+	STA.b $0C
+	STZ.b $0D
+
+	REP #$30
+	JSR GetCurrentRoomVisibility
+	SEP #$30
+
+.next_sprite
+	INX : INX
+	LDA.l SpiralProps, X
+
+
+	PHX
+	ASL A
+	TAX
+
+	PHX
+	LDA.b $0D
+	CLC : ADC.b #$15
+	ASL A
+	TAX
+	LDA.l DoorSlots, X
+	PLX
+	CMP.b #$0F
+	BEQ .skip
+
+	REP #$30
+	LDA.l CurrentDisplayedRoom
+	STA.b $CA
+	LDA.b $0D
+	AND.w #$00FF
+	JSR CheckStairSection
+	SEP #$30
+	BCC .skip
+
+	LDA.b $0A
+	CMP.b #$04
+	BCS .draw
+
+	LDA.l SpiralLabelQuadrantMasks, X
+	AND.b $0E
+	BEQ .skip
+
+.draw
+	LDY.b $00
+	LDA.b #$00
+	STA.w OAMBufferAux, Y
+	TYA
+	ASL A : ASL A
+	TAY
+
+	LDA.l DoorSlotsSprites
+	CLC : ADC.l SpiralLabelOffsets, X
+	STA.w OAMBuffer, Y
+
+	LDA.l DoorSlotsSprites+1
+	CLC : ADC.l SpiralLabelOffsets+1, X
+	STA.w OAMBuffer+1, Y
+
+	LDA.b #$39
+	CLC : ADC.b $0D
+	STA.w OAMBuffer+2, Y
+
+	LDA.b #$33
+	STA.w OAMBuffer+3, Y
+	INC.b $00
+
+.skip
+	PLX
+	INC.b $0D
+	DEC.b $0C
+	BNE .next_sprite
+
+.done
+	RTS
+
+DetectLinksSection:
+	LDA.b RoomIndex
+	ASL A
+	TAX
+	LDA.l SplitRooms, X
+	TAX
+	LDA.l SplitRooms, X
+	AND.w #$00FF
+	STA.b $00
+	BNE +
+	RTL
++
+
+	LDA.b LinkPosX
+	LSR A
+	AND.w #$00FF
+	INC A
+	STA.b $02
+
+	LDA.b LinkPosY
+	LSR A
+	AND.w #$00FF
+	INC A
+	STA.b $04
+
+	LDA.b LinkLayer
+	AND.w #$00FF
+	INC A
+	STA.b $06
+
+DetectSection:
+	INX
+.next_section
+	PHX
+	LDA.l SplitRooms+1, X
+	TAX
+.next_area
+	LDA.l SplitRooms, X
+	AND.w #$00FF
+	CMP.w #$00FF
+	BEQ .not_this_section
+
+	AND.w $06
+	BEQ .not_this_area
+
+	LDA.l SplitRooms+1, X ; x minimum
+	AND.w #$00FF
+	CMP.b $02
+	BCS .not_this_area
+
+	LDA.l SplitRooms+2, X ; x maximum
+	AND.w #$00FF
+	INC A
+	CMP.b $02
+	BCC .not_this_area
+
+	LDA.l SplitRooms+3, X ; y minimum
+	AND.w #$00FF
+	CMP.b $04
+	BCS .not_this_area
+
+	LDA.l SplitRooms+4, X ; y maximum
+	AND.w #$00FF
+	INC A
+	CMP.b $04
+	BCC .not_this_area
+
+	BRA .found
+
+.not_this_area
+	INX #5
+	BRA .next_area
+
+.not_this_section
+	PLX
+	TXA : CLC : ADC.w #$000D : TAX
+	DEC.b $00
+	BNE .next_section
+	BRA .done
+
+.found
+	PLX
+
+.done
+	LDA.b $00
+	RTL
+
+DetectEntranceSection:
+	TYA
+	ASL A
+	TAX
+	LDA.l EntranceData_room_id, X
+
+	ASL A
+	TAX
+	LDA.l SplitRooms, X
+	TAX
+	LDA.l SplitRooms, X
+	AND.w #$00FF
+	STA.b $00
+	BNE +
+	RTL
++
+
+	PHX
+	TYA
+	ASL A
+	TAX
+	LDA.l EntranceData_x_coordinate, X
+	LSR A
+	AND.w #$00FF
+	INC A
+	STA.b $02
+
+	TYA
+	ASL A
+	TAX
+	LDA.l EntranceData_y_coordinate, X
+	LSR A
+	AND.w #$00FF
+	INC A
+	STA.b $04
+
+	TYX
+	LDA.l EntranceData_layer, X
+	AND.w #$00FF
+	INC A
+	STA.b $06
+
+	PLX
+	JMP DetectSection
diff --git a/dungeon_map/data/doors_connections.asm b/dungeon_map/data/doors_connections.asm
index a2e41f9..95c0320 100644
--- a/dungeon_map/data/doors_connections.asm
+++ b/dungeon_map/data/doors_connections.asm
@@ -1,4 +1,5 @@
 DoorConnectionTiles:
+.vertical
 	dw $0000, $0000 ; $00
 	dw $01C0, $0000 ; $01 left -> left
 	dw $01D0, $01D1 ; $02 left -> middle
@@ -10,12 +11,33 @@ DoorConnectionTiles:
 	dw $41D1, $41D0 ; $08 right -> middle
 	dw $0000, $01C0 ; $09 right -> right
 	dw $41C2, $41C1 ; $0A left-middle -> left-middle
-	dw $81D2, $81D0 ; $0B left-middle -> left-right
+	dw $81D2, $C1D0 ; $0B left-middle -> left-right
 	dw $41D3, $81D3 ; $0C left-middle -> middle-right
-	dw $01D2, $01D0 ; $0D left-right -> left-middle
+	dw $01D2, $41D0 ; $0D left-right -> left-middle
 	dw $01C0, $01C0 ; $0E left-right -> left-right
 	dw $01D0, $41D2 ; $0F left-right -> middle-right
 	dw $C1D3, $01D3 ; $10 middle-right -> left-middle
 	dw $81D0, $C1D2 ; $11 middle-right -> left-right
 	dw $01C1, $01C2 ; $12 middle-right -> middle-right
 	dw $41C2, $01C2 ; $13 triple -> triple
+.horizontal
+	dw $0300, $0300 ; $00
+	dw $01C4, $0300 ; $01 top -> top
+	dw $C1D4, $C1D5 ; $02 top -> middle
+	dw $81C7, $41C7 ; $03 top -> bottom
+	dw $81D4, $81D5 ; $04 middle -> top
+	dw $01C5, $81C5 ; $05 middle -> middle
+	dw $01D5, $01D4 ; $06 middle -> bottom
+	dw $C1C7, $01C7 ; $07 bottom -> top
+	dw $41D5, $41D4 ; $08 bottom -> middle
+	dw $0300, $01C4 ; $09 bottom -> bottom
+	dw $41C6, $41C5 ; $0A top-middle -> top-middle
+	dw $41D6, $01D4 ; $0B top-middle -> top-bottom
+	dw $41D7, $81D7 ; $0C top-middle -> middle-bottom
+	dw $01D6, $41D4 ; $0D top-bottom -> top-middle
+	dw $01C4, $01C4 ; $0E top-bottom -> top-bottom
+	dw $C1D4, $81D6 ; $0F top-bottom -> middle-bottom
+	dw $C1D7, $01D7 ; $10 middle-bottom -> top-middle
+	dw $81D4, $C1D6 ; $11 middle-bottom -> top-bottom
+	dw $01C5, $01C6 ; $12 middle-bottom -> middle-bottom
+	dw $81C6, $01C6 ; $13 triple -> triple
diff --git a/dungeon_map/data/doors_display.asm b/dungeon_map/data/doors_display.asm
new file mode 100644
index 0000000..14e219b
--- /dev/null
+++ b/dungeon_map/data/doors_display.asm
@@ -0,0 +1,309 @@
+DoorSlotsSprites:
+; center
+	dw $48A8
+; north
+	dw $2090, $20A8, $20C0
+	dw $2098, $20B8
+; west
+	dw $3080, $4880, $6080
+	dw $3880, $5880
+; south
+	dw $7090, $70A8, $70C0
+	dw $7098, $70B8
+; east
+	dw $30D0, $48D0, $60D0
+	dw $38D0, $58D0
+; stairs
+	dw $B080, $B098, $B0B0
+; drop/warp
+	dw $B0D0
+
+DoorSlotsBG1:
+; center
+	dw $1135
+; north
+	dw $1092, $1095, $1098
+	dw $1093, $1097
+; west
+	dw $10D0, $1130, $1190
+	dw $10F0, $1170
+; south
+	dw $11D2, $11D5, $11D8
+	dw $11D3, $11D7
+; east
+	dw $10DA, $113A, $119A
+	dw $10FA, $117A
+; stairs
+	dw $12D0, $12D3, $12D6
+; drop/warp
+	dw $12DA
+
+DoorSlotsBG2:
+; center
+	dw $0000
+; north
+	dw $FEBA, $FEC0, $FEC6
+	dw $FEBC, $FEC4
+; west
+	dw $FF36, $FFF6, $00B6
+	dw $FF76, $0076
+; south
+	dw $013A, $0140, $0146
+	dw $013C, $0144
+; east
+	dw $FF4A, $000A, $00CA
+	dw $FF8A, $008A
+; stairs
+	dw $0336, $033C, $0342
+; drop/warp
+	dw $034A
+
+DoorSlotSides:
+	db $02, $0C, $16, $20
+
+DoorSlotOffsets:
+	db $02, $02, $06, $00
+
+; up, left, down, right
+NextCursorSlot:
+	db $80, $81, $82, $83
+; top
+	db $FF, $C1, $00, $04
+	db $FF, $04, $00, $05
+	db $FF, $05, $00, $C3
+	db $FF, $01, $00, $02
+	db $FF, $02, $00, $03
+; left
+	db $C0, $FF, $09, $00
+	db $09, $FF, $0A, $00
+	db $0A, $FF, $C2, $00
+	db $06, $FF, $07, $00
+	db $07, $FF, $08, $00
+; bottom
+	db $00, $E1, $85, $0E
+	db $00, $0E, $85, $0F
+	db $00, $0F, $85, $E3
+	db $00, $0B, $85, $0C
+	db $00, $0C, $85, $0D
+; right
+	db $E0, $00, $13, $FF
+	db $13, $00, $14, $FF
+	db $14, $00, $E2, $FF
+	db $10, $00, $11, $FF
+	db $11, $00, $12, $FF
+; stairs
+	db $84, $18, $FF, $16
+	db $84, $15, $FF, $17
+	db $84, $16, $FF, $18
+; drop/warp
+	db $84, $17, $FF, $15
+
+NextCursorSpecial:
+.center
+	db $02, $04, $05, $01, $03, $FF
+	db $07, $09, $0A, $06, $08, $FF
+	db $0C, $0E, $0F, $0B, $0D, $15, $16, $17, $18, $FF
+	db $11, $13, $14, $10, $12, $FF
+	db $0C, $0E, $0F, $0B, $0D, $00, $FF
+	db $17, $16, $15, $18, $FF
+.center_offset
+	db $00, $06, $0C, $16, $1C, $23
+.start_index
+	db $01, $06, $0B, $10, $15
+.start_direction
+	db $03, $02, $03, $02, $03
+.end_index
+	db $03, $08, $0D, $12, $18
+.end_direction
+	db $01, $00, $01, $00, $01
+
+SingleEdgeCurrentRoomConnectors:
+.north
+	dw $01C0, $0300, $01C0, $0300, $01C0, $0300 ; left -> left
+	dw $01C1, $41C1, $81D0, $81D1, $01C0, $0300 ; left -> middle
+	dw $41D1, $41D0, $01C1, $41C1, $81D0, $81D1 ; left -> right
+	dw $01C0, $0300, $01D0, $01D1, $01C1, $41C1 ; middle -> left
+	dw $01C1, $41C1, $01C1, $41C1, $01C1, $41C1 ; middle -> middle
+	dw $0300, $01C0, $41D1, $41D0, $01C1, $41C1 ; middle -> right
+	dw $01D0, $01D1, $01C1, $41C1, $C1D1, $C1D0 ; right -> left
+	dw $01C1, $41C1, $C1D1, $C1D0, $0300, $01C0 ; right -> middle
+	dw $0300, $01C0, $0300, $01C0, $0300, $01C0 ; right -> right
+.west
+	dw $01C4, $01C4, $01C4, $0300, $0300, $0300 ; top -> top
+	dw $01C5, $81D4, $01C4, $C1C5, $81D5, $0300 ; top -> middle
+	dw $41D5, $01C5, $81D4, $41D4, $C1C5, $81D5 ; top -> bottom
+	dw $01C4, $C1D4, $01C5, $0300, $C1D5, $C1C5 ; middle -> top
+	dw $01C5, $01C5, $01C5, $C1C5, $C1C5, $C1C5 ; middle -> middle
+	dw $0300, $41D5, $01C5, $01C4, $41D4, $C1C5 ; middle -> bottom
+	dw $C1D4, $01C5, $01D5, $C1D5, $C1C5, $01D4 ; bottom -> top
+	dw $01C5, $01D5, $0300, $C1C5, $01D4, $01C4 ; bottom -> middle
+	dw $0300, $0300, $0300, $01C4, $01C4, $01C4 ; bottom -> bottom
+.south
+	dw $01C0, $0300, $01C0, $0300, $01C0, $0300 ; left -> left
+	dw $01C0, $0300, $01D0, $01D1, $01C1, $41C1 ; left -> middle
+	dw $01D0, $01D1, $01C1, $41C1, $C1D1, $C1D0 ; left -> right
+	dw $01C1, $41C1, $81D0, $81D1, $01C0, $0300 ; middle -> left
+	dw $01C1, $41C1, $01C1, $41C1, $01C1, $41C1 ; middle -> middle
+	dw $01C1, $41C1, $C1D1, $C1D0, $0300, $01C0 ; middle -> right
+	dw $41D1, $41D0, $01C1, $41C1, $81D0, $81D1 ; right -> left
+	dw $0300, $01C0, $41D1, $41D0, $01C1, $41C1 ; right -> middle
+	dw $0300, $01C0, $0300, $01C0, $0300, $01C0 ; right -> right
+.east
+	dw $01C4, $01C4, $01C4, $0300, $0300, $0300 ; top -> top
+	dw $01C4, $C1D4, $01C5, $0300, $C1D5, $81C5 ; top -> middle
+	dw $C1D4, $01C5, $01D5, $C1D5, $81C5, $01D4 ; top -> bottom
+	dw $01C5, $81D4, $01C4, $81C5, $81D5, $0300 ; middle -> top
+	dw $01C5, $01C5, $01C5, $81C5, $81C5, $81C5 ; middle -> middle
+	dw $01C5, $01D5, $0300, $81C5, $01D4, $01C4 ; middle -> bottom
+	dw $41D5, $01C5, $81D4, $41D4, $81C5, $81D5 ; bottom -> top
+	dw $0300, $41D5, $01C5, $01C4, $41D4, $81C5 ; bottom -> middle
+	dw $0300, $0300, $0300, $01C4, $01C4, $01C4 ; bottom -> bottom
+
+QuadrantMasks:
+; north
+	dw $0008, $000C, $0004
+; west
+	dw $0008, $000A, $0002
+; south
+	dw $0002, $0003, $0001
+; east
+	dw $0004, $0005, $0001
+
+EntranceQuadrantMasks:
+	dw $0002
+	dw $0003
+	dw $0001
+
+DropdownQuadrantMasks:
+	dw $0008
+	dw $000C
+	dw $0004
+
+MultiConnectorMapping:
+.two
+	db $02, $00
+.three
+	db $02, $01, $00
+
+MultiConnectorTiles:
+.north
+..two
+	dw $41C7, $81C7, $C1C7, $01C7
+..three
+	dw $41C7, $01C4, $81F7, $C1F7, $01C4, $01C7
+.west
+..two
+	dw $81C7, $41C7, $C1C7, $01C7
+..three
+	dw $81C7, $01C0, $41E7, $C1E7, $01C0, $01C7
+.south
+..two
+	dw $C1C7, $01C7, $41C7, $81C7
+..three
+	dw $C1C7, $01C4, $01F7, $41F7, $01C4, $81C7
+.east
+..two
+	dw $C1C7, $01C7, $81C7, $41C7
+..three
+	dw $C1C7, $01C0, $01E7, $81E7, $01C0, $41C7
+.direction_index
+	db $00, $14, $28, $3C
+.start_offset
+..two
+	dw $FF7E, $FFBC, $00BE, $FFC6
+..three
+	dw $FF7C, $FF7C, $00BC, $FF86
+.increment
+	db $02, $40
+
+EdgePositions:
+.north
+	db $01, $00 ; HC Basement
+	db $02 ; Desert West Wing
+	db $00, $01, $02 ; Desert Lobby
+	db $00 ; Desert East Wing
+	db $01, $02 ; TT
+	db $00, $01 ; different TT
+.west
+	db $02 ; TT Attic
+	db $02, $02 ; Desert North Hall
+	db $00, $02 ; HC Basement
+	db $00 ; Desert East Wing
+	db $02, $00 ; TT Triple
+	db $02 ; TT Big Key Chest
+.south
+	db $01, $00 ; HC Basement
+	db $02 ; Desert West Wing
+	db $00, $01, $02 ; Desert Lobby
+	db $00 ; Desert East Wing
+	db $01, $02 ; TT
+	db $00, $01 ; different TT
+.east
+	db $02 ; TT Attic
+	db $02, $02 ; Desert North Hall
+	db $02, $00 ; HC Basement
+	db $00 ; Desert East Wing
+	db $02, $00 ; TT Triple
+	db $02 ; TT Big Key Chest
+
+EdgeConnectionIndices:
+; North
+	dw $0182, $0000
+	dw $0082, $0003
+	dw $0283, $0006
+	dw $0084, $0009
+	dw $0184, $000C
+	dw $0284, $000F
+	dw $0085, $0012
+	dw $01DB, $0015
+	dw $02DB, $0018
+	dw $00DC, $001B
+	dw $01DC, $001E
+
+; South
+	dw $0772, $0021
+	dw $0672, $0024
+	dw $0873, $0027
+	dw $0674, $002A
+	dw $0774, $002D
+	dw $0874, $0030
+	dw $0675, $0033
+	dw $07CB, $0036
+	dw $08CB, $0039
+	dw $06CC, $003C
+	dw $07CC, $003F
+
+; West
+	dw $0565, $0042
+	dw $0574, $0045
+	dw $0575, $0048
+	dw $0582, $004B
+	dw $0382, $004E
+	dw $0385, $0051
+	dw $05CC, $0054
+	dw $03CC, $0057
+	dw $05DC, $005A
+
+; East
+	dw $0B64, $005D
+	dw $0B73, $0060
+	dw $0B74, $0063
+	dw $0981, $0066
+	dw $0B81, $0069
+	dw $0984, $006C
+	dw $0BCB, $006F
+	dw $09CB, $0072
+	dw $0BDB, $0075
+
+	dw $FFFF
+
+InRoomConnectionIndices:
+	dw $020B, $0000
+	dw $081B, $0002
+	dw $023F, $0004
+	dw $081F, $0006
+	dw $007E, $0008
+	dw $065E, $000A
+	dw $0296, $000C
+	dw $083D, $000E
+	dw $FFFF
diff --git a/dungeon_map/data/fall_warps.asm b/dungeon_map/data/fall_warps.asm
new file mode 100644
index 0000000..db27d9e
--- /dev/null
+++ b/dungeon_map/data/fall_warps.asm
@@ -0,0 +1,38 @@
+FallTable:
+dw $1007, $1017 ; Moldorm Arena
+dw $1017, $1027 ; Below Moldorm drop to Big Chest
+dw $101E, $103E ; IP first drop
+dw $1027, $1031 ; ToH Big Chest drop
+dw $1031, $1077 ; Second Floor ToH
+dw $1039, $1029 ; Mothula drop
+dw $103A, $100A ; Pod front drop
+dw $103D, $1096 ; GT Torches drop
+dw $104D, $10A6 ; Moldorm 2 drop
+dw $1054, $1034 ; Left side Swamp
+dw $105E, $107E ; IP drop to tall icy room
+dw $107E, $109E ; Freezors drop (to big chest)
+dw $208C, $101C ; Ice Armos drop
+dw $1097, $10D1 ; Mire Cutscene
+dw $109E, $10BE ; IP Big Chest tile (push blocks)
+dw $10CE, $10DE ; Kholdstare drop
+; db $65, $AC ; TT Attic
+; db $77, $A7 ; ToH drop to fairy room (Herapot)
+; db $A9, $89 ; EP drop to fairy room
+; db $BE, $4F ; IP drop to fairy room
+dw $FFFF
+
+WarpTable:
+dw $2009, $104B ; PoD Basement (start)
+dw $100A, $1009 ; PoD Stalfos Basement
+dw $100B, $206A ; PoD Turtle Room to Boss
+dw $104B, $2009 ; PoD Basement (mimics)
+dw $207B, $209D ; GT post-compass island hardhat
+dw $207D, $109B ; GT warp maze
+dw $109D, $307B ; GT compass room
+dw $109B, $207D ; GT warp maze
+dw $10B1, $20B2 ; South of Fishbone warp
+dw $10D1, $10B1 ; Mire Big Key Chest warp
+; db $89, $A9 ; EP Fairy Room
+; db $A7, $17 ; ToH Fairy Room
+; db $4F, $BE ; IP Fairy Room
+dw $FFFF
diff --git a/dungeon_map/data/item_mapping.asm b/dungeon_map/data/item_mapping.asm
index 78f4f11..329c0d1 100644
--- a/dungeon_map/data/item_mapping.asm
+++ b/dungeon_map/data/item_mapping.asm
@@ -1,261 +1,276 @@
-db $0B ; 00 - Fighter Sword and Shield
-db $0B ; 01 - Master Sword
-db $0B ; 02 - Tempered Sword
-db $0B ; 03 - Butter Sword
-db $06 ; 04 - Fighter Shield
-db $06 ; 05 - Fire Shield
-db $06 ; 06 - Mirror Shield
-db $0B ; 07 - Fire Rod
-db $0B ; 08 - Ice Rod
-db $0B ; 09 - Hammer
-db $0B ; 0A - Hookshot
-db $0B ; 0B - Bow
-db $06 ; 0C - Boomerang
-db $0B ; 0D - Powder
-db $02 ; 0E - Bottle Refill (bee)
-db $0B ; 0F - Bombos
-db $0B ; 10 - Ether
-db $0B ; 11 - Quake
-db $0B ; 12 - Lamp
-db $06 ; 13 - Shovel
-db $0B ; 14 - Flute
-db $0B ; 15 - Somaria
-db $06 ; 16 - Bottle
-db $05 ; 17 - Heartpiece
-db $06 ; 18 - Byrna
-db $0B ; 19 - Cape
-db $0B ; 1A - Mirror
-db $0B ; 1B - Glove
-db $0B ; 1C - Mitts
-db $0B ; 1D - Book
-db $0B ; 1E - Flippers
-db $0B ; 1F - Pearl
-db $0D ; 20 - Crystal
-db $06 ; 21 - Net
-db $06 ; 22 - Blue Mail
-db $06 ; 23 - Red Mail
-db $03 ; 24 - Small Key
-db $07 ; 25 - Compass
-db $05 ; 26 - Heart Container from 4/4
-db $02 ; 27 - Bomb
-db $02 ; 28 - 3 bombs
-db $06 ; 29 - Mushroom
-db $06 ; 2A - Red boomerang
-db $06 ; 2B - Full bottle (red)
-db $06 ; 2C - Full bottle (green)
-db $06 ; 2D - Full bottle (blue)
-db $05 ; 2E - Potion refill (red)
-db $05 ; 2F - Potion refill (green)
-db $05 ; 30 - Potion refill (blue)
-db $02 ; 31 - 10 bombs
-db $09 ; 32 - Big key
-db $02 ; 33 - Map
-db $02 ; 34 - 1 rupee
-db $02 ; 35 - 5 rupees
-db $02 ; 36 - 20 rupees
-db $0A ; 37 - Green pendant
-db $0A ; 38 - Blue pendant
-db $0A ; 39 - Red pendant
-db $0B ; 3A - Tossed bow
-db $0B ; 3B - Silvers
-db $06 ; 3C - Full bottle (bee)
-db $06 ; 3D - Full bottle (fairy)
-db $05 ; 3E - Boss heart
-db $05 ; 3F - Sanc heart
-db $02 ; 40 - 100 rupees
-db $02 ; 41 - 50 rupees
-db $02 ; 42 - Heart
-db $02 ; 43 - Arrow
-db $02 ; 44 - 10 arrows
-db $02 ; 45 - Small magic
-db $02 ; 46 - 300 rupees
-db $02 ; 47 - 20 rupees green
-db $06 ; 48 - Full bottle (good bee)
-db $0B ; 49 - Tossed fighter sword
-db $0B ; 4A - Active Flute
-db $0B ; 4B - Boots
+!TIER_UNKNOWN = $01
+!TIER_JUNK = $02
+!TIER_LOW_KEY = $03
+!TIER_HEALTH = $05
+!TIER_MINOR = $06
+!TIER_MAP = $07
+!TIER_COMPASS = $08
+!TIER_SM_KEY = $09
+!TIER_BIG_KEY = $0A
+!TIER_MAJOR = $0B
+!TIER_PENDANT = $0C
+!TIER_CRYSTAL = $0D
+!TIER_TFP = $0E
+!TIER_TFORCE = $0F
 
-db $06 ; 4C - Bomb capacity (50)
-db $06 ; 4D - Arrow capacity (70)
-db $06 ; 4E - 1/2 magic
-db $06 ; 4F - 1/4 magic
-db $0B ; 50 - Safe master sword
-db $06 ; 51 - Bomb capacity (+5)
-db $06 ; 52 - Bomb capacity (+10)
-db $06 ; 53 - Arrow capacity (+5)
-db $06 ; 54 - Arrow capacity (+10)
-db $02 ; 55 - Programmable item 1
-db $02 ; 56 - Programmable item 2
-db $02 ; 57 - Programmable item 3
-db $0B ; 58 - Upgrade-only silver arrows
-db $02 ; 59 - Rupoor
-db $02 ; 5A - Nothing
-db $02 ; 5B - Red clock
-db $02 ; 5C - Blue clock
-db $02 ; 5D - Green clock
-db $0B ; 5E - Progressive sword
-db $06 ; 5F - Progressive shield
-db $06 ; 60 - Progressive armor
-db $0B ; 61 - Progressive glove
-db $02 ; 62 - RNG pool item (single)
-db $02 ; 63 - RNG pool item (multi)
-db $0B ; 64 - Progressive bow
-db $0B ; 65 - Progressive bow
-db $02 ; 66 -
-db $02 ; 67 -
-db $02 ; 68 -
-db $02 ; 69 -
-db $0F ; 6A - Triforce
-db $0E ; 6B - Power star
-db $0E ; 6C - Triforce Piece
-db $02 ; 6D - Server request item
-db $02 ; 6E - Server request item (dungeon drop)
-db $02 ; 6F -
+db !TIER_MAJOR   ; 00 - Fighter Sword and Shield
+db !TIER_MAJOR   ; 01 - Master Sword
+db !TIER_MAJOR   ; 02 - Tempered Sword
+db !TIER_MAJOR   ; 03 - Butter Sword
+db !TIER_JUNK    ; 04 - Fighter Shield
+db !TIER_MINOR   ; 05 - Fire Shield
+db !TIER_MINOR   ; 06 - Mirror Shield
+db !TIER_MAJOR   ; 07 - Fire Rod
+db !TIER_MAJOR   ; 08 - Ice Rod
+db !TIER_MAJOR   ; 09 - Hammer
+db !TIER_MAJOR   ; 0A - Hookshot
+db !TIER_MAJOR   ; 0B - Bow
+db !TIER_MINOR   ; 0C - Boomerang
+db !TIER_MINOR   ; 0D - Powder
+db !TIER_JUNK    ; 0E - Bottle Refill (bee)
+db !TIER_MAJOR   ; 0F - Bombos
+db !TIER_MAJOR   ; 10 - Ether
+db !TIER_MAJOR   ; 11 - Quake
+db !TIER_MAJOR   ; 12 - Lamp
+db !TIER_MINOR   ; 13 - Shovel
+db !TIER_MAJOR   ; 14 - Flute
+db !TIER_MAJOR   ; 15 - Somaria
+db !TIER_MINOR   ; 16 - Bottle
+db !TIER_HEALTH  ; 17 - Heartpiece
+db !TIER_MINOR   ; 18 - Byrna
+db !TIER_MINOR   ; 19 - Cape
+db !TIER_MAJOR   ; 1A - Mirror
+db !TIER_MAJOR   ; 1B - Glove
+db !TIER_MAJOR   ; 1C - Mitts
+db !TIER_MAJOR   ; 1D - Book
+db !TIER_MAJOR   ; 1E - Flippers
+db !TIER_MAJOR   ; 1F - Pearl
+db !TIER_CRYSTAL ; 20 - Crystal
+db !TIER_MINOR   ; 21 - Net
+db !TIER_MINOR   ; 22 - Blue Mail
+db !TIER_MINOR   ; 23 - Red Mail
+db !TIER_LOW_KEY ; 24 - Small Key
+db !TIER_COMPASS ; 25 - Compass
+db !TIER_HEALTH  ; 26 - Heart Container from 4/4
+db !TIER_JUNK    ; 27 - Bomb
+db !TIER_JUNK    ; 28 - 3 bombs
+db !TIER_MINOR   ; 29 - Mushroom
+db !TIER_MINOR   ; 2A - Red boomerang
+db !TIER_MINOR   ; 2B - Full bottle (red)
+db !TIER_MINOR   ; 2C - Full bottle (green)
+db !TIER_MINOR   ; 2D - Full bottle (blue)
+db !TIER_HEALTH  ; 2E - Potion refill (red)
+db !TIER_HEALTH  ; 2F - Potion refill (green)
+db !TIER_HEALTH  ; 30 - Potion refill (blue)
+db !TIER_JUNK    ; 31 - 10 bombs
+db !TIER_BIG_KEY ; 32 - Big key
+db !TIER_MAP     ; 33 - Map
+db !TIER_JUNK    ; 34 - 1 rupee
+db !TIER_JUNK    ; 35 - 5 rupees
+db !TIER_JUNK    ; 36 - 20 rupees
+db !TIER_PENDANT ; 37 - Green pendant
+db !TIER_PENDANT ; 38 - Blue pendant
+db !TIER_PENDANT ; 39 - Red pendant
+db !TIER_MAJOR   ; 3A - Tossed bow
+db !TIER_MAJOR   ; 3B - Silvers
+db !TIER_MINOR   ; 3C - Full bottle (bee)
+db !TIER_MINOR   ; 3D - Full bottle (fairy)
+db !TIER_HEALTH  ; 3E - Boss heart
+db !TIER_HEALTH  ; 3F - Sanc heart
+db !TIER_JUNK    ; 40 - 100 rupees
+db !TIER_JUNK    ; 41 - 50 rupees
+db !TIER_JUNK    ; 42 - Heart
+db !TIER_JUNK    ; 43 - Arrow
+db !TIER_JUNK    ; 44 - 10 arrows
+db !TIER_JUNK    ; 45 - Small magic
+db !TIER_JUNK    ; 46 - 300 rupees
+db !TIER_JUNK    ; 47 - 20 rupees green
+db !TIER_MINOR   ; 48 - Full bottle (good bee)
+db !TIER_MAJOR   ; 49 - Tossed fighter sword
+db !TIER_MAJOR   ; 4A - Active Flute
+db !TIER_MAJOR   ; 4B - Boots
 
-db $02 ; 70 - Map of Light World
-db $02 ; 71 - Map of Dark World
-db $02 ; 72 - Map of Ganon's Tower
-db $02 ; 73 - Map of Turtle Rock
-db $02 ; 74 - Map of Thieves' Town
-db $02 ; 75 - Map of Tower of Hera
-db $02 ; 76 - Map of Ice Palace
-db $02 ; 77 - Map of Skull Woods
-db $02 ; 78 - Map of Misery Mire
-db $02 ; 79 - Map of Dark Palace
-db $02 ; 7A - Map of Swamp Palace
-db $02 ; 7B - Map of Agahnim's Tower
-db $02 ; 7C - Map of Desert Palace
-db $02 ; 7D - Map of Eastern Palace
-db $02 ; 7E - Map of Hyrule Castle
-db $02 ; 7F - Map of Sewers
+db !TIER_MINOR   ; 4C - Bomb capacity (50)
+db !TIER_MINOR   ; 4D - Arrow capacity (70)
+db !TIER_MINOR   ; 4E - 1/2 magic
+db !TIER_MINOR   ; 4F - 1/4 magic
+db !TIER_MAJOR   ; 50 - Safe master sword
+db !TIER_MINOR   ; 51 - Bomb capacity (+5)
+db !TIER_MINOR   ; 52 - Bomb capacity (+10)
+db !TIER_MINOR   ; 53 - Arrow capacity (+5)
+db !TIER_MINOR   ; 54 - Arrow capacity (+10)
+db !TIER_JUNK    ; 55 - Programmable item 1
+db !TIER_JUNK    ; 56 - Programmable item 2
+db !TIER_JUNK    ; 57 - Programmable item 3
+db !TIER_MAJOR   ; 58 - Upgrade-only silver arrows
+db !TIER_JUNK    ; 59 - Rupoor
+db !TIER_JUNK    ; 5A - Nothing
+db !TIER_JUNK    ; 5B - Red clock
+db !TIER_JUNK    ; 5C - Blue clock
+db !TIER_JUNK    ; 5D - Green clock
+db !TIER_MAJOR   ; 5E - Progressive sword
+db !TIER_MINOR   ; 5F - Progressive shield
+db !TIER_MINOR   ; 60 - Progressive armor
+db !TIER_MAJOR   ; 61 - Progressive glove
+db !TIER_JUNK    ; 62 - RNG pool item (single)
+db !TIER_JUNK    ; 63 - RNG pool item (multi)
+db !TIER_MAJOR   ; 64 - Progressive bow
+db !TIER_MAJOR   ; 65 - Progressive bow
+db !TIER_JUNK    ; 66 -
+db !TIER_JUNK    ; 67 -
+db !TIER_JUNK    ; 68 -
+db !TIER_JUNK    ; 69 -
+db !TIER_TFORCE  ; 6A - Triforce
+db !TIER_TFP     ; 6B - Power star
+db !TIER_TFP     ; 6C - Triforce Piece
+db !TIER_JUNK    ; 6D - Server request item
+db !TIER_JUNK    ; 6E - Server request item (dungeon drop)
+db !TIER_JUNK    ; 6F -
 
-db $07 ; 80 - Compass of Light World
-db $07 ; 81 - Compass of Dark World
-db $07 ; 82 - Compass of Ganon's Tower
-db $07 ; 83 - Compass of Turtle Rock
-db $07 ; 84 - Compass of Thieves' Town
-db $07 ; 85 - Compass of Tower of Hera
-db $07 ; 86 - Compass of Ice Palace
-db $07 ; 87 - Compass of Skull Woods
-db $07 ; 88 - Compass of Misery Mire
-db $07 ; 89 - Compass of Dark Palace
-db $07 ; 8A - Compass of Swamp Palace
-db $07 ; 8B - Compass of Agahnim's Tower
-db $07 ; 8C - Compass of Desert Palace
-db $07 ; 8D - Compass of Eastern Palace
-db $07 ; 8E - Compass of Hyrule Castle
-db $07 ; 8F - Compass of Sewers
+db !TIER_MAP     ; 70 - Map of Light World
+db !TIER_MAP     ; 71 - Map of Dark World
+db !TIER_MAP     ; 72 - Map of Ganon's Tower
+db !TIER_MAP     ; 73 - Map of Turtle Rock
+db !TIER_MAP     ; 74 - Map of Thieves' Town
+db !TIER_MAP     ; 75 - Map of Tower of Hera
+db !TIER_MAP     ; 76 - Map of Ice Palace
+db !TIER_MAP     ; 77 - Map of Skull Woods
+db !TIER_MAP     ; 78 - Map of Misery Mire
+db !TIER_MAP     ; 79 - Map of Dark Palace
+db !TIER_MAP     ; 7A - Map of Swamp Palace
+db !TIER_MAP     ; 7B - Map of Agahnim's Tower
+db !TIER_MAP     ; 7C - Map of Desert Palace
+db !TIER_MAP     ; 7D - Map of Eastern Palace
+db !TIER_MAP     ; 7E - Map of Hyrule Castle
+db !TIER_MAP     ; 7F - Map of Sewers
 
-db $09 ; 90 - Skull key
-db $09 ; 91 - Reserved
-db $09 ; 92 - Big key of Ganon's Tower
-db $09 ; 93 - Big key of Turtle Rock
-db $09 ; 94 - Big key of Thieves' Town
-db $09 ; 95 - Big key of Tower of Hera
-db $09 ; 96 - Big key of Ice Palace
-db $09 ; 97 - Big key of Skull Woods
-db $09 ; 98 - Big key of Misery Mire
-db $09 ; 99 - Big key of Dark Palace
-db $09 ; 9A - Big key of Swamp Palace
-db $09 ; 9B - Big key of Agahnim's Tower
-db $09 ; 9C - Big key of Desert Palace
-db $09 ; 9D - Big key of Eastern Palace
-db $09 ; 9E - Big key of Hyrule Castle
-db $09 ; 9F - Big key of Sewers
+db !TIER_COMPASS ; 80 - Compass of Light World
+db !TIER_COMPASS ; 81 - Compass of Dark World
+db !TIER_COMPASS ; 82 - Compass of Ganon's Tower
+db !TIER_COMPASS ; 83 - Compass of Turtle Rock
+db !TIER_COMPASS ; 84 - Compass of Thieves' Town
+db !TIER_COMPASS ; 85 - Compass of Tower of Hera
+db !TIER_COMPASS ; 86 - Compass of Ice Palace
+db !TIER_COMPASS ; 87 - Compass of Skull Woods
+db !TIER_COMPASS ; 88 - Compass of Misery Mire
+db !TIER_COMPASS ; 89 - Compass of Dark Palace
+db !TIER_COMPASS ; 8A - Compass of Swamp Palace
+db !TIER_COMPASS ; 8B - Compass of Agahnim's Tower
+db !TIER_COMPASS ; 8C - Compass of Desert Palace
+db !TIER_COMPASS ; 8D - Compass of Eastern Palace
+db !TIER_COMPASS ; 8E - Compass of Hyrule Castle
+db !TIER_COMPASS ; 8F - Compass of Sewers
 
-db $08 ; A0 - Small key of Sewers
-db $08 ; A1 - Small key of Hyrule Castle
-db $08 ; A2 - Small key of Eastern Palace
-db $08 ; A3 - Small key of Desert Palace
-db $08 ; A4 - Small key of Agahnim's Tower
-db $08 ; A5 - Small key of Swamp Palace
-db $08 ; A6 - Small key of Dark Palace
-db $08 ; A7 - Small key of Misery Mire
-db $08 ; A8 - Small key of Skull Woods
-db $08 ; A9 - Small key of Ice Palace
-db $08 ; AA - Small key of Tower of Hera
-db $08 ; AB - Small key of Thieves' Town
-db $08 ; AC - Small key of Turtle Rock
-db $08 ; AD - Small key of Ganon's Tower
-db $02 ; AE - Reserved
-db $03 ; AF - Generic small key
-db $0D ; B0 - Crystal 6
-db $0D ; B1 - Crystal 1
-db $0D ; B2 - Crystal 5
-db $0D ; B3 - Crystal 7
-db $0D ; B4 - Crystal 2
-db $0D ; B5 - Crystal 4
-db $0D ; B6 - Crystal 3
-db $02 ; B7 - Reserved
-db $02 ; B8 -
-db $02 ; B9 -
-db $02 ; BA -
-db $02 ; BB -
-db $02 ; BC -
-db $02 ; BD -
-db $02 ; BE -
-db $02 ; BF -
-db $02 ; C0 -
-db $02 ; C1 -
-db $02 ; C2 -
-db $02 ; C3 -
-db $02 ; C4 -
-db $02 ; C5 -
-db $02 ; C6 -
-db $02 ; C7 -
-db $02 ; C8 -
-db $02 ; C9 -
-db $02 ; CA -
-db $02 ; CB -
-db $02 ; CC -
-db $02 ; CD -
-db $02 ; CE -
-db $02 ; CF -
-db $02 ; D0 - Bee trap
-db $02 ; D1 - Apples
-db $02 ; D2 - Fairy
-db $02 ; D3 - Chicken
-db $02 ; D4 - Big Magic
-db $02 ; D5 - 5 Arrows
-db $02 ; D6 - Good Bee
-db $02 ; D7 -
-db $02 ; D8 -
-db $02 ; D9 -
-db $02 ; DA -
-db $02 ; DB -
-db $02 ; DC -
-db $02 ; DD -
-db $02 ; DE -
-db $02 ; DF -
-db $02 ; E0 -
-db $02 ; E1 -
-db $02 ; E2 -
-db $02 ; E3 -
-db $02 ; E4 -
-db $02 ; E5 -
-db $02 ; E6 -
-db $02 ; E7 -
-db $02 ; E8 -
-db $02 ; E9 -
-db $02 ; EA -
-db $02 ; EB -
-db $02 ; EC -
-db $02 ; ED -
-db $02 ; EE -
-db $02 ; EF -
-db $02 ; F0 -
-db $02 ; F1 -
-db $02 ; F2 -
-db $02 ; F3 -
-db $02 ; F4 -
-db $02 ; F5 -
-db $02 ; F6 -
-db $02 ; F7 -
-db $02 ; F8 -
-db $02 ; F9 -
-db $02 ; FA -
-db $02 ; FB -
-db $02 ; FC -
-db $02 ; FD -
-db $02 ; FE - Server request (async)
-db $02 ; FF -
+db !TIER_BIG_KEY ; 90 - Skull key
+db !TIER_BIG_KEY ; 91 - Reserved
+db !TIER_BIG_KEY ; 92 - Big key of Ganon's Tower
+db !TIER_BIG_KEY ; 93 - Big key of Turtle Rock
+db !TIER_BIG_KEY ; 94 - Big key of Thieves' Town
+db !TIER_BIG_KEY ; 95 - Big key of Tower of Hera
+db !TIER_BIG_KEY ; 96 - Big key of Ice Palace
+db !TIER_BIG_KEY ; 97 - Big key of Skull Woods
+db !TIER_BIG_KEY ; 98 - Big key of Misery Mire
+db !TIER_BIG_KEY ; 99 - Big key of Dark Palace
+db !TIER_BIG_KEY ; 9A - Big key of Swamp Palace
+db !TIER_BIG_KEY ; 9B - Big key of Agahnim's Tower
+db !TIER_BIG_KEY ; 9C - Big key of Desert Palace
+db !TIER_BIG_KEY ; 9D - Big key of Eastern Palace
+db !TIER_BIG_KEY ; 9E - Big key of Hyrule Castle
+db !TIER_BIG_KEY ; 9F - Big key of Sewers
+
+db !TIER_SM_KEY  ; A0 - Small key of Sewers
+db !TIER_SM_KEY  ; A1 - Small key of Hyrule Castle
+db !TIER_SM_KEY  ; A2 - Small key of Eastern Palace
+db !TIER_SM_KEY  ; A3 - Small key of Desert Palace
+db !TIER_SM_KEY  ; A4 - Small key of Agahnim's Tower
+db !TIER_SM_KEY  ; A5 - Small key of Swamp Palace
+db !TIER_SM_KEY  ; A6 - Small key of Dark Palace
+db !TIER_SM_KEY  ; A7 - Small key of Misery Mire
+db !TIER_SM_KEY  ; A8 - Small key of Skull Woods
+db !TIER_SM_KEY  ; A9 - Small key of Ice Palace
+db !TIER_SM_KEY  ; AA - Small key of Tower of Hera
+db !TIER_SM_KEY  ; AB - Small key of Thieves' Town
+db !TIER_SM_KEY  ; AC - Small key of Turtle Rock
+db !TIER_SM_KEY  ; AD - Small key of Ganon's Tower
+db !TIER_JUNK    ; AE - Reserved
+db !TIER_LOW_KEY ; AF - Generic small key
+db !TIER_CRYSTAL ; B0 - Crystal 6
+db !TIER_CRYSTAL ; B1 - Crystal 1
+db !TIER_CRYSTAL ; B2 - Crystal 5
+db !TIER_CRYSTAL ; B3 - Crystal 7
+db !TIER_CRYSTAL ; B4 - Crystal 2
+db !TIER_CRYSTAL ; B5 - Crystal 4
+db !TIER_CRYSTAL ; B6 - Crystal 3
+db !TIER_JUNK    ; B7 - Reserved
+db !TIER_JUNK    ; B8 -
+db !TIER_JUNK    ; B9 -
+db !TIER_JUNK    ; BA -
+db !TIER_JUNK    ; BB -
+db !TIER_JUNK    ; BC -
+db !TIER_JUNK    ; BD -
+db !TIER_JUNK    ; BE -
+db !TIER_JUNK    ; BF -
+db !TIER_JUNK    ; C0 -
+db !TIER_JUNK    ; C1 -
+db !TIER_JUNK    ; C2 -
+db !TIER_JUNK    ; C3 -
+db !TIER_JUNK    ; C4 -
+db !TIER_JUNK    ; C5 -
+db !TIER_JUNK    ; C6 -
+db !TIER_JUNK    ; C7 -
+db !TIER_JUNK    ; C8 -
+db !TIER_JUNK    ; C9 -
+db !TIER_JUNK    ; CA -
+db !TIER_JUNK    ; CB -
+db !TIER_JUNK    ; CC -
+db !TIER_JUNK    ; CD -
+db !TIER_JUNK    ; CE -
+db !TIER_JUNK    ; CF -
+db !TIER_JUNK    ; D0 - Bee trap
+db !TIER_JUNK    ; D1 - Apples
+db !TIER_JUNK    ; D2 - Fairy
+db !TIER_JUNK    ; D3 - Chicken
+db !TIER_JUNK    ; D4 - Big Magic
+db !TIER_JUNK    ; D5 - 5 Arrows
+db !TIER_JUNK    ; D6 - Good Bee
+db !TIER_JUNK    ; D7 -
+db !TIER_JUNK    ; D8 -
+db !TIER_JUNK    ; D9 -
+db !TIER_JUNK    ; DA -
+db !TIER_JUNK    ; DB -
+db !TIER_JUNK    ; DC -
+db !TIER_JUNK    ; DD -
+db !TIER_JUNK    ; DE -
+db !TIER_JUNK    ; DF -
+db !TIER_JUNK    ; E0 -
+db !TIER_JUNK    ; E1 -
+db !TIER_JUNK    ; E2 -
+db !TIER_JUNK    ; E3 -
+db !TIER_JUNK    ; E4 -
+db !TIER_JUNK    ; E5 -
+db !TIER_JUNK    ; E6 -
+db !TIER_JUNK    ; E7 -
+db !TIER_JUNK    ; E8 -
+db !TIER_JUNK    ; E9 -
+db !TIER_JUNK    ; EA -
+db !TIER_JUNK    ; EB -
+db !TIER_JUNK    ; EC -
+db !TIER_JUNK    ; ED -
+db !TIER_JUNK    ; EE -
+db !TIER_JUNK    ; EF -
+db !TIER_JUNK    ; F0 -
+db !TIER_JUNK    ; F1 -
+db !TIER_JUNK    ; F2 -
+db !TIER_JUNK    ; F3 -
+db !TIER_JUNK    ; F4 -
+db !TIER_JUNK    ; F5 -
+db !TIER_JUNK    ; F6 -
+db !TIER_JUNK    ; F7 -
+db !TIER_JUNK    ; F8 -
+db !TIER_JUNK    ; F9 -
+db !TIER_JUNK    ; FA -
+db !TIER_JUNK    ; FB -
+db !TIER_JUNK    ; FC -
+db !TIER_JUNK    ; FD -
+db !TIER_JUNK    ; FE - Server request (async)
+db !TIER_JUNK    ; FF -
diff --git a/dungeon_map/data/spiral_stairs.asm b/dungeon_map/data/spiral_stairs.asm
new file mode 100644
index 0000000..11cc4db
--- /dev/null
+++ b/dungeon_map/data/spiral_stairs.asm
@@ -0,0 +1,87 @@
+SpiralPropsIndex:
+db $00, $04, $07, $00, $01, $00, $00, $0D, $00, $10, $04, $00, $15, $00, $0A, $00
+db $00, $07, $00, $00, $00, $01, $07, $1C, $00, $00, $21, $00, $26, $07, $0A, $00
+db $00, $00, $00, $00, $00, $00, $29, $30, $01, $00, $00, $00, $00, $00, $00, $00
+db $00, $35, $00, $00, $3A, $00, $00, $00, $01, $00, $04, $00, $00, $00, $00, $3D
+db $40, $07, $07, $00, $00, $01, $00, $00, $00, $00, $43, $00, $07, $07, $07, $00
+db $00, $00, $00, $01, $48, $00, $00, $00, $00, $00, $00, $00, $07, $07, $00, $4B
+db $00, $00, $00, $01, $50, $00, $07, $00, $00, $00, $53, $01, $01, $00, $58, $00
+;   0    1    2    3    4    5    6    7    8    9    a    b    c    d    e    f
+db $5B, $01, $04, $00, $00, $00, $60, $67, $00, $00, $00, $00, $00, $00, $00, $6E
+db $01, $00, $00, $00, $00, $00, $00, $71, $00, $00, $00, $00, $76, $00, $04, $00
+db $00, $07, $00, $04, $00, $00, $00, $01, $7D, $0A, $00, $00, $00, $00, $04, $00
+db $01, $00, $04, $00, $00, $01, $07, $00, $00, $00, $00, $0A, $00, $00, $07, $00
+db $80, $00, $00, $00, $00, $01, $01, $00, $00, $00, $00, $00, $01, $00, $07, $00
+db $85, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+db $8A, $92, $8F, $00, $00, $00, $00, $00, $00, $00, $0A, $00, $00, $00, $00, $00
+db $04
+
+SpiralProps:
+db $00 ;null row
+db $01, $00, $00 ; ($01) Single Top-Left Staircase
+db $01, $00, $01 ; ($04) Single Top-Middle Staircase
+db $01, $00, $02 ; ($07) Single Top-Right Staircase
+db $01, $00, $05 ; ($0A) Single Staircase at Top of Bottom Left Quadrant
+
+db $01, $00, $04 ; ($0D) Moldorm
+db $02, $01, $00, $00, $02 ; ($10) Pod Basement
+db $03, $01, $0A, $02, $01, $00, $0B ; ($15) GT Entrance
+db $02, $00, $03, $01, $04 ; ($1C) Hera Below Moldorm
+db $02, $00, $01, $01, $0B ; ($21) PoD Bridge
+db $01, $00, $08 ; ($26) GT Ice Armos
+db $03, $00, $01, $01, $0B, $02, $09 ; ($29) Swamp Statue
+db $02, $01, $03, $00, $04 ; ($30) Hera Big Chest
+db $02, $00, $04, $02, $09 ; ($35) Hera Startiles (middle value unused)
+db $01, $00, $08 ; ($3A) West Swamp
+db $01, $00, $05 ; ($3D) Ice Hamlift
+db $01, $00, $07 ; ($40) Aga Guards
+db $02, $01, $00, $00, $02 ; ($43) Pod Entrance
+db $01, $00, $08 ; ($48) Swamp Attic
+db $02, $03, $0C, $04, $06 ; ($4B) Ice U (1st three values unused)
+db $01, $00, $05 ; ($50) TT Attic Left
+db $02, $00, $01, $01, $0B ; ($53) Pod Rupees
+db $01, $00, $04 ; ($58) Ice Gators
+db $02, $01, $0A, $02, $01 ; ($5B) HC Tiny (first value placeholder)
+db $03, $00, $01, $01, $0B, $02, $09 ; ($60) Swamp Sunken
+db $03, $01, $00, $03, $08, $02, $09 ; ($67) Hera Entrance (first value unused)
+db $01, $00, $08 ; ($6E) Ice Hookshot
+db $02, $01, $00, $03, $08 ; ($71) Hera Basement (first and third values unused)
+db $03, $01, $00, $00, $02, $03, $08 ; ($76) GT Circle (third value unused)
+db $01, $00, $07 ; ($7D) Mire Entrance
+db $02, $00, $02, $02, $09 ; ($80) Tower Usains (2nd value unused)
+db $02, $00, $02, $02, $09 ; ($85) Tower Dark2 (2nd value unused)
+db $02, $00, $02, $02, $09 ; ($8A) Tower Dark1 (2nd value unused)
+db $01, $00, $09 ; ($8F) Mire2
+db $01, $00, $0A ; ($92) Mire south of Torch Room
+
+SpiralLabelOffsets:
+db 1, -9
+db 5, -9
+db 9, -9
+db -6, -1
+db 15, -1
+db 1, -1
+db 5, -1
+db 9, -1
+db -6, 7
+db 15, 7
+db -3, -9
+db 13, -9
+db -3, -1
+db 13, -1
+
+SpiralLabelQuadrantMasks:
+dw $0008
+dw $000C
+dw $0004
+dw $0008
+dw $0004
+dw $0002
+dw $0003
+dw $0001
+dw $0002
+dw $0001
+dw $0008
+dw $0004
+dw $0002
+dw $0001
diff --git a/dungeon_map/data/split_room.asm b/dungeon_map/data/split_room.asm
new file mode 100644
index 0000000..5665273
--- /dev/null
+++ b/dungeon_map/data/split_room.asm
@@ -0,0 +1,571 @@
+IncomingDoorMap:
+; north
+db $06, $07, $08
+; west
+db $09, $0A, $0B
+; south
+db $00, $01, $02
+; east
+db $03, $04, $05
+
+macro d(label)
+dw <label>-SplitRooms
+endmacro
+
+macro sq(byte)
+db <byte>
+endmacro
+
+SplitRooms:
+;  0/8       1/9       2/A       3/B       4/C       5/D       6/E       7/F
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+%d(.no) : %d(.09) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.14) : %d(.no) : %d(.no) : %d(.no)
+%d(.no) : %d(.no) : %d(.1a) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+%d(.no) : %d(.no) : %d(.2a) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.35) : %d(.36) : %d(.37)
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.57)
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+%d(.no) : %d(.no) : %d(.6a) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.75) : %d(.no) : %d(.no)
+%d(.no) : %d(.no) : %d(.no) : %d(.7b) : %d(.7c) : %d(.7d) : %d(.no) : %d(.no)
+
+;  0/8       1/9       2/A       3/B       4/C       5/D       6/E       7/F
+%d(.no) : %d(.no) : %d(.82) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.87)
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.8c) : %d(.no) : %d(.no) : %d(.no)
+
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.9d) : %d(.no) : %d(.no)
+
+%d(.no) : %d(.no) : %d(.a2) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+%d(.no) : %d(.a9) : %d(.aa) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+
+%d(.no) : %d(.no) : %d(.b2) : %d(.no) : %d(.no) : %d(.no) : %d(.b6) : %d(.no)
+%d(.no) : %d(.b9) : %d(.no) : %d(.no) : %d(.bc) : %d(.no) : %d(.no) : %d(.no)
+
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.c7)
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+
+%d(.no) : %d(.d1) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.d6) : %d(.no)
+%d(.no) : %d(.no) : %d(.no) : %d(.db) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+
+%d(.no)
+
+.no
+db $00
+
+.no_items
+db $FF
+
+.09
+db $01
+%sq($04)
+%d(..areas) : %d(.no_items) : %d(..stairs)
+%d(.no_items) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $80, $FF, $00, $80
+db $FF
+..stairs
+db $01
+db $FF
+..enemies
+db $02
+db $FF
+
+.14
+db $02
+%sq($00)
+%d(..areas3) : %d(..doors3) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(.no_items)
+%sq($00)
+%d(..areas2) : %d(..doors2) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(.no_items)
+..areas3
+db $03, $C0, $FF, $00, $50
+db $03, $00, $28, $30, $50
+db $03, $30, $50, $D0, $FF
+db $FF
+..doors3
+db $03, $06, $09
+db $FF
+..areas2
+db $03, $B0, $D0, $D0, $FF
+db $03, $30, $50, $00, $28
+db $FF
+..doors2
+db $00, $08
+db $FF
+
+.1a ; PoD Big Chest (2) // Falling bridge and such (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(..chests) : %d(.no_items) : %d(.no_items)
+..areas
+db $03, $00, $2C, $70, $98
+db $FF
+..doors
+db $04
+db $FF
+..chests
+db $00
+db $FF
+
+.2a ; PoD Arena Right-Side Chest (2) // Arena (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(..chests) : %d(.no_items) : %d(.no_items)
+..areas
+db $03, $D8, $FF, $A8, $C8
+db $FF
+..doors
+db $0B
+db $FF
+..chests
+db $00
+db $FF
+
+.35 ; Swamp BK Chest (2) // Swamp second trench (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(..chests) : %d(..pots) : %d(.no_items)
+..areas
+db $03, $00, $70, $00, $80
+db $FF
+..doors
+db $03
+db $FF
+..chests
+db $00
+db $FF
+..pots
+db $01, $02, $03, $04, $05
+db $FF
+
+.36 ; Swamp Big Lobby (1) // Tiny Top-Right Blocked Corner (2)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(..pots) : %d(.no_items)
+..areas
+db $03, $D4, $FF, $00, $48
+db $FF
+..doors
+db $09
+db $FF
+..pots
+db $00, $01
+db $FF
+
+.37 ; Swamp Second Chest (2) // Swamp first trench (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(..chests) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $90, $FF, $00, $80
+db $FF
+..doors
+db $09
+db $FF
+..chests
+db $00
+db $FF
+..enemies
+db $02, $03
+db $FF
+
+.57 ; SW pot cage (2) // middle section (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(..chests) : %d(..pots) : %d(..enemies)
+..areas
+db $03, $80, $FF, $80, $FF
+db $FF
+..doors
+db $08, $0B
+db $FF
+..chests
+db $01
+db $FF
+..pots
+db $02, $03, $04, $05
+db $FF
+..enemies
+db $08, $09, $0A, $0B
+db $FF
+
+.6a ; pre-helmasaur-king (2) // PoD rupee basement (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $B4, $C4, $00, $B4
+db $03, $A8, $D0, $B0, $D0
+db $FF
+..doors
+db $02
+db $FF
+..enemies
+db $00, $01, $04, $05
+db $FF
+
+.74 ; desert north -- trapped area (2) // everything else (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $4C, $C4, $CC, $FF
+db $FF
+..doors
+db $07
+db $FF
+..enemies
+db $06, $07
+db $FF
+
+.75 ; desert cannonball (2) // desert northeast + trap room (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items) : %d(..chests) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $80, $FF, $00, $FF
+db $FF
+..doors
+db $08
+db $FF
+..chests
+db $00
+db $FF
+..enemies
+db $06, $07
+db $FF
+
+.7b ; GT post-compass (3) // island hardhat (2) // DMs room (1)
+db $02
+%sq($00)
+%d(..areas3) : %d(..doors3) : %d(.no_items)
+%d(.no_items) : %d(..pots3) : %d(..enemies3)
+%sq($00)
+%d(..areas2) : %d(..doors2) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(..enemies2)
+
+..areas3
+db $03, $00, $FF, $00, $80
+db $FF
+..doors3
+db $09
+db $FF
+..pots3
+db $00, $01, $02, $03, $04
+db $FF
+..enemies3
+db $00, $01
+db $FF
+
+..areas2
+db $03, $80, $FF, $80, $FF
+db $FF
+..doors2
+db $0B
+db $FF
+..enemies2
+db $06, $07
+db $FF
+
+.7c ; GT falling bridge // rando room
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(..pots) : %d(..enemies)
+..areas
+db $03, $00, $80, $00, $FF
+db $FF
+..doors
+db $03, $05
+db $FF
+..pots
+db $00, $01, $02, $03
+db $FF
+..enemies
+db $01, $02, $03, $04
+db $FF
+
+.7d ; GT warp maze (section next to rando room)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(..chests) : %d(..pots) : %d(..enemies)
+..areas
+db $03, $00, $FF, $00, $80
+db $03, $00, $80, $80, $FF
+db $03, $CA, $DA, $9A, $A6
+db $FF
+..doors
+db $05
+db $FF
+..chests
+db $00
+db $FF
+..pots
+db $00, $01, $02, $03
+db $FF
+..enemies
+db $00, $01, $02, $03, $09
+db $FF
+
+.82 ; HC Basement (1) + catwalk (2)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(.no_items)
+..areas
+db $03, $00, $20, $00, $50
+db $FF
+..doors
+db $00, $03
+db $FF
+
+.87 ; Hera basement: cage (0) // torches (1)
+db $01
+%sq($08)
+%d(..areas) : %d(.no_items) : %d(..stairs)
+%d(..chests) : %d(..pots) : %d(..enemies)
+..areas
+db $03, $00, $FF, $00, $80
+db $03, $80, $FF, $80, $FF
+db $FF
+..stairs
+db $00
+db $FF
+..chests
+db $00
+db $FF
+..pots
+db $00, $01, $02, $03, $04, $05, $06, $07
+db $FF
+..enemies
+db $00, $01, $02, $05, $06, $09, $0C
+db $FF
+
+.8c
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(..chests) : %d(..pots) : %d(..enemies)
+..areas
+db $03, $80, $FF, $80, $FF
+db $FF
+..doors
+db $08
+db $FF
+..chests
+db $03
+db $FF
+..pots
+db $02, $03, $04, $05, $06
+db $FF
+..enemies
+db $06, $07, $09
+db $FF
+
+.9d
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $00, $FF, $80, $FF
+db $FF
+..doors
+db $05
+db $FF
+..enemies
+db $06, $07, $08
+db $FF
+
+.a2 ; Mire abyss -- EW bridge (2), stairs to basement + hookable chest (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(.no_items)
+..areas
+db $01, $00, $FF, $70, $84
+db $FF
+..doors
+db $04, $0A
+db $FF
+
+.a9
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items) : %d(.no_items) : %d(..pots) : %d(.no_items)
+..areas
+db $03, $00, $40, $70, $FF
+db $03, $00, $FF, $A0, $FF
+db $03, $C0, $FF, $70, $FF
+db $FF
+..doors
+db $04, $07, $0A
+db $FF
+..pots
+db $04, $05, $06, $07
+db $FF
+
+.aa
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items) : %d(.no_items) : %d(.no_items) : %d(.no_items)
+..areas
+db $02, $00, $80, $00, $FF
+db $01, $34, $D4, $B8, $FF
+db $FF
+..doors
+db $03, $06
+db $FF
+
+.b2
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items) : %d(.no_items) : %d(..pots) : %d(..enemies)
+..areas
+db $02, $00, $FF, $00, $80
+db $03, $60, $A0, $00, $40
+db $FF
+..doors
+db $01, $09
+db $FF
+..pots
+db $00, $01, $02, $03, $04, $05, $06
+db $FF
+..enemies
+db $00, $01, $02, $03, $04
+db $FF
+
+.b6
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(..pots) : %d(..enemies)
+..areas
+db $03, $80, $FF, $00, $FF
+db $FF
+..doors
+db $08
+db $FF
+..pots
+db $00
+db $FF
+..enemies
+db $04
+db $FF
+
+.b9
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items) : %d(.no_items) : %d(.no_items) : %d(.no_items)
+..areas
+db $01, $00, $20, $28, $60
+db $01, $E0, $FF, $28, $60
+db $01, $00, $FF, $58, $60
+db $FF
+..doors
+db $03, $09
+db $FF
+
+.bc
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items) : %d(.no_items) : %d(..pots) : %d(.no_items)
+..areas
+db $03, $2C, $4C, $CA, $FF
+db $FF
+..doors
+db $06
+db $FF
+..pots
+db $0C, $0D
+db $FF
+
+.c7 ; TR Torch Maze (1) // Tiny Bottom-Left Blocked Corner (2)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(..pots) : %d(.no_items)
+..areas
+db $03, $00, $1C, $A8, $FF
+db $FF
+..doors
+db $05
+db $FF
+..pots
+db $02, $03
+db $FF
+
+.d1
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(..pots) : %d(..enemies)
+..areas
+db $03, $80, $FF, $00, $A8
+db $FF
+..doors
+db $02
+db $FF
+..pots
+db $02, $03, $04, $05
+db $FF
+..enemies
+db $00, $01, $07
+db $FF
+
+.d6
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(..chests) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $00, $80, $00, $FF
+db $FF
+..doors
+db $00
+db $FF
+..chests
+db $00
+db $FF
+..enemies
+db $00, $01, $02
+db $FF
+
+.db
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(..chests) : %d(.no_items) : %d(.no_items)
+..areas
+db $02, $B0, $FF, $90, $C0
+db $FF
+..doors
+db $0B
+db $FF
+..chests
+db $01
+db $FF
diff --git a/dungeon_map/data/supertile_shapes.asm b/dungeon_map/data/supertile_shapes.asm
index 923dee1..b5cf126 100644
--- a/dungeon_map/data/supertile_shapes.asm
+++ b/dungeon_map/data/supertile_shapes.asm
@@ -21,7 +21,7 @@ dw $FFFF, $83B7, $FFFF, $03B7 ; 13
 dw $012E, $012F, $013E, $013F ; 14
 dw $C374, $8340, $4341, $0340 ; 15
 dw $0108, $0109, $436B, $036B ; 16
-dw $C114, $0104, $4114, $0114 ; 17
+dw $4104, $0104, $4114, $0114 ; 17
 dw $C3B5, $FFFF, $43B4, $FFFF ; 18 - useless fairy drop
 dw $FFFF, $8369, $FFFF, $035A ; 19
 dw $03E7, $03E8, $03F7, $0361 ; 1A
@@ -37,7 +37,7 @@ dw $FFFF, $FFFF, $FFFF, $039B ; 23
 dw $4365, $0365, $0132, $0133 ; 24
 dw $FFFF, $FFFF, $FFFF, $FFFF ; 25 - unused
 dw $039B, $03E4, $4363, $0382 ; 26
-dw $C114, $0104, $4114, $0114 ; 27
+dw $4104, $0104, $4114, $0114 ; 27
 dw $C3A5, $FFFF, $4358, $0348 ; 28
 dw $FFFF, $FFFF, $FFFF, $0396 ; 29 - Mothula
 dw $C350, $8352, $4350, $03F8 ; 2A
@@ -98,8 +98,8 @@ dw $FFFF, $8379, $FFFF, $036A ; 60
 dw $C387, $8385, $4356, $0356 ; 61
 dw $C346, $8354, $4352, $0340 ; 62
 dw $039A, $FFFF, $0361, $FFFF ; 63
-dw $FFFF, $FFFF, $8399, $C3B1 ; 64
-dw $FFFF, $FFFF, $83B1, $0381 ; 65
+dw $FFFF, $FFFF, $8399, $0367 ; 64
+dw $FFFF, $FFFF, $0367, $0381 ; 65
 dw $038F, $039A, $0362, $83B2 ; 66
 dw $83B4, $83B5, $03B7, $039F ; 67
 dw $C340, $8350, $4341, $0340 ; 68
@@ -162,7 +162,7 @@ dw $839B, $C39C, $FFFF, $FFFF ; A0
 dw $C3B0, $835D, $FFFF, $036A ; A1
 dw $03EE, $03EF, $03FE, $03FF ; A2
 dw $C35A, $FFFF, $436A, $FFFF ; A3
-dw $FFFF, $FFFF, $438E, $FFFF ; A4
+dw $FFFF, $FFFF, $438F, $FFFF ; A4
 dw $039A, $0361, $C3B2, $83B2 ; A5
 dw $C340, $8370, $4340, $0340 ; A6
 dw $C396, $FFFF, $FFFF, $FFFF ; A7 - ToH fairy basement room
diff --git a/dungeon_map/draw_loot.asm b/dungeon_map/draw_loot.asm
index fc006e8..c78b820 100644
--- a/dungeon_map/draw_loot.asm
+++ b/dungeon_map/draw_loot.asm
@@ -29,6 +29,12 @@ DrawLoot:
 	LDA.b $07
 	STA.w $021B
 
+	LDA.l DRMode
+	BEQ +
+	LDA.l DungeonMapMode
+	BNE +
+	BRA .skip
++
 	REP #$30
 	PHX : PHY
 
@@ -60,6 +66,7 @@ DrawLoot:
 	STA.b NMISTRIPES
 
 	PLY : PLX
+.skip
 	LDA.b #$00
 	RTL
 
diff --git a/dungeon_map/draw_rooms.asm b/dungeon_map/draw_rooms.asm
index f6d6b57..11caaef 100644
--- a/dungeon_map/draw_rooms.asm
+++ b/dungeon_map/draw_rooms.asm
@@ -14,7 +14,13 @@ FinishRoom:
 	TAX
 	JML $8AE7F6
 
+NormalDrawDungeonMapRoom:
+	JSL DrawDungeonMapRoom
+	JMP FinishRoom
+
 ; $CA has room_id
+; $0E has quadrant flags
+; X has address to draw at
 DrawDungeonMapRoom:
 	REP #$20
 	PHB : PHK : PLB ; need to keep this in same bank as data, or else specify bank
@@ -136,7 +142,7 @@ DrawDungeonMapRoom:
 .done
 	PLA : STA.b $0A
 	PLB
-	JMP FinishRoom
+	RTL
 
 DrawEntrances:
 	REP #$30
diff --git a/dungeon_map/dungeon_switch.asm b/dungeon_map/dungeon_switch.asm
index fd5629e..886f0dd 100644
--- a/dungeon_map/dungeon_switch.asm
+++ b/dungeon_map/dungeon_switch.asm
@@ -1,4 +1,65 @@
 CheckSwitchMap:
+	LDA.l DRMode
+	BEQ .not_fancy_door_map
+	LDA.l DungeonMapMode
+	BNE .not_fancy_door_map
+
+	; fancy door map
+	SEP #$20
+	LDA.b $F6
+	BIT.b #$30
+	BNE .change_dungeon
+
+	BIT.b #$80
+	BNE .select_new_room
+
+	LDA.b $F4
+	BIT.b #$80
+	BNE .select_new_room
+
+	BIT.b #$20
+	BNE .next_entrance
+
+	BIT.b #$40
+	BNE .current_room
+
+	AND.b #$0F
+	BEQ .doors_done
+	BIT.b #$08 : BEQ + : LDA.b #$00 : BRA .doors_move_cursor : +
+	BIT.b #$04 : BEQ + : LDA.b #$02 : BRA .doors_move_cursor : +
+	BIT.b #$02 : BEQ + : LDA.b #$01 : BRA .doors_move_cursor : +
+	LDA.b #$03
+
+.doors_move_cursor
+	STA.b $00
+	JSL MoveDoorsMapCursor
+	BRA .doors_done
+
+.select_new_room
+	JSL DoorsMapSelectCursor
+	BRA .doors_done
+
+.next_entrance
+	JSL DoorsMapNextEntrance
+	BRA .doors_done
+
+.change_dungeon
+	JSL DoorsMapChangeDungeon
+	BRA .doors_done
+
+.current_room
+	LDA.l CachedDungeonID
+	CMP.w DungeonID
+	BNE .doors_done
+	JSL DoorsMapCurrentRoom
+	BRA .doors_done
+
+.doors_done
+	REP #$20
+	LDA.w #$0002 ; ignore input! nothing to see here!
+	RTL
+
+.not_fancy_door_map
 	SEP #$20
 	LDA.b $F6
 	AND.b #$30
@@ -6,7 +67,7 @@ CheckSwitchMap:
 
 	; what we wrote over
 	REP #$20
-	LDA.w $8AF5E9, X
+	LDA.w DungeonMapFloorCountData, X
 	AND.w #$000F
 	CLC : ADC.b $00
 	RTL
@@ -99,7 +160,12 @@ SkipMapSprites:
 
 	LDA.l DRMode
 	BEQ +
-		JML $8AEAEE
+	LDA.l DungeonMapMode
+	BEQ .no_vanilla_draw
+		JML $8AEADE
+	.no_vanilla_draw
+		JSL DrawDoorsMapSprites
+		JML $8AEAFC
 +
 
 	LDA.l CachedDungeonID
@@ -161,6 +227,7 @@ DrawDungeonLabel:
 	LDY.b #$20
 +
 
+	; Dungeon Label
 	REP #$20
 	LDA.w #$E660
 	STA.w GFXStripes+$02, Y
@@ -171,9 +238,110 @@ DrawDungeonLabel:
 	STA.w GFXStripes+$06, Y
 	LDA.l DungeonLabels+2, X
 	STA.w GFXStripes+$08, Y
+
+	TYA
+	CLC : ADC.w #$0008
+	TAY
+
+	; L/R switch indicators
+	LDA.w #$E310
+	STA.w GFXStripes+$02, Y
+	LDA.w #$E910
+	STA.w GFXStripes+$0A, Y
+	LDA.w #$E318
+	STA.w GFXStripes+$12, Y
+	LDA.w #$E918
+	STA.w GFXStripes+$1A, Y
+
+	LDA.w #$0300
+	STA.w GFXStripes+$04, Y
+	STA.w GFXStripes+$0C, Y
+	STA.w GFXStripes+$14, Y
+	STA.w GFXStripes+$1C, Y
+
+	LDA.w #$49AF
+	STA.w GFXStripes+$06, Y
+	STA.w GFXStripes+$16, Y
+	LDA.w #$099E
+	STA.w GFXStripes+$08, Y
+	STA.w GFXStripes+$18, Y
+
+	LDA.w #$099F
+	STA.w GFXStripes+$0E, Y
+	STA.w GFXStripes+$1E, Y
+	LDA.w #$09AF
+	STA.w GFXStripes+$10, Y
+	STA.w GFXStripes+$20, Y
+
+	TYA
+	CLC : ADC.w #$0020
+	TAY
+
+	LDA.l DRMode
+	BEQ .not_doors
+	LDA.l DungeonMapMode
+	BEQ .doors
+.not_doors
+	JMP .skip_doors
+
+.doors
+	; Select for Next Entrance indicator
+	LDA.w #$E311
+	STA.w GFXStripes+$02, Y
+	LDA.w #$E319
+	STA.w GFXStripes+$16, Y
+
+	LDA.w #$0F00
+	STA.w GFXStripes+$04, Y
+	STA.w GFXStripes+$18, Y
+
+	LDA.w #$09B8
+	LDX.b #$07
+-
+	STA.w GFXStripes+$06, Y
+	STA.w GFXStripes+$1A, Y
+	INC A
+	INY : INY
+	DEX
+	BPL -
+
+	TYA
+	CLC : ADC.w #$0018
+	TAY
+
+	LDA.l CachedDungeonID
+	AND.w #$00FF
+	CMP.w DungeonID
+	BNE .skip_doors
+
+	; Y for Current Location indicator
+	LDA.w #$A411
+	STA.w GFXStripes+$02, Y
+	LDA.w #$A419
+	STA.w GFXStripes+$12, Y
+
+	LDA.w #$0B00
+	STA.w GFXStripes+$04, Y
+	STA.w GFXStripes+$14, Y
+
+	LDA.w #$09A9
+	LDX.b #$05
+-
+	STA.w GFXStripes+$06, Y
+	STA.w GFXStripes+$16, Y
+	INC A
+	INY : INY
+	DEX
+	BPL -
+
+	TYA
+	CLC : ADC.w #$0014
+	TAY
+
+.skip_doors
 	SEP #$20
 	LDA.b #$FF
-	STA.w GFXStripes+$0A, Y
+	STA.w GFXStripes+$02, Y
 	LDA.b #$01
 	STA.b NMISTRIPES
 
diff --git a/dungeon_map/hooks.asm b/dungeon_map/hooks.asm
index 65f5e38..695d7f0 100644
--- a/dungeon_map/hooks.asm
+++ b/dungeon_map/hooks.asm
@@ -5,7 +5,7 @@ db $08
 ; use AA1 = $1C for map stuff
 org $80E193
 skip 4
-db $61, $62, $62, $D6
+db $61, $62, $63, $D6
 
 org $8AE11D
 LDA.b #$1C
@@ -13,10 +13,6 @@ LDA.b #$1C
 org $8AE12B
 LDA.b #$20
 
-; change dungeon map subsheet gfx in TR
-; org $80DDC9
-; db $57
-
 ; dungeon map sheets
 org $80DD97
 db $61, $56, $57, $62
@@ -75,7 +71,7 @@ org $8AEE2B
 ;--------------------------------------------------------------------------------
 org $8AE64D
 	PLX
-	JML DrawDungeonMapRoom
+	JML NormalDrawDungeonMapRoom
 
 org $8AE606
 	PLX
@@ -221,3 +217,53 @@ org $8AE8F9
 org $8AEBC6
 	JSL GetLocationMarkerLeft
 	NOP
+
+;================================================================================
+; Draw Wacky Door Rando Layouts
+;--------------------------------------------------------------------------------
+org $8AE3D7
+	LDA.l DungeonMapMode
+	BNE .normal
+	LDA.l DRMode
+	BEQ .normal
+
+	JSL DrawWackyDoorRandoStuff
+	JMP.w $8AE422
+	NOP
+
+	.normal
+warnpc $8AE3EB
+
+org $8AE439
+	dw $0F19, $4F19, $8F19, $CF19
+
+org $8AE449
+	dw $0F1A, $8F1A
+
+org $8AE451
+	dw $0F1B, $4F1B
+
+org $8AE473
+	NOP #2
+
+org $8AE4A4
+	NOP #2
+
+org $8AE4DC
+	NOP #2
+
+org $8AE4F9
+	dw $0F1E, $0F1F, $0F20, $0F21
+	dw $0F22, $0F23, $0F24, $0F25
+
+org $8AE539
+	LDA.w #$0F1C
+
+org $8AE573
+	LDA.w #$0F1D
+
+org $8AE555
+	NOP #2
+
+org $8AE576
+	NOP #2
diff --git a/dungeon_map/main.asm b/dungeon_map/main.asm
index 60d256f..d9ce2ae 100644
--- a/dungeon_map/main.asm
+++ b/dungeon_map/main.asm
@@ -27,9 +27,14 @@ endmacro
 pullpc
 
 incsrc mappable_doors.asm
+incsrc current_room_map.asm
 incsrc draw_rooms.asm
 incsrc map_bg3.asm
 incsrc dungeon_switch.asm
 incsrc draw_loot.asm
 incsrc check_loot.asm
 incsrc blink_loot.asm
+incsrc data/doors_display.asm
+incsrc data/spiral_stairs.asm
+incsrc data/fall_warps.asm
+incsrc data/split_room.asm
diff --git a/dungeon_map/map_bg3.asm b/dungeon_map/map_bg3.asm
index 41b8d17..c0412d8 100644
--- a/dungeon_map/map_bg3.asm
+++ b/dungeon_map/map_bg3.asm
@@ -12,23 +12,34 @@ LoadStripes:
 
 .dungeon_map
 	LDA.l DungeonMapMode
-	BNE .doors
+	BNE .4x3
+	LDA.l DRMode
+	BNE .6x6
 
-.not_doors
-	LDA.b #BG3DungeonMapStripes>>0
+.5x5
+	LDA.b #BG3DungeonMap5x5Stripes>>0
 	STA.b $00
-	LDA.b #BG3DungeonMapStripes>>8
+	LDA.b #BG3DungeonMap5x5Stripes>>8
 	STA.b $01
-	LDA.b #BG3DungeonMapStripes>>16
+	LDA.b #BG3DungeonMap5x5Stripes>>16
 	STA.b $02
 	RTL
 
-.doors
-	LDA.b #BG3DungeonMapDoorStripes>>0
+.4x3
+	LDA.b #BG3DungeonMap4x3Stripes>>0
 	STA.b $00
-	LDA.b #BG3DungeonMapDoorStripes>>8
+	LDA.b #BG3DungeonMap4x3Stripes>>8
 	STA.b $01
-	LDA.b #BG3DungeonMapDoorStripes>>16
+	LDA.b #BG3DungeonMap4x3Stripes>>16
+	STA.b $02
+	RTL
+
+.6x6
+	LDA.b #BG3DungeonMap6x6Stripes>>0
+	STA.b $00
+	LDA.b #BG3DungeonMap6x6Stripes>>8
+	STA.b $01
+	LDA.b #BG3DungeonMap6x6Stripes>>16
 	STA.b $02
 	RTL
 
@@ -71,7 +82,7 @@ macro VanillaCommonMapStripes()
 endmacro
 
 
-BG3DungeonMapStripes:
+BG3DungeonMap5x5Stripes:
 %VanillaCommonMapStripes()
 ; left edge of map border, from vanilla
 dw $4E60, $0100, $2100
@@ -122,7 +133,7 @@ endmacro
 
 db $FF
 
-BG3DungeonMapDoorStripes:
+BG3DungeonMap4x3Stripes:
 %VanillaCommonMapStripes()
 ; left edge of map border, adjusted from vanilla
 dw $4D60, $0100, $2100
@@ -174,3 +185,96 @@ endmacro
 %FullDoorRow($6311)
 
 db $FF
+
+BG3DungeonMap6x6Stripes:
+; vanilla
+dw $4260, $0100, $2100
+dw $4360, $0E40, $2101
+dw $4B60, $0100, $6100
+dw $8460, $0B00, $2102, $2103, $2104, $2105, $2106, $2107
+dw $A460, $0B00, $2112, $2113, $2114, $2115, $2116, $2117
+dw $0060, $7E40, $2111
+dw $8063, $3E41, $2111
+dw $0060, $3EC0, $2111
+dw $0160, $3EC0, $2111
+dw $0C60, $3EC0, $2111
+dw $0D60, $3EC0, $2111
+dw $1E60, $3EC0, $2111
+dw $1F60, $3EC0, $2111
+
+; left side border
+dw $6260, $1AC0, $2110
+dw $6B60, $1AC0, $6110
+dw $2262, $0100, $A100
+dw $2362, $0E40, $A101
+dw $2B62, $0100, $E100
+
+; right side top area border
+dw $4E60, $0100, $2100
+dw $4F60, $1A40, $2101
+dw $5D60, $0100, $6100
+dw $6E60, $1AC0, $2110
+dw $7D60, $1AC0, $6110
+dw $2E62, $0100, $A100
+dw $2F62, $1A40, $A101
+dw $3D62, $0100, $E100
+
+; right side bottom area border
+dw $8E62, $0100, $2100
+dw $8F62, $1A40, $2101
+dw $9D62, $0100, $6100
+dw $AE62, $06C0, $2110
+dw $BD62, $06C0, $6110
+dw $2E63, $0100, $A100
+dw $2F63, $1A40, $A101
+dw $3D63, $0100, $E100
+
+; blank below left side
+dw $4262, $4440, $2111
+dw $6262, $4440, $2111
+
+dw $8262, $1240, $2111
+dw $A262, $1240, $2111
+dw $C262, $1240, $2111
+dw $E262, $1240, $2111
+dw $0263, $1240, $2111
+dw $2263, $1240, $2111
+
+dw $4263, $4440, $2111
+dw $6263, $4440, $2111
+
+; map area inside top area
+dw $6F60, $1A40, $1D11
+dw $8F60, $1A40, $1D11
+dw $AF60, $1A40, $1D11
+dw $CF60, $1A40, $1D11
+dw $EF60, $1A40, $1D11
+dw $0F61, $1A40, $1D11
+dw $2F61, $1A40, $1D11
+dw $4F61, $1A40, $1D11
+dw $6F61, $1A40, $1D11
+dw $8F61, $1A40, $1D11
+dw $AF61, $1A40, $1D11
+dw $CF61, $1A40, $1D11
+dw $EF61, $1A40, $1D11
+dw $0F62, $1A40, $1D11
+
+; center square
+dw $3561, $0300
+dw $5D4C, $1D4C
+
+dw $5561, $0300
+dw $DD4C, $9D4C
+
+; map area inside bottom area
+dw $AF62, $1A40, $1D11
+
+dw $CF62, $1B00
+dw $1D11, $5D4C, $1D4C, $1D11, $5D4C, $1D4C, $1D11, $5D4C, $1D4C, $1D11, $1D11, $5D4C, $1D4C, $1D11
+
+dw $EF62, $1B00
+dw $1D11, $DD4C, $9D4C, $1D11, $DD4C, $9D4C, $1D11, $DD4C, $9D4C, $1D11, $1D11, $DD4C, $9D4C, $1D11
+
+dw $0F63, $1A40, $1D11
+
+db $FF
diff --git a/dungeon_map/settings.asm b/dungeon_map/settings.asm
index e099939..a151a48 100644
--- a/dungeon_map/settings.asm
+++ b/dungeon_map/settings.asm
@@ -54,10 +54,10 @@ dw $29CA, $69CA, $29DA, $29DB ; 03 - small key
 dw $29E9, $69E9, $29F9, $69F9 ; 04 - triforce piece
 dw $29DD, $69DD, $A9DD, $E9DD ; 05 - safety - plus
 dw $29EC, $69EC, $29FC, $69FC ; 06 - less important item - small chest
-dw $29E8, $69E8, $29F8, $69F8 ; 07 - compass
-dw $29CA, $69CA, $29DA, $29DB ; 08 - small key
-dw $29C8, $69C8, $29D8, $29D9 ; 09 - big key
-dw $29CC, $29CD, $29DC, $69DC ; 0A - pendant
+dw $29CE, $29CF, $29DE, $29DF ; 07 - map
+dw $29E8, $69E8, $29F8, $69F8 ; 08 - compass
+dw $29CA, $69CA, $29DA, $29DB ; 09 - small key
+dw $29C8, $69C8, $29D8, $29D9 ; 0A - big key
 dw $29ED, $69ED, $29FD, $69FD ; 0B - important inventory item - big chest
 dw $29CC, $29CD, $29DC, $69DC ; 0C - pendant
 dw $2DC9, $69C9, $A9C9, $EDC9 ; 0D - crystal
@@ -129,7 +129,7 @@ pad $B9FB00
 ; $B9FB00
 DungeonLabels:
 dw $2550, $2579 ; Sewers
-dw $2550, $2578 ; Hyrule Castle
+dw $2564, $255F ; Hyrule Castle
 dw $2561, $256C ; Eastern Palace
 dw $2560, $256C ; Desert Palace
 dw $255D, $2570 ; Agahnim's Tower
@@ -197,11 +197,12 @@ org $B9FF10
 ItemSources:
 	db $09
 
+; $B9FF11
 AlwaysShowCompass:
 	db $01
 
-; $00 - vanilla 5x5 maps
-; $01 - special DR 4x3 maps
+; $B9FF12
+; $0000 - vanilla 5x5 maps
+; $0001 - special DR 4x3 maps
 DungeonMapMode:
 	dw $0000
-
diff --git a/fileselect.asm b/fileselect.asm
index 15d7a9d..1931199 100644
--- a/fileselect.asm
+++ b/fileselect.asm
@@ -248,7 +248,7 @@ DrawPlayerFileShared:
 
 	; Flute
 	LDA.l InventoryTrackingSRAM : AND.w #$0003 : BEQ +
-	LDA.l $7003C2 : AND.w #$00FF : CMP.w #$00FF : BNE .pseudo
+	LDA.l $7003C2 : AND.w #$00FF : BNE .pseudo
 		%fs_drawItem(7,16,FileSelectItems_flute)
 		BRA ++
 	.pseudo
diff --git a/initsramtable.asm b/initsramtable.asm
index 224fd43..75bd7eb 100644
--- a/initsramtable.asm
+++ b/initsramtable.asm
@@ -115,7 +115,7 @@ InitInventoryTracking: skip 2           ; PC 0x18338C \ Need to set bits here fo
 InitBowTracking: skip 2                 ; PC 0x18338E / boomerangs, powder/mushroom, etc 
 InitItemLimitCounts: skip 16            ; PC 0x183390
 skip 34                                 ;
-InitFluteBitfield: db $FF               ;
+InitFluteBitfield: db $00               ;
 InitSpecialWeaponLevel: db $00          ;
 InitItemOnB: db $00                     ;
 InitProgressIndicator: db $02           ; PC 0x1833C5 - Set to $80 for instant post-aga with standard
diff --git a/lampmantlecone.asm b/lampmantlecone.asm
index 7d1de70..0845526 100644
--- a/lampmantlecone.asm
+++ b/lampmantlecone.asm
@@ -34,16 +34,20 @@ RTL
 ; Output: 0 locked, 1 open
 ;--------------------------------------------------------------------------------
 CheckForZelda:
-        LDA.l ProgressIndicator : CMP.b #$02 : !BLT + ; Skip if rain is falling
-                LDA.b #$01 ; pretend we have zelda anyway
-                RTL
-        +
-        LDA.l FollowerIndicator
+	LDA.l ProgressIndicator : CMP.b #$02 : !BLT + ; Skip if rain is falling
+		LDA.b #$01 ; pretend we have zelda anyway
+		RTL
+	+
+	LDA.l FollowerIndicator
 RTL
 ;================================================================================
 SetOverlayIfLamp:
-        JSL LampCheck
-        STA.b SUBDESQ ; write it directly to the overlay, this isn't a terrible idea at all
+	JSL LampCheck
+	CMP.b #$00
+	BEQ +
+	LDA.b #$01
++
+	STA.b SUBDESQ ; write it directly to the overlay, this isn't a terrible idea at all
 RTL
 ;================================================================================
 ; Mantle Object Changes
diff --git a/menu/door_connectors.3bpp b/menu/door_connectors.3bpp
index ce86c7c..fc84b8e 100644
Binary files a/menu/door_connectors.3bpp and b/menu/door_connectors.3bpp differ
diff --git a/menu/door_connectors.3bppc b/menu/door_connectors.3bppc
index 3481299..22666d3 100644
Binary files a/menu/door_connectors.3bppc and b/menu/door_connectors.3bppc differ
diff --git a/menu/map_icons.3bpp b/menu/map_icons.3bpp
index c336a28..94ade56 100644
Binary files a/menu/map_icons.3bpp and b/menu/map_icons.3bpp differ
diff --git a/menu/map_icons_1.3bppc b/menu/map_icons_1.3bppc
index 4920ce2..91536f2 100644
Binary files a/menu/map_icons_1.3bppc and b/menu/map_icons_1.3bppc differ
diff --git a/menu/map_icons_2.3bppc b/menu/map_icons_2.3bppc
index 8cd4235..ecfb725 100644
Binary files a/menu/map_icons_2.3bppc and b/menu/map_icons_2.3bppc differ
diff --git a/menu/map_icons_4.3bppc b/menu/map_icons_4.3bppc
index 72ffcb5..86a98cb 100644
Binary files a/menu/map_icons_4.3bppc and b/menu/map_icons_4.3bppc differ
diff --git a/menu/map_icons_6.3bppc b/menu/map_icons_6.3bppc
index 22451a7..39ff5af 100644
Binary files a/menu/map_icons_6.3bppc and b/menu/map_icons_6.3bppc differ
diff --git a/menu/map_icons_b.3bpp b/menu/map_icons_b.3bpp
index b526823..bb85798 100644
Binary files a/menu/map_icons_b.3bpp and b/menu/map_icons_b.3bpp differ
diff --git a/menu/map_sheet_d4.3bpp b/menu/map_sheet_d4.3bpp
index 8958227..f0207cb 100644
Binary files a/menu/map_sheet_d4.3bpp and b/menu/map_sheet_d4.3bpp differ
diff --git a/menu/map_sheet_d4.3bppc b/menu/map_sheet_d4.3bppc
index 2b74b23..573ab91 100644
Binary files a/menu/map_sheet_d4.3bppc and b/menu/map_sheet_d4.3bppc differ
diff --git a/newitems.asm b/newitems.asm
index 3591544..b04478f 100755
--- a/newitems.asm
+++ b/newitems.asm
@@ -188,12 +188,12 @@ ItemBehavior:
         BRA .store_inventory_tracking
 
         .flute_inactive
-        LDA.b #$FF : STA.l FluteBitfield
+        LDA.b #$00 : STA.l FluteBitfield
         LDA.l InventoryTracking : ORA.b #$02
         BRA .store_inventory_tracking
 
         .flute_active
-        LDA.b #$FF : STA.l FluteBitfield
+        LDA.b #$00 : STA.l FluteBitfield
         LDA.l InventoryTracking : ORA.b #$01
         BRA .store_inventory_tracking
 
diff --git a/owrando.asm b/owrando.asm
index 00004be..57a29ea 100644
--- a/owrando.asm
+++ b/owrando.asm
@@ -320,7 +320,7 @@ OWLightWorldOrCrossed:
 
 OWFluteCancel:
 {
-    lda.l FluteBitfield : beq +
+    lda.l FluteBitfield : cmp.b #$FF : beq +
     lda.l OWFlags+1 : and.b #$01 : bne +
         jsl FluteMenu_LoadTransport : rtl
     + lda.w RandoOverworldTargetEdge : bne +
@@ -332,7 +332,7 @@ OWFluteCancel2:
     lda.b Joy1B_All : ora.b Joy1A_All : and.b #$c0 : bne +
         jml FluteMenu_HandleSelection_NoSelection
     + inc.w SubModuleInterface
-    lda.l FluteBitfield : beq .cancel
+    lda.l FluteBitfield : cmp.b #$FF : beq .cancel
     lda.l OWFlags+1 : and.b #$01 : beq +
     lda.b Joy1B_All : cmp.b #$40 : bne +
         .cancel
diff --git a/pseudoflute.asm b/pseudoflute.asm
index 3b60b04..eabf71b 100644
--- a/pseudoflute.asm
+++ b/pseudoflute.asm
@@ -1,35 +1,37 @@
 SelectFirstFluteSpot:
 	LDA.l FluteBitfield
+	CMP.b #$FF
 	BNE +
 	RTL
 +	LDA.b #$07
-	STA.w $1AF0
+	STA.w FluteSelection
 .try_next
-	LDA.w $1AF0
+	LDA.w FluteSelection
 	INC A
 	AND.b #$07
-	STA.w $1AF0
+	STA.w FluteSelection
 	TAX
 
 	LDA.l FluteBitfield
-	AND.l $8AB7A3, X
-	BEQ .try_next
+	AND.l FluteMenuNumbers_bits, X
+	BNE .try_next
 RTL
 
 SelectFluteNext:
 	LDA.l FluteBitfield
+	CMP.b #$FF
 	BEQ InvalidBeep
 
 .try_next
-	LDA.w $1AF0
+	LDA.w FluteSelection
 	INC A
 	AND.b #$07
-	STA.w $1AF0
+	STA.w FluteSelection
 	TAX
 
 	LDA.l FluteBitfield
-	AND.l $8AB7A3, X
-	BEQ .try_next
+	AND.l FluteMenuNumbers_bits, X
+	BNE .try_next
 
 	LDA.b #$20
 	STA.w $012F
@@ -37,18 +39,19 @@ RTL
 
 SelectFlutePrev:
 	LDA.l FluteBitfield
+	CMP.b #$FF
 	BEQ InvalidBeep
 
 .try_next
-	LDA.w $1AF0
+	LDA.w FluteSelection
 	DEC A
 	AND.b #$07
-	STA.w $1AF0
+	STA.w FluteSelection
 	TAX
 
 	LDA.l FluteBitfield
-	AND.l $8AB7A3, X
-	BEQ .try_next
+	AND.l FluteMenuNumbers_bits, X
+	BNE .try_next
 
 	LDA.b #$20
 	STA.w $012F
@@ -62,8 +65,8 @@ RTL
 SetFluteSpotPalette:
 	XBA
 	LDA.l FluteBitfield
-	AND.l $8AB7A3, X
-	BEQ .disabled
+	AND.l FluteMenuNumbers_bits, X
+	BNE .disabled
 .enabled
 	XBA
 	STA.b $0C
@@ -93,8 +96,9 @@ MaybeMarkFluteSpotVisited:
 	TXA
 	LSR A
 	TAX
-	LDA.l FluteBitfield
-	ORA.l $8AB7A3, X
+	LDA.l FluteMenuNumbers_bits, X
+	EOR.b #$FF
+	AND.l FluteBitfield
 	STA.l FluteBitfield
 
 .done
@@ -113,33 +117,9 @@ CheckTransitionOverworld:
 	STA.w $040A ; what we wrote over
 	JML MaybeMarkFluteSpotVisited
 
-DrawFluteIcon:
-	AND.w #$00FF
-	CMP.w #$0002
-	BCC .write
+CheckFlute:
 	LDA.l FluteBitfield
 	AND.w #$00FF
-	CMP.w #$00FF
-	BNE .pseudo
-.real
-	LDA.w #$0003
-	BRA .write
-.pseudo
-	LDA.w #$0002
-.write
-	STA.b $02
-	RTL
-
-CheckFluteInHUD:
-	LDA.l $7EF33F, X
-	AND.w #$00FF ; what we wrote over
-	CPX.w #$000D
-	BNE .done
-	CMP.w #$0002
-	BCC .done
-	LDA.l FluteBitfield
-	AND.w #$00FF
-	CMP.w #$00FF
 	BNE .pseudo
 .real
 	LDA.w #$0003
@@ -147,4 +127,24 @@ CheckFluteInHUD:
 .pseudo
 	LDA.w #$0002
 .done
+	RTS
+
+DrawFluteIcon:
+	AND.w #$00FF
+	CMP.w #$0002
+	BCC +
+	JSR CheckFlute
++
+	STA.b $02
+	RTL
+
+CheckFluteInHUD:
+	LDA.l EquipmentWRAM-1, X
+	AND.w #$00FF ; what we wrote over
+	CPX.w #$000D
+	BNE +
+	CMP.w #$0002
+	BCC +
+	JSR CheckFlute
++
 	RTL
diff --git a/ram.asm b/ram.asm
index 9c579b0..92da9a4 100644
--- a/ram.asm
+++ b/ram.asm
@@ -473,6 +473,8 @@ RoomStripes = $7E1100             ; Used for room drawing.
                                   ;
 MirrorPortalPosXH = $7E1ACF       ; Mirror portal position. (High byte of X coordinate)
                                   ;
+FluteSelection = $7E1AF0          ; Currently selected flute spot (zero-indexed)
+                                  ;
 IrisPtr = $7E1B00                 ; Spotlight pointers for HDMA. $1C0 bytes (?).
                                   ;
 MessageSubModule = $7E1CD8        ;
@@ -566,6 +568,14 @@ GameOverSongCache = $7EC227       ;
 CachedDungeonID = $7EC22A         ; Cached while opening dungeon map
 CachedCurrentFloor = $7EC22B      ; to restore when closing
                                   ;
+CurrentDisplayedRoom = $7EC22C    ; 2 bytes, used by dungeon map
+DisplayedRoomDoorIndex = $7EC22E  ; 2 bytes, used by dungeon map
+                                  ;
+DoorSlots = $7EC230               ; $32 bytes, used by dungeon map
+DoorSlotScratch = $7EC262         ; 6 bytes, used by dungeon map
+DoorSlotCursor = $7EC268          ; 2 bytes, used by dungeon map
+CurrentDoorEntrance = $7EC26A     ; 2 bytes, used by dungeon map
+                                  ;
 LastBGSet = $7EC2F8               ; Lists loaded sheets to check for decompression. 4 bytes.
                                   ;
 PaletteBufferAux = $7EC300        ; Secondary and main palette buffer. See symbols_wram.asm
diff --git a/vanillalabels.asm b/vanillalabels.asm
index fbc64b2..fbe6f95 100644
--- a/vanillalabels.asm
+++ b/vanillalabels.asm
@@ -280,10 +280,16 @@ Module1B_SpawnSelect_spawns                                = $828481
 Overworld_ActualScreenID                                   = $82A4E3
 UnderworldTransitionLandingCoordinate                      = $82C034
 Overworld_FinalizeEntryOntoScreen_Data                     = $82C176
+EntranceData_room_id                                       = $82C577
+EntranceData_y_coordinate                                  = $82CCBD
+EntranceData_x_coordinate                                  = $82CDC7
+EntranceData_dungeon_id                                    = $82D1EF
+EntranceData_layer                                         = $82D2F9
 EntranceData_song                                          = $82D592
 SpawnPointData_room_id                                     = $82D8D2
 Overworld_CheckForSpecialOverworldTrigger_Direction        = $84E879
 Sprite_ShowSolicitedMessage_Direction                      = $85E1A3
+FluteMenuNumbers_bits                                      = $8AB7A3
 WorldMap_RedXChars                                         = $8ABF70
 WorldMap_CalculateOAMCoordinates                           = $8AC3B1
 WorldMap_HandleSpriteBlink                                 = $8AC52E