254 files changed, 1228 insertions, 1228 deletions

diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/AgathasRoom.asm
index cd8bbfe7..4a82e78d 100755
--- a/data/mapObjects/agatha.asm
+++ b/data/mapObjects/AgathasRoom.asm
@@ -1,4 +1,4 @@
-AgathaObject:
+AgathasRoom_Object:
 	db $0 ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/BeachHouse.asm
index cbca9f28..02bd8037 100644
--- a/data/mapObjects/beach_house.asm
+++ b/data/mapObjects/BeachHouse.asm
@@ -1,4 +1,4 @@
-BeachHouseObjects:
+BeachHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/BikeShop.asm
index 98208a94..9f21ab3e 100755
--- a/data/mapObjects/bikeshop.asm
+++ b/data/mapObjects/BikeShop.asm
@@ -1,4 +1,4 @@
-BikeShopObject:
+BikeShop_Object:
 	db $e ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/BillsHouse.asm
index 317d7c01..c8f708cb 100755
--- a/data/mapObjects/billshouse.asm
+++ b/data/mapObjects/BillsHouse.asm
@@ -1,4 +1,4 @@
-BillsHouseObject:
+BillsHouse_Object:
 	db $d ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/BluesHouse.asm
index 65523b26..24c5baab 100755
--- a/data/mapObjects/blueshouse.asm
+++ b/data/mapObjects/BluesHouse.asm
@@ -1,4 +1,4 @@
-BluesHouseObject:
+BluesHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/BrunosRoom.asm
index 45d21186..dde1e2dd 100755
--- a/data/mapObjects/bruno.asm
+++ b/data/mapObjects/BrunosRoom.asm
@@ -1,4 +1,4 @@
-BrunoObject:
+BrunosRoom_Object:
 	db $3 ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/CeladonChiefHouse.asm
index d24354a6..88850f35 100755
--- a/data/mapObjects/celadonhouse.asm
+++ b/data/mapObjects/CeladonChiefHouse.asm
@@ -1,4 +1,4 @@
-CeladonHouseObject:
+CeladonChiefHouse_Object:
 	db $f ; border block
 
 	db 2 ; warps
@@ -13,5 +13,5 @@ CeladonHouseObject:
 	object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, CELADON_HOUSE_WIDTH
-	warp_to 3, 7, CELADON_HOUSE_WIDTH
+	warp_to 2, 7, CELADON_CHIEF_HOUSE_WIDTH
+	warp_to 3, 7, CELADON_CHIEF_HOUSE_WIDTH
diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/CeladonCity.asm
index c7135904..005fc61e 100755
--- a/data/mapObjects/celadoncity.asm
+++ b/data/mapObjects/CeladonCity.asm
@@ -1,19 +1,19 @@
-CeladonCityObject:
+CeladonCity_Object:
 	db $f ; border block
 
 	db 13 ; warps
-	warp 8, 13, 0, CELADON_MART_1
-	warp 10, 13, 2, CELADON_MART_1
-	warp 24, 9, 0, CELADON_MANSION_1
-	warp 24, 3, 2, CELADON_MANSION_1
-	warp 25, 3, 2, CELADON_MANSION_1
+	warp 8, 13, 0, CELADON_MART_1F
+	warp 10, 13, 2, CELADON_MART_1F
+	warp 24, 9, 0, CELADON_MANSION_1F
+	warp 24, 3, 2, CELADON_MANSION_1F
+	warp 25, 3, 2, CELADON_MANSION_1F
 	warp 41, 9, 0, CELADON_POKECENTER
 	warp 12, 27, 0, CELADON_GYM
 	warp 28, 19, 0, GAME_CORNER
-	warp 39, 19, 0, CELADON_MART_5 ; beta warp! no longer used
-	warp 33, 19, 0, CELADON_PRIZE_ROOM
+	warp 39, 19, 0, CELADON_MART_5F ; beta warp! no longer used
+	warp 33, 19, 0, GAME_CORNER_PRIZE_ROOM
 	warp 31, 27, 0, CELADON_DINER
-	warp 35, 27, 0, CELADON_HOUSE
+	warp 35, 27, 0, CELADON_CHIEF_HOUSE
 	warp 43, 27, 0, CELADON_HOTEL
 
 	db 9 ; signs
diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/CeladonDiner.asm
index b976a045..0a4a895d 100755
--- a/data/mapObjects/celadondiner.asm
+++ b/data/mapObjects/CeladonDiner.asm
@@ -1,4 +1,4 @@
-CeladonDinerObject:
+CeladonDiner_Object:
 	db $f ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/CeladonGym.asm
index b087153b..98fce576 100755
--- a/data/mapObjects/celadongym.asm
+++ b/data/mapObjects/CeladonGym.asm
@@ -1,4 +1,4 @@
-CeladonGymObject:
+CeladonGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/CeladonHotel.asm
index 09b4d99c..f4aa1305 100755
--- a/data/mapObjects/celadonhotel.asm
+++ b/data/mapObjects/CeladonHotel.asm
@@ -1,4 +1,4 @@
-CeladonHotelObject:
+CeladonHotel_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/CeladonMansion1F.asm
index 423a9a2e..1abd434c 100755
--- a/data/mapObjects/celadonmansion1.asm
+++ b/data/mapObjects/CeladonMansion1F.asm
@@ -1,12 +1,12 @@
-CeladonMansion1Object:
+CeladonMansion1F_Object:
 	db $f ; border block
 
 	db 5 ; warps
 	warp 4, 11, 2, -1
 	warp 5, 11, 2, -1
 	warp 4, 0, 4, -1
-	warp 7, 1, 1, CELADON_MANSION_2
-	warp 2, 1, 2, CELADON_MANSION_2
+	warp 7, 1, 1, CELADON_MANSION_2F
+	warp 2, 1, 2, CELADON_MANSION_2F
 
 	db 1 ; signs
 	sign 4, 9, 5 ; CeladonMansion1Text5
@@ -18,8 +18,8 @@ CeladonMansion1Object:
 	object SPRITE_SLOWBRO, 4, 4, WALK, 1, 4 ; person
 
 	; warp-to
-	warp_to 4, 11, CELADON_MANSION_1_WIDTH
-	warp_to 5, 11, CELADON_MANSION_1_WIDTH
-	warp_to 4, 0, CELADON_MANSION_1_WIDTH
-	warp_to 7, 1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2
-	warp_to 2, 1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2
+	warp_to 4, 11, CELADON_MANSION_1F_WIDTH
+	warp_to 5, 11, CELADON_MANSION_1F_WIDTH
+	warp_to 4, 0, CELADON_MANSION_1F_WIDTH
+	warp_to 7, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F
+	warp_to 2, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F
diff --git a/data/mapObjects/CeladonMansion2F.asm b/data/mapObjects/CeladonMansion2F.asm
new file mode 100755
index 00000000..09c94d29
--- /dev/null
+++ b/data/mapObjects/CeladonMansion2F.asm
@@ -0,0 +1,19 @@
+CeladonMansion2F_Object:
+	db $f ; border block
+
+	db 4 ; warps
+	warp 6, 1, 0, CELADON_MANSION_3F
+	warp 7, 1, 3, CELADON_MANSION_1F
+	warp 2, 1, 4, CELADON_MANSION_1F
+	warp 4, 1, 3, CELADON_MANSION_3F
+
+	db 1 ; signs
+	sign 4, 9, 1 ; CeladonMansion2Text1
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 6, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F
+	warp_to 7, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F
+	warp_to 2, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F
+	warp_to 4, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F
diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/CeladonMansion3F.asm
index 129a7148..32701f14 100755
--- a/data/mapObjects/celadonmansion3.asm
+++ b/data/mapObjects/CeladonMansion3F.asm
@@ -1,11 +1,11 @@
-CeladonMansion3Object:
+CeladonMansion3F_Object:
 	db $f ; border block
 
 	db 4 ; warps
-	warp 6, 1, 0, CELADON_MANSION_2
-	warp 7, 1, 0, CELADON_MANSION_4
-	warp 2, 1, 1, CELADON_MANSION_4
-	warp 4, 1, 3, CELADON_MANSION_2
+	warp 6, 1, 0, CELADON_MANSION_2F
+	warp 7, 1, 0, CELADON_MANSION_ROOF
+	warp 2, 1, 1, CELADON_MANSION_ROOF
+	warp 4, 1, 3, CELADON_MANSION_2F
 
 	db 4 ; signs
 	sign 1, 3, 5 ; CeladonMansion3Text5
@@ -20,7 +20,7 @@ CeladonMansion3Object:
 	object SPRITE_LAPRAS_GIVER, 2, 3, STAY, NONE, 4 ; person
 
 	; warp-to
-	warp_to 6, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2F
-	warp_to 7, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_ROOF
-	warp_to 2, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_ROOF
-	warp_to 4, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2F
+	warp_to 6, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F
+	warp_to 7, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF
+	warp_to 2, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF
+	warp_to 4, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F
diff --git a/data/mapObjects/CeladonMansionRoof.asm b/data/mapObjects/CeladonMansionRoof.asm
new file mode 100755
index 00000000..353b0b96
--- /dev/null
+++ b/data/mapObjects/CeladonMansionRoof.asm
@@ -0,0 +1,17 @@
+CeladonMansionRoof_Object:
+	db $9 ; border block
+
+	db 3 ; warps
+	warp 6, 1, 1, CELADON_MANSION_3F
+	warp 2, 1, 2, CELADON_MANSION_3F
+	warp 2, 7, 0, CELADON_MANSION_ROOF_HOUSE
+
+	db 1 ; signs
+	sign 3, 7, 1 ; CeladonMansion4Text1
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 6, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F
+	warp_to 2, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F
+	warp_to 2, 7, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_ROOF_HOUSE
diff --git a/data/mapObjects/CeladonMansionRoofHouse.asm b/data/mapObjects/CeladonMansionRoofHouse.asm
new file mode 100755
index 00000000..b6a6149f
--- /dev/null
+++ b/data/mapObjects/CeladonMansionRoofHouse.asm
@@ -0,0 +1,16 @@
+CeladonMansionRoofHouse_Object:
+	db $a ; border block
+
+	db 2 ; warps
+	warp 2, 7, 2, CELADON_MANSION_ROOF
+	warp 3, 7, 2, CELADON_MANSION_ROOF
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person
+	object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person
+
+	; warp-to
+	warp_to 2, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF
+	warp_to 3, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF
diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/CeladonMart1F.asm
index b2a8fdcd..2037369a 100755
--- a/data/mapObjects/celadonmart1.asm
+++ b/data/mapObjects/CeladonMart1F.asm
@@ -1,4 +1,4 @@
-CeladonMart1Object:
+CeladonMart1F_Object:
 	db $f ; border block
 
 	db 6 ; warps
@@ -6,7 +6,7 @@ CeladonMart1Object:
 	warp 3, 7, 0, -1
 	warp 16, 7, 1, -1
 	warp 17, 7, 1, -1
-	warp 12, 1, 0, CELADON_MART_2
+	warp 12, 1, 0, CELADON_MART_2F
 	warp 1, 1, 0, CELADON_MART_ELEVATOR
 
 	db 2 ; signs
@@ -17,9 +17,9 @@ CeladonMart1Object:
 	object SPRITE_CABLE_CLUB_WOMAN, 8, 3, STAY, DOWN, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, CELADON_MART_1_WIDTH
-	warp_to 3, 7, CELADON_MART_1_WIDTH
-	warp_to 16, 7, CELADON_MART_1_WIDTH
-	warp_to 17, 7, CELADON_MART_1_WIDTH
-	warp_to 12, 1, CELADON_MART_1_WIDTH ; CELADON_MART_2F
-	warp_to 1, 1, CELADON_MART_1_WIDTH ; CELADON_MART_ELEVATOR
+	warp_to 2, 7, CELADON_MART_1F_WIDTH
+	warp_to 3, 7, CELADON_MART_1F_WIDTH
+	warp_to 16, 7, CELADON_MART_1F_WIDTH
+	warp_to 17, 7, CELADON_MART_1F_WIDTH
+	warp_to 12, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_2F
+	warp_to 1, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_ELEVATOR
diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/CeladonMart2F.asm
index db095add..2f5f428e 100755
--- a/data/mapObjects/celadonmart2.asm
+++ b/data/mapObjects/CeladonMart2F.asm
@@ -1,9 +1,9 @@
-CeladonMart2Object:
+CeladonMart2F_Object:
 	db $f ; border block
 
 	db 3 ; warps
-	warp 12, 1, 4, CELADON_MART_1
-	warp 16, 1, 1, CELADON_MART_3
+	warp 12, 1, 4, CELADON_MART_1F
+	warp 16, 1, 1, CELADON_MART_3F
 	warp 1, 1, 0, CELADON_MART_ELEVATOR
 
 	db 1 ; signs
@@ -16,6 +16,6 @@ CeladonMart2Object:
 	object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person
 
 	; warp-to
-	warp_to 12, 1, CELADON_MART_2_WIDTH ; CELADON_MART_1F
-	warp_to 16, 1, CELADON_MART_2_WIDTH ; CELADON_MART_3F
-	warp_to 1, 1, CELADON_MART_2_WIDTH ; CELADON_MART_ELEVATOR
+	warp_to 12, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_1F
+	warp_to 16, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_3F
+	warp_to 1, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_ELEVATOR
diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/CeladonMart3F.asm
index c412ed5b..6c6adfd4 100755
--- a/data/mapObjects/celadonmart3.asm
+++ b/data/mapObjects/CeladonMart3F.asm
@@ -1,9 +1,9 @@
-CeladonMart3Object:
+CeladonMart3F_Object:
 	db $f ; border block
 
 	db 3 ; warps
-	warp 12, 1, 0, CELADON_MART_4
-	warp 16, 1, 1, CELADON_MART_2
+	warp 12, 1, 0, CELADON_MART_4F
+	warp 16, 1, 1, CELADON_MART_2F
 	warp 1, 1, 0, CELADON_MART_ELEVATOR
 
 	db 12 ; signs
@@ -28,6 +28,6 @@ CeladonMart3Object:
 	object SPRITE_YOUNG_BOY, 2, 5, STAY, UP, 5 ; person
 
 	; warp-to
-	warp_to 12, 1, CELADON_MART_3_WIDTH ; CELADON_MART_4F
-	warp_to 16, 1, CELADON_MART_3_WIDTH ; CELADON_MART_2F
-	warp_to 1, 1, CELADON_MART_3_WIDTH ; CELADON_MART_ELEVATOR
+	warp_to 12, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_4F
+	warp_to 16, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_2F
+	warp_to 1, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_ELEVATOR
diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/CeladonMart4F.asm
index eeb75d7f..18ba3bdc 100755
--- a/data/mapObjects/celadonmart4.asm
+++ b/data/mapObjects/CeladonMart4F.asm
@@ -1,9 +1,9 @@
-CeladonMart4Object:
+CeladonMart4F_Object:
 	db $f ; border block
 
 	db 3 ; warps
-	warp 12, 1, 0, CELADON_MART_3
-	warp 16, 1, 1, CELADON_MART_5
+	warp 12, 1, 0, CELADON_MART_3F
+	warp 16, 1, 1, CELADON_MART_5F
 	warp 1, 1, 0, CELADON_MART_ELEVATOR
 
 	db 1 ; signs
@@ -15,6 +15,6 @@ CeladonMart4Object:
 	object SPRITE_BUG_CATCHER, 5, 2, WALK, 2, 3 ; person
 
 	; warp-to
-	warp_to 12, 1, CELADON_MART_4_WIDTH ; CELADON_MART_3F
-	warp_to 16, 1, CELADON_MART_4_WIDTH ; CELADON_MART_5F
-	warp_to 1, 1, CELADON_MART_4_WIDTH ; CELADON_MART_ELEVATOR
+	warp_to 12, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_3F
+	warp_to 16, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_5F
+	warp_to 1, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_ELEVATOR
diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/CeladonMart5F.asm
index ff4f3955..fb1201c9 100755
--- a/data/mapObjects/celadonmart5.asm
+++ b/data/mapObjects/CeladonMart5F.asm
@@ -1,9 +1,9 @@
-CeladonMart5Object:
+CeladonMart5F_Object:
 	db $f ; border block
 
 	db 3 ; warps
 	warp 12, 1, 0, CELADON_MART_ROOF
-	warp 16, 1, 1, CELADON_MART_4
+	warp 16, 1, 1, CELADON_MART_4F
 	warp 1, 1, 0, CELADON_MART_ELEVATOR
 
 	db 1 ; signs
@@ -16,6 +16,6 @@ CeladonMart5Object:
 	object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 4 ; person
 
 	; warp-to
-	warp_to 12, 1, CELADON_MART_5_WIDTH ; CELADON_MART_ROOF
-	warp_to 16, 1, CELADON_MART_5_WIDTH ; CELADON_MART_4F
-	warp_to 1, 1, CELADON_MART_5_WIDTH ; CELADON_MART_ELEVATOR
+	warp_to 12, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ROOF
+	warp_to 16, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_4F
+	warp_to 1, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ELEVATOR
diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/CeladonMartElevator.asm
index 14fca2bf..9688daef 100755
--- a/data/mapObjects/celadonmartelevator.asm
+++ b/data/mapObjects/CeladonMartElevator.asm
@@ -1,9 +1,9 @@
-CeladonMartElevatorObject:
+CeladonMartElevator_Object:
 	db $f ; border block
 
 	db 2 ; warps
-	warp 1, 3, 5, CELADON_MART_1
-	warp 2, 3, 5, CELADON_MART_1
+	warp 1, 3, 5, CELADON_MART_1F
+	warp 2, 3, 5, CELADON_MART_1F
 
 	db 1 ; signs
 	sign 3, 0, 1 ; CeladonMartElevatorText1
diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/CeladonMartRoof.asm
index 744a636d..05cef2d4 100755
--- a/data/mapObjects/celadonmartroof.asm
+++ b/data/mapObjects/CeladonMartRoof.asm
@@ -1,8 +1,8 @@
-CeladonMartRoofObject:
+CeladonMartRoof_Object:
 	db $42 ; border block
 
 	db 1 ; warps
-	warp 15, 2, 0, CELADON_MART_5
+	warp 15, 2, 0, CELADON_MART_5F
 
 	db 4 ; signs
 	sign 10, 1, 3 ; CeladonMartRoofText3
diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/CeladonPokecenter.asm
index d4d40baa..91698e34 100755
--- a/data/mapObjects/celadonpokecenter.asm
+++ b/data/mapObjects/CeladonPokecenter.asm
@@ -1,4 +1,4 @@
-CeladonPokecenterObject:
+CeladonPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/CeruleanBadgeHouse.asm
index cf54c719..62a6873b 100755
--- a/data/mapObjects/ceruleanhouse2.asm
+++ b/data/mapObjects/CeruleanBadgeHouse.asm
@@ -1,4 +1,4 @@
-CeruleanHouse2Object:
+CeruleanBadgeHouse_Object:
 	db $c ; border block
 
 	db 3 ; warps
@@ -12,6 +12,6 @@ CeruleanHouse2Object:
 	object SPRITE_FAT_BALD_GUY, 5, 3, STAY, RIGHT, 1 ; person
 
 	; warp-to
-	warp_to 2, 0, CERULEAN_HOUSE_2_WIDTH
-	warp_to 2, 7, CERULEAN_HOUSE_2_WIDTH
-	warp_to 3, 7, CERULEAN_HOUSE_2_WIDTH
+	warp_to 2, 0, CERULEAN_BADGE_HOUSE_WIDTH
+	warp_to 2, 7, CERULEAN_BADGE_HOUSE_WIDTH
+	warp_to 3, 7, CERULEAN_BADGE_HOUSE_WIDTH
diff --git a/data/mapObjects/CeruleanCave1F.asm b/data/mapObjects/CeruleanCave1F.asm
new file mode 100755
index 00000000..a7f72b34
--- /dev/null
+++ b/data/mapObjects/CeruleanCave1F.asm
@@ -0,0 +1,32 @@
+CeruleanCave1F_Object:
+	db $7d ; border block
+
+	db 9 ; warps
+	warp 24, 17, 6, -1
+	warp 25, 17, 6, -1
+	warp 27, 1, 0, CERULEAN_CAVE_2F
+	warp 23, 7, 1, CERULEAN_CAVE_2F
+	warp 18, 9, 2, CERULEAN_CAVE_2F
+	warp 7, 1, 3, CERULEAN_CAVE_2F
+	warp 1, 3, 4, CERULEAN_CAVE_2F
+	warp 3, 11, 5, CERULEAN_CAVE_2F
+	warp 0, 6, 0, CERULEAN_CAVE_B1F
+
+	db 0 ; signs
+
+	db 4 ; objects
+	object SPRITE_BALL, $1d, $10, STAY, NONE, $1, RARE_CANDY
+	object SPRITE_BALL, $7, $b, STAY, NONE, $2, MAX_ELIXER
+	object SPRITE_BALL, $1d, $9, STAY, NONE, $3, MAX_REVIVE
+	object SPRITE_BALL, $12, $3, STAY, NONE, $4, ULTRA_BALL
+
+	; warp-to
+	warp_to 24, 17, CERULEAN_CAVE_1F_WIDTH
+	warp_to 25, 17, CERULEAN_CAVE_1F_WIDTH
+	warp_to 27, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+	warp_to 23, 7, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+	warp_to 18, 9, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+	warp_to 7, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+	warp_to 1, 3, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+	warp_to 3, 11, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+	warp_to 0, 6, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_B1F
diff --git a/data/mapObjects/CeruleanCave2F.asm b/data/mapObjects/CeruleanCave2F.asm
new file mode 100755
index 00000000..9a15eef8
--- /dev/null
+++ b/data/mapObjects/CeruleanCave2F.asm
@@ -0,0 +1,26 @@
+CeruleanCave2F_Object:
+	db $7d ; border block
+
+	db 6 ; warps
+	warp 29, 1, 2, CERULEAN_CAVE_1F
+	warp 22, 6, 3, CERULEAN_CAVE_1F
+	warp 19, 7, 4, CERULEAN_CAVE_1F
+	warp 9, 1, 5, CERULEAN_CAVE_1F
+	warp 1, 3, 6, CERULEAN_CAVE_1F
+	warp 3, 11, 7, CERULEAN_CAVE_1F
+
+	db 0 ; signs
+
+	db 4 ; objects
+	object SPRITE_BALL, 0, 11, STAY, NONE, 1, RARE_CANDY
+	object SPRITE_BALL, 16, 7, STAY, NONE, 2, ULTRA_BALL
+	object SPRITE_BALL, 19, 11, STAY, NONE, 3, MAX_REVIVE
+	object SPRITE_BALL, 27, 9, STAY, NONE, 4, FULL_RESTORE
+
+	; warp-to
+	warp_to 29, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
+	warp_to 22, 6, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
+	warp_to 19, 7, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
+	warp_to 9, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
+	warp_to 1, 3, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
+	warp_to 3, 11, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/CeruleanCaveB1F.asm
index b658d9f3..193d674b 100755
--- a/data/mapObjects/unknowndungeon3.asm
+++ b/data/mapObjects/CeruleanCaveB1F.asm
@@ -1,8 +1,8 @@
-UnknownDungeon3Object:
+CeruleanCaveB1F_Object:
 	db $7d ; border block
 
 	db 1 ; warps
-	warp 3, 6, 8, UNKNOWN_DUNGEON_1
+	warp 3, 6, 8, CERULEAN_CAVE_1F
 
 	db 0 ; signs
 
