diff --git a/dungeon_map/current_room_map.asm b/dungeon_map/current_room_map.asm
index 79d9e17..7beb73a 100644
--- a/dungeon_map/current_room_map.asm
+++ b/dungeon_map/current_room_map.asm
@@ -287,8 +287,10 @@ GetConnection:
 	JSR CheckInRoomTable
 	CMP.w #$FFFF
 	BEQ .nope
+	PHA
 	LDA.w #$0003
 	STA.b $04
+	PLA
 	BRA .found
 
 .nope
@@ -1096,7 +1098,9 @@ DrawDoorsMapBossRoom:
 	REP #$20
 	LDA.l DoorSlotsSprites, X
 	LDX.w DungeonID
+	XBA
 	CLC : ADC.l $8AEE6D, X
+	XBA
 	STA.w OAMBuffer, Y
 
 	LDA.w #$3331
@@ -1189,7 +1193,7 @@ MoveDoorsMapCursor:
 	BIT.b #$40
 	BNE .almost_easy
 
-	LDA.b $00
+	AND.b #$0F
 	TAX
 	LDA.l NextCursorSpecial_center_offset, X
 	TAX
diff --git a/dungeon_map/data/doors_display.asm b/dungeon_map/data/doors_display.asm
index 8e90dca..97235d1 100644
--- a/dungeon_map/data/doors_display.asm
+++ b/dungeon_map/data/doors_display.asm
@@ -92,11 +92,11 @@ NextCursorSlot:
 	db $10, $00, $11, $FF
 	db $11, $00, $12, $FF
 ; stairs
-	db $C2, $E1, $FF, $16
-	db $C2, $15, $FF, $17
-	db $C2, $16, $FF, $18
+	db $84, $18, $FF, $16
+	db $84, $15, $FF, $17
+	db $84, $16, $FF, $18
 ; drop/warp
-	db $C2, $17, $FF, $E3
+	db $84, $17, $FF, $15
 
 NextCursorSpecial:
 .center
@@ -104,8 +104,9 @@ NextCursorSpecial:
 	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
 .center_offset
-	db $00, $06, $0C, $16
+	db $00, $06, $0C, $16, $1C
 .start_index
 	db $01, $06, $0B, $10, $15
 .start_direction
@@ -254,8 +255,8 @@ EdgeConnectionIndices:
 	dw $0582, $004B
 	dw $0382, $004E
 	dw $0385, $0051
-	dw $03CC, $0054
-	dw $05CC, $0057
+	dw $05CC, $0054
+	dw $03CC, $0057
 	dw $05DC, $005A
 
 ; East
diff --git a/dungeon_map/data/spiral_stairs.asm b/dungeon_map/data/spiral_stairs.asm
index 3b6fae8..fe8c671 100644
--- a/dungeon_map/data/spiral_stairs.asm
+++ b/dungeon_map/data/spiral_stairs.asm
@@ -54,9 +54,9 @@ db $02, $00, $02, $02, $09 ; ($8A) Tower Dark1 (2nd value unused)
 db $01, $00, $09 ; ($8F) Mire2
 
 SpiralLabelOffsets:
-db 1, -8
-db 5, -8
-db 9, -8
+db 1, -9
+db 5, -9
+db 9, -9
 db -6, -1
 db 15, -1
 db 1, 0