Rename map files, labels, and constants to be consistent and work with Polished Map

data/mapObjects/AgathasRoom.asm

@@ -1,4 +1,4 @@
-AgathaObject:
+AgathasRoom_Object:
 	db $0 ; border block
 
 	db 4 ; warps

data/mapObjects/BikeShop.asm

@@ -1,4 +1,4 @@
-BikeShopObject:
+BikeShop_Object:
 	db $e ; border block
 
 	db 2 ; warps

data/mapObjects/BillsHouse.asm

@@ -1,4 +1,4 @@
-BillsHouseObject:
+BillsHouse_Object:
 	db $d ; border block
 
 	db 2 ; warps

data/mapObjects/BluesHouse.asm

@@ -1,4 +1,4 @@
-BluesHouseObject:
+BluesHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps

data/mapObjects/BrunosRoom.asm

@@ -1,4 +1,4 @@
-BrunoObject:
+BrunosRoom_Object:
 	db $3 ; border block
 
 	db 4 ; warps

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

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
@@ -39,16 +39,16 @@ CeladonCityObject:
 	object SPRITE_ROCKET, 42, 14, WALK, 2, 9 ; person
 
 	; warp-to
-	warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1
-	warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1
-	warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1
-	warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1
-	warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1
+	warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F
+	warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F
+	warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1F
+	warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F
+	warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F
 	warp_to 41, 9, CELADON_CITY_WIDTH ; CELADON_POKECENTER
 	warp_to 12, 27, CELADON_CITY_WIDTH ; CELADON_GYM
 	warp_to 28, 19, CELADON_CITY_WIDTH ; GAME_CORNER
-	warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5
-	warp_to 33, 19, CELADON_CITY_WIDTH ; CELADON_PRIZE_ROOM
+	warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5F
+	warp_to 33, 19, CELADON_CITY_WIDTH ; GAME_CORNER_PRIZE_ROOM
 	warp_to 31, 27, CELADON_CITY_WIDTH ; CELADON_DINER
-	warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_HOUSE
+	warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_CHIEF_HOUSE
 	warp_to 43, 27, CELADON_CITY_WIDTH ; CELADON_HOTEL

data/mapObjects/CeladonDiner.asm

@@ -1,4 +1,4 @@
-CeladonDinerObject:
+CeladonDiner_Object:
 	db $f ; border block
 
 	db 2 ; warps

data/mapObjects/CeladonGym.asm

@@ -1,4 +1,4 @@
-CeladonGymObject:
+CeladonGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps

data/mapObjects/CeladonHotel.asm

@@ -1,4 +1,4 @@
-CeladonHotelObject:
+CeladonHotel_Object:
 	db $0 ; border block
 
 	db 2 ; warps

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

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

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_2
-	warp_to 7, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4
-	warp_to 2, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4
-	warp_to 4, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2
+	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

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

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

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_2
-	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

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_1
-	warp_to 16, 1, CELADON_MART_2_WIDTH ; CELADON_MART_3
-	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

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_4
-	warp_to 16, 1, CELADON_MART_3_WIDTH ; CELADON_MART_2
-	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

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_3
-	warp_to 16, 1, CELADON_MART_4_WIDTH ; CELADON_MART_5
-	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

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_4
-	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

data/mapObjects/CeladonMartElevator.asm

@@ -0,0 +1,15 @@
+CeladonMartElevator_Object:
+	db $f ; border block
+
+	db 2 ; warps
+	warp 1, 3, 5, CELADON_MART_1F
+	warp 2, 3, 5, CELADON_MART_1F
+
+	db 1 ; signs
+	sign 3, 0, 1 ; CeladonMartElevatorText1
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 1, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F
+	warp_to 2, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F

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
@@ -15,4 +15,4 @@ CeladonMartRoofObject:
 	object SPRITE_LITTLE_GIRL, 5, 5, WALK, 0, 2 ; person
 
 	; warp-to
-	warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5
+	warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5F

data/mapObjects/CeladonPokecenter.asm

@@ -1,4 +1,4 @@
-CeladonPokecenterObject:
+CeladonPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps

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

data/mapObjects/CeruleanCave1F.asm

@@ -0,0 +1,31 @@
+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 3 ; objects
+	object SPRITE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE
+	object SPRITE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER
+	object SPRITE_BALL, 5, 0, STAY, NONE, 3, NUGGET
+
+	; 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

data/mapObjects/CeruleanCave2F.asm