@@ -14,4 +14,4 @@ UnknownDungeon3Object:
 	object SPRITE_BALL, 15, 3, STAY, NONE, 5, MAX_ELIXER
 
 	; warp-to
-	warp_to 3, 6, UNKNOWN_DUNGEON_3_WIDTH ; UNKNOWN_DUNGEON_1
+	warp_to 3, 6, CERULEAN_CAVE_B1F_WIDTH ; CERULEAN_CAVE_1F
diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/CeruleanCity.asm
index 864717fc..ca05e65f 100755
--- a/data/mapObjects/ceruleancity.asm
+++ b/data/mapObjects/CeruleanCity.asm
@@ -1,17 +1,17 @@
-CeruleanCityObject:
+CeruleanCity_Object:
 	db $a ; border block
 
-	db $a ; warps
-	warp 27, 11, 0, TRASHED_HOUSE
-	warp 13, 15, 0, CERULEAN_HOUSE_1
+	db 10 ; warps
+	warp 27, 11, 0, CERULEAN_TRASHED_HOUSE
+	warp 13, 15, 0, CERULEAN_TRADE_HOUSE
 	warp 19, 17, 0, CERULEAN_POKECENTER
 	warp 30, 19, 0, CERULEAN_GYM
 	warp 13, 25, 0, BIKE_SHOP
 	warp 25, 25, 0, CERULEAN_MART
-	warp 4, 11, 0, UNKNOWN_DUNGEON_1
-	warp 27, 9, 2, TRASHED_HOUSE
-	warp 9, 11, 1, CERULEAN_HOUSE_2
-	warp 9, 9, 0, CERULEAN_HOUSE_2
+	warp 4, 11, 0, CERULEAN_CAVE_1F
+	warp 27, 9, 2, CERULEAN_TRASHED_HOUSE
+	warp 9, 11, 1, CERULEAN_BADGE_HOUSE
+	warp 9, 9, 0, CERULEAN_BADGE_HOUSE
 
 	db 6 ; signs
 	sign 23, 19, 12 ; CeruleanCityText12
diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/CeruleanGym.asm
index d774c5dd..96713648 100755
--- a/data/mapObjects/ceruleangym.asm
+++ b/data/mapObjects/CeruleanGym.asm
@@ -1,4 +1,4 @@
-CeruleanGymObject:
+CeruleanGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/CeruleanMart.asm
index 389e0317..4659375f 100755
--- a/data/mapObjects/ceruleanmart.asm
+++ b/data/mapObjects/CeruleanMart.asm
@@ -1,4 +1,4 @@
-CeruleanMartObject:
+CeruleanMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/CeruleanPokecenter.asm
index 1297e6f4..78b2330e 100755
--- a/data/mapObjects/ceruleanpokecenter.asm
+++ b/data/mapObjects/CeruleanPokecenter.asm
@@ -1,4 +1,4 @@
-CeruleanPokecenterObject:
+CeruleanPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/CeruleanTradeHouse.asm
index efbbebd6..e51f9544 100755
--- a/data/mapObjects/ceruleanhouse1.asm
+++ b/data/mapObjects/CeruleanTradeHouse.asm
@@ -1,4 +1,4 @@
-CeruleanHouse1Object:
+CeruleanTradeHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -14,5 +14,5 @@ CeruleanHouse1Object:
 	object SPRITE_SANDSHREW, 5, 3, STAY, LEFT, 4 ; person
 
 	; warp-to
-	warp_to 2, 7, CERULEAN_HOUSE_1_WIDTH
-	warp_to 3, 7, CERULEAN_HOUSE_1_WIDTH
+	warp_to 2, 7, CERULEAN_TRADE_HOUSE_WIDTH
+	warp_to 3, 7, CERULEAN_TRADE_HOUSE_WIDTH
diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/CeruleanTrashedHouse.asm
index 7b90ff73..44b7cf20 100755
--- a/data/mapObjects/ceruleanhousetrashed.asm
+++ b/data/mapObjects/CeruleanTrashedHouse.asm
@@ -1,4 +1,4 @@
-CeruleanHouseTrashedObject:
+CeruleanTrashedHouse_Object:
 	db $a ; border block
 
 	db 3 ; warps
@@ -14,6 +14,6 @@ CeruleanHouseTrashedObject:
 	object SPRITE_GIRL, 5, 6, WALK, 2, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, TRASHED_HOUSE_WIDTH
-	warp_to 3, 7, TRASHED_HOUSE_WIDTH
-	warp_to 3, 0, TRASHED_HOUSE_WIDTH
+	warp_to 2, 7, CERULEAN_TRASHED_HOUSE_WIDTH
+	warp_to 3, 7, CERULEAN_TRASHED_HOUSE_WIDTH
+	warp_to 3, 0, CERULEAN_TRASHED_HOUSE_WIDTH
diff --git a/data/mapObjects/gary.asm b/data/mapObjects/ChampionsRoom.asm
index 10d9f0ed..1e0cb7f4 100755
--- a/data/mapObjects/gary.asm
+++ b/data/mapObjects/ChampionsRoom.asm
@@ -1,4 +1,4 @@
-GaryObject:
+ChampionsRoom_Object:
 	db $3 ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/CinnabarGym.asm
index 5de7f989..1a6e96cd 100755
--- a/data/mapObjects/cinnabargym.asm
+++ b/data/mapObjects/CinnabarGym.asm
@@ -1,4 +1,4 @@
-CinnabarGymObject:
+CinnabarGym_Object:
 	db $2e ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/CinnabarIsland.asm
index 264a59f8..1932e134 100755
--- a/data/mapObjects/cinnabarisland.asm
+++ b/data/mapObjects/CinnabarIsland.asm
@@ -1,10 +1,10 @@
-CinnabarIslandObject:
+CinnabarIsland_Object:
 	db $43 ; border block
 
 	db 5 ; warps
-	warp 6, 3, 1, MANSION_1
+	warp 6, 3, 1, POKEMON_MANSION_1F
 	warp 18, 3, 0, CINNABAR_GYM
-	warp 6, 9, 0, CINNABAR_LAB_1
+	warp 6, 9, 0, CINNABAR_LAB
 	warp 11, 11, 0, CINNABAR_POKECENTER
 	warp 15, 11, 0, CINNABAR_MART
 
diff --git a/data/mapObjects/CinnabarLab.asm b/data/mapObjects/CinnabarLab.asm
new file mode 100755
index 00000000..deb5d8ed
--- /dev/null
+++ b/data/mapObjects/CinnabarLab.asm
@@ -0,0 +1,25 @@
+CinnabarLab_Object:
+	db $17 ; border block
+
+	db 5 ; warps
+	warp 2, 7, 2, -1
+	warp 3, 7, 2, -1
+	warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM
+	warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM
+	warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM
+
+	db 4 ; signs
+	sign 3, 2, 2 ; Lab1Text2
+	sign 9, 4, 3 ; Lab1Text3
+	sign 13, 4, 4 ; Lab1Text4
+	sign 17, 4, 5 ; Lab1Text5
+
+	db 1 ; objects
+	object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person
+
+	; warp-to
+	warp_to 2, 7, CINNABAR_LAB_WIDTH
+	warp_to 3, 7, CINNABAR_LAB_WIDTH
+	warp_to 8, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_TRADE_ROOM
+	warp_to 12, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_METRONOME_ROOM
+	warp_to 16, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_FOSSIL_ROOM
diff --git a/data/mapObjects/CinnabarLabFossilRoom.asm b/data/mapObjects/CinnabarLabFossilRoom.asm
new file mode 100755
index 00000000..d31502e6
--- /dev/null
+++ b/data/mapObjects/CinnabarLabFossilRoom.asm
@@ -0,0 +1,16 @@
+CinnabarLabFossilRoom_Object:
+	db $17 ; border block
+
+	db 2 ; warps
+	warp 2, 7, 4, CINNABAR_LAB
+	warp 3, 7, 4, CINNABAR_LAB
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person
+	object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person
+
+	; warp-to
+	warp_to 2, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB
+	warp_to 3, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB
diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/CinnabarLabMetronomeRoom.asm
index 73ba321d..37f93d43 100755
--- a/data/mapObjects/lab3.asm
+++ b/data/mapObjects/CinnabarLabMetronomeRoom.asm
@@ -1,9 +1,9 @@
-Lab3Object:
+CinnabarLabMetronomeRoom_Object:
 	db $17 ; border block
 
 	db 2 ; warps
-	warp 2, 7, 3, CINNABAR_LAB_1
-	warp 3, 7, 3, CINNABAR_LAB_1
+	warp 2, 7, 3, CINNABAR_LAB
+	warp 3, 7, 3, CINNABAR_LAB
 
 	db 3 ; signs
 	sign 0, 4, 3 ; Lab3Text3
@@ -15,5 +15,5 @@ Lab3Object:
 	object SPRITE_OAK_AIDE, 2, 3, WALK, 2, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1
-	warp_to 3, 7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1
+	warp_to 2, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB
+	warp_to 3, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB
diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/CinnabarLabTradeRoom.asm
index 3062fcae..449cc914 100755
--- a/data/mapObjects/lab2.asm
+++ b/data/mapObjects/CinnabarLabTradeRoom.asm
@@ -1,9 +1,9 @@
-Lab2Object:
+CinnabarLabTradeRoom_Object:
 	db $17 ; border block
 
 	db 2 ; warps
-	warp 2, 7, 2, CINNABAR_LAB_1
-	warp 3, 7, 2, CINNABAR_LAB_1
+	warp 2, 7, 2, CINNABAR_LAB
+	warp 3, 7, 2, CINNABAR_LAB
 
 	db 0 ; signs
 
@@ -13,5 +13,5 @@ Lab2Object:
 	object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1
-	warp_to 3, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1
+	warp_to 2, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB
+	warp_to 3, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB
diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/CinnabarMart.asm
index cf135039..af88ddf0 100755
--- a/data/mapObjects/cinnabarmart.asm
+++ b/data/mapObjects/CinnabarMart.asm
@@ -1,4 +1,4 @@
-CinnabarMartObject:
+CinnabarMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/CinnabarPokecenter.asm
index 99fb3169..3c9efb34 100755
--- a/data/mapObjects/cinnabarpokecenter.asm
+++ b/data/mapObjects/CinnabarPokecenter.asm
@@ -1,4 +1,4 @@
-CinnabarPokecenterObject:
+CinnabarPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/Colosseum.asm
index 1c32de2f..18762584 100644
--- a/data/mapObjects/colosseum.asm
+++ b/data/mapObjects/Colosseum.asm
@@ -1,4 +1,4 @@
-ColosseumObject:
+Colosseum_Object:
 	db $e ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/CopycatsHouse1F.asm
index 4a8c2641..8bde12fe 100755
--- a/data/mapObjects/copycatshouse1f.asm
+++ b/data/mapObjects/CopycatsHouse1F.asm
@@ -1,4 +1,4 @@
-CopycatsHouse1FObject:
+CopycatsHouse1F_Object:
 	db $a ; border block
 
 	db 3 ; warps
diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/CopycatsHouse2F.asm
index 529f3416..18b56419 100755
--- a/data/mapObjects/copycatshouse2f.asm
+++ b/data/mapObjects/CopycatsHouse2F.asm
@@ -1,4 +1,4 @@
-CopycatsHouse2FObject:
+CopycatsHouse2F_Object:
 	db $a ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/Daycare.asm
index 7c10fe70..c58c83e4 100755
--- a/data/mapObjects/daycarem.asm
+++ b/data/mapObjects/Daycare.asm
@@ -1,4 +1,4 @@
-DayCareMObject:
+Daycare_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -11,5 +11,5 @@ DayCareMObject:
 	object SPRITE_GENTLEMAN, 2, 3, STAY, RIGHT, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, DAYCAREM_WIDTH
-	warp_to 3, 7, DAYCAREM_WIDTH
+	warp_to 2, 7, DAYCARE_WIDTH
+	warp_to 3, 7, DAYCARE_WIDTH
diff --git a/data/mapObjects/diglettscave.asm b/data/mapObjects/DiglettsCave.asm
index 844bc832..b4fd0af8 100755
--- a/data/mapObjects/diglettscave.asm
+++ b/data/mapObjects/DiglettsCave.asm
@@ -1,9 +1,9 @@
-DiglettsCaveObject:
+DiglettsCave_Object:
 	db $19 ; border block
 
 	db 2 ; warps
-	warp 5, 5, 2, DIGLETTS_CAVE_EXIT
-	warp 37, 31, 2, DIGLETTS_CAVE_ENTRANCE
+	warp 5, 5, 2, DIGLETTS_CAVE_ROUTE_2
+	warp 37, 31, 2, DIGLETTS_CAVE_ROUTE_11
 
 	db 0 ; signs
 
diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/DiglettsCaveRoute11.asm
index af28bfbf..a4c70f06 100755
--- a/data/mapObjects/diglettscaveroute11.asm
+++ b/data/mapObjects/DiglettsCaveRoute11.asm
@@ -1,4 +1,4 @@
-DiglettsCaveEntranceRoute11Object:
+DiglettsCaveRoute11_Object:
 	db $7d ; border block
 
 	db 3 ; warps
@@ -12,6 +12,6 @@ DiglettsCaveEntranceRoute11Object:
 	object SPRITE_GAMBLER, 2, 3, STAY, NONE, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, DIGLETTS_CAVE_ENTRANCE_WIDTH
-	warp_to 3, 7, DIGLETTS_CAVE_ENTRANCE_WIDTH
-	warp_to 4, 4, DIGLETTS_CAVE_ENTRANCE_WIDTH ; DIGLETTS_CAVE
+	warp_to 2, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH
+	warp_to 3, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH
+	warp_to 4, 4, DIGLETTS_CAVE_ROUTE_11_WIDTH ; DIGLETTS_CAVE
diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/DiglettsCaveRoute2.asm
index 645cc385..0567fee6 100755
--- a/data/mapObjects/diglettscaveroute2.asm
+++ b/data/mapObjects/DiglettsCaveRoute2.asm
@@ -1,4 +1,4 @@
-DiglettsCaveRoute2Object:
+DiglettsCaveRoute2_Object:
 	db $7d ; border block
 
 	db 3 ; warps
@@ -12,6 +12,6 @@ DiglettsCaveRoute2Object:
 	object SPRITE_FISHER, 3, 3, STAY, NONE, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, DIGLETTS_CAVE_EXIT_WIDTH
-	warp_to 3, 7, DIGLETTS_CAVE_EXIT_WIDTH
-	warp_to 4, 4, DIGLETTS_CAVE_EXIT_WIDTH ; DIGLETTS_CAVE
+	warp_to 2, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH
+	warp_to 3, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH
+	warp_to 4, 4, DIGLETTS_CAVE_ROUTE_2_WIDTH ; DIGLETTS_CAVE
diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/FightingDojo.asm
index b9ff9449..fdc7b838 100755
--- a/data/mapObjects/fightingdojo.asm
+++ b/data/mapObjects/FightingDojo.asm
@@ -1,4 +1,4 @@
-FightingDojoObject:
+FightingDojo_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/FuchsiaBillsGrandpasHouse.asm
index ca4638f9..363b56f9 100755
--- a/data/mapObjects/fuchsiahouse1.asm
+++ b/data/mapObjects/FuchsiaBillsGrandpasHouse.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse1Object:
+FuchsiaBillsGrandpasHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -13,5 +13,5 @@ FuchsiaHouse1Object:
 	object SPRITE_BUG_CATCHER, 5, 5, STAY, NONE, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, FUCHSIA_HOUSE_1_WIDTH
-	warp_to 3, 7, FUCHSIA_HOUSE_1_WIDTH
+	warp_to 2, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH
+	warp_to 3, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH
diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/FuchsiaCity.asm
index 35f9365d..0368905c 100755
--- a/data/mapObjects/fuchsiacity.asm
+++ b/data/mapObjects/FuchsiaCity.asm
@@ -1,16 +1,16 @@
-FuchsiaCityObject:
+FuchsiaCity_Object:
 	db $f ; border block
 
 	db 9 ; warps
 	warp 5, 13, 0, FUCHSIA_MART
-	warp 11, 27, 0, FUCHSIA_HOUSE_1
+	warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE
 	warp 19, 27, 0, FUCHSIA_POKECENTER
-	warp 27, 27, 0, FUCHSIA_HOUSE_2
-	warp 18, 3, 0, SAFARI_ZONE_ENTRANCE
+	warp 27, 27, 0, WARDENS_HOUSE
+	warp 18, 3, 0, SAFARI_ZONE_GATE
 	warp 5, 27, 0, FUCHSIA_GYM
 	warp 22, 13, 0, FUCHSIA_MEETING_ROOM
-	warp 31, 27, 1, FUCHSIA_HOUSE_3
-	warp 31, 24, 0, FUCHSIA_HOUSE_3
+	warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE
+	warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE
 
 	db 14 ; signs
 	sign 15, 23, 11 ; FuchsiaCityText11
diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/FuchsiaGoodRodHouse.asm
index 0bed500b..390447c8 100755
--- a/data/mapObjects/fuchsiahouse3.asm
+++ b/data/mapObjects/FuchsiaGoodRodHouse.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse3Object:
+FuchsiaGoodRodHouse_Object:
 	db $c ; border block
 
 	db 3 ; warps
@@ -12,6 +12,6 @@ FuchsiaHouse3Object:
 	object SPRITE_FISHER, 5, 3, STAY, RIGHT, 1 ; person
 
 	; warp-to
-	warp_to 2, 0, FUCHSIA_HOUSE_3_WIDTH
-	warp_to 2, 7, FUCHSIA_HOUSE_3_WIDTH
-	warp_to 3, 7, FUCHSIA_HOUSE_3_WIDTH
+	warp_to 2, 0, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
+	warp_to 2, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
+	warp_to 3, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/FuchsiaGym.asm
index 48dcc1d7..4e717086 100755
--- a/data/mapObjects/fuchsiagym.asm
+++ b/data/mapObjects/FuchsiaGym.asm
@@ -1,4 +1,4 @@
-FuchsiaGymObject:
+FuchsiaGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/FuchsiaMart.asm
index bfb93979..cfa71d8d 100755
--- a/data/mapObjects/fuchsiamart.asm
+++ b/data/mapObjects/FuchsiaMart.asm
@@ -1,4 +1,4 @@
-FuchsiaMartObject:
+FuchsiaMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/FuchsiaMeetingRoom.asm
index c6c10415..9130d920 100755
--- a/data/mapObjects/fuchsiameetingroom.asm
+++ b/data/mapObjects/FuchsiaMeetingRoom.asm
@@ -1,4 +1,4 @@
-FuchsiaMeetingRoomObject:
+FuchsiaMeetingRoom_Object:
 	db $17 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/FuchsiaPokecenter.asm
index bed81891..b0056acd 100755
--- a/data/mapObjects/fuchsiapokecenter.asm
+++ b/data/mapObjects/FuchsiaPokecenter.asm
@@ -1,4 +1,4 @@
-FuchsiaPokecenterObject:
+FuchsiaPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/GameCorner.asm
index be5a3c71..afac025e 100755
--- a/data/mapObjects/celadongamecorner.asm
+++ b/data/mapObjects/GameCorner.asm
@@ -1,10 +1,10 @@
-CeladonGameCornerObject:
+GameCorner_Object:
 	db $f ; border block
 
 	db 3 ; warps
 	warp 15, 17, 7, -1
 	warp 16, 17, 7, -1
-	warp 17, 4, 1, ROCKET_HIDEOUT_1
+	warp 17, 4, 1, ROCKET_HIDEOUT_B1F
 
 	db 1 ; signs
 	sign 9, 4, 12 ; CeladonGameCornerText12
diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/GameCornerPrizeRoom.asm
index bdaafe02..35cd3ac8 100755
--- a/data/mapObjects/celadonprizeroom.asm
+++ b/data/mapObjects/GameCornerPrizeRoom.asm
@@ -1,4 +1,4 @@
-CeladonPrizeRoomObject:
+GameCornerPrizeRoom_Object:
 	db $f ; border block
 
 	db 2 ; warps
@@ -15,5 +15,5 @@ CeladonPrizeRoomObject:
 	object SPRITE_GAMBLER, 7, 3, WALK, 2, 2 ; person
 
 	; warp-to
-	warp_to 4, 7, CELADON_PRIZE_ROOM_WIDTH
-	warp_to 5, 7, CELADON_PRIZE_ROOM_WIDTH
+	warp_to 4, 7, GAME_CORNER_PRIZE_ROOM_WIDTH
+	warp_to 5, 7, GAME_CORNER_PRIZE_ROOM_WIDTH
diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/HallOfFame.asm
index a815a053..3762d871 100755
--- a/data/mapObjects/halloffameroom.asm
+++ b/data/mapObjects/HallOfFame.asm
@@ -1,4 +1,4 @@
-HallofFameRoomObject:
+HallOfFame_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/indigoplateau.asm b/data/mapObjects/IndigoPlateau.asm
index d18f25e1..1447be11 100755
--- a/data/mapObjects/indigoplateau.asm
+++ b/data/mapObjects/IndigoPlateau.asm
@@ -1,4 +1,4 @@
-IndigoPlateauObject:
+IndigoPlateau_Object:
 	db $e ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/IndigoPlateauLobby.asm
index bb5895ac..d7de23a7 100755
--- a/data/mapObjects/indigoplateaulobby.asm
+++ b/data/mapObjects/IndigoPlateauLobby.asm
@@ -1,4 +1,4 @@
-IndigoPlateauLobbyObject:
+IndigoPlateauLobby_Object:
 	db $0 ; border block
 
 	db 3 ; warps
diff --git a/data/mapObjects/lance.asm b/data/mapObjects/LancesRoom.asm
index 77c0058c..6f22631a 100755
--- a/data/mapObjects/lance.asm
+++ b/data/mapObjects/LancesRoom.asm
@@ -1,4 +1,4 @@
-LanceObject:
+LancesRoom_Object:
 	db $3 ; border block
 
 	db 3 ; warps
diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/LavenderCuboneHouse.asm
index 6d900f45..96f1b3ba 100755
--- a/data/mapObjects/lavenderhouse2.asm
+++ b/data/mapObjects/LavenderCuboneHouse.asm
@@ -1,4 +1,4 @@
-LavenderHouse2Object:
+LavenderCuboneHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -12,5 +12,5 @@ LavenderHouse2Object:
 	object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, LAVENDER_HOUSE_2_WIDTH
-	warp_to 3, 7, LAVENDER_HOUSE_2_WIDTH
+	warp_to 2, 7, LAVENDER_CUBONE_HOUSE_WIDTH
+	warp_to 3, 7, LAVENDER_CUBONE_HOUSE_WIDTH
diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/LavenderMart.asm
index 6661fee9..df14ad39 100755
--- a/data/mapObjects/lavendermart.asm
+++ b/data/mapObjects/LavenderMart.asm
@@ -1,4 +1,4 @@
-LavenderMartObject:
+LavenderMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/LavenderPokecenter.asm
index 38b5a00e..6e38a8e9 100755
--- a/data/mapObjects/lavenderpokecenter.asm
+++ b/data/mapObjects/LavenderPokecenter.asm
@@ -1,4 +1,4 @@
-LavenderPokecenterObject:
+LavenderPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/LavenderTown.asm
index c694d763..4aead666 100755
--- a/data/mapObjects/lavendertown.asm
+++ b/data/mapObjects/LavenderTown.asm
@@ -1,12 +1,12 @@
-LavenderTownObject:
+LavenderTown_Object:
 	db $2c ; border block
 
 	db 6 ; warps
 	warp 3, 5, 0, LAVENDER_POKECENTER
