diff --git a/dungeon_map/current_room_map.asm b/dungeon_map/current_room_map.asm
index bc437b8..75dd9f9 100644
--- a/dungeon_map/current_room_map.asm
+++ b/dungeon_map/current_room_map.asm
@@ -138,9 +138,11 @@ DrawFullRoomTile:
 	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
@@ -577,7 +579,12 @@ DrawStairs:
 	STA.b $CA
 
 	JSR GetSpecificRoomVisibility
-	BEQ .ply_skip
+	BNE +
+	LDA.b $0E
+	AND.w #$000F
+	BNE +
+	BRA .ply_skip
++
 
 	TYX
 	LDA.b $CA
@@ -686,32 +693,42 @@ DrawDropOrWarp:
 
 .found_drop
 	LDA.w #$0DE0
-	STA.l $7F0574
-	INC A
-	STA.l $7F0576
+	PHA
 	LDA.l FallTable+2, X
 	BRA .draw_room
 
 .found_warp
 	LDA.w #$0DE2
-	STA.l $7F0574
-	INC A
-	STA.l $7F0576
+	PHA
 	LDA.l WarpTable+2, X
 
 .draw_room
-	PHY
-	LDX.w #$0030
-	TXY
-	STA.l DoorSlots, X
 	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
 	TAX
 
 	JSL DrawFullRoomTile
-	PLY
 
 .done
 	PLX
diff --git a/dungeon_map/data/fall_warps.asm b/dungeon_map/data/fall_warps.asm
index 5fa7f1a..db27d9e 100644
--- a/dungeon_map/data/fall_warps.asm
+++ b/dungeon_map/data/fall_warps.asm
@@ -1,25 +1,25 @@
 FallTable:
-db $1007, $1017 ; Moldorm Arena
-db $1017, $1027 ; Below Moldorm drop to Big Chest
-db $101E, $103E ; IP first drop
-db $1027, $1031 ; ToH Big Chest drop
-db $1031, $1077 ; Second Floor ToH
-db $1039, $1029 ; Mothula drop
-db $103A, $100A ; Pod front drop
-db $103D, $1096 ; GT Torches drop
-db $104D, $10A6 ; Moldorm 2 drop
-db $1054, $1034 ; Left side Swamp
-db $105E, $107E ; IP drop to tall icy room
-db $107E, $109E ; Freezors drop (to big chest)
-db $208C, $101C ; Ice Armos drop
-db $1097, $10D1 ; Mire Cutscene
-db $109E, $10BE ; IP Big Chest tile (push blocks)
-db $10CE, $10DE ; Kholdstare drop
+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
-db $FF
+dw $FFFF
 
 WarpTable:
 dw $2009, $104B ; PoD Basement (start)