@@ -0,0 +1,25 @@
+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 3 ; objects
+	object SPRITE_BALL, 29, 9, STAY, NONE, 1, PP_UP
+	object SPRITE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL
+	object SPRITE_BALL, 13, 6, STAY, NONE, 3, 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

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
 
@@ -12,4 +12,4 @@ UnknownDungeon3Object:
 	object SPRITE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE
 
 	; warp-to
-	warp_to 3, 6, UNKNOWN_DUNGEON_3_WIDTH ; UNKNOWN_DUNGEON_1
+	warp_to 3, 6, CERULEAN_CAVE_B1F_WIDTH ; CERULEAN_CAVE_1F

data/mapObjects/CeruleanCity.asm

@@ -1,17 +1,17 @@
-CeruleanCityObject:
+CeruleanCity_Object:
 	db $f ; border block
 
 	db 10 ; warps
-	warp 27, 11, 0, TRASHED_HOUSE
-	warp 13, 15, 0, CERULEAN_HOUSE_1
+	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
@@ -35,13 +35,13 @@ CeruleanCityObject:
 	object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person
 
 	; warp-to
-	warp_to 27, 11, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE
-	warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_1
+	warp_to 27, 11, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE
+	warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_TRADE_HOUSE
 	warp_to 19, 17, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER
 	warp_to 30, 19, CERULEAN_CITY_WIDTH ; CERULEAN_GYM
 	warp_to 13, 25, CERULEAN_CITY_WIDTH ; BIKE_SHOP
 	warp_to 25, 25, CERULEAN_CITY_WIDTH ; CERULEAN_MART
-	warp_to 4, 11, CERULEAN_CITY_WIDTH ; UNKNOWN_DUNGEON_1
-	warp_to 27, 9, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE
-	warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2
-	warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2
+	warp_to 4, 11, CERULEAN_CITY_WIDTH ; CERULEAN_CAVE_1F
+	warp_to 27, 9, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE
+	warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE
+	warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE

data/mapObjects/CeruleanGym.asm

@@ -1,4 +1,4 @@
-CeruleanGymObject:
+CeruleanGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps

data/mapObjects/CeruleanMart.asm

@@ -1,4 +1,4 @@
-CeruleanMartObject:
+CeruleanMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps

data/mapObjects/CeruleanPokecenter.asm

@@ -1,4 +1,4 @@
-CeruleanPokecenterObject:
+CeruleanPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps

data/mapObjects/CeruleanTradeHouse.asm

@@ -1,4 +1,4 @@
-CeruleanHouse1Object:
+CeruleanTradeHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -12,5 +12,5 @@ CeruleanHouse1Object:
 	object SPRITE_GAMBLER, 1, 2, STAY, NONE, 2 ; 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

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

data/mapObjects/ChampionsRoom.asm

@@ -1,4 +1,4 @@
-GaryObject:
+ChampionsRoom_Object:
 	db $3 ; border block
 
 	db 4 ; warps

data/mapObjects/CinnabarGym.asm

@@ -1,4 +1,4 @@
-CinnabarGymObject:
+CinnabarGym_Object:
 	db $2e ; border block
 
 	db 2 ; warps

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
 
@@ -20,8 +20,8 @@ CinnabarIslandObject:
 	object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
 
 	; warp-to
-	warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; MANSION_1
+	warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; POKEMON_MANSION_1F
 	warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM
-	warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB_1
+	warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB
 	warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER
 	warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART

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

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

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

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

data/mapObjects/CinnabarMart.asm

@@ -1,4 +1,4 @@
-CinnabarMartObject:
+CinnabarMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps

data/mapObjects/CinnabarPokecenter.asm

@@ -1,4 +1,4 @@
-CinnabarPokecenterObject:
+CinnabarPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps

data/mapObjects/Colosseum.asm

@@ -1,4 +1,4 @@
-ColosseumObject:
+Colosseum_Object:
 	db $e ; border block
 
 	db 0 ; warps

data/mapObjects/CopycatsHouse1F.asm

@@ -1,4 +1,4 @@
-CopycatsHouse1FObject:
+CopycatsHouse1F_Object:
 	db $a ; border block
 
 	db 3 ; warps

data/mapObjects/CopycatsHouse2F.asm

@@ -1,4 +1,4 @@
-CopycatsHouse2FObject:
+CopycatsHouse2F_Object:
 	db $a ; border block
 
 	db 1 ; warps

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

data/mapObjects/DiglettsCave.asm