-	warp 14, 5, 0, POKEMONTOWER_1
-	warp 7, 9, 0, LAVENDER_HOUSE_1
+	warp 14, 5, 0, POKEMON_TOWER_1F
+	warp 7, 9, 0, MR_FUJIS_HOUSE
 	warp 15, 13, 0, LAVENDER_MART
-	warp 3, 13, 0, LAVENDER_HOUSE_2
+	warp 3, 13, 0, LAVENDER_CUBONE_HOUSE
 	warp 7, 13, 0, NAME_RATERS_HOUSE
 
 	db 6 ; signs
diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/LoreleisRoom.asm
index e5f0f9f2..06450bb4 100755
--- a/data/mapObjects/lorelei.asm
+++ b/data/mapObjects/LoreleisRoom.asm
@@ -1,4 +1,4 @@
-LoreleiObject:
+LoreleisRoom_Object:
 	db $3 ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/MrFujisHouse.asm
index d9b61302..5b6ca2a6 100755
--- a/data/mapObjects/lavenderhouse1.asm
+++ b/data/mapObjects/MrFujisHouse.asm
@@ -1,4 +1,4 @@
-LavenderHouse1Object:
+MrFujisHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -16,5 +16,5 @@ LavenderHouse1Object:
 	object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 6 ; person
 
 	; warp-to
-	warp_to 2, 7, LAVENDER_HOUSE_1_WIDTH
-	warp_to 3, 7, LAVENDER_HOUSE_1_WIDTH
+	warp_to 2, 7, MR_FUJIS_HOUSE_WIDTH
+	warp_to 3, 7, MR_FUJIS_HOUSE_WIDTH
diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/MrPsychicsHouse.asm
index ac1827b9..01f9e11c 100755
--- a/data/mapObjects/saffronhouse2.asm
+++ b/data/mapObjects/MrPsychicsHouse.asm
@@ -1,4 +1,4 @@
-SaffronHouse2Object:
+MrPsychicsHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -11,5 +11,5 @@ SaffronHouse2Object:
 	object SPRITE_FISHER, 5, 3, STAY, LEFT, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, SAFFRON_HOUSE_2_WIDTH
-	warp_to 3, 7, SAFFRON_HOUSE_2_WIDTH
+	warp_to 2, 7, MR_PSYCHICS_HOUSE_WIDTH
+	warp_to 3, 7, MR_PSYCHICS_HOUSE_WIDTH
diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/MtMoon1F.asm
index 0215d821..56820161 100755
--- a/data/mapObjects/mtmoon1.asm
+++ b/data/mapObjects/MtMoon1F.asm
@@ -1,12 +1,12 @@
-MtMoon1Object:
+MtMoon1F_Object:
 	db $3 ; border block
 
 	db 5 ; warps
 	warp 14, 35, 1, -1
 	warp 15, 35, 1, -1
-	warp 5, 5, 0, MT_MOON_2
-	warp 17, 11, 2, MT_MOON_2
-	warp 25, 15, 3, MT_MOON_2
+	warp 5, 5, 0, MT_MOON_B1F
+	warp 17, 11, 2, MT_MOON_B1F
+	warp 25, 15, 3, MT_MOON_B1F
 
 	db 1 ; signs
 	sign 15, 23, 14 ; MtMoon1Text14
@@ -27,8 +27,8 @@ MtMoon1Object:
 	object SPRITE_BALL, 5, 32, STAY, NONE, 13, TM_12
 
 	; warp-to
-	warp_to 14, 35, MT_MOON_1_WIDTH
-	warp_to 15, 35, MT_MOON_1_WIDTH
-	warp_to 5, 5, MT_MOON_1_WIDTH ; MT_MOON_B1F
-	warp_to 17, 11, MT_MOON_1_WIDTH ; MT_MOON_B1F
-	warp_to 25, 15, MT_MOON_1_WIDTH ; MT_MOON_B1F
+	warp_to 14, 35, MT_MOON_1F_WIDTH
+	warp_to 15, 35, MT_MOON_1F_WIDTH
+	warp_to 5, 5, MT_MOON_1F_WIDTH ; MT_MOON_B1F
+	warp_to 17, 11, MT_MOON_1F_WIDTH ; MT_MOON_B1F
+	warp_to 25, 15, MT_MOON_1F_WIDTH ; MT_MOON_B1F
diff --git a/data/mapObjects/MtMoonB1F.asm b/data/mapObjects/MtMoonB1F.asm
new file mode 100755
index 00000000..a8365ba7
--- /dev/null
+++ b/data/mapObjects/MtMoonB1F.asm
@@ -0,0 +1,26 @@
+MtMoonB1F_Object:
+	db $3 ; border block
+
+	db 8 ; warps
+	warp 5, 5, 2, MT_MOON_1F
+	warp 17, 11, 0, MT_MOON_B2F
+	warp 25, 9, 3, MT_MOON_1F
+	warp 25, 15, 4, MT_MOON_1F
+	warp 21, 17, 1, MT_MOON_B2F
+	warp 13, 27, 2, MT_MOON_B2F
+	warp 23, 3, 3, MT_MOON_B2F
+	warp 27, 3, 2, -1
+
+	db 0 ; signs
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 5, 5, MT_MOON_B1F_WIDTH ; MT_MOON_1F
+	warp_to 17, 11, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
+	warp_to 25, 9, MT_MOON_B1F_WIDTH ; MT_MOON_1F
+	warp_to 25, 15, MT_MOON_B1F_WIDTH ; MT_MOON_1F
+	warp_to 21, 17, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
+	warp_to 13, 27, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
+	warp_to 23, 3, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
+	warp_to 27, 3, MT_MOON_B1F_WIDTH
diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/MtMoonB2F.asm
index f76a3e26..a4c9869a 100755
--- a/data/mapObjects/mtmoon3.asm
+++ b/data/mapObjects/MtMoonB2F.asm
@@ -1,11 +1,11 @@
-MtMoon3Object:
+MtMoonB2F_Object:
 	db $3 ; border block
 
 	db 4 ; warps
-	warp 25, 9, 1, MT_MOON_2
-	warp 21, 17, 4, MT_MOON_2
-	warp 15, 27, 5, MT_MOON_2
-	warp 5, 7, 6, MT_MOON_2
+	warp 25, 9, 1, MT_MOON_B1F
+	warp 21, 17, 4, MT_MOON_B1F
+	warp 15, 27, 5, MT_MOON_B1F
+	warp 5, 7, 6, MT_MOON_B1F
 
 	db 0 ; signs
 
@@ -22,7 +22,7 @@ MtMoon3Object:
 	object SPRITE_BALL, 29, 5, STAY, NONE, 10, TM_01
 
 	; warp-to
-	warp_to 25, 9, MT_MOON_3_WIDTH ; MT_MOON_2
-	warp_to 21, 17, MT_MOON_3_WIDTH ; MT_MOON_2
-	warp_to 15, 27, MT_MOON_3_WIDTH ; MT_MOON_2
-	warp_to 5, 7, MT_MOON_3_WIDTH ; MT_MOON_2
+	warp_to 25, 9, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
+	warp_to 21, 17, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
+	warp_to 15, 27, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
+	warp_to 5, 7, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/MtMoonPokecenter.asm
index 7469efa8..1027f88a 100755
--- a/data/mapObjects/mtmoonpokecenter.asm
+++ b/data/mapObjects/MtMoonPokecenter.asm
@@ -1,4 +1,4 @@
-MtMoonPokecenterObject:
+MtMoonPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/Museum1F.asm
index 3034dc74..1cfd2c68 100755
--- a/data/mapObjects/museum1f.asm
+++ b/data/mapObjects/Museum1F.asm
@@ -1,4 +1,4 @@
-Museum1FObject:
+Museum1F_Object:
 	db $a ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/Museum2F.asm
index 11fad941..80815820 100755
--- a/data/mapObjects/museum2f.asm
+++ b/data/mapObjects/Museum2F.asm
@@ -1,4 +1,4 @@
-Museum2FObject:
+Museum2F_Object:
 	db $a ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/NameRatersHouse.asm
index 10487f0b..da95bc43 100755
--- a/data/mapObjects/namerater.asm
+++ b/data/mapObjects/NameRatersHouse.asm
@@ -1,4 +1,4 @@
-NameRaterObject:
+NameRatersHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/OaksLab.asm
index 8595d81c..cf48bec9 100755
--- a/data/mapObjects/oakslab.asm
+++ b/data/mapObjects/OaksLab.asm
@@ -1,4 +1,4 @@
-OaksLabObject:
+OaksLab_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/PalletTown.asm
index ce6c80da..93807688 100755
--- a/data/mapObjects/pallettown.asm
+++ b/data/mapObjects/PalletTown.asm
@@ -1,4 +1,4 @@
-PalletTownObject:
+PalletTown_Object:
 	db $b ; border block
 
 	db 3 ; warps
diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/PewterCity.asm
index 8ad183dc..e1a3eecb 100755
--- a/data/mapObjects/pewtercity.asm
+++ b/data/mapObjects/PewterCity.asm
@@ -1,13 +1,13 @@
-PewterCityObject:
+PewterCity_Object:
 	db $a ; border block
 
 	db 7 ; warps
 	warp 14, 7, 0, MUSEUM_1F
 	warp 19, 5, 2, MUSEUM_1F
 	warp 16, 17, 0, PEWTER_GYM
-	warp 29, 13, 0, PEWTER_HOUSE_1
+	warp 29, 13, 0, PEWTER_NIDORAN_HOUSE
 	warp 23, 17, 0, PEWTER_MART
-	warp 7, 29, 0, PEWTER_HOUSE_2
+	warp 7, 29, 0, PEWTER_SPEECH_HOUSE
 	warp 13, 25, 0, PEWTER_POKECENTER
 
 	db 7 ; signs
diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/PewterGym.asm
index fc571f26..538c3923 100755
--- a/data/mapObjects/pewtergym.asm
+++ b/data/mapObjects/PewterGym.asm
@@ -1,4 +1,4 @@
-PewterGymObject:
+PewterGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/PewterMart.asm
index e79952c9..9b983316 100755
--- a/data/mapObjects/pewtermart.asm
+++ b/data/mapObjects/PewterMart.asm
@@ -1,4 +1,4 @@
-PewterMartObject:
+PewterMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/PewterNidoranHouse.asm
index 63abe6b3..f00317d1 100755
--- a/data/mapObjects/pewterhouse1.asm
+++ b/data/mapObjects/PewterNidoranHouse.asm
@@ -1,4 +1,4 @@
-PewterHouse1Object:
+PewterNidoranHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -13,5 +13,5 @@ PewterHouse1Object:
 	object SPRITE_FAT_BALD_GUY, 1, 2, STAY, NONE, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, PEWTER_HOUSE_1_WIDTH
-	warp_to 3, 7, PEWTER_HOUSE_1_WIDTH
+	warp_to 2, 7, PEWTER_NIDORAN_HOUSE_WIDTH
+	warp_to 3, 7, PEWTER_NIDORAN_HOUSE_WIDTH
diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/PewterPokecenter.asm
index 9370cc16..4d460747 100755
--- a/data/mapObjects/pewterpokecenter.asm
+++ b/data/mapObjects/PewterPokecenter.asm
@@ -1,4 +1,4 @@
-PewterPokecenterObject:
+PewterPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/PewterSpeechHouse.asm
index 48cb243d..e7134cb5 100755
--- a/data/mapObjects/pewterhouse2.asm
+++ b/data/mapObjects/PewterSpeechHouse.asm
@@ -1,4 +1,4 @@
-PewterHouse2Object:
+PewterSpeechHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -12,5 +12,5 @@ PewterHouse2Object:
 	object SPRITE_BUG_CATCHER, 4, 5, STAY, NONE, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, PEWTER_HOUSE_2_WIDTH
-	warp_to 3, 7, PEWTER_HOUSE_2_WIDTH
+	warp_to 2, 7, PEWTER_SPEECH_HOUSE_WIDTH
+	warp_to 3, 7, PEWTER_SPEECH_HOUSE_WIDTH
diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/PokemonFanClub.asm
index 9ddc6e3a..588ebdc2 100755
--- a/data/mapObjects/fanclub.asm
+++ b/data/mapObjects/PokemonFanClub.asm
@@ -1,4 +1,4 @@
-FanClubObject:
+PokemonFanClub_Object:
 	db $d ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/PokemonMansion1F.asm b/data/mapObjects/PokemonMansion1F.asm
new file mode 100755
index 00000000..109b5b8e
--- /dev/null
+++ b/data/mapObjects/PokemonMansion1F.asm
@@ -0,0 +1,29 @@
+PokemonMansion1F_Object:
+	db $2e ; border block
+
+	db 8 ; warps
+	warp 4, 27, 0, -1
+	warp 5, 27, 0, -1
+	warp 6, 27, 0, -1
+	warp 7, 27, 0, -1
+	warp 5, 10, 0, POKEMON_MANSION_2F
+	warp 21, 23, 0, POKEMON_MANSION_B1F
+	warp 26, 27, 0, -1
+	warp 27, 27, 0, -1
+
+	db 0 ; signs
+
+	db 3 ; objects
+	object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4
+	object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE
+	object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS
+
+	; warp-to
+	warp_to 4, 27, POKEMON_MANSION_1F_WIDTH
+	warp_to 5, 27, POKEMON_MANSION_1F_WIDTH
+	warp_to 6, 27, POKEMON_MANSION_1F_WIDTH
+	warp_to 7, 27, POKEMON_MANSION_1F_WIDTH
+	warp_to 5, 10, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_2F
+	warp_to 21, 23, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_B1F
+	warp_to 26, 27, POKEMON_MANSION_1F_WIDTH
+	warp_to 27, 27, POKEMON_MANSION_1F_WIDTH
diff --git a/data/mapObjects/PokemonMansion2F.asm b/data/mapObjects/PokemonMansion2F.asm
new file mode 100755
index 00000000..6c0cc5f8
--- /dev/null
+++ b/data/mapObjects/PokemonMansion2F.asm
@@ -0,0 +1,22 @@
+PokemonMansion2F_Object:
+	db $1 ; border block
+
+	db 4 ; warps
+	warp 5, 10, 4, POKEMON_MANSION_1F
+	warp 7, 10, 0, POKEMON_MANSION_3F
+	warp 25, 14, 2, POKEMON_MANSION_3F
+	warp 6, 1, 1, POKEMON_MANSION_3F
+
+	db 0 ; signs
+
+	db 4 ; objects
+	object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7
+	object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM
+	object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person
+	object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person
+
+	; warp-to
+	warp_to 5, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_1F
+	warp_to 7, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F
+	warp_to 25, 14, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F
+	warp_to 6, 1, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F
diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/PokemonMansion3F.asm
index 54fbfa75..7c8c9c22 100755
--- a/data/mapObjects/mansion3.asm
+++ b/data/mapObjects/PokemonMansion3F.asm
@@ -1,10 +1,10 @@
-Mansion3Object:
+PokemonMansion3F_Object:
 	db $1 ; border block
 
 	db 3 ; warps
-	warp 7, 10, 1, MANSION_2
-	warp 6, 1, 3, MANSION_2
-	warp 25, 14, 2, MANSION_2
+	warp 7, 10, 1, POKEMON_MANSION_2F
+	warp 6, 1, 3, POKEMON_MANSION_2F
+	warp 25, 14, 2, POKEMON_MANSION_2F
 
 	db 0 ; signs
 
@@ -16,6 +16,6 @@ Mansion3Object:
 	object SPRITE_BOOK_MAP_DEX, 6, 12, STAY, NONE, 5 ; person
 
 	; warp-to
-	warp_to 7, 10, MANSION_3_WIDTH ; POKEMON_MANSION_2F
-	warp_to 6, 1, MANSION_3_WIDTH ; POKEMON_MANSION_2F
-	warp_to 25, 14, MANSION_3_WIDTH ; POKEMON_MANSION_2F
+	warp_to 7, 10, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
+	warp_to 6, 1, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
+	warp_to 25, 14, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/PokemonMansionB1F.asm
index bcd85206..ac232799 100755
--- a/data/mapObjects/mansion4.asm
+++ b/data/mapObjects/PokemonMansionB1F.asm
@@ -1,8 +1,8 @@
-Mansion4Object:
+PokemonMansionB1F_Object:
 	db $1 ; border block
 
 	db 1 ; warps
-	warp 23, 22, 5, MANSION_1
+	warp 23, 22, 5, POKEMON_MANSION_1F
 
 	db 0 ; signs
 
@@ -17,4 +17,4 @@ Mansion4Object:
 	object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY
 
 	; warp-to
-	warp_to 23, 22, MANSION_4_WIDTH ; POKEMON_MANSION_1F
+	warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F
diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/PokemonTower1F.asm
index e29867ac..cf62836b 100755
--- a/data/mapObjects/pokemontower1.asm
+++ b/data/mapObjects/PokemonTower1F.asm
@@ -1,10 +1,10 @@
-PokemonTower1Object:
+PokemonTower1F_Object:
 	db $1 ; border block
 
 	db 3 ; warps
 	warp 10, 17, 1, -1
 	warp 11, 17, 1, -1
-	warp 18, 9, 1, POKEMONTOWER_2
+	warp 18, 9, 1, POKEMON_TOWER_2F
 
 	db 0 ; signs
 
@@ -16,6 +16,6 @@ PokemonTower1Object:
 	object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person
 
 	; warp-to
-	warp_to 10, 17, POKEMONTOWER_1_WIDTH
-	warp_to 11, 17, POKEMONTOWER_1_WIDTH
-	warp_to 18, 9, POKEMONTOWER_1_WIDTH ; POKEMON_TOWER_2F
+	warp_to 10, 17, POKEMON_TOWER_1F_WIDTH
+	warp_to 11, 17, POKEMON_TOWER_1F_WIDTH
+	warp_to 18, 9, POKEMON_TOWER_1F_WIDTH ; POKEMON_TOWER_2F
diff --git a/data/mapObjects/PokemonTower2F.asm b/data/mapObjects/PokemonTower2F.asm
new file mode 100755
index 00000000..5ce437d1
--- /dev/null
+++ b/data/mapObjects/PokemonTower2F.asm
@@ -0,0 +1,16 @@
+PokemonTower2F_Object:
+	db $1 ; border block
+
+	db 2 ; warps
+	warp 3, 9, 0, POKEMON_TOWER_3F
+	warp 18, 9, 2, POKEMON_TOWER_1F
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person
+	object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person
+
+	; warp-to
+	warp_to 3, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_3F
+	warp_to 18, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_1F
diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/PokemonTower3F.asm
index f8151f00..79b83f88 100755
--- a/data/mapObjects/pokemontower3.asm
+++ b/data/mapObjects/PokemonTower3F.asm
@@ -1,9 +1,9 @@
-PokemonTower3Object:
+PokemonTower3F_Object:
 	db $1 ; border block
 
 	db 2 ; warps
-	warp 3, 9, 0, POKEMONTOWER_2
-	warp 18, 9, 1, POKEMONTOWER_4
+	warp 3, 9, 0, POKEMON_TOWER_2F
+	warp 18, 9, 1, POKEMON_TOWER_4F
 
 	db 0 ; signs
 
@@ -14,5 +14,5 @@ PokemonTower3Object:
 	object SPRITE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE
 
 	; warp-to
-	warp_to 3, 9, POKEMONTOWER_3_WIDTH ; POKEMON_TOWER_2F
-	warp_to 18, 9, POKEMONTOWER_3_WIDTH ; POKEMON_TOWER_4F
+	warp_to 3, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_2F
+	warp_to 18, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_4F
diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/PokemonTower4F.asm
index a6723d5f..db86c02c 100755
--- a/data/mapObjects/pokemontower4.asm
+++ b/data/mapObjects/PokemonTower4F.asm
@@ -1,9 +1,9 @@
-PokemonTower4Object:
+PokemonTower4F_Object:
 	db $1 ; border block
 
 	db 2 ; warps
-	warp 3, 9, 0, POKEMONTOWER_5
-	warp 18, 9, 1, POKEMONTOWER_3
+	warp 3, 9, 0, POKEMON_TOWER_5F
+	warp 18, 9, 1, POKEMON_TOWER_3F
 
 	db 0 ; signs
 
@@ -16,5 +16,5 @@ PokemonTower4Object:
 	object SPRITE_BALL, 12, 16, STAY, NONE, 6, HP_UP
 
 	; warp-to
-	warp_to 3, 9, POKEMONTOWER_4_WIDTH ; POKEMON_TOWER_5F
-	warp_to 18, 9, POKEMONTOWER_4_WIDTH ; POKEMON_TOWER_3F
+	warp_to 3, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_5F
+	warp_to 18, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_3F
diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/PokemonTower5F.asm
index da550fe2..b482871f 100755
--- a/data/mapObjects/pokemontower5.asm
+++ b/data/mapObjects/PokemonTower5F.asm
@@ -1,9 +1,9 @@
-PokemonTower5Object:
+PokemonTower5F_Object:
 	db $1 ; border block
 
 	db 2 ; warps
-	warp 3, 9, 0, POKEMONTOWER_4
-	warp 18, 9, 0, POKEMONTOWER_6
+	warp 3, 9, 0, POKEMON_TOWER_4F
+	warp 18, 9, 0, POKEMON_TOWER_6F
 
 	db 0 ; signs
 
@@ -16,5 +16,5 @@ PokemonTower5Object:
 	object SPRITE_BALL, 6, 14, STAY, NONE, 6, NUGGET
 
 	; warp-to
-	warp_to 3, 9, POKEMONTOWER_5_WIDTH ; POKEMON_TOWER_4F
-	warp_to 18, 9, POKEMONTOWER_5_WIDTH ; POKEMON_TOWER_6F
+	warp_to 3, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_4F
+	warp_to 18, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_6F
diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/PokemonTower6F.asm
index 1d2ecdd3..823fe78a 100755
--- a/data/mapObjects/pokemontower6.asm
+++ b/data/mapObjects/PokemonTower6F.asm
@@ -1,9 +1,9 @@
-PokemonTower6Object:
+PokemonTower6F_Object:
 	db $1 ; border block
 
 	db 2 ; warps
-	warp 18, 9, 1, POKEMONTOWER_5
-	warp 9, 16, 0, POKEMONTOWER_7
+	warp 18, 9, 1, POKEMON_TOWER_5F
+	warp 9, 16, 0, POKEMON_TOWER_7F
 
 	db 0 ; signs
 
@@ -15,5 +15,5 @@ PokemonTower6Object:
 	object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY
 
 	; warp-to
-	warp_to 18, 9, POKEMONTOWER_6_WIDTH ; POKEMON_TOWER_5F
-	warp_to 9, 16, POKEMONTOWER_6_WIDTH ; POKEMON_TOWER_7F
+	warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F
+	warp_to 9, 16, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_7F
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/PokemonTower7F.asm
index 67adcd69..ccd4f23c 100755
--- a/data/mapObjects/pokemontower7.asm
+++ b/data/mapObjects/PokemonTower7F.asm
@@ -1,8 +1,8 @@
-PokemonTower7Object:
+PokemonTower7F_Object:
 	db $1 ; border block
 
 	db 1 ; warps
-	warp 9, 16, 1, POKEMONTOWER_6
+	warp 9, 16, 1, POKEMON_TOWER_6F
 
 	db 0 ; signs
 
@@ -12,4 +12,4 @@ PokemonTower7Object:
 	object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 3
 
 	; warp-to
-	warp_to 9, 16, POKEMONTOWER_7_WIDTH ; POKEMONTOWER_6
+	warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F
diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/PowerPlant.asm
index 402f899f..a8548b1c 100755
--- a/data/mapObjects/powerplant.asm
+++ b/data/mapObjects/PowerPlant.asm
@@ -1,4 +1,4 @@
-PowerPlantObject:
+PowerPlant_Object:
 	db $2e ; border block
 
 	db 3 ; warps
diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/RedsHouse1F.asm
index c70ee1f6..a54b5411 100755
--- a/data/mapObjects/redshouse1f.asm
+++ b/data/mapObjects/RedsHouse1F.asm
@@ -1,5 +1,5 @@
-RedsHouse1FObject:
-	db $0A ; border block
+RedsHouse1F_Object:
+	db $a ; border block
 
 	db 3 ; warps
 	warp 2, 7, 0, -1 ; exit1
diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/RedsHouse2F.asm
index ec13e99c..98e9c236 100755
--- a/data/mapObjects/redshouse2f.asm
+++ b/data/mapObjects/RedsHouse2F.asm
@@ -1,5 +1,5 @@
-RedsHouse2FObject:
-	db $0A ; border block
+RedsHouse2F_Object:
+	db $a ; border block
 
 	db 1 ; warps
 	warp 7, 1, 2, REDS_HOUSE_1F
diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/RockTunnel1F.asm
index 310c4792..1cf5a12f 100755
--- a/data/mapObjects/rocktunnel1.asm
+++ b/data/mapObjects/RockTunnel1F.asm
@@ -1,4 +1,4 @@
-RockTunnel1Object:
+RockTunnel1F_Object:
 	db $3 ; border block
 
 	db 8 ; warps
@@ -6,10 +6,10 @@ RockTunnel1Object:
 	warp 15, 0, 1, -1
 	warp 15, 33, 2, -1
 	warp 15, 35, 2, -1
-	warp 37, 3, 0, ROCK_TUNNEL_2
-	warp 5, 3, 1, ROCK_TUNNEL_2
-	warp 17, 11, 2, ROCK_TUNNEL_2
-	warp 37, 17, 3, ROCK_TUNNEL_2
+	warp 37, 3, 0, ROCK_TUNNEL_B1F
+	warp 5, 3, 1, ROCK_TUNNEL_B1F
+	warp 17, 11, 2, ROCK_TUNNEL_B1F
+	warp 37, 17, 3, ROCK_TUNNEL_B1F
 
 	db 1 ; signs
 	sign 11, 29, 8 ; RockTunnel1Text8
@@ -24,11 +24,11 @@ RockTunnel1Object:
 	object SPRITE_LASS, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19
 
 	; warp-to
-	warp_to 15, 3, ROCK_TUNNEL_1_WIDTH
-	warp_to 15, 0, ROCK_TUNNEL_1_WIDTH
-	warp_to 15, 33, ROCK_TUNNEL_1_WIDTH
-	warp_to 15, 35, ROCK_TUNNEL_1_WIDTH
-	warp_to 37, 3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_B1F
-	warp_to 5, 3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_B1F
-	warp_to 17, 11, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_B1F
-	warp_to 37, 17, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_B1F
+	warp_to 15, 3, ROCK_TUNNEL_1F_WIDTH
+	warp_to 15, 0, ROCK_TUNNEL_1F_WIDTH
+	warp_to 15, 33, ROCK_TUNNEL_1F_WIDTH
+	warp_to 15, 35, ROCK_TUNNEL_1F_WIDTH
+	warp_to 37, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
+	warp_to 5, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
+	warp_to 17, 11, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
+	warp_to 37, 17, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/RockTunnelB1F.asm
index 1a3201a4..f562168e 100755
--- a/data/mapObjects/rocktunnel2.asm
+++ b/data/mapObjects/RockTunnelB1F.asm
@@ -1,11 +1,11 @@
-RockTunnel2Object:
+RockTunnelB1F_Object:
 	db $3 ; border block
 
 	db 4 ; warps
-	warp 33, 25, 4, ROCK_TUNNEL_1
-	warp 27, 3, 5, ROCK_TUNNEL_1
-	warp 23, 11, 6, ROCK_TUNNEL_1
-	warp 3, 3, 7, ROCK_TUNNEL_1
+	warp 33, 25, 4, ROCK_TUNNEL_1F
+	warp 27, 3, 5, ROCK_TUNNEL_1F
+	warp 23, 11, 6, ROCK_TUNNEL_1F
+	warp 3, 3, 7, ROCK_TUNNEL_1F
 
 	db 0 ; signs
 
@@ -20,7 +20,7 @@ RockTunnel2Object:
 	object SPRITE_BLACK_HAIR_BOY_2, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5
 
 	; warp-to
-	warp_to 33, 25, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1F
-	warp_to 27, 3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1F
-	warp_to 23, 11, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1F
-	warp_to 3, 3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1F
+	warp_to 33, 25, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
+	warp_to 27, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
+	warp_to 23, 11, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
+	warp_to 3, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/RockTunnelPokecenter.asm
index f2d429b7..dfd08017 100755
--- a/data/mapObjects/rocktunnelpokecenter.asm
+++ b/data/mapObjects/RockTunnelPokecenter.asm
@@ -1,4 +1,4 @@
-RockTunnelPokecenterObject:
+RockTunnelPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/RocketHideoutB1F.asm
index 14bed205..99537510 100755
--- a/data/mapObjects/rockethideout1.asm
+++ b/data/mapObjects/RocketHideoutB1F.asm
@@ -1,11 +1,11 @@
-RocketHideout1Object:
+RocketHideoutB1F_Object:
 	db $2e ; border block
 
 	db 5 ; warps
-	warp 23, 2, 0, ROCKET_HIDEOUT_2
+	warp 23, 2, 0, ROCKET_HIDEOUT_B2F
 	warp 21, 2, 2, GAME_CORNER
 	warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR
-	warp 21, 24, 3, ROCKET_HIDEOUT_2
+	warp 21, 24, 3, ROCKET_HIDEOUT_B2F
 	warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR
 
 	db 0 ; signs
@@ -20,8 +20,8 @@ RocketHideout1Object:
 	object SPRITE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION
 
 	; warp-to
-	warp_to 23, 2, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_B2F
-	warp_to 21, 2, ROCKET_HIDEOUT_1_WIDTH ; GAME_CORNER
-	warp_to 24, 19, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
-	warp_to 21, 24, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_B2F
-	warp_to 25, 19, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to 23, 2, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F
+	warp_to 21, 2, ROCKET_HIDEOUT_B1F_WIDTH ; GAME_CORNER
+	warp_to 24, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to 21, 24, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F
+	warp_to 25, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
diff --git a/data/mapObjects/RocketHideoutB2F.asm b/data/mapObjects/RocketHideoutB2F.asm
new file mode 100755
index 00000000..36fe9289
--- /dev/null
+++ b/data/mapObjects/RocketHideoutB2F.asm
@@ -0,0 +1,25 @@
+RocketHideoutB2F_Object:
+	db $2e ; border block
+
+	db 5 ; warps
+	warp 27, 8, 0, ROCKET_HIDEOUT_B1F
+	warp 21, 8, 0, ROCKET_HIDEOUT_B3F
+	warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR
+	warp 21, 22, 3, ROCKET_HIDEOUT_B1F
+	warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR
+
+	db 0 ; signs
+
+	db 5 ; objects
+	object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13
+	object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE
+	object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET
+	object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_07
+	object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION
+
+	; warp-to
+	warp_to 27, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F
+	warp_to 21, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B3F
+	warp_to 24, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to 21, 22, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F
+	warp_to 25, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/RocketHideoutB3F.asm
index 690724b0..6169dbed 100755
--- a/data/mapObjects/rockethideout3.asm
+++ b/data/mapObjects/RocketHideoutB3F.asm
@@ -1,9 +1,9 @@
-RocketHideout3Object:
+RocketHideoutB3F_Object:
 	db $2e ; border block
 
 	db 2 ; warps
-	warp 25, 6, 1, ROCKET_HIDEOUT_2
-	warp 19, 18, 0, ROCKET_HIDEOUT_4
+	warp 25, 6, 1, ROCKET_HIDEOUT_B2F
+	warp 19, 18, 0, ROCKET_HIDEOUT_B4F
 
 	db 0 ; signs
 
@@ -14,5 +14,5 @@ RocketHideout3Object:
 	object SPRITE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY
 
 	; warp-to
-	warp_to 25, 6, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_B2F
-	warp_to 19, 18, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_B4F
+	warp_to 25, 6, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B2F
+	warp_to 19, 18, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B4F
diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/RocketHideoutB4F.asm
index 60998c61..ba746951 100755
--- a/data/mapObjects/rockethideout4.asm
+++ b/data/mapObjects/RocketHideoutB4F.asm
@@ -1,8 +1,8 @@
-RocketHideout4Object:
+RocketHideoutB4F_Object:
 	db $2e ; border block
 
 	db 3 ; warps
-	warp 19, 10, 1, ROCKET_HIDEOUT_3
+	warp 19, 10, 1, ROCKET_HIDEOUT_B3F
 	warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR
 	warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR
 
@@ -20,6 +20,6 @@ RocketHideout4Object:
 	object SPRITE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY
 
 	; warp-to
-	warp_to 19, 10, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_3
-	warp_to 24, 15, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
-	warp_to 25, 15, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to 19, 10, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_B3F
+	warp_to 24, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to 25, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
diff --git a/data/mapObjects/rockethideoutelevator.asm b/data/mapObjects/RocketHideoutElevator.asm
index 3c17e7e4..bc4fd7ff 100755
--- a/data/mapObjects/rockethideoutelevator.asm
+++ b/data/mapObjects/RocketHideoutElevator.asm
@@ -1,9 +1,9 @@
-RocketHideoutElevatorObject:
+RocketHideoutElevator_Object:
 	db $f ; border block
 
 	db 2 ; warps
-	warp 2, 1, 2, ROCKET_HIDEOUT_1
-	warp 3, 1, 4, ROCKET_HIDEOUT_1
+	warp 2, 1, 2, ROCKET_HIDEOUT_B1F
+	warp 3, 1, 4, ROCKET_HIDEOUT_B1F
 
 	db 1 ; signs
 	sign 1, 1, 1 ; RocketHideoutElevatorText1
diff --git a/data/mapObjects/route1.asm b/data/mapObjects/Route1.asm
index 26505ea6..0815fe67 100755
--- a/data/mapObjects/route1.asm
+++ b/data/mapObjects/Route1.asm
@@ -1,4 +1,4 @@
-Route1Object:
+Route1_Object:
 	db $b ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/route10.asm b/data/mapObjects/Route10.asm
index 40d5c93a..12850577 100755
--- a/data/mapObjects/route10.asm
+++ b/data/mapObjects/Route10.asm
@@ -1,10 +1,10 @@
-Route10Object:
+Route10_Object:
 	db $2c ; border block
 
 	db 4 ; warps
 	warp 11, 19, 0, ROCK_TUNNEL_POKECENTER
-	warp 8, 17, 0, ROCK_TUNNEL_1
-	warp 8, 53, 2, ROCK_TUNNEL_1
+	warp 8, 17, 0, ROCK_TUNNEL_1F
+	warp 8, 53, 2, ROCK_TUNNEL_1F
 	warp 6, 39, 0, POWER_PLANT
 
 	db 4 ; signs
diff --git a/data/mapObjects/route11.asm b/data/mapObjects/Route11.asm
index f2bbb01b..a72bf347 100755
--- a/data/mapObjects/route11.asm
+++ b/data/mapObjects/Route11.asm
@@ -1,4 +1,4 @@
-Route11Object:
+Route11_Object:
 	db $f ; border block
 
 	db 5 ; warps
@@ -6,7 +6,7 @@ Route11Object:
 	warp 49, 9, 0, ROUTE_11_GATE_1F
 	warp 58, 8, 2, ROUTE_11_GATE_1F
 	warp 58, 9, 2, ROUTE_11_GATE_1F
-	warp 4, 5, 0, DIGLETTS_CAVE_ENTRANCE
+	warp 4, 5, 0, DIGLETTS_CAVE_ROUTE_11
 
 	db 1 ; signs
 	sign 1, 5, 11 ; Route11Text11
diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/Route11Gate1F.asm
index fa627963..5c4a120c 100755
--- a/data/mapObjects/route11gate.asm
+++ b/data/mapObjects/Route11Gate1F.asm
@@ -1,4 +1,4 @@
-Route11GateObject:
+Route11Gate1F_Object:
 	db $a ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/Route11Gate2F.asm
index e112c685..bf305bba 100755
--- a/data/mapObjects/route11gateupstairs.asm
+++ b/data/mapObjects/Route11Gate2F.asm
@@ -1,4 +1,4 @@
-Route11GateUpstairsObject:
+Route11Gate2F_Object:
 	db $a ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/route12.asm b/data/mapObjects/Route12.asm
index 394bae3d..8043b5db 100755
--- a/data/mapObjects/route12.asm
+++ b/data/mapObjects/Route12.asm
@@ -1,11 +1,11 @@
-Route12Object:
+Route12_Object:
 	db $43 ; border block
 
 	db 4 ; warps
 	warp 10, 15, 0, ROUTE_12_GATE_1F
 	warp 11, 15, 0, ROUTE_12_GATE_1F
 	warp 10, 21, 2, ROUTE_12_GATE_1F
-	warp 11, 77, 0, ROUTE_12_HOUSE
+	warp 11, 77, 0, ROUTE_12_SUPER_ROD_HOUSE
 
 	db 2 ; signs
 	sign 13, 13, 11 ; Route12Text11
diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/Route12Gate1F.asm
index bbfab54c..94f6b91a 100755
--- a/data/mapObjects/route12gate.asm
+++ b/data/mapObjects/Route12Gate1F.asm
@@ -1,4 +1,4 @@
-Route12GateObject:
+Route12Gate1F_Object:
 	db $a ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/Route12Gate2F.asm
index 9351ebac..cc6c1c19 100755
--- a/data/mapObjects/route12gateupstairs.asm
+++ b/data/mapObjects/Route12Gate2F.asm
@@ -1,4 +1,4 @@
-Route12GateUpstairsObject:
+Route12Gate2F_Object:
 	db $a ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/Route12SuperRodHouse.asm
index 3161ebe6..458378a2 100755
--- a/data/mapObjects/route12house.asm
+++ b/data/mapObjects/Route12SuperRodHouse.asm
@@ -1,4 +1,4 @@
-Route12HouseObject:
+Route12SuperRodHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -11,5 +11,5 @@ Route12HouseObject:
 	object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, ROUTE_12_HOUSE_WIDTH
-	warp_to 3, 7, ROUTE_12_HOUSE_WIDTH
+	warp_to 2, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH
+	warp_to 3, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH
diff --git a/data/mapObjects/route13.asm b/data/mapObjects/Route13.asm
index b2a40c2c..3f460901 100755
--- a/data/mapObjects/route13.asm
+++ b/data/mapObjects/Route13.asm
@@ -1,4 +1,4 @@
-Route13Object:
+Route13_Object:
 	db $43 ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/route14.asm b/data/mapObjects/Route14.asm
index 9694715b..565e587f 100755
--- a/data/mapObjects/route14.asm
+++ b/data/mapObjects/Route14.asm
@@ -1,4 +1,4 @@
-Route14Object:
+Route14_Object:
 	db $43 ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/route15.asm b/data/mapObjects/Route15.asm
index 244e4f41..10cd8090 100755
--- a/data/mapObjects/route15.asm
+++ b/data/mapObjects/Route15.asm
@@ -1,4 +1,4 @@
-Route15Object:
+Route15_Object:
 	db $43 ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/Route15Gate1F.asm
index 13c39674..23b1f5a7 100755
--- a/data/mapObjects/route15gate.asm
+++ b/data/mapObjects/Route15Gate1F.asm
@@ -1,4 +1,4 @@
-Route15GateObject:
+Route15Gate1F_Object:
 	db $a ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/Route15Gate2F.asm
index ff180883..162f2b1f 100755
--- a/data/mapObjects/route15gateupstairs.asm
+++ b/data/mapObjects/Route15Gate2F.asm
@@ -1,4 +1,4 @@
-Route15GateUpstairsObject:
+Route15Gate2F_Object:
 	db $a ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/route16.asm b/data/mapObjects/Route16.asm
index 0b84caa7..93531d13 100755
--- a/data/mapObjects/route16.asm
+++ b/data/mapObjects/Route16.asm
@@ -1,4 +1,4 @@
-Route16Object:
+Route16_Object:
 	db $f ; border block
 
 	db 9 ; warps
@@ -10,7 +10,7 @@ Route16Object:
 	warp 17, 5, 4, ROUTE_16_GATE_1F
 	warp 24, 4, 6, ROUTE_16_GATE_1F
 	warp 24, 5, 6, ROUTE_16_GATE_1F
-	warp 7, 5, 0, ROUTE_16_HOUSE
+	warp 7, 5, 0, ROUTE_16_FLY_HOUSE
 
 	db 2 ; signs
 	sign 27, 11, 8 ; Route16Text8
diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/Route16FlyHouse.asm
index 7a097105..ec493fef 100755
--- a/data/mapObjects/route16house.asm
+++ b/data/mapObjects/Route16FlyHouse.asm
@@ -1,4 +1,4 @@
-Route16HouseObject:
+Route16FlyHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -12,5 +12,5 @@ Route16HouseObject:
 	object SPRITE_BIRD, 6, 4, WALK, 0, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, ROUTE_16_HOUSE_WIDTH
-	warp_to 3, 7, ROUTE_16_HOUSE_WIDTH
+	warp_to 2, 7, ROUTE_16_FLY_HOUSE_WIDTH
+	warp_to 3, 7, ROUTE_16_FLY_HOUSE_WIDTH
diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/Route16Gate1F.asm
index 4e1863ed..1d5baa1d 100755
--- a/data/mapObjects/route16gate.asm
+++ b/data/mapObjects/Route16Gate1F.asm
@@ -1,4 +1,4 @@
-Route16GateObject:
+Route16Gate1F_Object:
 	db $a ; border block
 
 	db 9 ; warps
diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/Route16Gate2F.asm
index 41487e6e..5914f854 100755
--- a/data/mapObjects/route16gateupstairs.asm
+++ b/data/mapObjects/Route16Gate2F.asm
@@ -1,4 +1,4 @@
-Route16GateUpstairsObject:
+Route16Gate2F_Object:
 	db $a ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/route17.asm b/data/mapObjects/Route17.asm
index 48750597..f5bc4307 100755
--- a/data/mapObjects/route17.asm
+++ b/data/mapObjects/Route17.asm
@@ -1,4 +1,4 @@
-Route17Object:
+Route17_Object:
 	db $43 ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/route18.asm b/data/mapObjects/Route18.asm
index 9c12faf6..dc6cc6b6 100755
--- a/data/mapObjects/route18.asm
+++ b/data/mapObjects/Route18.asm
@@ -1,4 +1,4 @@
-Route18Object:
+Route18_Object:
 	db $43 ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/Route18Gate1F.asm
index c73d7131..83cb386a 100755
--- a/data/mapObjects/route18gate.asm
+++ b/data/mapObjects/Route18Gate1F.asm
@@ -1,4 +1,4 @@
-Route18GateObject:
+Route18Gate1F_Object:
 	db $a ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/Route18Gate2F.asm
index 4110089e..1981a7f0 100755
--- a/data/mapObjects/route18gateupstairs.asm
+++ b/data/mapObjects/Route18Gate2F.asm
@@ -1,4 +1,4 @@
-Route18GateUpstairsObject:
+Route18Gate2F_Object:
 	db $a ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/route19.asm b/data/mapObjects/Route19.asm
index fafcd20f..d1b3034b 100755
--- a/data/mapObjects/route19.asm
+++ b/data/mapObjects/Route19.asm
@@ -1,4 +1,4 @@
-Route19Object:
+Route19_Object:
 	db $43 ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/route2.asm b/data/mapObjects/Route2.asm
index b9f7ae19..9595fec0 100755
--- a/data/mapObjects/route2.asm
+++ b/data/mapObjects/Route2.asm
@@ -1,13 +1,13 @@
-Route2Object:
+Route2_Object:
 	db $f ; border block
 
 	db 7 ; warps
-	warp 12, 9, 0, DIGLETTS_CAVE_EXIT
-	warp 3, 11, 1, VIRIDIAN_FOREST_EXIT
-	warp 15, 19, 0, ROUTE_2_HOUSE
+	warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2
+	warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE
+	warp 15, 19, 0, ROUTE_2_TRADE_HOUSE
 	warp 16, 35, 1, ROUTE_2_GATE
 	warp 15, 39, 2, ROUTE_2_GATE
-	warp 3, 43, 2, VIRIDIAN_FOREST_ENTRANCE
+	warp 3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE
 	warp 17, 35, 1, ROUTE_2_GATE
 
 	db 2 ; signs
@@ -30,7 +30,7 @@ Route2Object:
 	; unused
 	warp_to 2, 7, 4
 	dw      $c712
-	db             $9, $7
+	db      $9, $7
 	warp_to 2, 7, 4
 	warp_to 2, 7, 4
 	warp_to 2, 7, 4
diff --git a/data/mapObjects/route20.asm b/data/mapObjects/Route20.asm
index bfd87d8f..7bceef97 100755
--- a/data/mapObjects/route20.asm
+++ b/data/mapObjects/Route20.asm
@@ -1,9 +1,9 @@
-Route20Object:
+Route20_Object:
 	db $43 ; border block
 
 	db 2 ; warps
-	warp 48, 5, 0, SEAFOAM_ISLANDS_1
-	warp 58, 9, 2, SEAFOAM_ISLANDS_1
+	warp 48, 5, 0, SEAFOAM_ISLANDS_1F
+	warp 58, 9, 2, SEAFOAM_ISLANDS_1F
 
 	db 2 ; signs
 	sign 51, 7, 11 ; Route20Text11
diff --git a/data/mapObjects/route21.asm b/data/mapObjects/Route21.asm
index bb2409ce..b7759b59 100755
--- a/data/mapObjects/route21.asm
+++ b/data/mapObjects/Route21.asm
@@ -1,4 +1,4 @@
-Route21Object:
+Route21_Object:
 	db $43 ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/route22.asm b/data/mapObjects/Route22.asm
index e91eb792..56e759fd 100755
--- a/data/mapObjects/route22.asm
+++ b/data/mapObjects/Route22.asm
@@ -1,4 +1,4 @@
-Route22Object:
+Route22_Object:
 	db $2c ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/Route22Gate.asm
index bd7764da..e59ca6cf 100755
--- a/data/mapObjects/route22gate.asm
+++ b/data/mapObjects/Route22Gate.asm
@@ -1,4 +1,4 @@
-Route22GateObject:
+Route22Gate_Object:
 	db $a ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route23.asm b/data/mapObjects/Route23.asm
index eafb0def..b510c285 100755
--- a/data/mapObjects/route23.asm
+++ b/data/mapObjects/Route23.asm
@@ -1,11 +1,11 @@
-Route23Object:
+Route23_Object:
 	db $f ; border block
 
 	db 4 ; warps
 	warp 7, 139, 2, ROUTE_22_GATE
 	warp 8, 139, 3, ROUTE_22_GATE
-	warp 4, 31, 0, VICTORY_ROAD_1
-	warp 14, 31, 1, VICTORY_ROAD_2
+	warp 4, 31, 0, VICTORY_ROAD_1F
+	warp 14, 31, 1, VICTORY_ROAD_2F
 
 	db 1 ; signs
 	sign 3, 33, 8 ; Route23Text8