@@ -0,0 +1,14 @@
+DiglettsCave_Object:
+	db $19 ; border block
+
+	db 2 ; warps
+	warp 5, 5, 2, DIGLETTS_CAVE_ROUTE_2
+	warp 37, 31, 2, DIGLETTS_CAVE_ROUTE_11
+
+	db 0 ; signs
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 5, 5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_2
+	warp_to 37, 31, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_11

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

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

data/mapObjects/FightingDojo.asm

@@ -1,4 +1,4 @@
-FightingDojoObject:
+FightingDojo_Object:
 	db $3 ; border block
 
 	db 2 ; warps

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

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
@@ -42,11 +42,11 @@ FuchsiaCityObject:
 
 	; warp-to
 	warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART
-	warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_1
+	warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_BILLS_GRANDPAS_HOUSE
 	warp_to 19, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER
-	warp_to 27, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_2
-	warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_ENTRANCE
+	warp_to 27, 27, FUCHSIA_CITY_WIDTH ; WARDENS_HOUSE
+	warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_GATE
 	warp_to 5, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM
 	warp_to 22, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM
-	warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3
-	warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3
+	warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE
+	warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE

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

data/mapObjects/FuchsiaGym.asm

@@ -1,4 +1,4 @@
-FuchsiaGymObject:
+FuchsiaGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps

data/mapObjects/FuchsiaMart.asm

@@ -1,4 +1,4 @@
-FuchsiaMartObject:
+FuchsiaMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps

data/mapObjects/FuchsiaMeetingRoom.asm

@@ -1,4 +1,4 @@
-FuchsiaMeetingRoomObject:
+FuchsiaMeetingRoom_Object:
 	db $17 ; border block
 
 	db 2 ; warps

data/mapObjects/FuchsiaPokecenter.asm

@@ -1,4 +1,4 @@
-FuchsiaPokecenterObject:
+FuchsiaPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps

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
@@ -25,4 +25,4 @@ CeladonGameCornerObject:
 	; warp-to
 	warp_to 15, 17, GAME_CORNER_WIDTH
 	warp_to 16, 17, GAME_CORNER_WIDTH
-	warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_1
+	warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_B1F

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

data/mapObjects/HallOfFame.asm

@@ -1,4 +1,4 @@
-HallofFameRoomObject:
+HallOfFame_Object:
 	db $3 ; border block
 
 	db 2 ; warps

data/mapObjects/IndigoPlateau.asm

@@ -1,4 +1,4 @@
-IndigoPlateauObject:
+IndigoPlateau_Object:
 	db $e ; border block
 
 	db 2 ; warps

data/mapObjects/IndigoPlateauLobby.asm

@@ -1,4 +1,4 @@
-IndigoPlateauLobbyObject:
+IndigoPlateauLobby_Object:
 	db $0 ; border block
 
 	db 3 ; warps

data/mapObjects/LancesRoom.asm

@@ -1,4 +1,4 @@
-LanceObject:
+LancesRoom_Object:
 	db $3 ; border block
 
 	db 3 ; warps

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

data/mapObjects/LavenderMart.asm

@@ -1,4 +1,4 @@
-LavenderMartObject:
+LavenderMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps

data/mapObjects/LavenderPokecenter.asm

@@ -1,4 +1,4 @@
-LavenderPokecenterObject:
+LavenderPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps

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
@@ -24,8 +24,8 @@ LavenderTownObject:
 
 	; warp-to
 	warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER
-	warp_to 14, 5, LAVENDER_TOWN_WIDTH ; POKEMONTOWER_1
-	warp_to 7, 9, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_1
+	warp_to 14, 5, LAVENDER_TOWN_WIDTH ; POKEMON_TOWER_1F
+	warp_to 7, 9, LAVENDER_TOWN_WIDTH ; MR_FUJIS_HOUSE
 	warp_to 15, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_MART
-	warp_to 3, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_2
+	warp_to 3, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_CUBONE_HOUSE
 	warp_to 7, 13, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE

data/mapObjects/LoreleisRoom.asm

@@ -1,4 +1,4 @@
-LoreleiObject:
+LoreleisRoom_Object:
 	db $3 ; border block
 
 	db 4 ; warps

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

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

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_2
-	warp_to 17, 11, MT_MOON_1_WIDTH ; MT_MOON_2
-	warp_to 25, 15, MT_MOON_1_WIDTH ; MT_MOON_2
+	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

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

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
 