diff --git a/data/mapObjects/route24.asm b/data/mapObjects/Route24.asm
index e4e44f18..5f41c519 100755
--- a/data/mapObjects/route24.asm
+++ b/data/mapObjects/Route24.asm
@@ -1,4 +1,4 @@
-Route24Object:
+Route24_Object:
 	db $2c ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/route25.asm b/data/mapObjects/Route25.asm
index 3ba5fbdb..a85f85ca 100755
--- a/data/mapObjects/route25.asm
+++ b/data/mapObjects/Route25.asm
@@ -1,4 +1,4 @@
-Route25Object:
+Route25_Object:
 	db $2c ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/Route2Gate.asm
index 714b8ee6..a7feb780 100755
--- a/data/mapObjects/route2gate.asm
+++ b/data/mapObjects/Route2Gate.asm
@@ -1,4 +1,4 @@
-Route2GateObject:
+Route2Gate_Object:
 	db $a ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/Route2TradeHouse.asm
index 1f655e15..29948d6b 100755
--- a/data/mapObjects/route2house.asm
+++ b/data/mapObjects/Route2TradeHouse.asm
@@ -1,4 +1,4 @@
-Route2HouseObject:
+Route2TradeHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -12,5 +12,5 @@ Route2HouseObject:
 	object SPRITE_GAMEBOY_KID, 4, 1, STAY, DOWN, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, ROUTE_2_HOUSE_WIDTH
-	warp_to 3, 7, ROUTE_2_HOUSE_WIDTH
+	warp_to 2, 7, ROUTE_2_TRADE_HOUSE_WIDTH
+	warp_to 3, 7, ROUTE_2_TRADE_HOUSE_WIDTH
diff --git a/data/mapObjects/route3.asm b/data/mapObjects/Route3.asm
index 422fa29b..372ea6cf 100755
--- a/data/mapObjects/route3.asm
+++ b/data/mapObjects/Route3.asm
@@ -1,4 +1,4 @@
-Route3Object:
+Route3_Object:
 	db $2c ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/route4.asm b/data/mapObjects/Route4.asm
index 2cb56c59..4ab88f8f 100755
--- a/data/mapObjects/route4.asm
+++ b/data/mapObjects/Route4.asm
@@ -1,10 +1,10 @@
-Route4Object:
+Route4_Object:
 	db $2c ; border block
 
 	db 3 ; warps
 	warp 11, 5, 0, MT_MOON_POKECENTER
-	warp 18, 5, 0, MT_MOON_1
-	warp 24, 5, 7, MT_MOON_2
+	warp 18, 5, 0, MT_MOON_1F
+	warp 24, 5, 7, MT_MOON_B1F
 
 	db 3 ; signs
 	sign 12, 5, 4 ; PokeCenterSignText
diff --git a/data/mapObjects/route5.asm b/data/mapObjects/Route5.asm
index 08d6d9f9..fd74edf6 100755
--- a/data/mapObjects/route5.asm
+++ b/data/mapObjects/Route5.asm
@@ -1,12 +1,12 @@
-Route5Object:
+Route5_Object:
 	db $a ; border block
 
-	db $5 ; warps
+	db 5 ; warps
 	warp 10, 29, 2, ROUTE_5_GATE
 	warp 9, 29, 2, ROUTE_5_GATE
 	warp 10, 33, 0, ROUTE_5_GATE
-	warp 17, 27, 0, PATH_ENTRANCE_ROUTE_5
-	warp 10, 21, 0, DAYCAREM
+	warp 17, 27, 0, UNDERGROUND_PATH_ROUTE_5
+	warp 10, 21, 0, DAYCARE
 
 	db 1 ; signs
 	sign 17, 29, 1 ; Route5Text1
diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/Route5Gate.asm
index 8b230942..e0e06a1d 100755
--- a/data/mapObjects/route5gate.asm
+++ b/data/mapObjects/Route5Gate.asm
@@ -1,4 +1,4 @@
-Route5GateObject:
+Route5Gate_Object:
 	db $a ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route6.asm b/data/mapObjects/Route6.asm
index a024d777..13825be1 100755
--- a/data/mapObjects/route6.asm
+++ b/data/mapObjects/Route6.asm
@@ -1,11 +1,11 @@
-Route6Object:
+Route6_Object:
 	db $f ; border block
 
 	db 4 ; warps
 	warp 9, 1, 2, ROUTE_6_GATE
 	warp 10, 1, 2, ROUTE_6_GATE
 	warp 10, 7, 0, ROUTE_6_GATE
-	warp 17, 13, 0, PATH_ENTRANCE_ROUTE_6
+	warp 17, 13, 0, UNDERGROUND_PATH_ROUTE_6
 
 	db 1 ; signs
 	sign 19, 15, 7 ; Route6Text7
diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/Route6Gate.asm
index e3b7b2b8..8ed96d04 100755
--- a/data/mapObjects/route6gate.asm
+++ b/data/mapObjects/Route6Gate.asm
@@ -1,4 +1,4 @@
-Route6GateObject:
+Route6Gate_Object:
 	db $a ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route7.asm b/data/mapObjects/Route7.asm
index 2207bfd4..3da2fd4b 100755
--- a/data/mapObjects/route7.asm
+++ b/data/mapObjects/Route7.asm
@@ -1,4 +1,4 @@
-Route7Object:
+Route7_Object:
 	db $f ; border block
 
 	db 5 ; warps
@@ -6,7 +6,7 @@ Route7Object:
 	warp 18, 10, 2, ROUTE_7_GATE
 	warp 11, 9, 0, ROUTE_7_GATE
 	warp 11, 10, 0, ROUTE_7_GATE
-	warp 5, 13, 0, PATH_ENTRANCE_ROUTE_7
+	warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7
 
 	db 1 ; signs
 	sign 3, 13, 1 ; Route7Text1
diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/Route7Gate.asm
index 5b894657..c9dc8dca 100755
--- a/data/mapObjects/route7gate.asm
+++ b/data/mapObjects/Route7Gate.asm
@@ -1,4 +1,4 @@
-Route7GateObject:
+Route7Gate_Object:
 	db $a ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route8.asm b/data/mapObjects/Route8.asm
index 5d2b73cb..2fc0045c 100755
--- a/data/mapObjects/route8.asm
+++ b/data/mapObjects/Route8.asm
@@ -1,4 +1,4 @@
-Route8Object:
+Route8_Object:
 	db $2c ; border block
 
 	db 5 ; warps
@@ -6,7 +6,7 @@ Route8Object:
 	warp 1, 10, 0, ROUTE_8_GATE
 	warp 8, 9, 2, ROUTE_8_GATE
 	warp 8, 10, 2, ROUTE_8_GATE
-	warp 13, 3, 0, PATH_ENTRANCE_ROUTE_8
+	warp 13, 3, 0, UNDERGROUND_PATH_ROUTE_8
 
 	db 1 ; signs
 	sign 17, 3, 10 ; Route8Text10
diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/Route8Gate.asm
index 23fa54d6..008a0fcb 100755
--- a/data/mapObjects/route8gate.asm
+++ b/data/mapObjects/Route8Gate.asm
@@ -1,4 +1,4 @@
-Route8GateObject:
+Route8Gate_Object:
 	db $a ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route9.asm b/data/mapObjects/Route9.asm
index 9013ce54..c531cf7a 100755
--- a/data/mapObjects/route9.asm
+++ b/data/mapObjects/Route9.asm
@@ -1,4 +1,4 @@
-Route9Object:
+Route9_Object:
 	db $2c ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/SSAnne1F.asm b/data/mapObjects/SSAnne1F.asm
new file mode 100755
index 00000000..3e454f06
--- /dev/null
+++ b/data/mapObjects/SSAnne1F.asm
@@ -0,0 +1,34 @@
+SSAnne1F_Object:
+	db $c ; border block
+
+	db 11 ; warps
+	warp 26, 0, 1, VERMILION_DOCK
+	warp 27, 0, 1, VERMILION_DOCK
+	warp 31, 8, 0, SS_ANNE_1F_ROOMS
+	warp 23, 8, 1, SS_ANNE_1F_ROOMS
+	warp 19, 8, 2, SS_ANNE_1F_ROOMS
+	warp 15, 8, 3, SS_ANNE_1F_ROOMS
+	warp 11, 8, 4, SS_ANNE_1F_ROOMS
+	warp 7, 8, 5, SS_ANNE_1F_ROOMS
+	warp 2, 6, 6, SS_ANNE_2F
+	warp 37, 15, 5, SS_ANNE_B1F
+	warp 3, 16, 0, SS_ANNE_KITCHEN
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person
+	object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person
+
+	; warp-to
+	warp_to 26, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK
+	warp_to 27, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK
+	warp_to 31, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+	warp_to 23, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+	warp_to 19, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+	warp_to 15, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+	warp_to 11, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+	warp_to 7, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+	warp_to 2, 6, SS_ANNE_1F_WIDTH ; SS_ANNE_2F
+	warp_to 37, 15, SS_ANNE_1F_WIDTH ; SS_ANNE_B1F
+	warp_to 3, 16, SS_ANNE_1F_WIDTH ; SS_ANNE_KITCHEN
diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/SSAnne1FRooms.asm
index b5ad60fd..fcd36532 100755
--- a/data/mapObjects/ssanne8.asm
+++ b/data/mapObjects/SSAnne1FRooms.asm
@@ -1,13 +1,13 @@
-SSAnne8Object:
+SSAnne1FRooms_Object:
 	db $c ; border block
 
 	db 6 ; warps
-	warp 0, 0, 2, SS_ANNE_1
-	warp 10, 0, 3, SS_ANNE_1
-	warp 20, 0, 4, SS_ANNE_1
-	warp 0, 10, 5, SS_ANNE_1
-	warp 10, 10, 6, SS_ANNE_1
-	warp 20, 10, 7, SS_ANNE_1
+	warp 0, 0, 2, SS_ANNE_1F
+	warp 10, 0, 3, SS_ANNE_1F
+	warp 20, 0, 4, SS_ANNE_1F
+	warp 0, 10, 5, SS_ANNE_1F
+	warp 10, 10, 6, SS_ANNE_1F
+	warp 20, 10, 7, SS_ANNE_1F
 
 	db 0 ; signs
 
@@ -25,9 +25,9 @@ SSAnne8Object:
 	object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person
 
 	; warp-to
-	warp_to 0, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1
-	warp_to 10, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1
-	warp_to 20, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1
-	warp_to 0, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1
-	warp_to 10, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1
-	warp_to 20, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1
+	warp_to 0, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
+	warp_to 10, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
+	warp_to 20, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
+	warp_to 0, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
+	warp_to 10, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
+	warp_to 20, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
diff --git a/data/mapObjects/SSAnne2F.asm b/data/mapObjects/SSAnne2F.asm
new file mode 100755
index 00000000..6abd5ac4
--- /dev/null
+++ b/data/mapObjects/SSAnne2F.asm
@@ -0,0 +1,30 @@
+SSAnne2F_Object:
+	db $c ; border block
+
+	db 9 ; warps
+	warp 9, 11, 0, SS_ANNE_2F_ROOMS
+	warp 13, 11, 2, SS_ANNE_2F_ROOMS
+	warp 17, 11, 4, SS_ANNE_2F_ROOMS
+	warp 21, 11, 6, SS_ANNE_2F_ROOMS
+	warp 25, 11, 8, SS_ANNE_2F_ROOMS
+	warp 29, 11, 10, SS_ANNE_2F_ROOMS
+	warp 2, 4, 8, SS_ANNE_1F
+	warp 2, 12, 1, SS_ANNE_3F
+	warp 36, 4, 0, SS_ANNE_CAPTAINS_ROOM
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person
+	object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1
+
+	; warp-to
+	warp_to 9, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+	warp_to 13, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+	warp_to 17, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+	warp_to 21, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+	warp_to 25, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+	warp_to 29, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+	warp_to 2, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_1F
+	warp_to 2, 12, SS_ANNE_2F_WIDTH ; SS_ANNE_3F
+	warp_to 36, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_CAPTAINS_ROOM
diff --git a/data/mapObjects/SSAnne2FRooms.asm b/data/mapObjects/SSAnne2FRooms.asm
new file mode 100755
index 00000000..ebb053a8
--- /dev/null
+++ b/data/mapObjects/SSAnne2FRooms.asm
@@ -0,0 +1,47 @@
+SSAnne2FRooms_Object:
+	db $c ; border block
+
+	db 12 ; warps
+	warp 2, 5, 0, SS_ANNE_2F
+	warp 3, 5, 0, SS_ANNE_2F
+	warp 12, 5, 1, SS_ANNE_2F
+	warp 13, 5, 1, SS_ANNE_2F
+	warp 22, 5, 2, SS_ANNE_2F
+	warp 23, 5, 2, SS_ANNE_2F
+	warp 2, 15, 3, SS_ANNE_2F
+	warp 3, 15, 3, SS_ANNE_2F
+	warp 12, 15, 4, SS_ANNE_2F
+	warp 13, 15, 4, SS_ANNE_2F
+	warp 22, 15, 5, SS_ANNE_2F
+	warp 23, 15, 5, SS_ANNE_2F
+
+	db 0 ; signs
+
+	db 13 ; objects
+	object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3
+	object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1
+	object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5
+	object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12
+	object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person
+	object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER
+	object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person
+	object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person
+	object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY
+	object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person
+	object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person
+	object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person
+	object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person
+
+	; warp-to
+	warp_to 2, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 3, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 12, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 13, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 22, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 23, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 2, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 3, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 12, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 13, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 22, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 23, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
diff --git a/data/mapObjects/SSAnne3F.asm b/data/mapObjects/SSAnne3F.asm
new file mode 100755
index 00000000..f0bfc17b
--- /dev/null
+++ b/data/mapObjects/SSAnne3F.asm
@@ -0,0 +1,15 @@
+SSAnne3F_Object:
+	db $c ; border block
+
+	db 2 ; warps
+	warp 0, 3, 0, SS_ANNE_BOW
+	warp 19, 3, 7, SS_ANNE_2F
+
+	db 0 ; signs
+
+	db 1 ; objects
+	object SPRITE_SAILOR, 9, 3, WALK, 2, 1 ; person
+
+	; warp-to
+	warp_to 0, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_BOW
+	warp_to 19, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_2F
diff --git a/data/mapObjects/SSAnneB1F.asm b/data/mapObjects/SSAnneB1F.asm
new file mode 100755
index 00000000..fe54ea24
--- /dev/null
+++ b/data/mapObjects/SSAnneB1F.asm
@@ -0,0 +1,22 @@
+SSAnneB1F_Object:
+	db $c ; border block
+
+	db 6 ; warps
+	warp 23, 3, 8, SS_ANNE_B1F_ROOMS
+	warp 19, 3, 6, SS_ANNE_B1F_ROOMS
+	warp 15, 3, 4, SS_ANNE_B1F_ROOMS
+	warp 11, 3, 2, SS_ANNE_B1F_ROOMS
+	warp 7, 3, 0, SS_ANNE_B1F_ROOMS
+	warp 27, 5, 9, SS_ANNE_1F
+
+	db 0 ; signs
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 23, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
+	warp_to 19, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
+	warp_to 15, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
+	warp_to 11, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
+	warp_to 7, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
+	warp_to 27, 5, SS_ANNE_B1F_WIDTH ; SS_ANNE_1F
diff --git a/data/mapObjects/SSAnneB1FRooms.asm b/data/mapObjects/SSAnneB1FRooms.asm
new file mode 100755
index 00000000..1d31b89c
--- /dev/null
+++ b/data/mapObjects/SSAnneB1FRooms.asm
@@ -0,0 +1,41 @@
+SSAnneB1FRooms_Object:
+	db $c ; border block
+
+	db 10 ; warps
+	warp 2, 5, 4, SS_ANNE_B1F
+	warp 3, 5, 4, SS_ANNE_B1F
+	warp 12, 5, 3, SS_ANNE_B1F
+	warp 13, 5, 3, SS_ANNE_B1F
+	warp 22, 5, 2, SS_ANNE_B1F
+	warp 23, 5, 2, SS_ANNE_B1F
+	warp 2, 15, 1, SS_ANNE_B1F
+	warp 3, 15, 1, SS_ANNE_B1F
+	warp 12, 15, 0, SS_ANNE_B1F
+	warp 13, 15, 0, SS_ANNE_B1F
+
+	db 0 ; signs
+
+	db 11 ; objects
+	object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3
+	object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4
+	object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5
+	object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6
+	object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7
+	object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2
+	object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person
+	object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person
+	object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER
+	object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_44
+	object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION
+
+	; warp-to
+	warp_to 2, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 3, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 12, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 13, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 22, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 23, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 2, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 3, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 12, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 13, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/SSAnneBow.asm
index 106557be..8873c8f8 100755
--- a/data/mapObjects/ssanne5.asm
+++ b/data/mapObjects/SSAnneBow.asm
@@ -1,9 +1,9 @@
-SSAnne5Object:
+SSAnneBow_Object:
 	db $23 ; border block
 
 	db 2 ; warps
-	warp 13, 6, 0, SS_ANNE_3
-	warp 13, 7, 0, SS_ANNE_3
+	warp 13, 6, 0, SS_ANNE_3F
+	warp 13, 7, 0, SS_ANNE_3F
 
 	db 0 ; signs
 
@@ -15,5 +15,5 @@ SSAnne5Object:
 	object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2
 
 	; warp-to
-	warp_to 13, 6, SS_ANNE_5_WIDTH ; SS_ANNE_3
-	warp_to 13, 7, SS_ANNE_5_WIDTH ; SS_ANNE_3
+	warp_to 13, 6, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F
+	warp_to 13, 7, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F
diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/SSAnneCaptainsRoom.asm
index 7657170e..545656cc 100755
--- a/data/mapObjects/ssanne7.asm
+++ b/data/mapObjects/SSAnneCaptainsRoom.asm
@@ -1,8 +1,8 @@
-SSAnne7Object:
+SSAnneCaptainsRoom_Object:
 	db $c ; border block
 
 	db 1 ; warps
-	warp 0, 7, 8, SS_ANNE_2
+	warp 0, 7, 8, SS_ANNE_2F
 
 	db 2 ; signs
 	sign 4, 1, 2 ; SSAnne7Text2
@@ -12,4 +12,4 @@ SSAnne7Object:
 	object SPRITE_SS_CAPTAIN, 4, 2, STAY, UP, 1 ; person
 
 	; warp-to
-	warp_to 0, 7, SS_ANNE_7_WIDTH ; SS_ANNE_2
+	warp_to 0, 7, SS_ANNE_CAPTAINS_ROOM_WIDTH ; SS_ANNE_2F
diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/SSAnneKitchen.asm
index a25fe9b3..b5771e68 100755
--- a/data/mapObjects/ssanne6.asm
+++ b/data/mapObjects/SSAnneKitchen.asm
@@ -1,8 +1,8 @@
-SSAnne6Object:
+SSAnneKitchen_Object:
 	db $c ; border block
 
 	db 1 ; warps
-	warp 6, 0, 10, SS_ANNE_1
+	warp 6, 0, 10, SS_ANNE_1F
 
 	db 0 ; signs
 
@@ -16,4 +16,4 @@ SSAnne6Object:
 	object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person
 
 	; warp-to
-	warp_to 6, 0, SS_ANNE_6_WIDTH ; SS_ANNE_1
+	warp_to 6, 0, SS_ANNE_KITCHEN_WIDTH ; SS_ANNE_1F
diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/SafariZoneCenter.asm
index 9e0d5751..e54cec74 100755
--- a/data/mapObjects/safarizonecenter.asm
+++ b/data/mapObjects/SafariZoneCenter.asm
@@ -1,16 +1,16 @@
-SafariZoneCenterObject:
+SafariZoneCenter_Object:
 	db $0 ; border block
 
 	db 9 ; warps
-	warp 14, 25, 2, SAFARI_ZONE_ENTRANCE
-	warp 15, 25, 3, SAFARI_ZONE_ENTRANCE
+	warp 14, 25, 2, SAFARI_ZONE_GATE
+	warp 15, 25, 3, SAFARI_ZONE_GATE
 	warp 0, 10, 4, SAFARI_ZONE_WEST
 	warp 0, 11, 5, SAFARI_ZONE_WEST
 	warp 14, 0, 4, SAFARI_ZONE_NORTH
 	warp 15, 0, 5, SAFARI_ZONE_NORTH
 	warp 29, 10, 2, SAFARI_ZONE_EAST
 	warp 29, 11, 3, SAFARI_ZONE_EAST
-	warp 17, 19, 0, SAFARI_ZONE_REST_HOUSE_1
+	warp 17, 19, 0, SAFARI_ZONE_CENTER_REST_HOUSE
 
 	db 2 ; signs
 	sign 18, 20, 2 ; SafariZoneCenterText2
diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/SafariZoneCenterRestHouse.asm
index 031debec..9eda9970 100755
--- a/data/mapObjects/safarizoneresthouse1.asm
+++ b/data/mapObjects/SafariZoneCenterRestHouse.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse1Object:
+SafariZoneCenterRestHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -12,5 +12,5 @@ SafariZoneRestHouse1Object:
 	object SPRITE_OAK_AIDE, 1, 4, WALK, 1, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER
-	warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER
+	warp_to 2, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER
+	warp_to 3, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER
diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/SafariZoneEast.asm
index 4426159d..df612ea9 100755
--- a/data/mapObjects/safarizoneeast.asm
+++ b/data/mapObjects/SafariZoneEast.asm
@@ -1,4 +1,4 @@
-SafariZoneEastObject:
+SafariZoneEast_Object:
 	db $0 ; border block
 
 	db 5 ; warps
@@ -6,7 +6,7 @@ SafariZoneEastObject:
 	warp 0, 5, 7, SAFARI_ZONE_NORTH
 	warp 0, 22, 6, SAFARI_ZONE_CENTER
 	warp 0, 23, 6, SAFARI_ZONE_CENTER
-	warp 25, 9, 0, SAFARI_ZONE_REST_HOUSE_3
+	warp 25, 9, 0, SAFARI_ZONE_EAST_REST_HOUSE
 
 	db 3 ; signs
 	sign 26, 10, 5 ; SafariZoneEastText5
diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/SafariZoneEastRestHouse.asm
index 00623953..e7c68343 100755
--- a/data/mapObjects/safarizoneresthouse3.asm
+++ b/data/mapObjects/SafariZoneEastRestHouse.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse3Object:
+SafariZoneEastRestHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -13,5 +13,5 @@ SafariZoneRestHouse3Object:
 	object SPRITE_LAPRAS_GIVER, 5, 2, STAY, NONE, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST
-	warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST
+	warp_to 2, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST
+	warp_to 3, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST
diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/SafariZoneGate.asm
index 5a3379c7..6749b45b 100755
--- a/data/mapObjects/safarizoneentrance.asm
+++ b/data/mapObjects/SafariZoneGate.asm
@@ -1,4 +1,4 @@
-SafariZoneEntranceObject:
+SafariZoneGate_Object:
 	db $a ; border block
 
 	db 4 ; warps
@@ -14,7 +14,7 @@ SafariZoneEntranceObject:
 	object SPRITE_WHITE_PLAYER, 1, 4, STAY, RIGHT, 2 ; person
 
 	; warp-to