@@ -21,7 +21,7 @@ MtMoon3Object:
 	object SPRITE_BALL, 29, 5, STAY, NONE, 9, 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

data/mapObjects/MtMoonPokecenter.asm

@@ -1,4 +1,4 @@
-MtMoonPokecenterObject:
+MtMoonPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps

data/mapObjects/Museum1F.asm

@@ -1,4 +1,4 @@
-Museum1FObject:
+Museum1F_Object:
 	db $a ; border block
 
 	db 5 ; warps

data/mapObjects/Museum2F.asm

@@ -1,4 +1,4 @@
-Museum2FObject:
+Museum2F_Object:
 	db $a ; border block
 
 	db 1 ; warps

data/mapObjects/NameRatersHouse.asm

@@ -1,4 +1,4 @@
-NameRaterObject:
+NameRatersHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps

data/mapObjects/OaksLab.asm

@@ -1,4 +1,4 @@
-OaksLabObject:
+OaksLab_Object:
 	db $3 ; border block
 
 	db 2 ; warps

data/mapObjects/PalletTown.asm

@@ -1,4 +1,4 @@
-PalletTownObject:
+PalletTown_Object:
 	db $b ; border block
 
 	db 3 ; warps

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
@@ -30,7 +30,7 @@ PewterCityObject:
 	warp_to 14, 7, PEWTER_CITY_WIDTH ; MUSEUM_1F
 	warp_to 19, 5, PEWTER_CITY_WIDTH ; MUSEUM_1F
 	warp_to 16, 17, PEWTER_CITY_WIDTH ; PEWTER_GYM
-	warp_to 29, 13, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_1
+	warp_to 29, 13, PEWTER_CITY_WIDTH ; PEWTER_NIDORAN_HOUSE
 	warp_to 23, 17, PEWTER_CITY_WIDTH ; PEWTER_MART
-	warp_to 7, 29, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_2
+	warp_to 7, 29, PEWTER_CITY_WIDTH ; PEWTER_SPEECH_HOUSE
 	warp_to 13, 25, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER

data/mapObjects/PewterGym.asm

@@ -1,4 +1,4 @@
-PewterGymObject:
+PewterGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps

data/mapObjects/PewterMart.asm

@@ -1,4 +1,4 @@
-PewterMartObject:
+PewterMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps

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

data/mapObjects/PewterPokecenter.asm

@@ -1,4 +1,4 @@
-PewterPokecenterObject:
+PewterPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps

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

data/mapObjects/PokemonFanClub.asm

@@ -1,4 +1,4 @@
-FanClubObject:
+PokemonFanClub_Object:
 	db $d ; border block
 
 	db 2 ; warps

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

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

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 ; MANSION_2
-	warp_to 6, 1, MANSION_3_WIDTH ; MANSION_2
-	warp_to 25, 14, MANSION_3_WIDTH ; MANSION_2
+	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

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 ; MANSION_1
+	warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F

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 ; POKEMONTOWER_2
+	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

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

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 ; POKEMONTOWER_2
-	warp_to 18, 9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_4
+	warp_to 3, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_2F
+	warp_to 18, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_4F

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 ; POKEMONTOWER_5
-	warp_to 18, 9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_3
+	warp_to 3, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_5F
+	warp_to 18, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_3F

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 ; POKEMONTOWER_4
-	warp_to 18, 9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_6
+	warp_to 3, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_4F
+	warp_to 18, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_6F

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 ; POKEMONTOWER_5
-	warp_to 9, 16, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_7
+	warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F
+	warp_to 9, 16, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_7F

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
 
@@ -13,4 +13,4 @@ PokemonTower7Object:
 	object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person
 
 	; warp-to
-	warp_to 9, 16, POKEMONTOWER_7_WIDTH ; POKEMONTOWER_6
+	warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F

data/mapObjects/PowerPlant.asm

@@ -1,4 +1,4 @@
-PowerPlantObject:
+PowerPlant_Object:
 	db $2e ; border block
 
 	db 3 ; warps

data/mapObjects/RedsHouse1F.asm

@@ -1,4 +1,4 @@
-RedsHouse1FObject:
+RedsHouse1F_Object:
 	db $a ; border block
 
 	db 3 ; warps

data/mapObjects/RedsHouse2F.asm

@@ -1,4 +1,4 @@
-RedsHouse2FObject:
+RedsHouse2F_Object:
 	db $a ; border block
 
 	db 1 ; warps