-	warp_to 3, 5, SAFARI_ZONE_ENTRANCE_WIDTH
-	warp_to 4, 5, SAFARI_ZONE_ENTRANCE_WIDTH
-	warp_to 3, 0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER
-	warp_to 4, 0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER
+	warp_to 3, 5, SAFARI_ZONE_GATE_WIDTH
+	warp_to 4, 5, SAFARI_ZONE_GATE_WIDTH
+	warp_to 3, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER
+	warp_to 4, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER
diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/SafariZoneNorth.asm
index b768a077..9eda7b4b 100755
--- a/data/mapObjects/safarizonenorth.asm
+++ b/data/mapObjects/SafariZoneNorth.asm
@@ -1,4 +1,4 @@
-SafariZoneNorthObject:
+SafariZoneNorth_Object:
 	db $0 ; border block
 
 	db 9 ; warps
@@ -10,7 +10,7 @@ SafariZoneNorthObject:
 	warp 21, 35, 5, SAFARI_ZONE_CENTER
 	warp 39, 30, 0, SAFARI_ZONE_EAST
 	warp 39, 31, 1, SAFARI_ZONE_EAST
-	warp 35, 3, 0, SAFARI_ZONE_REST_HOUSE_4
+	warp 35, 3, 0, SAFARI_ZONE_NORTH_REST_HOUSE
 
 	db 5 ; signs
 	sign 36, 4, 3 ; SafariZoneNorthText3
diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/SafariZoneNorthRestHouse.asm
index d3b81b4e..34b3ab4f 100755
--- a/data/mapObjects/safarizoneresthouse4.asm
+++ b/data/mapObjects/SafariZoneNorthRestHouse.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse4Object:
+SafariZoneNorthRestHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -13,5 +13,5 @@ SafariZoneRestHouse4Object:
 	object SPRITE_GENTLEMAN, 1, 5, WALK, 1, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH
-	warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH
+	warp_to 2, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH
+	warp_to 3, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH
diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/SafariZoneSecretHouse.asm
index 4faa90c6..2a5fc22d 100755
--- a/data/mapObjects/safarizonesecrethouse.asm
+++ b/data/mapObjects/SafariZoneSecretHouse.asm
@@ -1,4 +1,4 @@
-SafariZoneSecretHouseObject:
+SafariZoneSecretHouse_Object:
 	db $17 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/SafariZoneWest.asm
index 3b3acd50..7faced72 100755
--- a/data/mapObjects/safarizonewest.asm
+++ b/data/mapObjects/SafariZoneWest.asm
@@ -1,4 +1,4 @@
-SafariZoneWestObject:
+SafariZoneWest_Object:
 	db $0 ; border block
 
 	db 8 ; warps
@@ -9,7 +9,7 @@ SafariZoneWestObject:
 	warp 29, 22, 2, SAFARI_ZONE_CENTER
 	warp 29, 23, 3, SAFARI_ZONE_CENTER
 	warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE
-	warp 11, 11, 0, SAFARI_ZONE_REST_HOUSE_2
+	warp 11, 11, 0, SAFARI_ZONE_WEST_REST_HOUSE
 
 	db 4 ; signs
 	sign 12, 12, 5 ; SafariZoneWestText5
diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/SafariZoneWestRestHouse.asm
index 7e589731..9f1bc0ed 100755
--- a/data/mapObjects/safarizoneresthouse2.asm
+++ b/data/mapObjects/SafariZoneWestRestHouse.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse2Object:
+SafariZoneWestRestHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -13,5 +13,5 @@ SafariZoneRestHouse2Object:
 	object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST
-	warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST
+	warp_to 2, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST
+	warp_to 3, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST
diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/SaffronCity.asm
index 6ff8ea93..fd8ed6b1 100755
--- a/data/mapObjects/saffroncity.asm
+++ b/data/mapObjects/SaffronCity.asm
@@ -1,15 +1,15 @@
-SaffronCityObject:
+SaffronCity_Object:
 	db $f ; border block
 
 	db 8 ; warps
 	warp 7, 5, 0, COPYCATS_HOUSE_1F
 	warp 26, 3, 0, FIGHTING_DOJO
 	warp 34, 3, 0, SAFFRON_GYM
-	warp 13, 11, 0, SAFFRON_HOUSE_1
+	warp 13, 11, 0, SAFFRON_PIDGEY_HOUSE
 	warp 25, 11, 0, SAFFRON_MART
 	warp 18, 21, 0, SILPH_CO_1F
 	warp 9, 29, 0, SAFFRON_POKECENTER
-	warp 29, 29, 0, SAFFRON_HOUSE_2
+	warp 29, 29, 0, MR_PSYCHICS_HOUSE
 
 	db 10 ; signs
 	sign 17, 5, 16 ; SaffronCityText16
diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/SaffronGym.asm
index 43065f22..4cb80bcd 100755
--- a/data/mapObjects/saffrongym.asm
+++ b/data/mapObjects/SaffronGym.asm
@@ -1,4 +1,4 @@
-SaffronGymObject:
+SaffronGym_Object:
 	db $2e ; border block
 
 	db 32 ; warps
diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/SaffronMart.asm
index 6293b901..c376f2de 100755
--- a/data/mapObjects/saffronmart.asm
+++ b/data/mapObjects/SaffronMart.asm
@@ -1,4 +1,4 @@
-SaffronMartObject:
+SaffronMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/SaffronPidgeyHouse.asm
index c6abb539..65a851bf 100755
--- a/data/mapObjects/saffronhouse1.asm
+++ b/data/mapObjects/SaffronPidgeyHouse.asm
@@ -1,4 +1,4 @@
-SaffronHouse1Object:
+SaffronPidgeyHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -14,5 +14,5 @@ SaffronHouse1Object:
 	object SPRITE_PAPER_SHEET, 3, 3, STAY, NONE, 4 ; person
 
 	; warp-to
-	warp_to 2, 7, SAFFRON_HOUSE_1_WIDTH
-	warp_to 3, 7, SAFFRON_HOUSE_1_WIDTH
+	warp_to 2, 7, SAFFRON_PIDGEY_HOUSE_WIDTH
+	warp_to 3, 7, SAFFRON_PIDGEY_HOUSE_WIDTH
diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/SaffronPokecenter.asm
index 19e939a6..db28f048 100755
--- a/data/mapObjects/saffronpokecenter.asm
+++ b/data/mapObjects/SaffronPokecenter.asm
@@ -1,4 +1,4 @@
-SaffronPokecenterObject:
+SaffronPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/SeafoamIslands1F.asm b/data/mapObjects/SeafoamIslands1F.asm
new file mode 100755
index 00000000..67b3f0e5
--- /dev/null
+++ b/data/mapObjects/SeafoamIslands1F.asm
@@ -0,0 +1,26 @@
+SeafoamIslands1F_Object:
+	db $7d ; border block
+
+	db 7 ; warps
+	warp 4, 17, 0, -1
+	warp 5, 17, 0, -1
+	warp 26, 17, 1, -1
+	warp 27, 17, 1, -1
+	warp 7, 5, 1, SEAFOAM_ISLANDS_B1F
+	warp 25, 3, 6, SEAFOAM_ISLANDS_B1F
+	warp 23, 15, 4, SEAFOAM_ISLANDS_B1F
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
+	object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+
+	; warp-to
+	warp_to 4, 17, SEAFOAM_ISLANDS_1F_WIDTH
+	warp_to 5, 17, SEAFOAM_ISLANDS_1F_WIDTH
+	warp_to 26, 17, SEAFOAM_ISLANDS_1F_WIDTH
+	warp_to 27, 17, SEAFOAM_ISLANDS_1F_WIDTH
+	warp_to 7, 5, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F
+	warp_to 25, 3, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F
+	warp_to 23, 15, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F
diff --git a/data/mapObjects/SeafoamIslandsB1F.asm b/data/mapObjects/SeafoamIslandsB1F.asm
new file mode 100755
index 00000000..426ca0c3
--- /dev/null
+++ b/data/mapObjects/SeafoamIslandsB1F.asm
@@ -0,0 +1,26 @@
+SeafoamIslandsB1F_Object:
+	db $7d ; border block
+
+	db 7 ; warps
+	warp 4, 2, 0, SEAFOAM_ISLANDS_B2F
+	warp 7, 5, 4, SEAFOAM_ISLANDS_1F
+	warp 13, 7, 2, SEAFOAM_ISLANDS_B2F
+	warp 19, 15, 3, SEAFOAM_ISLANDS_B2F
+	warp 23, 15, 6, SEAFOAM_ISLANDS_1F
+	warp 25, 11, 5, SEAFOAM_ISLANDS_B2F
+	warp 25, 3, 5, SEAFOAM_ISLANDS_1F
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
+	object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+
+	; warp-to
+	warp_to 4, 2, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
+	warp_to 7, 5, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F
+	warp_to 13, 7, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
+	warp_to 19, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
+	warp_to 23, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F
+	warp_to 25, 11, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
+	warp_to 25, 3, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F
diff --git a/data/mapObjects/SeafoamIslandsB2F.asm b/data/mapObjects/SeafoamIslandsB2F.asm
new file mode 100755
index 00000000..9c1a7898
--- /dev/null
+++ b/data/mapObjects/SeafoamIslandsB2F.asm
@@ -0,0 +1,26 @@
+SeafoamIslandsB2F_Object:
+	db $7d ; border block
+
+	db 7 ; warps
+	warp 5, 3, 0, SEAFOAM_ISLANDS_B1F
+	warp 5, 13, 0, SEAFOAM_ISLANDS_B3F
+	warp 13, 7, 2, SEAFOAM_ISLANDS_B1F
+	warp 19, 15, 3, SEAFOAM_ISLANDS_B1F
+	warp 25, 3, 3, SEAFOAM_ISLANDS_B3F
+	warp 25, 11, 5, SEAFOAM_ISLANDS_B1F
+	warp 25, 14, 4, SEAFOAM_ISLANDS_B3F
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_BOULDER, 18, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
+	object SPRITE_BOULDER, 23, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+
+	; warp-to
+	warp_to 5, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
+	warp_to 5, 13, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F
+	warp_to 13, 7, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
+	warp_to 19, 15, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
+	warp_to 25, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F
+	warp_to 25, 11, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
+	warp_to 25, 14, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F
diff --git a/data/mapObjects/SeafoamIslandsB3F.asm b/data/mapObjects/SeafoamIslandsB3F.asm
new file mode 100755
index 00000000..d194e1cd
--- /dev/null
+++ b/data/mapObjects/SeafoamIslandsB3F.asm
@@ -0,0 +1,30 @@
+SeafoamIslandsB3F_Object:
+	db $7d ; border block
+
+	db 7 ; warps
+	warp 5, 12, 1, SEAFOAM_ISLANDS_B2F
+	warp 8, 6, 2, SEAFOAM_ISLANDS_B4F
+	warp 25, 4, 3, SEAFOAM_ISLANDS_B4F
+	warp 25, 3, 4, SEAFOAM_ISLANDS_B2F
+	warp 25, 14, 6, SEAFOAM_ISLANDS_B2F
+	warp 20, 17, 0, SEAFOAM_ISLANDS_B4F
+	warp 21, 17, 1, SEAFOAM_ISLANDS_B4F
+
+	db 0 ; signs
+
+	db 6 ; objects
+	object SPRITE_BOULDER, 5, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
+	object SPRITE_BOULDER, 3, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+	object SPRITE_BOULDER, 8, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
+	object SPRITE_BOULDER, 9, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person
+	object SPRITE_BOULDER, 18, 6, STAY, NONE, 5 ; person
+	object SPRITE_BOULDER, 19, 6, STAY, NONE, 6 ; person
+
+	; warp-to
+	warp_to 5, 12, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F
+	warp_to 8, 6, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
+	warp_to 25, 4, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
+	warp_to 25, 3, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F
+	warp_to 25, 14, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F
+	warp_to 20, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
+	warp_to 21, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
diff --git a/data/mapObjects/SeafoamIslandsB4F.asm b/data/mapObjects/SeafoamIslandsB4F.asm
new file mode 100755
index 00000000..62d88b0c
--- /dev/null
+++ b/data/mapObjects/SeafoamIslandsB4F.asm
@@ -0,0 +1,23 @@
+SeafoamIslandsB4F_Object:
+	db $7d ; border block
+
+	db 4 ; warps
+	warp 20, 17, 5, SEAFOAM_ISLANDS_B3F
+	warp 21, 17, 6, SEAFOAM_ISLANDS_B3F
+	warp 11, 7, 1, SEAFOAM_ISLANDS_B3F
+	warp 25, 4, 2, SEAFOAM_ISLANDS_B3F
+
+	db 2 ; signs
+	sign 9, 15, 4 ; SeafoamIslands5Text4
+	sign 23, 1, 5 ; SeafoamIslands5Text5
+
+	db 3 ; objects
+	object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person
+	object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person
+	object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50
+
+	; warp-to
+	warp_to 20, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
+	warp_to 21, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
+	warp_to 11, 7, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
+	warp_to 25, 4, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/SilphCo10F.asm
index 90fa2acd..1c8948d3 100755
--- a/data/mapObjects/silphco10.asm
+++ b/data/mapObjects/SilphCo10F.asm
@@ -1,4 +1,4 @@
-SilphCo10Object:
+SilphCo10F_Object:
 	db $2e ; border block
 
 	db 6 ; warps
diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/SilphCo11F.asm
index e3cdd1a7..ec6331b2 100755
--- a/data/mapObjects/silphco11.asm
+++ b/data/mapObjects/SilphCo11F.asm
@@ -1,4 +1,4 @@
-SilphCo11Object:
+SilphCo11F_Object:
 	db $d ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/SilphCo1F.asm
index 0f98247b..fc040091 100755
--- a/data/mapObjects/silphco1.asm
+++ b/data/mapObjects/SilphCo1F.asm
@@ -1,4 +1,4 @@
-SilphCo1Object:
+SilphCo1F_Object:
 	db $2e ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/SilphCo2F.asm
index 4b7f34f6..bc30d78d 100755
--- a/data/mapObjects/silphco2.asm
+++ b/data/mapObjects/SilphCo2F.asm
@@ -1,4 +1,4 @@
-SilphCo2Object:
+SilphCo2F_Object:
 	db $2e ; border block
 
 	db 7 ; warps
diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/SilphCo3F.asm
index 86b3b215..f45cdf81 100755
--- a/data/mapObjects/silphco3.asm
+++ b/data/mapObjects/SilphCo3F.asm
@@ -1,4 +1,4 @@
-SilphCo3Object:
+SilphCo3F_Object:
 	db $2e ; border block
 
 	db 10 ; warps
diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/SilphCo4F.asm
index 73082342..3d865bbc 100755
--- a/data/mapObjects/silphco4.asm
+++ b/data/mapObjects/SilphCo4F.asm
@@ -1,4 +1,4 @@
-SilphCo4Object:
+SilphCo4F_Object:
 	db $2e ; border block
 
 	db 7 ; warps
diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/SilphCo5F.asm
index 5a7d59fc..c10f17c8 100755
--- a/data/mapObjects/silphco5.asm
+++ b/data/mapObjects/SilphCo5F.asm
@@ -1,4 +1,4 @@
-SilphCo5Object:
+SilphCo5F_Object:
 	db $2e ; border block
 
 	db 7 ; warps
diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/SilphCo6F.asm
index c936970d..ad2ac32f 100755
--- a/data/mapObjects/silphco6.asm
+++ b/data/mapObjects/SilphCo6F.asm
@@ -1,4 +1,4 @@
-SilphCo6Object:
+SilphCo6F_Object:
 	db $2e ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/SilphCo7F.asm
index 96dc64a5..255f4b33 100755
--- a/data/mapObjects/silphco7.asm
+++ b/data/mapObjects/SilphCo7F.asm
@@ -1,4 +1,4 @@
-SilphCo7Object:
+SilphCo7F_Object:
 	db $2e ; border block
 
 	db 6 ; warps
diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/SilphCo8F.asm
index 513e84ea..d05c7844 100755
--- a/data/mapObjects/silphco8.asm
+++ b/data/mapObjects/SilphCo8F.asm
@@ -1,4 +1,4 @@
-SilphCo8Object:
+SilphCo8F_Object:
 	db $2e ; border block
 
 	db 7 ; warps
diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/SilphCo9F.asm
index 377d7ca0..28ef5f10 100755
--- a/data/mapObjects/silphco9.asm
+++ b/data/mapObjects/SilphCo9F.asm
@@ -1,4 +1,4 @@
-SilphCo9Object:
+SilphCo9F_Object:
 	db $2e ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/silphcoelevator.asm b/data/mapObjects/SilphCoElevator.asm
index 205fc046..9c4b5a79 100755
--- a/data/mapObjects/silphcoelevator.asm
+++ b/data/mapObjects/SilphCoElevator.asm
@@ -1,4 +1,4 @@
-SilphCoElevatorObject:
+SilphCoElevator_Object:
 	db $f ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/TradeCenter.asm
index 63c3e04a..e6df8087 100644
--- a/data/mapObjects/tradecenter.asm
+++ b/data/mapObjects/TradeCenter.asm
@@ -1,4 +1,4 @@
-TradeCenterObject:
+TradeCenter_Object:
 	db $e ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/UndergroundPathNorthSouth.asm b/data/mapObjects/UndergroundPathNorthSouth.asm
new file mode 100755
index 00000000..35e21cca
--- /dev/null
+++ b/data/mapObjects/UndergroundPathNorthSouth.asm
@@ -0,0 +1,14 @@
+UndergroundPathNorthSouth_Object:
+	db $1 ; border block
+
+	db 2 ; warps
+	warp 5, 4, 2, UNDERGROUND_PATH_ROUTE_5
+	warp 2, 41, 2, UNDERGROUND_PATH_ROUTE_6
+
+	db 0 ; signs
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 5, 4, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_5
+	warp_to 2, 41, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_6
diff --git a/data/mapObjects/UndergroundPathRoute5.asm b/data/mapObjects/UndergroundPathRoute5.asm
new file mode 100755
index 00000000..af71ebb4
--- /dev/null
+++ b/data/mapObjects/UndergroundPathRoute5.asm
@@ -0,0 +1,17 @@
+UndergroundPathRoute5_Object:
+	db $a ; border block
+
+	db 3 ; warps
+	warp 3, 7, 3, -1
+	warp 4, 7, 3, -1
+	warp 4, 4, 0, UNDERGROUND_PATH_NORTH_SOUTH
+
+	db 0 ; signs
+
+	db 1 ; objects
+	object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person
+
+	; warp-to
+	warp_to 3, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH
+	warp_to 4, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH
+	warp_to 4, 4, UNDERGROUND_PATH_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH
diff --git a/data/mapObjects/UndergroundPathRoute6.asm b/data/mapObjects/UndergroundPathRoute6.asm
new file mode 100755
index 00000000..5a40ade2
--- /dev/null
+++ b/data/mapObjects/UndergroundPathRoute6.asm
@@ -0,0 +1,17 @@
+UndergroundPathRoute6_Object:
+	db $a ; border block
+
+	db 3 ; warps
+	warp 3, 7, 3, -1
+	warp 4, 7, 3, -1
+	warp 4, 4, 1, UNDERGROUND_PATH_NORTH_SOUTH
+
+	db 0 ; signs
+
+	db 1 ; objects
+	object SPRITE_GIRL, 2, 3, STAY, NONE, 1 ; person
+
+	; warp-to
+	warp_to 3, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH
+	warp_to 4, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH
+	warp_to 4, 4, UNDERGROUND_PATH_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH
diff --git a/data/mapObjects/UndergroundPathRoute7.asm b/data/mapObjects/UndergroundPathRoute7.asm
new file mode 100755
index 00000000..4666e0c9
--- /dev/null
+++ b/data/mapObjects/UndergroundPathRoute7.asm
@@ -0,0 +1,17 @@
+UndergroundPathRoute7_Object:
+	db $a ; border block
+
+	db 3 ; warps
+	warp 3, 7, 4, -1
+	warp 4, 7, 4, -1
+	warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST
+
+	db 0 ; signs
+
+	db 1 ; objects
+	object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 1 ; person
+
+	; warp-to
+	warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH
+	warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH
+	warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WEST_EAST
diff --git a/data/mapObjects/UndergroundPathRoute7Copy.asm b/data/mapObjects/UndergroundPathRoute7Copy.asm
new file mode 100755
index 00000000..c020646e
--- /dev/null
+++ b/data/mapObjects/UndergroundPathRoute7Copy.asm
@@ -0,0 +1,18 @@
+UndergroundPathRoute7Copy_Object:
+	db $a ; border block
+
+	db 3 ; warps
+	warp 3, 7, 5, -1
+	warp 4, 7, 5, -1
+	warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person
+	object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 2 ; person
+
+	; warp-to
+	warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH
+	warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH
+	warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WEST_EAST
diff --git a/data/mapObjects/UndergroundPathRoute8.asm b/data/mapObjects/UndergroundPathRoute8.asm
new file mode 100755
index 00000000..8be0d474
--- /dev/null
+++ b/data/mapObjects/UndergroundPathRoute8.asm
@@ -0,0 +1,17 @@
+UndergroundPathRoute8_Object:
+	db $a ; border block
+
+	db 3 ; warps
+	warp 3, 7, 4, -1
+	warp 4, 7, 4, -1
+	warp 4, 4, 1, UNDERGROUND_PATH_WEST_EAST
+
+	db 0 ; signs
+
+	db 1 ; objects
+	object SPRITE_GIRL, 3, 4, STAY, NONE, 1 ; person
+
+	; warp-to
+	warp_to 3, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH
+	warp_to 4, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH
+	warp_to 4, 4, UNDERGROUND_PATH_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WEST_EAST
diff --git a/data/mapObjects/UndergroundPathWestEast.asm b/data/mapObjects/UndergroundPathWestEast.asm
new file mode 100755
index 00000000..fa064aca
--- /dev/null
+++ b/data/mapObjects/UndergroundPathWestEast.asm
@@ -0,0 +1,14 @@
+UndergroundPathWestEast_Object:
+	db $1 ; border block
+
+	db 2 ; warps
+	warp 2, 5, 2, UNDERGROUND_PATH_ROUTE_7
+	warp 47, 2, 2, UNDERGROUND_PATH_ROUTE_8
+
+	db 0 ; signs
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 2, 5, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_7
+	warp_to 47, 2, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_8
diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/VermilionCity.asm
index f4e5f1ce..646f126a 100755
--- a/data/mapObjects/vermilioncity.asm
+++ b/data/mapObjects/VermilionCity.asm
@@ -1,4 +1,4 @@
-VermilionCityObject:
+VermilionCity_Object:
 	db $43 ; border block
 
 	db 9 ; warps
@@ -6,11 +6,11 @@ VermilionCityObject:
 	warp 9, 13, 0, POKEMON_FAN_CLUB
 	warp 23, 13, 0, VERMILION_MART
 	warp 12, 19, 0, VERMILION_GYM
-	warp 23, 19, 0, VERMILION_HOUSE_1
+	warp 23, 19, 0, VERMILION_PIDGEY_HOUSE
 	warp 18, 31, 0, VERMILION_DOCK
 	warp 19, 31, 0, VERMILION_DOCK
-	warp 15, 13, 0, VERMILION_HOUSE_3
-	warp 7, 3, 0, VERMILION_HOUSE_2
+	warp 15, 13, 0, VERMILION_TRADE_HOUSE
+	warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE
 
 	db 7 ; signs
 	sign 27, 3, 8 ; VermilionCityText7
diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/VermilionDock.asm
index 289689b5..6f07554a 100755
--- a/data/mapObjects/vermiliondock.asm
+++ b/data/mapObjects/VermilionDock.asm
@@ -1,9 +1,9 @@
-VermilionDockObject:
+VermilionDock_Object:
 	db $f ; border block
 
 	db 2 ; warps
 	warp 14, 0, 5, -1
-	warp 14, 2, 1, SS_ANNE_1
+	warp 14, 2, 1, SS_ANNE_1F
 
 	db 0 ; signs
 
@@ -11,4 +11,4 @@ VermilionDockObject:
 
 	; warp-to
 	warp_to 14, 0, VERMILION_DOCK_WIDTH
-	warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1
+	warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1F
diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/VermilionGym.asm
index 843454c0..4ace83be 100755
--- a/data/mapObjects/vermiliongym.asm
+++ b/data/mapObjects/VermilionGym.asm
@@ -1,4 +1,4 @@
-VermilionGymObject:
+VermilionGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/VermilionMart.asm
index f5b15c7d..74bcf35f 100755
--- a/data/mapObjects/vermilionmart.asm
+++ b/data/mapObjects/VermilionMart.asm
@@ -1,4 +1,4 @@
-VermilionMartObject:
+VermilionMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/VermilionOldRodHouse.asm
index e612b06a..f5b4b96a 100755
--- a/data/mapObjects/vermilionhouse2.asm
+++ b/data/mapObjects/VermilionOldRodHouse.asm
@@ -1,4 +1,4 @@
-VermilionHouse2Object:
+VermilionOldRodHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -11,5 +11,5 @@ VermilionHouse2Object:
 	object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, VERMILION_HOUSE_2_WIDTH
-	warp_to 3, 7, VERMILION_HOUSE_2_WIDTH
+	warp_to 2, 7, VERMILION_OLD_ROD_HOUSE_WIDTH
+	warp_to 3, 7, VERMILION_OLD_ROD_HOUSE_WIDTH
diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/VermilionPidgeyHouse.asm
index bbb7491b..0e820f86 100755
--- a/data/mapObjects/vermilionhouse1.asm
+++ b/data/mapObjects/VermilionPidgeyHouse.asm
@@ -1,4 +1,4 @@
-VermilionHouse1Object:
+VermilionPidgeyHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -13,5 +13,5 @@ VermilionHouse1Object:
 	object SPRITE_PAPER_SHEET, 4, 3, STAY, NONE, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, VERMILION_HOUSE_1_WIDTH
-	warp_to 3, 7, VERMILION_HOUSE_1_WIDTH
+	warp_to 2, 7, VERMILION_PIDGEY_HOUSE_WIDTH
+	warp_to 3, 7, VERMILION_PIDGEY_HOUSE_WIDTH
diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/VermilionPokecenter.asm
index b18a34c1..a99bdf28 100755
--- a/data/mapObjects/vermilionpokecenter.asm
+++ b/data/mapObjects/VermilionPokecenter.asm
@@ -1,4 +1,4 @@
-VermilionPokecenterObject:
+VermilionPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/VermilionTradeHouse.asm
index bc5ec829..fcf8a8e9 100755
--- a/data/mapObjects/vermilionhouse3.asm
+++ b/data/mapObjects/VermilionTradeHouse.asm
@@ -1,4 +1,4 @@
-VermilionHouse3Object:
+VermilionTradeHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -11,5 +11,5 @@ VermilionHouse3Object:
 	object SPRITE_GENTLEMAN, 3, 5, STAY, UP, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, VERMILION_HOUSE_3_WIDTH
-	warp_to 3, 7, VERMILION_HOUSE_3_WIDTH
+	warp_to 2, 7, VERMILION_TRADE_HOUSE_WIDTH
+	warp_to 3, 7, VERMILION_TRADE_HOUSE_WIDTH
diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/VictoryRoad1F.asm
index 325a9715..cc0c47ce 100755
--- a/data/mapObjects/victoryroad1.asm
+++ b/data/mapObjects/VictoryRoad1F.asm
@@ -1,10 +1,10 @@
-VictoryRoad1Object:
+VictoryRoad1F_Object:
 	db $7d ; border block
 
 	db 3 ; warps
 	warp 8, 17, 2, -1
 	warp 9, 17, 2, -1
-	warp 1, 1, 0, VICTORY_ROAD_2
+	warp 1, 1, 0, VICTORY_ROAD_2F
 
 	db 0 ; signs
 
@@ -18,6 +18,6 @@ VictoryRoad1Object:
 	object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
 
 	; warp-to
-	warp_to 8, 17, VICTORY_ROAD_1_WIDTH
-	warp_to 9, 17, VICTORY_ROAD_1_WIDTH
-	warp_to 1, 1, VICTORY_ROAD_1_WIDTH ; VICTORY_ROAD_2F
+	warp_to 8, 17, VICTORY_ROAD_1F_WIDTH
+	warp_to 9, 17, VICTORY_ROAD_1F_WIDTH
+	warp_to 1, 1, VICTORY_ROAD_1F_WIDTH ; VICTORY_ROAD_2F
diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/VictoryRoad2F.asm
index bc55e2da..55559bca 100755
--- a/data/mapObjects/victoryroad2.asm
+++ b/data/mapObjects/VictoryRoad2F.asm
@@ -1,14 +1,14 @@
-VictoryRoad2Object:
+VictoryRoad2F_Object:
 	db $7d ; border block
 
 	db 7 ; warps
-	warp 0, 8, 2, VICTORY_ROAD_1
+	warp 0, 8, 2, VICTORY_ROAD_1F
 	warp 29, 7, 3, -1
 	warp 29, 8, 3, -1
-	warp 23, 7, 0, VICTORY_ROAD_3
-	warp 25, 14, 2, VICTORY_ROAD_3
-	warp 27, 7, 1, VICTORY_ROAD_3
-	warp 1, 1, 3, VICTORY_ROAD_3
+	warp 23, 7, 0, VICTORY_ROAD_3F
+	warp 25, 14, 2, VICTORY_ROAD_3F
+	warp 27, 7, 1, VICTORY_ROAD_3F
+	warp 1, 1, 3, VICTORY_ROAD_3F
 
 	db 0 ; signs
 
@@ -28,10 +28,10 @@ VictoryRoad2Object:
 	object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person
 
 	; warp-to
-	warp_to 0, 8, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_1F
-	warp_to 29, 7, VICTORY_ROAD_2_WIDTH
-	warp_to 29, 8, VICTORY_ROAD_2_WIDTH
-	warp_to 23, 7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3F
-	warp_to 25, 14, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3F
-	warp_to 27, 7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3F
-	warp_to 1, 1, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3F
+	warp_to 0, 8, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_1F
+	warp_to 29, 7, VICTORY_ROAD_2F_WIDTH
+	warp_to 29, 8, VICTORY_ROAD_2F_WIDTH
+	warp_to 23, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
+	warp_to 25, 14, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
+	warp_to 27, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
+	warp_to 1, 1, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/VictoryRoad3F.asm
index a71cd172..2eb42417 100755
--- a/data/mapObjects/victoryroad3.asm
+++ b/data/mapObjects/VictoryRoad3F.asm
@@ -1,11 +1,11 @@
-VictoryRoad3Object:
+VictoryRoad3F_Object:
 	db $7d ; border block
 
 	db 4 ; warps
-	warp 23, 7, 3, VICTORY_ROAD_2
-	warp 26, 8, 5, VICTORY_ROAD_2
-	warp 27, 15, 4, VICTORY_ROAD_2
-	warp 2, 0, 6, VICTORY_ROAD_2
+	warp 23, 7, 3, VICTORY_ROAD_2F
+	warp 26, 8, 5, VICTORY_ROAD_2F
+	warp 27, 15, 4, VICTORY_ROAD_2F
+	warp 2, 0, 6, VICTORY_ROAD_2F
 
 	db 0 ; signs
 
@@ -22,7 +22,7 @@ VictoryRoad3Object:
 	object SPRITE_BOULDER, 22, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person
 
 	; warp-to
-	warp_to 23, 7, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2F
-	warp_to 26, 8, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2F
-	warp_to 27, 15, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2F
-	warp_to 2, 0, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2F
+	warp_to 23, 7, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
+	warp_to 26, 8, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
+	warp_to 27, 15, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
+	warp_to 2, 0, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/ViridianCity.asm
index 8a571da9..9a2a554d 100755
--- a/data/mapObjects/viridiancity.asm
+++ b/data/mapObjects/ViridianCity.asm
@@ -1,11 +1,11 @@
-ViridianCityObject:
+ViridianCity_Object:
 	db $f ; border block
 
 	db 5 ; warps
 	warp 23, 25, 0, VIRIDIAN_POKECENTER
 	warp 29, 19, 0, VIRIDIAN_MART
-	warp 21, 15, 0, VIRIDIAN_SCHOOL
-	warp 21, 9, 0, VIRIDIAN_HOUSE
+	warp 21, 15, 0, VIRIDIAN_SCHOOL_HOUSE
+	warp 21, 9, 0, VIRIDIAN_NICKNAME_HOUSE
 	warp 32, 7, 0, VIRIDIAN_GYM
 
 	db 6 ; signs
diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/ViridianForest.asm
index 9502ed7d..94f74b96 100755
--- a/data/mapObjects/viridianforest.asm
+++ b/data/mapObjects/ViridianForest.asm
@@ -1,13 +1,13 @@
-ViridianForestObject:
+ViridianForest_Object:
 	db $3 ; border block
 
 	db 6 ; warps
-	warp 1, 0, 2, VIRIDIAN_FOREST_EXIT
-	warp 2, 0, 2, VIRIDIAN_FOREST_EXIT
-	warp 15, 47, 1, VIRIDIAN_FOREST_ENTRANCE
-	warp 16, 47, 1, VIRIDIAN_FOREST_ENTRANCE
-	warp 17, 47, 1, VIRIDIAN_FOREST_ENTRANCE
-	warp 18, 47, 1, VIRIDIAN_FOREST_ENTRANCE
+	warp 1, 0, 2, VIRIDIAN_FOREST_NORTH_GATE
+	warp 2, 0, 2, VIRIDIAN_FOREST_NORTH_GATE
+	warp 15, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
+	warp 16, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
+	warp 17, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
+	warp 18, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
 
 	db 6 ; signs
 	sign 24, 40, 11 ; ViridianForestText9
diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/ViridianForestNorthGate.asm
index 521ad818..81e7fece 100755
--- a/data/mapObjects/viridianforestexit.asm
+++ b/data/mapObjects/ViridianForestNorthGate.asm
@@ -1,4 +1,4 @@
-ViridianForestExitObject:
+ViridianForestNorthGate_Object:
 	db $a ; border block
 
 	db 4 ; warps
@@ -14,7 +14,7 @@ ViridianForestExitObject:
 	object SPRITE_OLD_PERSON, 2, 5, STAY, NONE, 2 ; person
 
 	; warp-to
-	warp_to 4, 0, VIRIDIAN_FOREST_EXIT_WIDTH
-	warp_to 5, 0, VIRIDIAN_FOREST_EXIT_WIDTH
-	warp_to 4, 7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST
-	warp_to 5, 7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST
+	warp_to 4, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH
+	warp_to 5, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH
+	warp_to 4, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST
+	warp_to 5, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST
diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/ViridianForestSouthGate.asm
index d84e5df5..47432513 100755
--- a/data/mapObjects/viridianforestentrance.asm
+++ b/data/mapObjects/ViridianForestSouthGate.asm
@@ -1,4 +1,4 @@
-ViridianForestEntranceObject:
+ViridianForestSouthGate_Object:
 	db $a ; border block
 
 	db 4 ; warps
@@ -14,7 +14,7 @@ ViridianForestEntranceObject:
 	object SPRITE_LITTLE_GIRL, 2, 4, WALK, 1, 2 ; person
 
 	; warp-to
-	warp_to 4, 0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST
-	warp_to 5, 0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST
-	warp_to 4, 7, VIRIDIAN_FOREST_ENTRANCE_WIDTH
-	warp_to 5, 7, VIRIDIAN_FOREST_ENTRANCE_WIDTH
+	warp_to 4, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST
+	warp_to 5, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST
+	warp_to 4, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH
+	warp_to 5, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH
diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/ViridianGym.asm
index c6ddb1d4..e3fd17bd 100755
--- a/data/mapObjects/viridiangym.asm
+++ b/data/mapObjects/ViridianGym.asm
@@ -1,4 +1,4 @@
-ViridianGymObject:
+ViridianGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/ViridianMart.asm
index e692f810..b3e7fee5 100755
--- a/data/mapObjects/viridianmart.asm
+++ b/data/mapObjects/ViridianMart.asm
@@ -1,4 +1,4 @@
-ViridianMartObject:
+ViridianMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/ViridianNicknameHouse.asm
index 932542a6..aaf20a91 100755
--- a/data/mapObjects/viridianhouse.asm
+++ b/data/mapObjects/ViridianNicknameHouse.asm
@@ -1,4 +1,4 @@
-ViridianHouseObject:
+ViridianNicknameHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -14,5 +14,5 @@ ViridianHouseObject:
 	object SPRITE_CLIPBOARD, 4, 0, STAY, NONE, 4 ; person
 
 	; warp-to
-	warp_to 2, 7, VIRIDIAN_HOUSE_WIDTH
-	warp_to 3, 7, VIRIDIAN_HOUSE_WIDTH
+	warp_to 2, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH
+	warp_to 3, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH
diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/ViridianPokecenter.asm
index 55efe10a..70024ede 100755
--- a/data/mapObjects/viridianpokecenter.asm
+++ b/data/mapObjects/ViridianPokecenter.asm
@@ -1,4 +1,4 @@
-ViridianPokecenterObject:
+ViridianPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/school.asm b/data/mapObjects/ViridianSchoolHouse.asm
index 590ae732..29b0614c 100755
--- a/data/mapObjects/school.asm
+++ b/data/mapObjects/ViridianSchoolHouse.asm
@@ -1,4 +1,4 @@
-SchoolObject:
+ViridianSchoolHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -13,5 +13,5 @@ SchoolObject:
 	object SPRITE_LITTLE_GIRL, 4, 5, STAY, UP, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, VIRIDIAN_SCHOOL_WIDTH
-	warp_to 3, 7, VIRIDIAN_SCHOOL_WIDTH
+	warp_to 2, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH
+	warp_to 3, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH
diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/WardensHouse.asm
index e3702594..d8445738 100755
--- a/data/mapObjects/fuchsiahouse2.asm
+++ b/data/mapObjects/WardensHouse.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse2Object:
+WardensHouse_Object:
 	db $17 ; border block
 
 	db 2 ; warps
@@ -15,5 +15,5 @@ FuchsiaHouse2Object:
 	object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
 
 	; warp-to
-	warp_to 4, 7, FUCHSIA_HOUSE_2_WIDTH
-	warp_to 5, 7, FUCHSIA_HOUSE_2_WIDTH
+	warp_to 4, 7, WARDENS_HOUSE_WIDTH
+	warp_to 5, 7, WARDENS_HOUSE_WIDTH
diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm
deleted file mode 100755
index f2b96d89..00000000
--- a/data/mapObjects/celadonmansion2.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-CeladonMansion2Object:
-	db $f ; border block
-
-	db 4 ; warps
-	warp 6, 1, 0, CELADON_MANSION_3
-	warp 7, 1, 3, CELADON_MANSION_1
-	warp 2, 1, 4, CELADON_MANSION_1
-	warp 4, 1, 3, CELADON_MANSION_3
-
-	db 1 ; signs
-	sign 4, 9, 1 ; CeladonMansion2Text1
-
-	db 0 ; objects
-
-	; warp-to
-	warp_to 6, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3
-	warp_to 7, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1
-	warp_to 2, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1
-	warp_to 4, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3
diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm
deleted file mode 100755
index 49ec71cf..00000000
--- a/data/mapObjects/celadonmansion4.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-CeladonMansion4Object:
-	db $9 ; border block
-
-	db 3 ; warps
-	warp 6, 1, 1, CELADON_MANSION_3
-	warp 2, 1, 2, CELADON_MANSION_3
-	warp 2, 7, 0, CELADON_MANSION_5
-
-	db 1 ; signs
-	sign 3, 7, 1 ; CeladonMansion4Text1
-
-	db 0 ; objects
-
-	; warp-to
-	warp_to 6, 1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3F
-	warp_to 2, 1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3F
-	warp_to 2, 7, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_ROOF_HOUSE
diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm
deleted file mode 100755
index 3c5c04e3..00000000
--- a/data/mapObjects/celadonmansion5.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-CeladonMansion5Object:
-	db $a ; border block
-
-	db 2 ; warps
-	warp 2, 7, 2, CELADON_MANSION_4
-	warp 3, 7, 2, CELADON_MANSION_4
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person
-	object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person
-
-	; warp-to
-	warp_to 2, 7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_ROOF
-	warp_to 3, 7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_ROOF
diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm
deleted file mode 100755
index b9eea581..00000000
--- a/data/mapObjects/lab1.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-Lab1Object:
-	db $17 ; border block
-
-	db 5 ; warps
-	warp 2, 7, 2, -1
-	warp 3, 7, 2, -1
-	warp 8, 4, 0, CINNABAR_LAB_2
-	warp 12, 4, 0, CINNABAR_LAB_3
-	warp 16, 4, 0, CINNABAR_LAB_4
-
-	db 4 ; signs
-	sign 3, 2, 2 ; Lab1Text2
-	sign 9, 4, 3 ; Lab1Text3
-	sign 13, 4, 4 ; Lab1Text4
-	sign 17, 4, 5 ; Lab1Text5
-
-	db 1 ; objects
-	object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person
-
-	; warp-to
-	warp_to 2, 7, CINNABAR_LAB_1_WIDTH
-	warp_to 3, 7, CINNABAR_LAB_1_WIDTH
-	warp_to 8, 4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_2
-	warp_to 12, 4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_3
-	warp_to 16, 4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_4
diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm
deleted file mode 100755
index b9956f5f..00000000
--- a/data/mapObjects/lab4.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-Lab4Object:
-	db $17 ; border block
-
-	db 2 ; warps
-	warp 2, 7, 4, CINNABAR_LAB_1
-	warp 3, 7, 4, CINNABAR_LAB_1
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person
-	object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person
-
-	; warp-to
-	warp_to 2, 7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1
-	warp_to 3, 7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1
diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm
deleted file mode 100755
index 1b97c898..00000000
--- a/data/mapObjects/mansion1.asm
+++ /dev/null
@@ -1,29 +0,0 @@
-Mansion1Object:
-	db $2e ; border block
-
-	db 8 ; warps
-	warp 4, 27, 0, -1
-	warp 5, 27, 0, -1
-	warp 6, 27, 0, -1
-	warp 7, 27, 0, -1
-	warp 5, 10, 0, MANSION_2
-	warp 21, 23, 0, MANSION_4
-	warp 26, 27, 0, -1
-	warp 27, 27, 0, -1
-
-	db 0 ; signs
-
-	db 3 ; objects
-	object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4
-	object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE
-	object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS
-
-	; warp-to
-	warp_to 4, 27, MANSION_1_WIDTH
-	warp_to 5, 27, MANSION_1_WIDTH
-	warp_to 6, 27, MANSION_1_WIDTH
-	warp_to 7, 27, MANSION_1_WIDTH
-	warp_to 5, 10, MANSION_1_WIDTH ; POKEMON_MANSION_2F
-	warp_to 21, 23, MANSION_1_WIDTH ; POKEMON_MANSION_B1F
-	warp_to 26, 27, MANSION_1_WIDTH
-	warp_to 27, 27, MANSION_1_WIDTH
diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm
deleted file mode 100755
index 6fd86b97..00000000
--- a/data/mapObjects/mansion2.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-Mansion2Object:
-	db $1 ; border block
-
-	db 4 ; warps
-	warp 5, 10, 4, MANSION_1
-	warp 7, 10, 0, MANSION_3
-	warp 25, 14, 2, MANSION_3
-	warp 6, 1, 1, MANSION_3
-
-	db 0 ; signs
-
-	db 4 ; objects
-	object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7
-	object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM
-	object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person
-	object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person
-
-	; warp-to
-	warp_to 5, 10, MANSION_2_WIDTH ; POKEMON_MANSION_1F
-	warp_to 7, 10, MANSION_2_WIDTH ; POKEMON_MANSION_3F
-	warp_to 25, 14, MANSION_2_WIDTH ; POKEMON_MANSION_3F
-	warp_to 6, 1, MANSION_2_WIDTH ; POKEMON_MANSION_3F
diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm
deleted file mode 100755
index ee56e471..00000000
--- a/data/mapObjects/mtmoon2.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-MtMoon2Object:
-	db $3 ; border block
-
-	db 8 ; warps
-	warp 5, 5, 2, MT_MOON_1
-	warp 17, 11, 0, MT_MOON_3
-	warp 25, 9, 3, MT_MOON_1
-	warp 25, 15, 4, MT_MOON_1
-	warp 21, 17, 1, MT_MOON_3
-	warp 13, 27, 2, MT_MOON_3
-	warp 23, 3, 3, MT_MOON_3
-	warp 27, 3, 2, -1
-
-	db 0 ; signs
-
-	db 0 ; objects
-
-	; warp-to
-	warp_to 5, 5, MT_MOON_2_WIDTH ; MT_MOON_1F
-	warp_to 17, 11, MT_MOON_2_WIDTH ; MT_MOON_B2F
-	warp_to 25, 9, MT_MOON_2_WIDTH ; MT_MOON_1F
-	warp_to 25, 15, MT_MOON_2_WIDTH ; MT_MOON_1F
-	warp_to 21, 17, MT_MOON_2_WIDTH ; MT_MOON_B2F
-	warp_to 13, 27, MT_MOON_2_WIDTH ; MT_MOON_B2F
-	warp_to 23, 3, MT_MOON_2_WIDTH ; MT_MOON_B2F
-	warp_to 27, 3, MT_MOON_2_WIDTH
diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm
deleted file mode 100755
index 96223a26..00000000
--- a/data/mapObjects/pokemontower2.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-PokemonTower2Object:
-	db $1 ; border block
-
-	db 2 ; warps
-	warp 3, 9, 0, POKEMONTOWER_3
-	warp 18, 9, 2, POKEMONTOWER_1
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person
-	object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person
-
-	; warp-to
-	warp_to 3, 9, POKEMONTOWER_2_WIDTH ; POKEMON_TOWER_3F
-	warp_to 18, 9, POKEMONTOWER_2_WIDTH ; POKEMON_TOWER_1F
diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm
deleted file mode 100755
index 3c3d4277..00000000
--- a/data/mapObjects/rockethideout2.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-RocketHideout2Object:
-	db $2e ; border block
-
-	db 5 ; warps
-	warp 27, 8, 0, ROCKET_HIDEOUT_1
-	warp 21, 8, 0, ROCKET_HIDEOUT_3
-	warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR
-	warp 21, 22, 3, ROCKET_HIDEOUT_1
-	warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR
-
-	db 0 ; signs
-
-	db 5 ; objects
-	object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13
-	object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE
-	object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET
-	object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_07
-	object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION
-
-	; warp-to
-	warp_to 27, 8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_B1F
-	warp_to 21, 8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_B3F
-	warp_to 24, 19, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
-	warp_to 21, 22, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_B1F
-	warp_to 25, 19, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm
deleted file mode 100755
index 6dd877e2..00000000
--- a/data/mapObjects/seafoamislands1.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-SeafoamIslands1Object:
-	db $7d ; border block
-
-	db 7 ; warps
-	warp 4, 17, 0, -1
-	warp 5, 17, 0, -1
-	warp 26, 17, 1, -1
-	warp 27, 17, 1, -1
-	warp 7, 5, 1, SEAFOAM_ISLANDS_2
-	warp 25, 3, 6, SEAFOAM_ISLANDS_2
-	warp 23, 15, 4, SEAFOAM_ISLANDS_2
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
-	object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
-
-	; warp-to
-	warp_to 4, 17, SEAFOAM_ISLANDS_1_WIDTH
-	warp_to 5, 17, SEAFOAM_ISLANDS_1_WIDTH
-	warp_to 26, 17, SEAFOAM_ISLANDS_1_WIDTH
-	warp_to 27, 17, SEAFOAM_ISLANDS_1_WIDTH
-	warp_to 7, 5, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2
-	warp_to 25, 3, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2
-	warp_to 23, 15, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2
diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm
deleted file mode 100755
index 76c2ce3c..00000000
--- a/data/mapObjects/seafoamislands2.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-SeafoamIslands2Object:
-	db $7d ; border block
-
-	db 7 ; warps
-	warp 4, 2, 0, SEAFOAM_ISLANDS_3
-	warp 7, 5, 4, SEAFOAM_ISLANDS_1
-	warp 13, 7, 2, SEAFOAM_ISLANDS_3
-	warp 19, 15, 3, SEAFOAM_ISLANDS_3
-	warp 23, 15, 6, SEAFOAM_ISLANDS_1
-	warp 25, 11, 5, SEAFOAM_ISLANDS_3
-	warp 25, 3, 5, SEAFOAM_ISLANDS_1
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
-	object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
-
-	; warp-to
-	warp_to 4, 2, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3
-	warp_to 7, 5, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1
-	warp_to 13, 7, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3
-	warp_to 19, 15, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3
-	warp_to 23, 15, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1
-	warp_to 25, 11, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3
-	warp_to 25, 3, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1
diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm
deleted file mode 100755
index 50bc43e5..00000000
--- a/data/mapObjects/seafoamislands3.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-SeafoamIslands3Object:
-	db $7d ; border block
-
-	db 7 ; warps
-	warp 5, 3, 0, SEAFOAM_ISLANDS_2
-	warp 5, 13, 0, SEAFOAM_ISLANDS_4
-	warp 13, 7, 2, SEAFOAM_ISLANDS_2
-	warp 19, 15, 3, SEAFOAM_ISLANDS_2
-	warp 25, 3, 3, SEAFOAM_ISLANDS_4
-	warp 25, 11, 5, SEAFOAM_ISLANDS_2
-	warp 25, 14, 4, SEAFOAM_ISLANDS_4
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_BOULDER, 18, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
-	object SPRITE_BOULDER, 23, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
-
-	; warp-to
-	warp_to 5, 3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_B1F
-	warp_to 5, 13, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_B3F
-	warp_to 13, 7, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_B1F
-	warp_to 19, 15, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_B1F
-	warp_to 25, 3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_B3F
-	warp_to 25, 11, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_B1F
-	warp_to 25, 14, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_B3F
diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm
deleted file mode 100755
index 262fb9b0..00000000
--- a/data/mapObjects/seafoamislands4.asm
+++ /dev/null
@@ -1,30 +0,0 @@
-SeafoamIslands4Object:
-	db $7d ; border block
-
-	db 7 ; warps
-	warp 5, 12, 1, SEAFOAM_ISLANDS_3
-	warp 8, 6, 2, SEAFOAM_ISLANDS_5
-	warp 25, 4, 3, SEAFOAM_ISLANDS_5
-	warp 25, 3, 4, SEAFOAM_ISLANDS_3
-	warp 25, 14, 6, SEAFOAM_ISLANDS_3
-	warp 20, 17, 0, SEAFOAM_ISLANDS_5
-	warp 21, 17, 1, SEAFOAM_ISLANDS_5
-
-	db 0 ; signs
-
-	db 6 ; objects
-	object SPRITE_BOULDER, 5, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
-	object SPRITE_BOULDER, 3, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
-	object SPRITE_BOULDER, 8, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
-	object SPRITE_BOULDER, 9, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person
-	object SPRITE_BOULDER, 18, 6, STAY, NONE, 5 ; person
-	object SPRITE_BOULDER, 19, 6, STAY, NONE, 6 ; person
-
-	; warp-to
-	warp_to 5, 12, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_B2F
-	warp_to 8, 6, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_B4F
-	warp_to 25, 4, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_B4F
-	warp_to 25, 3, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_B2F
-	warp_to 25, 14, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_B2F
-	warp_to 20, 17, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_B4F
-	warp_to 21, 17, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_B4F
diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm
deleted file mode 100755
index 9f6a70f0..00000000
--- a/data/mapObjects/seafoamislands5.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-SeafoamIslands5Object:
-	db $7d ; border block
-
-	db 4 ; warps
-	warp 20, 17, 5, SEAFOAM_ISLANDS_4
-	warp 21, 17, 6, SEAFOAM_ISLANDS_4
-	warp 11, 7, 1, SEAFOAM_ISLANDS_4
-	warp 25, 4, 2, SEAFOAM_ISLANDS_4
-
-	db 2 ; signs
-	sign 9, 15, 4 ; SeafoamIslands5Text4
-	sign 23, 1, 5 ; SeafoamIslands5Text5
-
-	db 3 ; objects
-	object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person
-	object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person
-	object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50
-
-	; warp-to
-	warp_to 20, 17, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_B3F
-	warp_to 21, 17, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_B3F
-	warp_to 11, 7, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_B3F
-	warp_to 25, 4, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_B3F
diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm
deleted file mode 100755
index 92a12616..00000000
--- a/data/mapObjects/ssanne1.asm
+++ /dev/null
@@ -1,34 +0,0 @@
-SSAnne1Object:
-	db $c ; border block
-
-	db 11 ; warps
-	warp 26, 0, 1, VERMILION_DOCK
-	warp 27, 0, 1, VERMILION_DOCK
-	warp 31, 8, 0, SS_ANNE_8
-	warp 23, 8, 1, SS_ANNE_8
-	warp 19, 8, 2, SS_ANNE_8
-	warp 15, 8, 3, SS_ANNE_8
-	warp 11, 8, 4, SS_ANNE_8
-	warp 7, 8, 5, SS_ANNE_8
-	warp 2, 6, 6, SS_ANNE_2
-	warp 37, 15, 5, SS_ANNE_4
-	warp 3, 16, 0, SS_ANNE_6
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person
-	object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person
-
-	; warp-to
-	warp_to 26, 0, SS_ANNE_1_WIDTH ; VERMILION_DOCK
-	warp_to 27, 0, SS_ANNE_1_WIDTH ; VERMILION_DOCK
-	warp_to 31, 8, SS_ANNE_1_WIDTH ; SS_ANNE_1F_ROOMS
-	warp_to 23, 8, SS_ANNE_1_WIDTH ; SS_ANNE_1F_ROOMS
-	warp_to 19, 8, SS_ANNE_1_WIDTH ; SS_ANNE_1F_ROOMS
-	warp_to 15, 8, SS_ANNE_1_WIDTH ; SS_ANNE_1F_ROOMS
-	warp_to 11, 8, SS_ANNE_1_WIDTH ; SS_ANNE_1F_ROOMS
-	warp_to 7, 8, SS_ANNE_1_WIDTH ; SS_ANNE_1F_ROOMS
-	warp_to 2, 6, SS_ANNE_1_WIDTH ; SS_ANNE_2F
-	warp_to 37, 15, SS_ANNE_1_WIDTH ; SS_ANNE_B1F
-	warp_to 3, 16, SS_ANNE_1_WIDTH ; SS_ANNE_KITCHEN
diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm
deleted file mode 100755
index 0f92eee1..00000000
--- a/data/mapObjects/ssanne10.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-SSAnne10Object:
-	db $c ; border block
-
-	db 10 ; warps
-	warp 2, 5, 4, SS_ANNE_4
-	warp 3, 5, 4, SS_ANNE_4
-	warp 12, 5, 3, SS_ANNE_4
-	warp 13, 5, 3, SS_ANNE_4
-	warp 22, 5, 2, SS_ANNE_4
-	warp 23, 5, 2, SS_ANNE_4
-	warp 2, 15, 1, SS_ANNE_4
-	warp 3, 15, 1, SS_ANNE_4
-	warp 12, 15, 0, SS_ANNE_4
-	warp 13, 15, 0, SS_ANNE_4
-
-	db 0 ; signs
-
-	db 11 ; objects
-	object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3
-	object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4
-	object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5
-	object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6
-	object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7
-	object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2
-	object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person
-	object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person
-	object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER
-	object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_44
-	object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION
-
-	; warp-to
-	warp_to 2, 5, SS_ANNE_10_WIDTH ; SS_ANNE_B1F
-	warp_to 3, 5, SS_ANNE_10_WIDTH ; SS_ANNE_B1F
-	warp_to 12, 5, SS_ANNE_10_WIDTH ; SS_ANNE_B1F
-	warp_to 13, 5, SS_ANNE_10_WIDTH ; SS_ANNE_B1F
-	warp_to 22, 5, SS_ANNE_10_WIDTH ; SS_ANNE_B1F
-	warp_to 23, 5, SS_ANNE_10_WIDTH ; SS_ANNE_B1F
-	warp_to 2, 15, SS_ANNE_10_WIDTH ; SS_ANNE_B1F
-	warp_to 3, 15, SS_ANNE_10_WIDTH ; SS_ANNE_B1F
-	warp_to 12, 15, SS_ANNE_10_WIDTH ; SS_ANNE_B1F
-	warp_to 13, 15, SS_ANNE_10_WIDTH ; SS_ANNE_B1F
diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm
deleted file mode 100755
index 2ab7947c..00000000
--- a/data/mapObjects/ssanne2.asm
+++ /dev/null
@@ -1,30 +0,0 @@
-SSAnne2Object:
-	db $c ; border block
-
-	db 9 ; warps
-	warp 9, 11, 0, SS_ANNE_9
-	warp 13, 11, 2, SS_ANNE_9
-	warp 17, 11, 4, SS_ANNE_9
-	warp 21, 11, 6, SS_ANNE_9
-	warp 25, 11, 8, SS_ANNE_9
-	warp 29, 11, 10, SS_ANNE_9
-	warp 2, 4, 8, SS_ANNE_1
-	warp 2, 12, 1, SS_ANNE_3
-	warp 36, 4, 0, SS_ANNE_7
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person
-	object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1
-
-	; warp-to
-	warp_to 9, 11, SS_ANNE_2_WIDTH ; SS_ANNE_2F_ROOMS
-	warp_to 13, 11, SS_ANNE_2_WIDTH ; SS_ANNE_2F_ROOMS
-	warp_to 17, 11, SS_ANNE_2_WIDTH ; SS_ANNE_2F_ROOMS
-	warp_to 21, 11, SS_ANNE_2_WIDTH ; SS_ANNE_2F_ROOMS
-	warp_to 25, 11, SS_ANNE_2_WIDTH ; SS_ANNE_2F_ROOMS
-	warp_to 29, 11, SS_ANNE_2_WIDTH ; SS_ANNE_2F_ROOMS
-	warp_to 2, 4, SS_ANNE_2_WIDTH ; SS_ANNE_1F
-	warp_to 2, 12, SS_ANNE_2_WIDTH ; SS_ANNE_3F
-	warp_to 36, 4, SS_ANNE_2_WIDTH ; SS_ANNE_CAPTAINS_ROOM
diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm
deleted file mode 100755
index fea7c143..00000000
--- a/data/mapObjects/ssanne3.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-SSAnne3Object:
-	db $c ; border block
-
-	db 2 ; warps
-	warp 0, 3, 0, SS_ANNE_5
-	warp 19, 3, 7, SS_ANNE_2
-
-	db 0 ; signs
-
-	db 1 ; objects
-	object SPRITE_SAILOR, 9, 3, WALK, 2, 1 ; person
-
-	; warp-to
-	warp_to 0, 3, SS_ANNE_3_WIDTH ; SS_ANNE_BOW
-	warp_to 19, 3, SS_ANNE_3_WIDTH ; SS_ANNE_2F
diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm
deleted file mode 100755
index f4a0d720..00000000
--- a/data/mapObjects/ssanne4.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-SSAnne4Object:
-	db $c ; border block
-
-	db 6 ; warps
-	warp 23, 3, 8, SS_ANNE_10
-	warp 19, 3, 6, SS_ANNE_10
-	warp 15, 3, 4, SS_ANNE_10
-	warp 11, 3, 2, SS_ANNE_10
-	warp 7, 3, 0, SS_ANNE_10
-	warp 27, 5, 9, SS_ANNE_1
-
-	db 0 ; signs
-
-	db 0 ; objects
-
-	; warp-to
-	warp_to 23, 3, SS_ANNE_4_WIDTH ; SS_ANNE_B1F_ROOMS
-	warp_to 19, 3, SS_ANNE_4_WIDTH ; SS_ANNE_B1F_ROOMS
-	warp_to 15, 3, SS_ANNE_4_WIDTH ; SS_ANNE_B1F_ROOMS
-	warp_to 11, 3, SS_ANNE_4_WIDTH ; SS_ANNE_B1F_ROOMS
-	warp_to 7, 3, SS_ANNE_4_WIDTH ; SS_ANNE_B1F_ROOMS
-	warp_to 27, 5, SS_ANNE_4_WIDTH ; SS_ANNE_1F
diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm
deleted file mode 100755
index 455e6983..00000000
--- a/data/mapObjects/ssanne9.asm
+++ /dev/null
@@ -1,47 +0,0 @@
-SSAnne9Object:
-	db $c ; border block
-
-	db 12 ; warps
-	warp 2, 5, 0, SS_ANNE_2
-	warp 3, 5, 0, SS_ANNE_2
-	warp 12, 5, 1, SS_ANNE_2
-	warp 13, 5, 1, SS_ANNE_2
-	warp 22, 5, 2, SS_ANNE_2
-	warp 23, 5, 2, SS_ANNE_2
-	warp 2, 15, 3, SS_ANNE_2
-	warp 3, 15, 3, SS_ANNE_2
-	warp 12, 15, 4, SS_ANNE_2
-	warp 13, 15, 4, SS_ANNE_2
-	warp 22, 15, 5, SS_ANNE_2
-	warp 23, 15, 5, SS_ANNE_2
-
-	db 0 ; signs
-
-	db 13 ; objects
-	object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3
-	object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1
-	object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5
-	object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12
-	object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person
-	object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER
-	object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person
-	object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person
-	object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY
-	object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person
-	object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person
-	object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person
-	object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person
-
-	; warp-to
-	warp_to 2, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 3, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 12, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 13, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 22, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 23, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 2, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 3, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 12, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 13, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 22, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 23, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2
diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm
deleted file mode 100755
index dd6746a7..00000000
--- a/data/mapObjects/undergroundpathentranceroute5.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-UndergroundPathEntranceRoute5Object:
-	db $a ; border block
-
-	db 3 ; warps
-	warp 3, 7, 3, -1
-	warp 4, 7, 3, -1
-	warp 4, 4, 0, UNDERGROUND_PATH_NS
-
-	db 0 ; signs
-
-	db 1 ; objects
-	object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person
-
-	; warp-to
-	warp_to 3, 7, PATH_ENTRANCE_ROUTE_5_WIDTH
-	warp_to 4, 7, PATH_ENTRANCE_ROUTE_5_WIDTH
-	warp_to 4, 4, PATH_ENTRANCE_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH
diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm
deleted file mode 100755
index bb2fed89..00000000
--- a/data/mapObjects/undergroundpathentranceroute6.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-UndergroundPathEntranceRoute6Object:
-	db $a ; border block
-
-	db 3 ; warps
-	warp 3, 7, 3, -1
-	warp 4, 7, 3, -1
-	warp 4, 4, 1, UNDERGROUND_PATH_NS
-
-	db 0 ; signs
-
-	db 1 ; objects
-	object SPRITE_GIRL, 2, 3, STAY, NONE, 1 ; person
-
-	; warp-to
-	warp_to 3, 7, PATH_ENTRANCE_ROUTE_6_WIDTH
-	warp_to 4, 7, PATH_ENTRANCE_ROUTE_6_WIDTH
-	warp_to 4, 4, PATH_ENTRANCE_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH
diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm
deleted file mode 100755
index be4a10d4..00000000
--- a/data/mapObjects/undergroundpathentranceroute7.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-UndergroundPathEntranceRoute7Object:
-	db $a ; border block
-
-	db 3 ; warps
-	warp 3, 7, 4, -1
-	warp 4, 7, 4, -1
-	warp 4, 4, 0, UNDERGROUND_PATH_WE
-
-	db 0 ; signs
-
-	db 1 ; objects
-	object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 1 ; person
-
-	; warp-to
-	warp_to 3, 7, PATH_ENTRANCE_ROUTE_7_WIDTH
-	warp_to 4, 7, PATH_ENTRANCE_ROUTE_7_WIDTH
-	warp_to 4, 4, PATH_ENTRANCE_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WEST_EAST
diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm
deleted file mode 100755
index 20b74599..00000000
--- a/data/mapObjects/undergroundpathentranceroute7copy.asm
+++ /dev/null
@@ -1,18 +0,0 @@
-UndergroundPathEntranceRoute7CopyObject:
-	db $a ; border block
-
-	db 3 ; warps
-	warp 3, 7, 5, -1
-	warp 4, 7, 5, -1
-	warp 4, 4, 0, UNDERGROUND_PATH_WE
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person
-	object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 2 ; person
-
-	; warp-to
-	warp_to 3, 7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH
-	warp_to 4, 7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH
-	warp_to 4, 4, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WE
diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm
deleted file mode 100755
index 4ae05e89..00000000
--- a/data/mapObjects/undergroundpathentranceroute8.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-UndergroundPathEntranceRoute8Object:
-	db $a ; border block
-
-	db 3 ; warps
-	warp 3, 7, 4, -1
-	warp 4, 7, 4, -1
-	warp 4, 4, 1, UNDERGROUND_PATH_WE
-
-	db 0 ; signs
-
-	db 1 ; objects
-	object SPRITE_GIRL, 3, 4, STAY, NONE, 1 ; person
-
-	; warp-to
-	warp_to 3, 7, PATH_ENTRANCE_ROUTE_8_WIDTH
-	warp_to 4, 7, PATH_ENTRANCE_ROUTE_8_WIDTH
-	warp_to 4, 4, PATH_ENTRANCE_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WEST_EAST
diff --git a/data/mapObjects/undergroundpathns.asm b/data/mapObjects/undergroundpathns.asm
deleted file mode 100755
index 69fc1857..00000000
--- a/data/mapObjects/undergroundpathns.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-UndergroundPathNSObject:
-	db $1 ; border block
-
-	db 2 ; warps
-	warp 5, 4, 2, PATH_ENTRANCE_ROUTE_5
-	warp 2, 41, 2, PATH_ENTRANCE_ROUTE_6
-
-	db 0 ; signs
-
-	db 0 ; objects
-
-	; warp-to
-	warp_to 5, 4, UNDERGROUND_PATH_NS_WIDTH ; UNDERGROUND_PATH_ROUTE_5
-	warp_to 2, 41, UNDERGROUND_PATH_NS_WIDTH ; UNDERGROUND_PATH_ROUTE_6
diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm
deleted file mode 100755
index dab6e292..00000000
--- a/data/mapObjects/undergroundpathwe.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-UndergroundPathWEObject:
-	db $1 ; border block
-
-	db 2 ; warps
-	warp 2, 5, 2, PATH_ENTRANCE_ROUTE_7
-	warp 47, 2, 2, PATH_ENTRANCE_ROUTE_8
-
-	db 0 ; signs
-
-	db 0 ; objects
-
-	; warp-to
-	warp_to 2, 5, UNDERGROUND_PATH_WE_WIDTH ; UNDERGROUND_PATH_ROUTE_7
-	warp_to 47, 2, UNDERGROUND_PATH_WE_WIDTH ; UNDERGROUND_PATH_ROUTE_8
diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm
deleted file mode 100755
index 1287f752..00000000
--- a/data/mapObjects/unknowndungeon1.asm
+++ /dev/null
@@ -1,32 +0,0 @@
-UnknownDungeon1Object:
-	db $7d ; border block
-
-	db 9 ; warps
-	warp 24, 17, 6, -1
-	warp 25, 17, 6, -1
-	warp 27, 1, 0, UNKNOWN_DUNGEON_2
-	warp 23, 7, 1, UNKNOWN_DUNGEON_2
-	warp 18, 9, 2, UNKNOWN_DUNGEON_2
-	warp 7, 1, 3, UNKNOWN_DUNGEON_2
-	warp 1, 3, 4, UNKNOWN_DUNGEON_2
-	warp 3, 11, 5, UNKNOWN_DUNGEON_2
-	warp 0, 6, 0, UNKNOWN_DUNGEON_3
-
-	db 0 ; signs
-
-	db 4 ; objects
-	object SPRITE_BALL, $1d, $10, STAY, NONE, $1, RARE_CANDY
-	object SPRITE_BALL, $7, $b, STAY, NONE, $2, MAX_ELIXER
-	object SPRITE_BALL, $1d, $9, STAY, NONE, $3, MAX_REVIVE
-	object SPRITE_BALL, $12, $3, STAY, NONE, $4, ULTRA_BALL
-
-	; warp-to
-	warp_to 24, 17, UNKNOWN_DUNGEON_1_WIDTH
-	warp_to 25, 17, UNKNOWN_DUNGEON_1_WIDTH
-	warp_to 27, 1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2
-	warp_to 23, 7, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2
-	warp_to 18, 9, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2
-	warp_to 7, 1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2
-	warp_to 1, 3, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2
-	warp_to 3, 11, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2
-	warp_to 0, 6, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_3
diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm
deleted file mode 100755
index 9d53c2bf..00000000
--- a/data/mapObjects/unknowndungeon2.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-UnknownDungeon2Object:
-	db $7d ; border block
-
-	db 6 ; warps
-	warp 29, 1, 2, UNKNOWN_DUNGEON_1
-	warp 22, 6, 3, UNKNOWN_DUNGEON_1
-	warp 19, 7, 4, UNKNOWN_DUNGEON_1
-	warp 9, 1, 5, UNKNOWN_DUNGEON_1
-	warp 1, 3, 6, UNKNOWN_DUNGEON_1
-	warp 3, 11, 7, UNKNOWN_DUNGEON_1
-
-	db 0 ; signs
-
-	db 4 ; objects
-	object SPRITE_BALL, 0, 11, STAY, NONE, 1, RARE_CANDY
-	object SPRITE_BALL, 16, 7, STAY, NONE, 2, ULTRA_BALL
-	object SPRITE_BALL, 19, 11, STAY, NONE, 3, MAX_REVIVE
-	object SPRITE_BALL, 27, 9, STAY, NONE, 4, FULL_RESTORE
-
-	; warp-to
-	warp_to 29, 1, UNKNOWN_DUNGEON_2_WIDTH ; CERULEAN_CAVE_1F
-	warp_to 22, 6, UNKNOWN_DUNGEON_2_WIDTH ; CERULEAN_CAVE_1F
-	warp_to 19, 7, UNKNOWN_DUNGEON_2_WIDTH ; CERULEAN_CAVE_1F
-	warp_to 9, 1, UNKNOWN_DUNGEON_2_WIDTH ; CERULEAN_CAVE_1F
-	warp_to 1, 3, UNKNOWN_DUNGEON_2_WIDTH ; CERULEAN_CAVE_1F
-	warp_to 3, 11, UNKNOWN_DUNGEON_2_WIDTH ; CERULEAN_CAVE_1F