shithub: pokered

Download patch

ref: 48da6c53be768e85b8ba47430e2fc0f3dd4de61e
parent: 7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f
author: Rangi <[email protected]>
date: Fri Aug 21 07:57:53 EDT 2020 

Align warp and sign coordinates


--- a/data/maps/objects/AgathasRoom.asm
+++ b/data/maps/objects/AgathasRoom.asm
@@ -2,10 +2,10 @@
 	db $0 ; border block
 
 	def_warps
-	warp 4, 11, 2, BRUNOS_ROOM
-	warp 5, 11, 3, BRUNOS_ROOM
-	warp 4, 0, 0, LANCES_ROOM
-	warp 5, 0, 0, LANCES_ROOM
+	warp  4, 11, 2, BRUNOS_ROOM
+	warp  5, 11, 3, BRUNOS_ROOM
+	warp  4,  0, 0, LANCES_ROOM
+	warp  5,  0, 0, LANCES_ROOM
 
 	def_signs
 
--- a/data/maps/objects/BikeShop.asm
+++ b/data/maps/objects/BikeShop.asm
@@ -2,8 +2,8 @@
 	db $e ; border block
 
 	def_warps
-	warp 2, 7, 4, LAST_MAP
-	warp 3, 7, 4, LAST_MAP
+	warp  2,  7, 4, LAST_MAP
+	warp  3,  7, 4, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/BillsHouse.asm
+++ b/data/maps/objects/BillsHouse.asm
@@ -2,8 +2,8 @@
 	db $d ; border block
 
 	def_warps
-	warp 2, 7, 0, LAST_MAP
-	warp 3, 7, 0, LAST_MAP
+	warp  2,  7, 0, LAST_MAP
+	warp  3,  7, 0, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/BluesHouse.asm
+++ b/data/maps/objects/BluesHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 1, LAST_MAP
-	warp 3, 7, 1, LAST_MAP
+	warp  2,  7, 1, LAST_MAP
+	warp  3,  7, 1, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/BrunosRoom.asm
+++ b/data/maps/objects/BrunosRoom.asm
@@ -2,10 +2,10 @@
 	db $3 ; border block
 
 	def_warps
-	warp 4, 11, 2, LORELEIS_ROOM
-	warp 5, 11, 3, LORELEIS_ROOM
-	warp 4, 0, 0, AGATHAS_ROOM
-	warp 5, 0, 1, AGATHAS_ROOM
+	warp  4, 11, 2, LORELEIS_ROOM
+	warp  5, 11, 3, LORELEIS_ROOM
+	warp  4,  0, 0, AGATHAS_ROOM
+	warp  5,  0, 1, AGATHAS_ROOM
 
 	def_signs
 
--- a/data/maps/objects/CeladonChiefHouse.asm
+++ b/data/maps/objects/CeladonChiefHouse.asm
@@ -2,8 +2,8 @@
 	db $f ; border block
 
 	def_warps
-	warp 2, 7, 11, LAST_MAP
-	warp 3, 7, 11, LAST_MAP
+	warp  2,  7, 11, LAST_MAP
+	warp  3,  7, 11, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/CeladonCity.asm
+++ b/data/maps/objects/CeladonCity.asm
@@ -2,12 +2,12 @@
 	db $f ; border block
 
 	def_warps
-	warp 8, 13, 0, CELADON_MART_1F
+	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 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_5F ; beta warp! no longer used
@@ -19,9 +19,9 @@
 	def_signs
 	sign 27, 15, 10 ; CeladonCityText10
 	sign 19, 15, 11 ; CeladonCityText11
-	sign 42, 9, 12 ; PokeCenterSignText
+	sign 42,  9, 12 ; PokeCenterSignText
 	sign 13, 29, 13 ; CeladonCityText13
-	sign 21, 9, 14 ; CeladonCityText14
+	sign 21,  9, 14 ; CeladonCityText14
 	sign 12, 13, 15 ; CeladonCityText15
 	sign 39, 21, 16 ; CeladonCityText16
 	sign 33, 21, 17 ; CeladonCityText17
--- a/data/maps/objects/CeladonDiner.asm
+++ b/data/maps/objects/CeladonDiner.asm
@@ -2,8 +2,8 @@
 	db $f ; border block
 
 	def_warps
-	warp 3, 7, 10, LAST_MAP
-	warp 4, 7, 10, LAST_MAP
+	warp  3,  7, 10, LAST_MAP
+	warp  4,  7, 10, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/CeladonGym.asm
+++ b/data/maps/objects/CeladonGym.asm
@@ -2,8 +2,8 @@
 	db $3 ; border block
 
 	def_warps
-	warp 4, 17, 6, LAST_MAP
-	warp 5, 17, 6, LAST_MAP
+	warp  4, 17, 6, LAST_MAP
+	warp  5, 17, 6, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/CeladonHotel.asm
+++ b/data/maps/objects/CeladonHotel.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 12, LAST_MAP
-	warp 4, 7, 12, LAST_MAP
+	warp  3,  7, 12, LAST_MAP
+	warp  4,  7, 12, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/CeladonMansion1F.asm
+++ b/data/maps/objects/CeladonMansion1F.asm
@@ -2,14 +2,14 @@
 	db $f ; border block
 
 	def_warps
-	warp 4, 11, 2, LAST_MAP
-	warp 5, 11, 2, LAST_MAP
-	warp 4, 0, 4, LAST_MAP
-	warp 7, 1, 1, CELADON_MANSION_2F
-	warp 2, 1, 2, CELADON_MANSION_2F
+	warp  4, 11, 2, LAST_MAP
+	warp  5, 11, 2, LAST_MAP
+	warp  4,  0, 4, LAST_MAP
+	warp  7,  1, 1, CELADON_MANSION_2F
+	warp  2,  1, 2, CELADON_MANSION_2F
 
 	def_signs
-	sign 4, 9, 5 ; CeladonMansion1Text5
+	sign  4,  9, 5 ; CeladonMansion1Text5
 
 	def_objects
 	object SPRITE_MONSTER, 0, 5, STAY, RIGHT, 1 ; person
--- a/data/maps/objects/CeladonMansion2F.asm
+++ b/data/maps/objects/CeladonMansion2F.asm
@@ -2,13 +2,13 @@
 	db $f ; border block
 
 	def_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
+	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
 
 	def_signs
-	sign 4, 9, 1 ; CeladonMansion2Text1
+	sign  4,  9, 1 ; CeladonMansion2Text1
 
 	def_objects
 
--- a/data/maps/objects/CeladonMansion3F.asm
+++ b/data/maps/objects/CeladonMansion3F.asm
@@ -2,16 +2,16 @@
 	db $f ; border block
 
 	def_warps
-	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
+	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
 
 	def_signs
-	sign 1, 3, 5 ; CeladonMansion3Text5
-	sign 4, 3, 6 ; CeladonMansion3Text6
-	sign 1, 6, 7 ; CeladonMansion3Text7
-	sign 4, 9, 8 ; CeladonMansion3Text8
+	sign  1,  3, 5 ; CeladonMansion3Text5
+	sign  4,  3, 6 ; CeladonMansion3Text6
+	sign  1,  6, 7 ; CeladonMansion3Text7
+	sign  4,  9, 8 ; CeladonMansion3Text8
 
 	def_objects
 	object SPRITE_BIKE_SHOP_CLERK, 0, 4, STAY, UP, 1 ; person
--- a/data/maps/objects/CeladonMansionRoof.asm
+++ b/data/maps/objects/CeladonMansionRoof.asm
@@ -2,12 +2,12 @@
 	db $9 ; border block
 
 	def_warps
-	warp 6, 1, 1, CELADON_MANSION_3F
-	warp 2, 1, 2, CELADON_MANSION_3F
-	warp 2, 7, 0, CELADON_MANSION_ROOF_HOUSE
+	warp  6,  1, 1, CELADON_MANSION_3F
+	warp  2,  1, 2, CELADON_MANSION_3F
+	warp  2,  7, 0, CELADON_MANSION_ROOF_HOUSE
 
 	def_signs
-	sign 3, 7, 1 ; CeladonMansion4Text1
+	sign  3,  7, 1 ; CeladonMansion4Text1
 
 	def_objects
 
--- a/data/maps/objects/CeladonMansionRoofHouse.asm
+++ b/data/maps/objects/CeladonMansionRoofHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 2, CELADON_MANSION_ROOF
-	warp 3, 7, 2, CELADON_MANSION_ROOF
+	warp  2,  7, 2, CELADON_MANSION_ROOF
+	warp  3,  7, 2, CELADON_MANSION_ROOF
 
 	def_signs
 
--- a/data/maps/objects/CeladonMart1F.asm
+++ b/data/maps/objects/CeladonMart1F.asm
@@ -2,16 +2,16 @@
 	db $f ; border block
 
 	def_warps
-	warp 2, 7, 0, LAST_MAP
-	warp 3, 7, 0, LAST_MAP
-	warp 16, 7, 1, LAST_MAP
-	warp 17, 7, 1, LAST_MAP
-	warp 12, 1, 0, CELADON_MART_2F
-	warp 1, 1, 0, CELADON_MART_ELEVATOR
+	warp  2,  7, 0, LAST_MAP
+	warp  3,  7, 0, LAST_MAP
+	warp 16,  7, 1, LAST_MAP
+	warp 17,  7, 1, LAST_MAP
+	warp 12,  1, 0, CELADON_MART_2F
+	warp  1,  1, 0, CELADON_MART_ELEVATOR
 
 	def_signs
-	sign 11, 4, 2 ; CeladonMart1Text2
-	sign 14, 1, 3 ; CeladonMart1Text3
+	sign 11,  4, 2 ; CeladonMart1Text2
+	sign 14,  1, 3 ; CeladonMart1Text3
 
 	def_objects
 	object SPRITE_LINK_RECEPTIONIST, 8, 3, STAY, DOWN, 1 ; person
--- a/data/maps/objects/CeladonMart2F.asm
+++ b/data/maps/objects/CeladonMart2F.asm
@@ -2,12 +2,12 @@
 	db $f ; border block
 
 	def_warps
-	warp 12, 1, 4, CELADON_MART_1F
-	warp 16, 1, 1, CELADON_MART_3F
-	warp 1, 1, 0, CELADON_MART_ELEVATOR
+	warp 12,  1, 4, CELADON_MART_1F
+	warp 16,  1, 1, CELADON_MART_3F
+	warp  1,  1, 0, CELADON_MART_ELEVATOR
 
 	def_signs
-	sign 14, 1, 5 ; CeladonMart2Text5
+	sign 14,  1, 5 ; CeladonMart2Text5
 
 	def_objects
 	object SPRITE_CLERK, 5, 3, STAY, DOWN, 1 ; person
--- a/data/maps/objects/CeladonMart3F.asm
+++ b/data/maps/objects/CeladonMart3F.asm
@@ -2,23 +2,23 @@
 	db $f ; border block
 
 	def_warps
-	warp 12, 1, 0, CELADON_MART_4F
-	warp 16, 1, 1, CELADON_MART_2F
-	warp 1, 1, 0, CELADON_MART_ELEVATOR
+	warp 12,  1, 0, CELADON_MART_4F
+	warp 16,  1, 1, CELADON_MART_2F
+	warp  1,  1, 0, CELADON_MART_ELEVATOR
 
 	def_signs
-	sign 2, 4, 6 ; CeladonMart3Text6
-	sign 3, 4, 7 ; CeladonMart3Text7
-	sign 5, 4, 8 ; CeladonMart3Text8
-	sign 6, 4, 9 ; CeladonMart3Text9
-	sign 2, 6, 10 ; CeladonMart3Text10
-	sign 3, 6, 11 ; CeladonMart3Text11
-	sign 5, 6, 12 ; CeladonMart3Text12
-	sign 6, 6, 13 ; CeladonMart3Text13
-	sign 14, 1, 14 ; CeladonMart3Text14
-	sign 4, 1, 15 ; CeladonMart3Text15
-	sign 6, 1, 16 ; CeladonMart3Text16
-	sign 10, 1, 17 ; CeladonMart3Text17
+	sign  2,  4, 6 ; CeladonMart3Text6
+	sign  3,  4, 7 ; CeladonMart3Text7
+	sign  5,  4, 8 ; CeladonMart3Text8
+	sign  6,  4, 9 ; CeladonMart3Text9
+	sign  2,  6, 10 ; CeladonMart3Text10
+	sign  3,  6, 11 ; CeladonMart3Text11
+	sign  5,  6, 12 ; CeladonMart3Text12
+	sign  6,  6, 13 ; CeladonMart3Text13
+	sign 14,  1, 14 ; CeladonMart3Text14
+	sign  4,  1, 15 ; CeladonMart3Text15
+	sign  6,  1, 16 ; CeladonMart3Text16
+	sign 10,  1, 17 ; CeladonMart3Text17
 
 	def_objects
 	object SPRITE_CLERK, 16, 5, STAY, NONE, 1 ; person
--- a/data/maps/objects/CeladonMart4F.asm
+++ b/data/maps/objects/CeladonMart4F.asm
@@ -2,12 +2,12 @@
 	db $f ; border block
 
 	def_warps
-	warp 12, 1, 0, CELADON_MART_3F
-	warp 16, 1, 1, CELADON_MART_5F
-	warp 1, 1, 0, CELADON_MART_ELEVATOR
+	warp 12,  1, 0, CELADON_MART_3F
+	warp 16,  1, 1, CELADON_MART_5F
+	warp  1,  1, 0, CELADON_MART_ELEVATOR
 
 	def_signs
-	sign 14, 1, 4 ; CeladonMart4Text4
+	sign 14,  1, 4 ; CeladonMart4Text4
 
 	def_objects
 	object SPRITE_CLERK, 5, 7, STAY, NONE, 1 ; person
--- a/data/maps/objects/CeladonMart5F.asm
+++ b/data/maps/objects/CeladonMart5F.asm
@@ -2,12 +2,12 @@
 	db $f ; border block
 
 	def_warps
-	warp 12, 1, 0, CELADON_MART_ROOF
-	warp 16, 1, 1, CELADON_MART_4F
-	warp 1, 1, 0, CELADON_MART_ELEVATOR
+	warp 12,  1, 0, CELADON_MART_ROOF
+	warp 16,  1, 1, CELADON_MART_4F
+	warp  1,  1, 0, CELADON_MART_ELEVATOR
 
 	def_signs
-	sign 14, 1, 5 ; CeladonMart5Text5
+	sign 14,  1, 5 ; CeladonMart5Text5
 
 	def_objects
 	object SPRITE_GENTLEMAN, 14, 5, WALK, UP_DOWN, 1 ; person
--- a/data/maps/objects/CeladonMartElevator.asm
+++ b/data/maps/objects/CeladonMartElevator.asm
@@ -2,11 +2,11 @@
 	db $f ; border block
 
 	def_warps
-	warp 1, 3, 5, CELADON_MART_1F
-	warp 2, 3, 5, CELADON_MART_1F
+	warp  1,  3, 5, CELADON_MART_1F
+	warp  2,  3, 5, CELADON_MART_1F
 
 	def_signs
-	sign 3, 0, 1 ; CeladonMartElevatorText1
+	sign  3,  0, 1 ; CeladonMartElevatorText1
 
 	def_objects
 
--- a/data/maps/objects/CeladonMartRoof.asm
+++ b/data/maps/objects/CeladonMartRoof.asm
@@ -2,13 +2,13 @@
 	db $42 ; border block
 
 	def_warps
-	warp 15, 2, 0, CELADON_MART_5F
+	warp 15,  2, 0, CELADON_MART_5F
 
 	def_signs
-	sign 10, 1, 3 ; CeladonMartRoofText3
-	sign 11, 1, 4 ; CeladonMartRoofText4
-	sign 12, 2, 5 ; CeladonMartRoofText5
-	sign 13, 2, 6 ; CeladonMartRoofText6
+	sign 10,  1, 3 ; CeladonMartRoofText3
+	sign 11,  1, 4 ; CeladonMartRoofText4
+	sign 12,  2, 5 ; CeladonMartRoofText5
+	sign 13,  2, 6 ; CeladonMartRoofText6
 
 	def_objects
 	object SPRITE_SUPER_NERD, 10, 4, STAY, LEFT, 1 ; person
--- a/data/maps/objects/CeladonPokecenter.asm
+++ b/data/maps/objects/CeladonPokecenter.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 5, LAST_MAP
-	warp 4, 7, 5, LAST_MAP
+	warp  3,  7, 5, LAST_MAP
+	warp  4,  7, 5, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/CeruleanBadgeHouse.asm
+++ b/data/maps/objects/CeruleanBadgeHouse.asm
@@ -2,9 +2,9 @@
 	db $c ; border block
 
 	def_warps
-	warp 2, 0, 9, LAST_MAP
-	warp 2, 7, 8, LAST_MAP
-	warp 3, 7, 8, LAST_MAP
+	warp  2,  0, 9, LAST_MAP
+	warp  2,  7, 8, LAST_MAP
+	warp  3,  7, 8, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/CeruleanCave1F.asm
+++ b/data/maps/objects/CeruleanCave1F.asm
@@ -4,13 +4,13 @@
 	def_warps
 	warp 24, 17, 6, LAST_MAP
 	warp 25, 17, 6, LAST_MAP
-	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
+	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
 
 	def_signs
 
--- a/data/maps/objects/CeruleanCave2F.asm
+++ b/data/maps/objects/CeruleanCave2F.asm
@@ -2,12 +2,12 @@
 	db $7d ; border block
 
 	def_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
+	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
 
 	def_signs
 
--- a/data/maps/objects/CeruleanCaveB1F.asm
+++ b/data/maps/objects/CeruleanCaveB1F.asm
@@ -2,7 +2,7 @@
 	db $7d ; border block
 
 	def_warps
-	warp 3, 6, 8, CERULEAN_CAVE_1F
+	warp  3,  6, 8, CERULEAN_CAVE_1F
 
 	def_signs
 
--- a/data/maps/objects/CeruleanCity.asm
+++ b/data/maps/objects/CeruleanCity.asm
@@ -8,10 +8,10 @@
 	warp 30, 19, 0, CERULEAN_GYM
 	warp 13, 25, 0, BIKE_SHOP
 	warp 25, 25, 0, CERULEAN_MART
-	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
+	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
 
 	def_signs
 	sign 23, 19, 12 ; CeruleanCityText12
--- a/data/maps/objects/CeruleanGym.asm
+++ b/data/maps/objects/CeruleanGym.asm
@@ -2,8 +2,8 @@
 	db $3 ; border block
 
 	def_warps
-	warp 4, 13, 3, LAST_MAP
-	warp 5, 13, 3, LAST_MAP
+	warp  4, 13, 3, LAST_MAP
+	warp  5, 13, 3, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/CeruleanMart.asm
+++ b/data/maps/objects/CeruleanMart.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 5, LAST_MAP
-	warp 4, 7, 5, LAST_MAP
+	warp  3,  7, 5, LAST_MAP
+	warp  4,  7, 5, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/CeruleanPokecenter.asm
+++ b/data/maps/objects/CeruleanPokecenter.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 2, LAST_MAP
-	warp 4, 7, 2, LAST_MAP
+	warp  3,  7, 2, LAST_MAP
+	warp  4,  7, 2, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/CeruleanTradeHouse.asm
+++ b/data/maps/objects/CeruleanTradeHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 1, LAST_MAP
-	warp 3, 7, 1, LAST_MAP
+	warp  2,  7, 1, LAST_MAP
+	warp  3,  7, 1, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/CeruleanTrashedHouse.asm
+++ b/data/maps/objects/CeruleanTrashedHouse.asm
@@ -2,12 +2,12 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 0, LAST_MAP
-	warp 3, 7, 0, LAST_MAP
-	warp 3, 0, 7, LAST_MAP
+	warp  2,  7, 0, LAST_MAP
+	warp  3,  7, 0, LAST_MAP
+	warp  3,  0, 7, LAST_MAP
 
 	def_signs
-	sign 3, 0, 3 ; CeruleanHouseTrashedText3
+	sign  3,  0, 3 ; CeruleanHouseTrashedText3
 
 	def_objects
 	object SPRITE_FISHING_GURU, 2, 1, STAY, DOWN, 1 ; person
--- a/data/maps/objects/ChampionsRoom.asm
+++ b/data/maps/objects/ChampionsRoom.asm
@@ -2,10 +2,10 @@
 	db $3 ; border block
 
 	def_warps
-	warp 3, 7, 1, LANCES_ROOM
-	warp 4, 7, 2, LANCES_ROOM
-	warp 3, 0, 0, HALL_OF_FAME
-	warp 4, 0, 0, HALL_OF_FAME
+	warp  3,  7, 1, LANCES_ROOM
+	warp  4,  7, 2, LANCES_ROOM
+	warp  3,  0, 0, HALL_OF_FAME
+	warp  4,  0, 0, HALL_OF_FAME
 
 	def_signs
 
--- a/data/maps/objects/CinnabarIsland.asm
+++ b/data/maps/objects/CinnabarIsland.asm
@@ -2,18 +2,18 @@
 	db $43 ; border block
 
 	def_warps
-	warp 6, 3, 1, POKEMON_MANSION_1F
-	warp 18, 3, 0, CINNABAR_GYM
-	warp 6, 9, 0, CINNABAR_LAB
+	warp  6,  3, 1, POKEMON_MANSION_1F
+	warp 18,  3, 0, CINNABAR_GYM
+	warp  6,  9, 0, CINNABAR_LAB
 	warp 11, 11, 0, CINNABAR_POKECENTER
 	warp 15, 11, 0, CINNABAR_MART
 
 	def_signs
-	sign 9, 5, 3 ; CinnabarIslandText3
+	sign  9,  5, 3 ; CinnabarIslandText3
 	sign 16, 11, 4 ; MartSignText
 	sign 12, 11, 5 ; PokeCenterSignText
-	sign 9, 11, 6 ; CinnabarIslandText6
-	sign 13, 3, 7 ; CinnabarIslandText7
+	sign  9, 11, 6 ; CinnabarIslandText6
+	sign 13,  3, 7 ; CinnabarIslandText7
 
 	def_objects
 	object SPRITE_GIRL, 12, 5, WALK, LEFT_RIGHT, 1 ; person
--- a/data/maps/objects/CinnabarLab.asm
+++ b/data/maps/objects/CinnabarLab.asm
@@ -2,17 +2,17 @@
 	db $17 ; border block
 
 	def_warps
-	warp 2, 7, 2, LAST_MAP
-	warp 3, 7, 2, LAST_MAP
-	warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM
-	warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM
-	warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM
+	warp  2,  7, 2, LAST_MAP
+	warp  3,  7, 2, LAST_MAP
+	warp  8,  4, 0, CINNABAR_LAB_TRADE_ROOM
+	warp 12,  4, 0, CINNABAR_LAB_METRONOME_ROOM
+	warp 16,  4, 0, CINNABAR_LAB_FOSSIL_ROOM
 
 	def_signs
-	sign 3, 2, 2 ; Lab1Text2
-	sign 9, 4, 3 ; Lab1Text3
-	sign 13, 4, 4 ; Lab1Text4
-	sign 17, 4, 5 ; Lab1Text5
+	sign  3,  2, 2 ; Lab1Text2
+	sign  9,  4, 3 ; Lab1Text3
+	sign 13,  4, 4 ; Lab1Text4
+	sign 17,  4, 5 ; Lab1Text5
 
 	def_objects
 	object SPRITE_FISHING_GURU, 1, 3, STAY, NONE, 1 ; person
--- a/data/maps/objects/CinnabarLabFossilRoom.asm
+++ b/data/maps/objects/CinnabarLabFossilRoom.asm
@@ -2,8 +2,8 @@
 	db $17 ; border block
 
 	def_warps
-	warp 2, 7, 4, CINNABAR_LAB
-	warp 3, 7, 4, CINNABAR_LAB
+	warp  2,  7, 4, CINNABAR_LAB
+	warp  3,  7, 4, CINNABAR_LAB
 
 	def_signs
 
--- a/data/maps/objects/CinnabarLabMetronomeRoom.asm
+++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm
@@ -2,13 +2,13 @@
 	db $17 ; border block
 
 	def_warps
-	warp 2, 7, 3, CINNABAR_LAB
-	warp 3, 7, 3, CINNABAR_LAB
+	warp  2,  7, 3, CINNABAR_LAB
+	warp  3,  7, 3, CINNABAR_LAB
 
 	def_signs
-	sign 0, 4, 3 ; Lab3Text3
-	sign 1, 4, 4 ; Lab3Text4
-	sign 2, 1, 5 ; Lab3Text5
+	sign  0,  4, 3 ; Lab3Text3
+	sign  1,  4, 4 ; Lab3Text4
+	sign  2,  1, 5 ; Lab3Text5
 
 	def_objects
 	object SPRITE_SCIENTIST, 7, 2, STAY, DOWN, 1 ; person
--- a/data/maps/objects/CinnabarLabTradeRoom.asm
+++ b/data/maps/objects/CinnabarLabTradeRoom.asm
@@ -2,8 +2,8 @@
 	db $17 ; border block
 
 	def_warps
-	warp 2, 7, 2, CINNABAR_LAB
-	warp 3, 7, 2, CINNABAR_LAB
+	warp  2,  7, 2, CINNABAR_LAB
+	warp  3,  7, 2, CINNABAR_LAB
 
 	def_signs
 
--- a/data/maps/objects/CinnabarMart.asm
+++ b/data/maps/objects/CinnabarMart.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 4, LAST_MAP
-	warp 4, 7, 4, LAST_MAP
+	warp  3,  7, 4, LAST_MAP
+	warp  4,  7, 4, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/CinnabarPokecenter.asm
+++ b/data/maps/objects/CinnabarPokecenter.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 3, LAST_MAP
-	warp 4, 7, 3, LAST_MAP
+	warp  3,  7, 3, LAST_MAP
+	warp  4,  7, 3, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/CopycatsHouse1F.asm
+++ b/data/maps/objects/CopycatsHouse1F.asm
@@ -2,9 +2,9 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 0, LAST_MAP
-	warp 3, 7, 0, LAST_MAP
-	warp 7, 1, 0, COPYCATS_HOUSE_2F
+	warp  2,  7, 0, LAST_MAP
+	warp  3,  7, 0, LAST_MAP
+	warp  7,  1, 0, COPYCATS_HOUSE_2F
 
 	def_signs
 
--- a/data/maps/objects/CopycatsHouse2F.asm
+++ b/data/maps/objects/CopycatsHouse2F.asm
@@ -2,11 +2,11 @@
 	db $a ; border block
 
 	def_warps
-	warp 7, 1, 2, COPYCATS_HOUSE_1F
+	warp  7,  1, 2, COPYCATS_HOUSE_1F
 
 	def_signs
-	sign 3, 5, 6 ; CopycatsHouse2FText6
-	sign 0, 1, 7 ; CopycatsHouse2FText7
+	sign  3,  5, 6 ; CopycatsHouse2FText6
+	sign  0,  1, 7 ; CopycatsHouse2FText7
 
 	def_objects
 	object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, ANY_DIR, 1 ; person
--- a/data/maps/objects/Daycare.asm
+++ b/data/maps/objects/Daycare.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 4, LAST_MAP
-	warp 3, 7, 4, LAST_MAP
+	warp  2,  7, 4, LAST_MAP
+	warp  3,  7, 4, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/DiglettsCave.asm
+++ b/data/maps/objects/DiglettsCave.asm
@@ -2,7 +2,7 @@
 	db $19 ; border block
 
 	def_warps
-	warp 5, 5, 2, DIGLETTS_CAVE_ROUTE_2
+	warp  5,  5, 2, DIGLETTS_CAVE_ROUTE_2
 	warp 37, 31, 2, DIGLETTS_CAVE_ROUTE_11
 
 	def_signs
--- a/data/maps/objects/DiglettsCaveRoute11.asm
+++ b/data/maps/objects/DiglettsCaveRoute11.asm
@@ -2,9 +2,9 @@
 	db $7d ; border block
 
 	def_warps
-	warp 2, 7, 4, LAST_MAP
-	warp 3, 7, 4, LAST_MAP
-	warp 4, 4, 1, DIGLETTS_CAVE
+	warp  2,  7, 4, LAST_MAP
+	warp  3,  7, 4, LAST_MAP
+	warp  4,  4, 1, DIGLETTS_CAVE
 
 	def_signs
 
--- a/data/maps/objects/DiglettsCaveRoute2.asm
+++ b/data/maps/objects/DiglettsCaveRoute2.asm
@@ -2,9 +2,9 @@
 	db $7d ; border block
 
 	def_warps
-	warp 2, 7, 0, LAST_MAP
-	warp 3, 7, 0, LAST_MAP
-	warp 4, 4, 0, DIGLETTS_CAVE
+	warp  2,  7, 0, LAST_MAP
+	warp  3,  7, 0, LAST_MAP
+	warp  4,  4, 0, DIGLETTS_CAVE
 
 	def_signs
 
--- a/data/maps/objects/FightingDojo.asm
+++ b/data/maps/objects/FightingDojo.asm
@@ -2,8 +2,8 @@
 	db $3 ; border block
 
 	def_warps
-	warp 4, 11, 1, LAST_MAP
-	warp 5, 11, 1, LAST_MAP
+	warp  4, 11, 1, LAST_MAP
+	warp  5, 11, 1, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm
+++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 1, LAST_MAP
-	warp 3, 7, 1, LAST_MAP
+	warp  2,  7, 1, LAST_MAP
+	warp  3,  7, 1, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/FuchsiaCity.asm
+++ b/data/maps/objects/FuchsiaCity.asm
@@ -2,12 +2,12 @@
 	db $f ; border block
 
 	def_warps
-	warp 5, 13, 0, FUCHSIA_MART
+	warp  5, 13, 0, FUCHSIA_MART
 	warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE
 	warp 19, 27, 0, FUCHSIA_POKECENTER
 	warp 27, 27, 0, WARDENS_HOUSE
-	warp 18, 3, 0, SAFARI_ZONE_GATE
-	warp 5, 27, 0, FUCHSIA_GYM
+	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_GOOD_ROD_HOUSE
 	warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE
@@ -15,18 +15,18 @@
 	def_signs
 	sign 15, 23, 11 ; FuchsiaCityText11
 	sign 25, 15, 12 ; FuchsiaCityText12
-	sign 17, 5, 13 ; FuchsiaCityText13
-	sign 6, 13, 14 ; MartSignText
+	sign 17,  5, 13 ; FuchsiaCityText13
+	sign  6, 13, 14 ; MartSignText
 	sign 20, 27, 15 ; PokeCenterSignText
 	sign 27, 29, 16 ; FuchsiaCityText16
 	sign 21, 15, 17 ; FuchsiaCityText17
-	sign 5, 29, 18 ; FuchsiaCityText18
-	sign 33, 7, 19 ; FuchsiaCityText19
-	sign 27, 7, 20 ; FuchsiaCityText20
-	sign 13, 7, 21 ; FuchsiaCityText21
+	sign  5, 29, 18 ; FuchsiaCityText18
+	sign 33,  7, 19 ; FuchsiaCityText19
+	sign 27,  7, 20 ; FuchsiaCityText20
+	sign 13,  7, 21 ; FuchsiaCityText21
 	sign 31, 13, 22 ; FuchsiaCityText22
 	sign 13, 15, 23 ; FuchsiaCityText23
-	sign 7, 7, 24 ; FuchsiaCityText24
+	sign  7,  7, 24 ; FuchsiaCityText24
 
 	def_objects
 	object SPRITE_YOUNGSTER, 10, 12, WALK, LEFT_RIGHT, 1 ; person
--- a/data/maps/objects/FuchsiaGoodRodHouse.asm
+++ b/data/maps/objects/FuchsiaGoodRodHouse.asm
@@ -2,9 +2,9 @@
 	db $c ; border block
 
 	def_warps
-	warp 2, 0, 8, LAST_MAP
-	warp 2, 7, 7, LAST_MAP
-	warp 3, 7, 7, LAST_MAP
+	warp  2,  0, 8, LAST_MAP
+	warp  2,  7, 7, LAST_MAP
+	warp  3,  7, 7, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/FuchsiaGym.asm
+++ b/data/maps/objects/FuchsiaGym.asm
@@ -2,8 +2,8 @@
 	db $3 ; border block
 
 	def_warps
-	warp 4, 17, 5, LAST_MAP
-	warp 5, 17, 5, LAST_MAP
+	warp  4, 17, 5, LAST_MAP
+	warp  5, 17, 5, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/FuchsiaMart.asm
+++ b/data/maps/objects/FuchsiaMart.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 0, LAST_MAP
-	warp 4, 7, 0, LAST_MAP
+	warp  3,  7, 0, LAST_MAP
+	warp  4,  7, 0, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/FuchsiaMeetingRoom.asm
+++ b/data/maps/objects/FuchsiaMeetingRoom.asm
@@ -2,8 +2,8 @@
 	db $17 ; border block
 
 	def_warps
-	warp 4, 7, 6, LAST_MAP
-	warp 5, 7, 6, LAST_MAP
+	warp  4,  7, 6, LAST_MAP
+	warp  5,  7, 6, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/FuchsiaPokecenter.asm
+++ b/data/maps/objects/FuchsiaPokecenter.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 2, LAST_MAP
-	warp 4, 7, 2, LAST_MAP
+	warp  3,  7, 2, LAST_MAP
+	warp  4,  7, 2, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/GameCorner.asm
+++ b/data/maps/objects/GameCorner.asm
@@ -4,10 +4,10 @@
 	def_warps
 	warp 15, 17, 7, LAST_MAP
 	warp 16, 17, 7, LAST_MAP
-	warp 17, 4, 1, ROCKET_HIDEOUT_B1F
+	warp 17,  4, 1, ROCKET_HIDEOUT_B1F
 
 	def_signs
-	sign 9, 4, 12 ; CeladonGameCornerText12
+	sign  9,  4, 12 ; CeladonGameCornerText12
 
 	def_objects
 	object SPRITE_BEAUTY, 2, 6, STAY, DOWN, 1 ; person
--- a/data/maps/objects/GameCornerPrizeRoom.asm
+++ b/data/maps/objects/GameCornerPrizeRoom.asm
@@ -2,13 +2,13 @@
 	db $f ; border block
 
 	def_warps
-	warp 4, 7, 9, LAST_MAP
-	warp 5, 7, 9, LAST_MAP
+	warp  4,  7, 9, LAST_MAP
+	warp  5,  7, 9, LAST_MAP
 
 	def_signs
-	sign 2, 2, 3 ; CeladonPrizeRoomText3
-	sign 4, 2, 4 ; CeladonPrizeRoomText4
-	sign 6, 2, 5 ; CeladonPrizeRoomText5
+	sign  2,  2, 3 ; CeladonPrizeRoomText3
+	sign  4,  2, 4 ; CeladonPrizeRoomText4
+	sign  6,  2, 5 ; CeladonPrizeRoomText5
 
 	def_objects
 	object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person
--- a/data/maps/objects/HallOfFame.asm
+++ b/data/maps/objects/HallOfFame.asm
@@ -2,8 +2,8 @@
 	db $3 ; border block
 
 	def_warps
-	warp 4, 7, 2, CHAMPIONS_ROOM
-	warp 5, 7, 3, CHAMPIONS_ROOM
+	warp  4,  7, 2, CHAMPIONS_ROOM
+	warp  5,  7, 3, CHAMPIONS_ROOM
 
 	def_signs
 
--- a/data/maps/objects/IndigoPlateau.asm
+++ b/data/maps/objects/IndigoPlateau.asm
@@ -2,8 +2,8 @@
 	db $e ; border block
 
 	def_warps
-	warp 9, 5, 0, INDIGO_PLATEAU_LOBBY
-	warp 10, 5, 0, INDIGO_PLATEAU_LOBBY
+	warp  9,  5, 0, INDIGO_PLATEAU_LOBBY
+	warp 10,  5, 0, INDIGO_PLATEAU_LOBBY
 
 	def_signs
 
--- a/data/maps/objects/IndigoPlateauLobby.asm
+++ b/data/maps/objects/IndigoPlateauLobby.asm
@@ -2,9 +2,9 @@
 	db $0 ; border block
 
 	def_warps
-	warp 7, 11, 0, LAST_MAP
-	warp 8, 11, 1, LAST_MAP
-	warp 8, 0, 0, LORELEIS_ROOM
+	warp  7, 11, 0, LAST_MAP
+	warp  8, 11, 1, LAST_MAP
+	warp  8,  0, 0, LORELEIS_ROOM
 
 	def_signs
 
--- a/data/maps/objects/LancesRoom.asm
+++ b/data/maps/objects/LancesRoom.asm
@@ -3,8 +3,8 @@
 
 	def_warps
 	warp 24, 16, 2, AGATHAS_ROOM
-	warp 5, 0, 0, CHAMPIONS_ROOM
-	warp 6, 0, 0, CHAMPIONS_ROOM
+	warp  5,  0, 0, CHAMPIONS_ROOM
+	warp  6,  0, 0, CHAMPIONS_ROOM
 
 	def_signs
 
--- a/data/maps/objects/LavenderCuboneHouse.asm
+++ b/data/maps/objects/LavenderCuboneHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 4, LAST_MAP
-	warp 3, 7, 4, LAST_MAP
+	warp  2,  7, 4, LAST_MAP
+	warp  3,  7, 4, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/LavenderMart.asm
+++ b/data/maps/objects/LavenderMart.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 3, LAST_MAP
-	warp 4, 7, 3, LAST_MAP
+	warp  3,  7, 3, LAST_MAP
+	warp  4,  7, 3, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/LavenderPokecenter.asm
+++ b/data/maps/objects/LavenderPokecenter.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 0, LAST_MAP
-	warp 4, 7, 0, LAST_MAP
+	warp  3,  7, 0, LAST_MAP
+	warp  4,  7, 0, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/LavenderTown.asm
+++ b/data/maps/objects/LavenderTown.asm
@@ -2,20 +2,20 @@
 	db $2c ; border block
 
 	def_warps
-	warp 3, 5, 0, LAVENDER_POKECENTER
-	warp 14, 5, 0, POKEMON_TOWER_1F
-	warp 7, 9, 0, MR_FUJIS_HOUSE
+	warp  3,  5, 0, LAVENDER_POKECENTER
+	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_CUBONE_HOUSE
-	warp 7, 13, 0, NAME_RATERS_HOUSE
+	warp  3, 13, 0, LAVENDER_CUBONE_HOUSE
+	warp  7, 13, 0, NAME_RATERS_HOUSE
 
 	def_signs
-	sign 11, 9, 4 ; LavenderTownText4
-	sign 9, 3, 5 ; LavenderTownText5
+	sign 11,  9, 4 ; LavenderTownText4
+	sign  9,  3, 5 ; LavenderTownText5
 	sign 16, 13, 6 ; MartSignText
-	sign 4, 5, 7 ; PokeCenterSignText
-	sign 5, 9, 8 ; LavenderTownText8
-	sign 17, 7, 9 ; LavenderTownText9
+	sign  4,  5, 7 ; PokeCenterSignText
+	sign  5,  9, 8 ; LavenderTownText8
+	sign 17,  7, 9 ; LavenderTownText9
 
 	def_objects
 	object SPRITE_LITTLE_GIRL, 15, 9, WALK, ANY_DIR, 1 ; person
--- a/data/maps/objects/LoreleisRoom.asm
+++ b/data/maps/objects/LoreleisRoom.asm
@@ -2,10 +2,10 @@
 	db $3 ; border block
 
 	def_warps
-	warp 4, 11, 2, INDIGO_PLATEAU_LOBBY
-	warp 5, 11, 2, INDIGO_PLATEAU_LOBBY
-	warp 4, 0, 0, BRUNOS_ROOM
-	warp 5, 0, 1, BRUNOS_ROOM
+	warp  4, 11, 2, INDIGO_PLATEAU_LOBBY
+	warp  5, 11, 2, INDIGO_PLATEAU_LOBBY
+	warp  4,  0, 0, BRUNOS_ROOM
+	warp  5,  0, 1, BRUNOS_ROOM
 
 	def_signs
 
--- a/data/maps/objects/MrFujisHouse.asm
+++ b/data/maps/objects/MrFujisHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 2, LAST_MAP
-	warp 3, 7, 2, LAST_MAP
+	warp  2,  7, 2, LAST_MAP
+	warp  3,  7, 2, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/MrPsychicsHouse.asm
+++ b/data/maps/objects/MrPsychicsHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 7, LAST_MAP
-	warp 3, 7, 7, LAST_MAP
+	warp  2,  7, 7, LAST_MAP
+	warp  3,  7, 7, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/MtMoon1F.asm
+++ b/data/maps/objects/MtMoon1F.asm
@@ -4,7 +4,7 @@
 	def_warps
 	warp 14, 35, 1, LAST_MAP
 	warp 15, 35, 1, LAST_MAP
-	warp 5, 5, 0, MT_MOON_B1F
+	warp  5,  5, 0, MT_MOON_B1F
 	warp 17, 11, 2, MT_MOON_B1F
 	warp 25, 15, 3, MT_MOON_B1F
 
--- a/data/maps/objects/MtMoonB1F.asm
+++ b/data/maps/objects/MtMoonB1F.asm
@@ -2,14 +2,14 @@
 	db $3 ; border block
 
 	def_warps
-	warp 5, 5, 2, MT_MOON_1F
+	warp  5,  5, 2, MT_MOON_1F
 	warp 17, 11, 0, MT_MOON_B2F
-	warp 25, 9, 3, MT_MOON_1F
+	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, LAST_MAP
+	warp 23,  3, 3, MT_MOON_B2F
+	warp 27,  3, 2, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/MtMoonB2F.asm
+++ b/data/maps/objects/MtMoonB2F.asm
@@ -2,10 +2,10 @@
 	db $3 ; border block
 
 	def_warps
-	warp 25, 9, 1, MT_MOON_B1F
+	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
+	warp  5,  7, 6, MT_MOON_B1F
 
 	def_signs
 
--- a/data/maps/objects/MtMoonPokecenter.asm
+++ b/data/maps/objects/MtMoonPokecenter.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 0, LAST_MAP
-	warp 4, 7, 0, LAST_MAP
+	warp  3,  7, 0, LAST_MAP
+	warp  4,  7, 0, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/Museum1F.asm
+++ b/data/maps/objects/Museum1F.asm
@@ -2,11 +2,11 @@
 	db $a ; border block
 
 	def_warps
-	warp 10, 7, 0, LAST_MAP
-	warp 11, 7, 0, LAST_MAP
-	warp 16, 7, 1, LAST_MAP
-	warp 17, 7, 1, LAST_MAP
-	warp 7, 7, 0, MUSEUM_2F
+	warp 10,  7, 0, LAST_MAP
+	warp 11,  7, 0, LAST_MAP
+	warp 16,  7, 1, LAST_MAP
+	warp 17,  7, 1, LAST_MAP
+	warp  7,  7, 0, MUSEUM_2F
 
 	def_signs
 
--- a/data/maps/objects/Museum2F.asm
+++ b/data/maps/objects/Museum2F.asm
@@ -2,11 +2,11 @@
 	db $a ; border block
 
 	def_warps
-	warp 7, 7, 4, MUSEUM_1F
+	warp  7,  7, 4, MUSEUM_1F
 
 	def_signs
-	sign 11, 2, 6 ; Museum2FText6
-	sign 2, 5, 7 ; Museum2FText7
+	sign 11,  2, 6 ; Museum2FText6
+	sign  2,  5, 7 ; Museum2FText7
 
 	def_objects
 	object SPRITE_YOUNGSTER, 1, 7, WALK, LEFT_RIGHT, 1 ; person
--- a/data/maps/objects/NameRatersHouse.asm
+++ b/data/maps/objects/NameRatersHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 5, LAST_MAP
-	warp 3, 7, 5, LAST_MAP
+	warp  2,  7, 5, LAST_MAP
+	warp  3,  7, 5, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/OaksLab.asm
+++ b/data/maps/objects/OaksLab.asm
@@ -2,8 +2,8 @@
 	db $3 ; border block
 
 	def_warps
-	warp 4, 11, 2, LAST_MAP
-	warp 5, 11, 2, LAST_MAP
+	warp  4, 11, 2, LAST_MAP
+	warp  5, 11, 2, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/PalletTown.asm
+++ b/data/maps/objects/PalletTown.asm
@@ -2,15 +2,15 @@
 	db $b ; border block
 
 	def_warps
-	warp 5, 5, 0, REDS_HOUSE_1F
-	warp 13, 5, 0, BLUES_HOUSE
+	warp  5,  5, 0, REDS_HOUSE_1F
+	warp 13,  5, 0, BLUES_HOUSE
 	warp 12, 11, 1, OAKS_LAB
 
 	def_signs
 	sign 13, 13, 4 ; PalletTownText4
-	sign 7, 9, 5 ; PalletTownText5
-	sign 3, 5, 6 ; PalletTownText6
-	sign 11, 5, 7 ; PalletTownText7
+	sign  7,  9, 5 ; PalletTownText5
+	sign  3,  5, 6 ; PalletTownText6
+	sign 11,  5, 7 ; PalletTownText7
 
 	def_objects
 	object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person
--- a/data/maps/objects/PewterCity.asm
+++ b/data/maps/objects/PewterCity.asm
@@ -2,20 +2,20 @@
 	db $a ; border block
 
 	def_warps
-	warp 14, 7, 0, MUSEUM_1F
-	warp 19, 5, 2, MUSEUM_1F
+	warp 14,  7, 0, MUSEUM_1F
+	warp 19,  5, 2, MUSEUM_1F
 	warp 16, 17, 0, PEWTER_GYM
 	warp 29, 13, 0, PEWTER_NIDORAN_HOUSE
 	warp 23, 17, 0, PEWTER_MART
-	warp 7, 29, 0, PEWTER_SPEECH_HOUSE
+	warp  7, 29, 0, PEWTER_SPEECH_HOUSE
 	warp 13, 25, 0, PEWTER_POKECENTER
 
 	def_signs
-	sign 19, 29, 6 ; PewterCityText6
-	sign 33, 19, 7 ; PewterCityText7
-	sign 24, 17, 8 ; MartSignText
-	sign 14, 25, 9 ; PokeCenterSignText
-	sign 15, 9, 10 ; PewterCityText10
+	sign 19, 29,  6 ; PewterCityText6
+	sign 33, 19,  7 ; PewterCityText7
+	sign 24, 17,  8 ; MartSignText
+	sign 14, 25,  9 ; PokeCenterSignText
+	sign 15,  9, 10 ; PewterCityText10
 	sign 11, 17, 11 ; PewterCityText11
 	sign 25, 23, 12 ; PewterCityText12
 
--- a/data/maps/objects/PewterGym.asm
+++ b/data/maps/objects/PewterGym.asm
@@ -2,8 +2,8 @@
 	db $3 ; border block
 
 	def_warps
-	warp 4, 13, 2, LAST_MAP
-	warp 5, 13, 2, LAST_MAP
+	warp  4, 13, 2, LAST_MAP
+	warp  5, 13, 2, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/PewterMart.asm
+++ b/data/maps/objects/PewterMart.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 4, LAST_MAP
-	warp 4, 7, 4, LAST_MAP
+	warp  3,  7, 4, LAST_MAP
+	warp  4,  7, 4, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/PewterNidoranHouse.asm
+++ b/data/maps/objects/PewterNidoranHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 3, LAST_MAP
-	warp 3, 7, 3, LAST_MAP
+	warp  2,  7, 3, LAST_MAP
+	warp  3,  7, 3, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/PewterPokecenter.asm
+++ b/data/maps/objects/PewterPokecenter.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 6, LAST_MAP
-	warp 4, 7, 6, LAST_MAP
+	warp  3,  7, 6, LAST_MAP
+	warp  4,  7, 6, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/PewterSpeechHouse.asm
+++ b/data/maps/objects/PewterSpeechHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 5, LAST_MAP
-	warp 3, 7, 5, LAST_MAP
+	warp  2,  7, 5, LAST_MAP
+	warp  3,  7, 5, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/PokemonFanClub.asm
+++ b/data/maps/objects/PokemonFanClub.asm
@@ -2,12 +2,12 @@
 	db $d ; border block
 
 	def_warps
-	warp 2, 7, 1, LAST_MAP
-	warp 3, 7, 1, LAST_MAP
+	warp  2,  7, 1, LAST_MAP
+	warp  3,  7, 1, LAST_MAP
 
 	def_signs
-	sign 1, 0, 7 ; FanClubText7
-	sign 6, 0, 8 ; FanClubText8
+	sign  1,  0, 7 ; FanClubText7
+	sign  6,  0, 8 ; FanClubText8
 
 	def_objects
 	object SPRITE_FISHER, 6, 3, STAY, LEFT, 1 ; person
--- a/data/maps/objects/PokemonMansion1F.asm
+++ b/data/maps/objects/PokemonMansion1F.asm
@@ -2,11 +2,11 @@
 	db $2e ; border block
 
 	def_warps
-	warp 4, 27, 0, LAST_MAP
-	warp 5, 27, 0, LAST_MAP
-	warp 6, 27, 0, LAST_MAP
-	warp 7, 27, 0, LAST_MAP
-	warp 5, 10, 0, POKEMON_MANSION_2F
+	warp  4, 27, 0, LAST_MAP
+	warp  5, 27, 0, LAST_MAP
+	warp  6, 27, 0, LAST_MAP
+	warp  7, 27, 0, LAST_MAP
+	warp  5, 10, 0, POKEMON_MANSION_2F
 	warp 21, 23, 0, POKEMON_MANSION_B1F
 	warp 26, 27, 0, LAST_MAP
 	warp 27, 27, 0, LAST_MAP
--- a/data/maps/objects/PokemonMansion2F.asm
+++ b/data/maps/objects/PokemonMansion2F.asm
@@ -2,10 +2,10 @@
 	db $1 ; border block
 
 	def_warps
-	warp 5, 10, 4, POKEMON_MANSION_1F
-	warp 7, 10, 0, POKEMON_MANSION_3F
+	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
+	warp  6,  1, 1, POKEMON_MANSION_3F
 
 	def_signs
 
--- a/data/maps/objects/PokemonMansion3F.asm
+++ b/data/maps/objects/PokemonMansion3F.asm
@@ -2,8 +2,8 @@
 	db $1 ; border block
 
 	def_warps
-	warp 7, 10, 1, POKEMON_MANSION_2F
-	warp 6, 1, 3, POKEMON_MANSION_2F
+	warp  7, 10, 1, POKEMON_MANSION_2F
+	warp  6,  1, 3, POKEMON_MANSION_2F
 	warp 25, 14, 2, POKEMON_MANSION_2F
 
 	def_signs
--- a/data/maps/objects/PokemonTower1F.asm
+++ b/data/maps/objects/PokemonTower1F.asm
@@ -4,7 +4,7 @@
 	def_warps
 	warp 10, 17, 1, LAST_MAP
 	warp 11, 17, 1, LAST_MAP
-	warp 18, 9, 1, POKEMON_TOWER_2F
+	warp 18,  9, 1, POKEMON_TOWER_2F
 
 	def_signs
 
--- a/data/maps/objects/PokemonTower2F.asm
+++ b/data/maps/objects/PokemonTower2F.asm
@@ -2,8 +2,8 @@
 	db $1 ; border block
 
 	def_warps
-	warp 3, 9, 0, POKEMON_TOWER_3F
-	warp 18, 9, 2, POKEMON_TOWER_1F
+	warp  3,  9, 0, POKEMON_TOWER_3F
+	warp 18,  9, 2, POKEMON_TOWER_1F
 
 	def_signs
 
--- a/data/maps/objects/PokemonTower3F.asm
+++ b/data/maps/objects/PokemonTower3F.asm
@@ -2,8 +2,8 @@
 	db $1 ; border block
 
 	def_warps
-	warp 3, 9, 0, POKEMON_TOWER_2F
-	warp 18, 9, 1, POKEMON_TOWER_4F
+	warp  3,  9, 0, POKEMON_TOWER_2F
+	warp 18,  9, 1, POKEMON_TOWER_4F
 
 	def_signs
 
--- a/data/maps/objects/PokemonTower4F.asm
+++ b/data/maps/objects/PokemonTower4F.asm
@@ -2,8 +2,8 @@
 	db $1 ; border block
 
 	def_warps
-	warp 3, 9, 0, POKEMON_TOWER_5F
-	warp 18, 9, 1, POKEMON_TOWER_3F
+	warp  3,  9, 0, POKEMON_TOWER_5F
+	warp 18,  9, 1, POKEMON_TOWER_3F
 
 	def_signs
 
--- a/data/maps/objects/PokemonTower5F.asm
+++ b/data/maps/objects/PokemonTower5F.asm
@@ -2,8 +2,8 @@
 	db $1 ; border block
 
 	def_warps
-	warp 3, 9, 0, POKEMON_TOWER_4F
-	warp 18, 9, 0, POKEMON_TOWER_6F
+	warp  3,  9, 0, POKEMON_TOWER_4F
+	warp 18,  9, 0, POKEMON_TOWER_6F
 
 	def_signs
 
--- a/data/maps/objects/PokemonTower6F.asm
+++ b/data/maps/objects/PokemonTower6F.asm
@@ -2,8 +2,8 @@
 	db $1 ; border block
 
 	def_warps
-	warp 18, 9, 1, POKEMON_TOWER_5F
-	warp 9, 16, 0, POKEMON_TOWER_7F
+	warp 18,  9, 1, POKEMON_TOWER_5F
+	warp  9, 16, 0, POKEMON_TOWER_7F
 
 	def_signs
 
--- a/data/maps/objects/PokemonTower7F.asm
+++ b/data/maps/objects/PokemonTower7F.asm
@@ -2,7 +2,7 @@
 	db $1 ; border block
 
 	def_warps
-	warp 9, 16, 1, POKEMON_TOWER_6F
+	warp  9, 16, 1, POKEMON_TOWER_6F
 
 	def_signs
 
--- a/data/maps/objects/PowerPlant.asm
+++ b/data/maps/objects/PowerPlant.asm
@@ -2,9 +2,9 @@
 	db $2e ; border block
 
 	def_warps
-	warp 4, 35, 3, LAST_MAP
-	warp 5, 35, 3, LAST_MAP
-	warp 0, 11, 3, LAST_MAP
+	warp  4, 35, 3, LAST_MAP
+	warp  5, 35, 3, LAST_MAP
+	warp  0, 11, 3, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/RedsHouse1F.asm
+++ b/data/maps/objects/RedsHouse1F.asm
@@ -2,12 +2,12 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 0, LAST_MAP ; exit1
-	warp 3, 7, 0, LAST_MAP ; exit2
-	warp 7, 1, 0, REDS_HOUSE_2F ; staircase
+	warp  2,  7, 0, LAST_MAP ; exit1
+	warp  3,  7, 0, LAST_MAP ; exit2
+	warp  7,  1, 0, REDS_HOUSE_2F ; staircase
 
 	def_signs
-	sign 3, 1, 2 ; TV
+	sign  3,  1, 2 ; TV
 
 	def_objects
 	object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom
--- a/data/maps/objects/RedsHouse2F.asm
+++ b/data/maps/objects/RedsHouse2F.asm
@@ -2,7 +2,7 @@
 	db $a ; border block
 
 	def_warps
-	warp 7, 1, 2, REDS_HOUSE_1F
+	warp  7,  1, 2, REDS_HOUSE_1F
 
 	def_signs
 
--- a/data/maps/objects/RockTunnel1F.asm
+++ b/data/maps/objects/RockTunnel1F.asm
@@ -2,12 +2,12 @@
 	db $3 ; border block
 
 	def_warps
-	warp 15, 3, 1, LAST_MAP
-	warp 15, 0, 1, LAST_MAP
+	warp 15,  3, 1, LAST_MAP
+	warp 15,  0, 1, LAST_MAP
 	warp 15, 33, 2, LAST_MAP
 	warp 15, 35, 2, LAST_MAP
-	warp 37, 3, 0, ROCK_TUNNEL_B1F
-	warp 5, 3, 1, ROCK_TUNNEL_B1F
+	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
 
--- a/data/maps/objects/RockTunnelB1F.asm
+++ b/data/maps/objects/RockTunnelB1F.asm
@@ -3,9 +3,9 @@
 
 	def_warps
 	warp 33, 25, 4, ROCK_TUNNEL_1F
-	warp 27, 3, 5, ROCK_TUNNEL_1F
+	warp 27,  3, 5, ROCK_TUNNEL_1F
 	warp 23, 11, 6, ROCK_TUNNEL_1F
-	warp 3, 3, 7, ROCK_TUNNEL_1F
+	warp  3,  3, 7, ROCK_TUNNEL_1F
 
 	def_signs
 
--- a/data/maps/objects/RockTunnelPokecenter.asm
+++ b/data/maps/objects/RockTunnelPokecenter.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 0, LAST_MAP
-	warp 4, 7, 0, LAST_MAP
+	warp  3,  7, 0, LAST_MAP
+	warp  4,  7, 0, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/RocketHideoutB1F.asm
+++ b/data/maps/objects/RocketHideoutB1F.asm
@@ -2,8 +2,8 @@
 	db $2e ; border block
 
 	def_warps
-	warp 23, 2, 0, ROCKET_HIDEOUT_B2F
-	warp 21, 2, 2, GAME_CORNER
+	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_B2F
 	warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR
--- a/data/maps/objects/RocketHideoutB2F.asm
+++ b/data/maps/objects/RocketHideoutB2F.asm
@@ -2,8 +2,8 @@
 	db $2e ; border block
 
 	def_warps
-	warp 27, 8, 0, ROCKET_HIDEOUT_B1F
-	warp 21, 8, 0, ROCKET_HIDEOUT_B3F
+	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
--- a/data/maps/objects/RocketHideoutB3F.asm
+++ b/data/maps/objects/RocketHideoutB3F.asm
@@ -2,7 +2,7 @@
 	db $2e ; border block
 
 	def_warps
-	warp 25, 6, 1, ROCKET_HIDEOUT_B2F
+	warp 25,  6, 1, ROCKET_HIDEOUT_B2F
 	warp 19, 18, 0, ROCKET_HIDEOUT_B4F
 
 	def_signs
--- a/data/maps/objects/RocketHideoutElevator.asm
+++ b/data/maps/objects/RocketHideoutElevator.asm
@@ -2,11 +2,11 @@
 	db $f ; border block
 
 	def_warps
-	warp 2, 1, 2, ROCKET_HIDEOUT_B1F
-	warp 3, 1, 4, ROCKET_HIDEOUT_B1F
+	warp  2,  1, 2, ROCKET_HIDEOUT_B1F
+	warp  3,  1, 4, ROCKET_HIDEOUT_B1F
 
 	def_signs
-	sign 1, 1, 1 ; RocketHideoutElevatorText1
+	sign  1,  1, 1 ; RocketHideoutElevatorText1
 
 	def_objects
 
--- a/data/maps/objects/Route1.asm
+++ b/data/maps/objects/Route1.asm
@@ -4,7 +4,7 @@
 	def_warps
 
 	def_signs
-	sign 9, 27, 3 ; Route1Text3
+	sign  9, 27, 3 ; Route1Text3
 
 	def_objects
 	object SPRITE_YOUNGSTER, 5, 24, WALK, UP_DOWN, 1 ; person
--- a/data/maps/objects/Route10.asm
+++ b/data/maps/objects/Route10.asm
@@ -3,15 +3,15 @@
 
 	def_warps
 	warp 11, 19, 0, ROCK_TUNNEL_POKECENTER
-	warp 8, 17, 0, ROCK_TUNNEL_1F
-	warp 8, 53, 2, ROCK_TUNNEL_1F
-	warp 6, 39, 0, POWER_PLANT
+	warp  8, 17, 0, ROCK_TUNNEL_1F
+	warp  8, 53, 2, ROCK_TUNNEL_1F
+	warp  6, 39, 0, POWER_PLANT
 
 	def_signs
-	sign 7, 19, 7 ; Route10Text7
+	sign  7, 19, 7 ; Route10Text7
 	sign 12, 19, 8 ; PokeCenterSignText
-	sign 9, 55, 9 ; Route10Text9
-	sign 5, 41, 10 ; Route10Text10
+	sign  9, 55, 9 ; Route10Text9
+	sign  5, 41, 10 ; Route10Text10
 
 	def_objects
 	object SPRITE_SUPER_NERD, 10, 44, STAY, LEFT, 1, OPP_POKEMANIAC, 1
--- a/data/maps/objects/Route11.asm
+++ b/data/maps/objects/Route11.asm
@@ -2,14 +2,14 @@
 	db $f ; border block
 
 	def_warps
-	warp 49, 8, 0, ROUTE_11_GATE_1F
-	warp 49, 9, 1, ROUTE_11_GATE_1F
-	warp 58, 8, 2, ROUTE_11_GATE_1F
-	warp 58, 9, 3, ROUTE_11_GATE_1F
-	warp 4, 5, 0, DIGLETTS_CAVE_ROUTE_11
+	warp 49,  8, 0, ROUTE_11_GATE_1F
+	warp 49,  9, 1, ROUTE_11_GATE_1F
+	warp 58,  8, 2, ROUTE_11_GATE_1F
+	warp 58,  9, 3, ROUTE_11_GATE_1F
+	warp  4,  5, 0, DIGLETTS_CAVE_ROUTE_11
 
 	def_signs
-	sign 1, 5, 11 ; Route11Text11
+	sign  1,  5, 11 ; Route11Text11
 
 	def_objects
 	object SPRITE_GAMBLER, 10, 14, STAY, DOWN, 1, OPP_GAMBLER, 1
--- a/data/maps/objects/Route11Gate1F.asm
+++ b/data/maps/objects/Route11Gate1F.asm
@@ -2,11 +2,11 @@
 	db $a ; border block
 
 	def_warps
-	warp 0, 4, 0, LAST_MAP
-	warp 0, 5, 1, LAST_MAP
-	warp 7, 4, 2, LAST_MAP
-	warp 7, 5, 3, LAST_MAP
-	warp 6, 8, 0, ROUTE_11_GATE_2F
+	warp  0,  4, 0, LAST_MAP
+	warp  0,  5, 1, LAST_MAP
+	warp  7,  4, 2, LAST_MAP
+	warp  7,  5, 3, LAST_MAP
+	warp  6,  8, 0, ROUTE_11_GATE_2F
 
 	def_signs
 
--- a/data/maps/objects/Route11Gate2F.asm
+++ b/data/maps/objects/Route11Gate2F.asm
@@ -2,11 +2,11 @@
 	db $a ; border block
 
 	def_warps
-	warp 7, 7, 4, ROUTE_11_GATE_1F
+	warp  7,  7, 4, ROUTE_11_GATE_1F
 
 	def_signs
-	sign 1, 2, 3 ; Route11GateUpstairsText3
-	sign 6, 2, 4 ; Route11GateUpstairsText4
+	sign  1,  2, 3 ; Route11GateUpstairsText3
+	sign  6,  2, 4 ; Route11GateUpstairsText4
 
 	def_objects
 	object SPRITE_YOUNGSTER, 4, 2, WALK, LEFT_RIGHT, 1 ; person
--- a/data/maps/objects/Route12Gate1F.asm
+++ b/data/maps/objects/Route12Gate1F.asm
@@ -2,11 +2,11 @@
 	db $a ; border block
 
 	def_warps
-	warp 4, 0, 0, LAST_MAP
-	warp 5, 0, 1, LAST_MAP
-	warp 4, 7, 2, LAST_MAP
-	warp 5, 7, 2, LAST_MAP
-	warp 8, 6, 0, ROUTE_12_GATE_2F
+	warp  4,  0, 0, LAST_MAP
+	warp  5,  0, 1, LAST_MAP
+	warp  4,  7, 2, LAST_MAP
+	warp  5,  7, 2, LAST_MAP
+	warp  8,  6, 0, ROUTE_12_GATE_2F
 
 	def_signs
 
--- a/data/maps/objects/Route12Gate2F.asm
+++ b/data/maps/objects/Route12Gate2F.asm
@@ -2,11 +2,11 @@
 	db $a ; border block
 
 	def_warps
-	warp 7, 7, 4, ROUTE_12_GATE_1F
+	warp  7,  7, 4, ROUTE_12_GATE_1F
 
 	def_signs
-	sign 1, 2, 2 ; Route12GateUpstairsText2
-	sign 6, 2, 3 ; Route12GateUpstairsText3
+	sign  1,  2, 2 ; Route12GateUpstairsText2
+	sign  6,  2, 3 ; Route12GateUpstairsText3
 
 	def_objects
 	object SPRITE_BRUNETTE_GIRL, 3, 4, WALK, UP_DOWN, 1 ; person
--- a/data/maps/objects/Route12SuperRodHouse.asm
+++ b/data/maps/objects/Route12SuperRodHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 3, LAST_MAP
-	warp 3, 7, 3, LAST_MAP
+	warp  2,  7, 3, LAST_MAP
+	warp  3,  7, 3, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/Route13.asm
+++ b/data/maps/objects/Route13.asm
@@ -5,7 +5,7 @@
 
 	def_signs
 	sign 15, 13, 11 ; Route13Text11
-	sign 33, 5, 12 ; Route13Text12
+	sign 33,  5, 12 ; Route13Text12
 	sign 31, 11, 13 ; Route13Text13
 
 	def_objects
--- a/data/maps/objects/Route15.asm
+++ b/data/maps/objects/Route15.asm
@@ -2,13 +2,13 @@
 	db $43 ; border block
 
 	def_warps
-	warp 7, 8, 0, ROUTE_15_GATE_1F
-	warp 7, 9, 1, ROUTE_15_GATE_1F
-	warp 14, 8, 2, ROUTE_15_GATE_1F
-	warp 14, 9, 3, ROUTE_15_GATE_1F
+	warp  7,  8, 0, ROUTE_15_GATE_1F
+	warp  7,  9, 1, ROUTE_15_GATE_1F
+	warp 14,  8, 2, ROUTE_15_GATE_1F
+	warp 14,  9, 3, ROUTE_15_GATE_1F
 
 	def_signs
-	sign 39, 9, 12 ; Route15Text12
+	sign 39,  9, 12 ; Route15Text12
 
 	def_objects
 	object SPRITE_COOLTRAINER_F, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20
--- a/data/maps/objects/Route15Gate1F.asm
+++ b/data/maps/objects/Route15Gate1F.asm
@@ -2,11 +2,11 @@
 	db $a ; border block
 
 	def_warps
-	warp 0, 4, 0, LAST_MAP
-	warp 0, 5, 1, LAST_MAP
-	warp 7, 4, 2, LAST_MAP
-	warp 7, 5, 3, LAST_MAP
-	warp 6, 8, 0, ROUTE_15_GATE_2F
+	warp  0,  4, 0, LAST_MAP
+	warp  0,  5, 1, LAST_MAP
+	warp  7,  4, 2, LAST_MAP
+	warp  7,  5, 3, LAST_MAP
+	warp  6,  8, 0, ROUTE_15_GATE_2F
 
 	def_signs
 
--- a/data/maps/objects/Route15Gate2F.asm
+++ b/data/maps/objects/Route15Gate2F.asm
@@ -2,10 +2,10 @@
 	db $a ; border block
 
 	def_warps
-	warp 7, 7, 4, ROUTE_15_GATE_1F
+	warp  7,  7, 4, ROUTE_15_GATE_1F
 
 	def_signs
-	sign 6, 2, 2 ; Route15GateUpstairsText2
+	sign  6,  2, 2 ; Route15GateUpstairsText2
 
 	def_objects
 	object SPRITE_SCIENTIST, 4, 2, STAY, DOWN, 1
--- a/data/maps/objects/Route16.asm
+++ b/data/maps/objects/Route16.asm
@@ -6,15 +6,15 @@
 	warp 17, 11, 1, ROUTE_16_GATE_1F
 	warp 24, 10, 2, ROUTE_16_GATE_1F
 	warp 24, 11, 3, ROUTE_16_GATE_1F
-	warp 17, 4, 4, ROUTE_16_GATE_1F
-	warp 17, 5, 5, ROUTE_16_GATE_1F
-	warp 24, 4, 6, ROUTE_16_GATE_1F
-	warp 24, 5, 7, ROUTE_16_GATE_1F
-	warp 7, 5, 0, ROUTE_16_FLY_HOUSE
+	warp 17,  4, 4, ROUTE_16_GATE_1F
+	warp 17,  5, 5, ROUTE_16_GATE_1F
+	warp 24,  4, 6, ROUTE_16_GATE_1F
+	warp 24,  5, 7, ROUTE_16_GATE_1F
+	warp  7,  5, 0, ROUTE_16_FLY_HOUSE
 
 	def_signs
 	sign 27, 11, 8 ; Route16Text8
-	sign 5, 17, 9 ; Route16Text9
+	sign  5, 17, 9 ; Route16Text9
 
 	def_objects
 	object SPRITE_BIKER, 17, 12, STAY, LEFT, 1, OPP_BIKER, 5
--- a/data/maps/objects/Route16FlyHouse.asm
+++ b/data/maps/objects/Route16FlyHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 8, LAST_MAP
-	warp 3, 7, 8, LAST_MAP
+	warp  2,  7, 8, LAST_MAP
+	warp  3,  7, 8, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/Route16Gate1F.asm
+++ b/data/maps/objects/Route16Gate1F.asm
@@ -2,15 +2,15 @@
 	db $a ; border block
 
 	def_warps
-	warp 0, 8, 0, LAST_MAP
-	warp 0, 9, 1, LAST_MAP
-	warp 7, 8, 2, LAST_MAP
-	warp 7, 9, 2, LAST_MAP
-	warp 0, 2, 4, LAST_MAP
-	warp 0, 3, 5, LAST_MAP
-	warp 7, 2, 6, LAST_MAP
-	warp 7, 3, 7, LAST_MAP
-	warp 6, 12, 0, ROUTE_16_GATE_2F
+	warp  0,  8, 0, LAST_MAP
+	warp  0,  9, 1, LAST_MAP
+	warp  7,  8, 2, LAST_MAP
+	warp  7,  9, 2, LAST_MAP
+	warp  0,  2, 4, LAST_MAP
+	warp  0,  3, 5, LAST_MAP
+	warp  7,  2, 6, LAST_MAP
+	warp  7,  3, 7, LAST_MAP
+	warp  6, 12, 0, ROUTE_16_GATE_2F
 
 	def_signs
 
--- a/data/maps/objects/Route16Gate2F.asm
+++ b/data/maps/objects/Route16Gate2F.asm
@@ -2,11 +2,11 @@
 	db $a ; border block
 
 	def_warps
-	warp 7, 7, 8, ROUTE_16_GATE_1F
+	warp  7,  7, 8, ROUTE_16_GATE_1F
 
 	def_signs
-	sign 1, 2, 3 ; Route16GateUpstairsText3
-	sign 6, 2, 4 ; Route16GateUpstairsText4
+	sign  1,  2, 3 ; Route16GateUpstairsText3
+	sign  6,  2, 4 ; Route16GateUpstairsText4
 
 	def_objects
 	object SPRITE_LITTLE_BOY, 4, 2, STAY, NONE, 1 ; person
--- a/data/maps/objects/Route17.asm
+++ b/data/maps/objects/Route17.asm
@@ -4,12 +4,12 @@
 	def_warps
 
 	def_signs
-	sign 9, 51, 11 ; Route17Text11
-	sign 9, 63, 12 ; Route17Text12
-	sign 9, 75, 13 ; Route17Text13
-	sign 9, 87, 14 ; Route17Text14
-	sign 9, 111, 15 ; Route17Text15
-	sign 9, 141, 16 ; Route17Text16
+	sign  9, 51, 11 ; Route17Text11
+	sign  9, 63, 12 ; Route17Text12
+	sign  9, 75, 13 ; Route17Text13
+	sign  9, 87, 14 ; Route17Text14
+	sign  9, 111, 15 ; Route17Text15
+	sign  9, 141, 16 ; Route17Text16
 
 	def_objects
 	object SPRITE_BIKER, 12, 19, STAY, LEFT, 1, OPP_CUE_BALL, 4
--- a/data/maps/objects/Route18.asm
+++ b/data/maps/objects/Route18.asm
@@ -2,14 +2,14 @@
 	db $43 ; border block
 
 	def_warps
-	warp 33, 8, 0, ROUTE_18_GATE_1F
-	warp 33, 9, 1, ROUTE_18_GATE_1F
-	warp 40, 8, 2, ROUTE_18_GATE_1F
-	warp 40, 9, 3, ROUTE_18_GATE_1F
+	warp 33,  8, 0, ROUTE_18_GATE_1F
+	warp 33,  9, 1, ROUTE_18_GATE_1F
+	warp 40,  8, 2, ROUTE_18_GATE_1F
+	warp 40,  9, 3, ROUTE_18_GATE_1F
 
 	def_signs
-	sign 43, 7, 4 ; Route18Text4
-	sign 33, 5, 5 ; Route18Text5
+	sign 43,  7, 4 ; Route18Text4
+	sign 33,  5, 5 ; Route18Text5
 
 	def_objects
 	object SPRITE_COOLTRAINER_M, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8
--- a/data/maps/objects/Route18Gate1F.asm
+++ b/data/maps/objects/Route18Gate1F.asm
@@ -2,11 +2,11 @@
 	db $a ; border block
 
 	def_warps
-	warp 0, 4, 0, LAST_MAP
-	warp 0, 5, 1, LAST_MAP
-	warp 7, 4, 2, LAST_MAP
-	warp 7, 5, 3, LAST_MAP
-	warp 6, 8, 0, ROUTE_18_GATE_2F
+	warp  0,  4, 0, LAST_MAP
+	warp  0,  5, 1, LAST_MAP
+	warp  7,  4, 2, LAST_MAP
+	warp  7,  5, 3, LAST_MAP
+	warp  6,  8, 0, ROUTE_18_GATE_2F
 
 	def_signs
 
--- a/data/maps/objects/Route18Gate2F.asm
+++ b/data/maps/objects/Route18Gate2F.asm
@@ -2,11 +2,11 @@
 	db $a ; border block
 
 	def_warps
-	warp 7, 7, 4, ROUTE_18_GATE_1F
+	warp  7,  7, 4, ROUTE_18_GATE_1F
 
 	def_signs
-	sign 1, 2, 2 ; Route18GateUpstairsText2
-	sign 6, 2, 3 ; Route18GateUpstairsText3
+	sign  1,  2, 2 ; Route18GateUpstairsText2
+	sign  6,  2, 3 ; Route18GateUpstairsText3
 
 	def_objects
 	object SPRITE_YOUNGSTER, 4, 2, WALK, LEFT_RIGHT, 1 ; person
--- a/data/maps/objects/Route19.asm
+++ b/data/maps/objects/Route19.asm
@@ -4,7 +4,7 @@
 	def_warps
 
 	def_signs
-	sign 11, 9, 11 ; Route19Text11
+	sign 11,  9, 11 ; Route19Text11
 
 	def_objects
 	object SPRITE_COOLTRAINER_M, 8, 7, STAY, LEFT, 1, OPP_SWIMMER, 2
--- a/data/maps/objects/Route2.asm
+++ b/data/maps/objects/Route2.asm
@@ -2,15 +2,15 @@
 	db $f ; border block
 
 	def_warps
-	warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2
-	warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE
+	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_SOUTH_GATE
+	warp  3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE
 
 	def_signs
-	sign 5, 65, 3 ; Route2Text3
+	sign  5, 65, 3 ; Route2Text3
 	sign 11, 11, 4 ; Route2Text4
 
 	def_objects
--- a/data/maps/objects/Route20.asm
+++ b/data/maps/objects/Route20.asm
@@ -2,11 +2,11 @@
 	db $43 ; border block
 
 	def_warps
-	warp 48, 5, 0, SEAFOAM_ISLANDS_1F
-	warp 58, 9, 2, SEAFOAM_ISLANDS_1F
+	warp 48,  5, 0, SEAFOAM_ISLANDS_1F
+	warp 58,  9, 2, SEAFOAM_ISLANDS_1F
 
 	def_signs
-	sign 51, 7, 11 ; Route20Text11
+	sign 51,  7, 11 ; Route20Text11
 	sign 57, 11, 12 ; Route20Text12
 
 	def_objects
--- a/data/maps/objects/Route22.asm
+++ b/data/maps/objects/Route22.asm
@@ -2,10 +2,10 @@
 	db $2c ; border block
 
 	def_warps
-	warp 8, 5, 0, ROUTE_22_GATE
+	warp  8,  5, 0, ROUTE_22_GATE
 
 	def_signs
-	sign 7, 11, 3 ; Route22FrontGateText
+	sign  7, 11, 3 ; Route22FrontGateText
 
 	def_objects
 	object SPRITE_BLUE, 25, 5, STAY, NONE, 1 ; person
--- a/data/maps/objects/Route22Gate.asm
+++ b/data/maps/objects/Route22Gate.asm
@@ -2,10 +2,10 @@
 	db $a ; border block
 
 	def_warps
-	warp 4, 7, 0, LAST_MAP
-	warp 5, 7, 0, LAST_MAP
-	warp 4, 0, 0, LAST_MAP
-	warp 5, 0, 1, LAST_MAP
+	warp  4,  7, 0, LAST_MAP
+	warp  5,  7, 0, LAST_MAP
+	warp  4,  0, 0, LAST_MAP
+	warp  5,  0, 1, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/Route23.asm
+++ b/data/maps/objects/Route23.asm
@@ -2,13 +2,13 @@
 	db $f ; border block
 
 	def_warps
-	warp 7, 139, 2, ROUTE_22_GATE
-	warp 8, 139, 3, ROUTE_22_GATE
-	warp 4, 31, 0, VICTORY_ROAD_1F
+	warp  7, 139, 2, ROUTE_22_GATE
+	warp  8, 139, 3, ROUTE_22_GATE
+	warp  4, 31, 0, VICTORY_ROAD_1F
 	warp 14, 31, 1, VICTORY_ROAD_2F
 
 	def_signs
-	sign 3, 33, 8 ; Route23Text8
+	sign  3, 33, 8 ; Route23Text8
 
 	def_objects
 	object SPRITE_GUARD, 4, 35, STAY, DOWN, 1 ; person
--- a/data/maps/objects/Route25.asm
+++ b/data/maps/objects/Route25.asm
@@ -2,10 +2,10 @@
 	db $2c ; border block
 
 	def_warps
-	warp 45, 3, 0, BILLS_HOUSE
+	warp 45,  3, 0, BILLS_HOUSE
 
 	def_signs
-	sign 43, 3, 11 ; Route25Text11
+	sign 43,  3, 11 ; Route25Text11
 
 	def_objects
 	object SPRITE_YOUNGSTER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5
--- a/data/maps/objects/Route2Gate.asm
+++ b/data/maps/objects/Route2Gate.asm
@@ -2,10 +2,10 @@
 	db $a ; border block
 
 	def_warps
-	warp 4, 0, 3, LAST_MAP
-	warp 5, 0, 3, LAST_MAP
-	warp 4, 7, 4, LAST_MAP
-	warp 5, 7, 4, LAST_MAP
+	warp  4,  0, 3, LAST_MAP
+	warp  5,  0, 3, LAST_MAP
+	warp  4,  7, 4, LAST_MAP
+	warp  5,  7, 4, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/Route2TradeHouse.asm
+++ b/data/maps/objects/Route2TradeHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 2, LAST_MAP
-	warp 3, 7, 2, LAST_MAP
+	warp  2,  7, 2, LAST_MAP
+	warp  3,  7, 2, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/Route3.asm
+++ b/data/maps/objects/Route3.asm
@@ -4,7 +4,7 @@
 	def_warps
 
 	def_signs
-	sign 59, 9, 10 ; Route3Text10
+	sign 59,  9, 10 ; Route3Text10
 
 	def_objects
 	object SPRITE_SUPER_NERD, 57, 11, STAY, NONE, 1 ; person
--- a/data/maps/objects/Route4.asm
+++ b/data/maps/objects/Route4.asm
@@ -2,14 +2,14 @@
 	db $2c ; border block
 
 	def_warps
-	warp 11, 5, 0, MT_MOON_POKECENTER
-	warp 18, 5, 0, MT_MOON_1F
-	warp 24, 5, 7, MT_MOON_B1F
+	warp 11,  5, 0, MT_MOON_POKECENTER
+	warp 18,  5, 0, MT_MOON_1F
+	warp 24,  5, 7, MT_MOON_B1F
 
 	def_signs
-	sign 12, 5, 4 ; PokeCenterSignText
-	sign 17, 7, 5 ; Route4Text5
-	sign 27, 7, 6 ; Route4Text6
+	sign 12,  5, 4 ; PokeCenterSignText
+	sign 17,  7, 5 ; Route4Text5
+	sign 27,  7, 6 ; Route4Text6
 
 	def_objects
 	object SPRITE_COOLTRAINER_F, 9, 8, WALK, ANY_DIR, 1 ; person
--- a/data/maps/objects/Route5.asm
+++ b/data/maps/objects/Route5.asm
@@ -3,7 +3,7 @@
 
 	def_warps
 	warp 10, 29, 3, ROUTE_5_GATE
-	warp 9, 29, 2, ROUTE_5_GATE
+	warp  9, 29, 2, ROUTE_5_GATE
 	warp 10, 33, 0, ROUTE_5_GATE
 	warp 17, 27, 0, UNDERGROUND_PATH_ROUTE_5
 	warp 10, 21, 0, DAYCARE
--- a/data/maps/objects/Route5Gate.asm
+++ b/data/maps/objects/Route5Gate.asm
@@ -2,10 +2,10 @@
 	db $a ; border block
 
 	def_warps
-	warp 3, 5, 2, LAST_MAP
-	warp 4, 5, 2, LAST_MAP
-	warp 3, 0, 1, LAST_MAP
-	warp 4, 0, 0, LAST_MAP
+	warp  3,  5, 2, LAST_MAP
+	warp  4,  5, 2, LAST_MAP
+	warp  3,  0, 1, LAST_MAP
+	warp  4,  0, 0, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/Route6.asm
+++ b/data/maps/objects/Route6.asm
@@ -2,9 +2,9 @@
 	db $f ; border block
 
 	def_warps
-	warp 9, 1, 2, ROUTE_6_GATE
-	warp 10, 1, 2, ROUTE_6_GATE
-	warp 10, 7, 0, ROUTE_6_GATE
+	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, UNDERGROUND_PATH_ROUTE_6
 
 	def_signs
--- a/data/maps/objects/Route6Gate.asm
+++ b/data/maps/objects/Route6Gate.asm
@@ -2,10 +2,10 @@
 	db $a ; border block
 
 	def_warps
-	warp 3, 5, 2, LAST_MAP
-	warp 4, 5, 2, LAST_MAP
-	warp 3, 0, 1, LAST_MAP
-	warp 4, 0, 1, LAST_MAP
+	warp  3,  5, 2, LAST_MAP
+	warp  4,  5, 2, LAST_MAP
+	warp  3,  0, 1, LAST_MAP
+	warp  4,  0, 1, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/Route7.asm
+++ b/data/maps/objects/Route7.asm
@@ -2,14 +2,14 @@
 	db $f ; border block
 
 	def_warps
-	warp 18, 9, 2, ROUTE_7_GATE
+	warp 18,  9, 2, ROUTE_7_GATE
 	warp 18, 10, 3, ROUTE_7_GATE
-	warp 11, 9, 0, ROUTE_7_GATE
+	warp 11,  9, 0, ROUTE_7_GATE
 	warp 11, 10, 1, ROUTE_7_GATE
-	warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7
+	warp  5, 13, 0, UNDERGROUND_PATH_ROUTE_7
 
 	def_signs
-	sign 3, 13, 1 ; Route7Text1
+	sign  3, 13, 1 ; Route7Text1
 
 	def_objects
 
--- a/data/maps/objects/Route7Gate.asm
+++ b/data/maps/objects/Route7Gate.asm
@@ -2,10 +2,10 @@
 	db $a ; border block
 
 	def_warps
-	warp 0, 3, 3, LAST_MAP
-	warp 0, 4, 3, LAST_MAP
-	warp 5, 3, 0, LAST_MAP
-	warp 5, 4, 1, LAST_MAP
+	warp  0,  3, 3, LAST_MAP
+	warp  0,  4, 3, LAST_MAP
+	warp  5,  3, 0, LAST_MAP
+	warp  5,  4, 1, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/Route8.asm
+++ b/data/maps/objects/Route8.asm
@@ -2,14 +2,14 @@
 	db $2c ; border block
 
 	def_warps
-	warp 1, 9, 0, ROUTE_8_GATE
-	warp 1, 10, 1, ROUTE_8_GATE
-	warp 8, 9, 2, ROUTE_8_GATE
-	warp 8, 10, 3, ROUTE_8_GATE
-	warp 13, 3, 0, UNDERGROUND_PATH_ROUTE_8
+	warp  1,  9, 0, ROUTE_8_GATE
+	warp  1, 10, 1, ROUTE_8_GATE
+	warp  8,  9, 2, ROUTE_8_GATE
+	warp  8, 10, 3, ROUTE_8_GATE
+	warp 13,  3, 0, UNDERGROUND_PATH_ROUTE_8
 
 	def_signs
-	sign 17, 3, 10 ; Route8Text10
+	sign 17,  3, 10 ; Route8Text10
 
 	def_objects
 	object SPRITE_SUPER_NERD, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3
--- a/data/maps/objects/Route8Gate.asm
+++ b/data/maps/objects/Route8Gate.asm
@@ -2,10 +2,10 @@
 	db $a ; border block
 
 	def_warps
-	warp 0, 3, 0, LAST_MAP
-	warp 0, 4, 1, LAST_MAP
-	warp 5, 3, 2, LAST_MAP
-	warp 5, 4, 3, LAST_MAP
+	warp  0,  3, 0, LAST_MAP
+	warp  0,  4, 1, LAST_MAP
+	warp  5,  3, 2, LAST_MAP
+	warp  5,  4, 3, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/Route9.asm
+++ b/data/maps/objects/Route9.asm
@@ -4,7 +4,7 @@
 	def_warps
 
 	def_signs
-	sign 25, 7, 11 ; Route9Text11
+	sign 25,  7, 11 ; Route9Text11
 
 	def_objects
 	object SPRITE_COOLTRAINER_F, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5
--- a/data/maps/objects/SSAnne1F.asm
+++ b/data/maps/objects/SSAnne1F.asm
@@ -2,17 +2,17 @@
 	db $c ; border block
 
 	def_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 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
+	warp  3, 16, 0, SS_ANNE_KITCHEN
 
 	def_signs
 
--- a/data/maps/objects/SSAnne1FRooms.asm
+++ b/data/maps/objects/SSAnne1FRooms.asm
@@ -2,10 +2,10 @@
 	db $c ; border block
 
 	def_warps
-	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  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
 
--- a/data/maps/objects/SSAnne2F.asm
+++ b/data/maps/objects/SSAnne2F.asm
@@ -2,15 +2,15 @@
 	db $c ; border block
 
 	def_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  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
+	warp  2,  4,  8, SS_ANNE_1F
+	warp  2, 12,  1, SS_ANNE_3F
+	warp 36,  4,  0, SS_ANNE_CAPTAINS_ROOM
 
 	def_signs
 
--- a/data/maps/objects/SSAnne2FRooms.asm
+++ b/data/maps/objects/SSAnne2FRooms.asm
@@ -2,14 +2,14 @@
 	db $c ; border block
 
 	def_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  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
--- a/data/maps/objects/SSAnne3F.asm
+++ b/data/maps/objects/SSAnne3F.asm
@@ -2,8 +2,8 @@
 	db $c ; border block
 
 	def_warps
-	warp 0, 3, 0, SS_ANNE_BOW
-	warp 19, 3, 7, SS_ANNE_2F
+	warp  0,  3, 0, SS_ANNE_BOW
+	warp 19,  3, 7, SS_ANNE_2F
 
 	def_signs
 
--- a/data/maps/objects/SSAnneB1F.asm
+++ b/data/maps/objects/SSAnneB1F.asm
@@ -2,12 +2,12 @@
 	db $c ; border block
 
 	def_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
+	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
 
 	def_signs
 
--- a/data/maps/objects/SSAnneB1FRooms.asm
+++ b/data/maps/objects/SSAnneB1FRooms.asm
@@ -2,14 +2,14 @@
 	db $c ; border block
 
 	def_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  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
 
--- a/data/maps/objects/SSAnneBow.asm
+++ b/data/maps/objects/SSAnneBow.asm
@@ -2,8 +2,8 @@
 	db $23 ; border block
 
 	def_warps
-	warp 13, 6, 0, SS_ANNE_3F
-	warp 13, 7, 0, SS_ANNE_3F
+	warp 13,  6, 0, SS_ANNE_3F
+	warp 13,  7, 0, SS_ANNE_3F
 
 	def_signs
 
--- a/data/maps/objects/SSAnneCaptainsRoom.asm
+++ b/data/maps/objects/SSAnneCaptainsRoom.asm
@@ -2,11 +2,11 @@
 	db $c ; border block
 
 	def_warps
-	warp 0, 7, 8, SS_ANNE_2F
+	warp  0,  7, 8, SS_ANNE_2F
 
 	def_signs
-	sign 4, 1, 2 ; SSAnne7Text2
-	sign 1, 2, 3 ; SSAnne7Text3
+	sign  4,  1, 2 ; SSAnne7Text2
+	sign  1,  2, 3 ; SSAnne7Text3
 
 	def_objects
 	object SPRITE_CAPTAIN, 4, 2, STAY, UP, 1 ; person
--- a/data/maps/objects/SSAnneKitchen.asm
+++ b/data/maps/objects/SSAnneKitchen.asm
@@ -2,7 +2,7 @@
 	db $c ; border block
 
 	def_warps
-	warp 6, 0, 10, SS_ANNE_1F
+	warp  6,  0, 10, SS_ANNE_1F
 
 	def_signs
 
--- a/data/maps/objects/SafariZoneCenter.asm
+++ b/data/maps/objects/SafariZoneCenter.asm
@@ -4,10 +4,10 @@
 	def_warps
 	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  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_CENTER_REST_HOUSE
--- a/data/maps/objects/SafariZoneCenterRestHouse.asm
+++ b/data/maps/objects/SafariZoneCenterRestHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 8, SAFARI_ZONE_CENTER
-	warp 3, 7, 8, SAFARI_ZONE_CENTER
+	warp  2,  7, 8, SAFARI_ZONE_CENTER
+	warp  3,  7, 8, SAFARI_ZONE_CENTER
 
 	def_signs
 
--- a/data/maps/objects/SafariZoneEast.asm
+++ b/data/maps/objects/SafariZoneEast.asm
@@ -2,16 +2,16 @@
 	db $0 ; border block
 
 	def_warps
-	warp 0, 4, 6, SAFARI_ZONE_NORTH
-	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_EAST_REST_HOUSE
+	warp  0,  4, 6, SAFARI_ZONE_NORTH
+	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_EAST_REST_HOUSE
 
 	def_signs
 	sign 26, 10, 5 ; SafariZoneEastText5
-	sign 6, 4, 6 ; SafariZoneEastText6
-	sign 5, 23, 7 ; SafariZoneEastText7
+	sign  6,  4, 6 ; SafariZoneEastText6
+	sign  5, 23, 7 ; SafariZoneEastText7
 
 	def_objects
 	object SPRITE_POKE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE
--- a/data/maps/objects/SafariZoneEastRestHouse.asm
+++ b/data/maps/objects/SafariZoneEastRestHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 4, SAFARI_ZONE_EAST
-	warp 3, 7, 4, SAFARI_ZONE_EAST
+	warp  2,  7, 4, SAFARI_ZONE_EAST
+	warp  3,  7, 4, SAFARI_ZONE_EAST
 
 	def_signs
 
--- a/data/maps/objects/SafariZoneGate.asm
+++ b/data/maps/objects/SafariZoneGate.asm
@@ -2,10 +2,10 @@
 	db $a ; border block
 
 	def_warps
-	warp 3, 5, 4, LAST_MAP
-	warp 4, 5, 4, LAST_MAP
-	warp 3, 0, 0, SAFARI_ZONE_CENTER
-	warp 4, 0, 1, SAFARI_ZONE_CENTER
+	warp  3,  5, 4, LAST_MAP
+	warp  4,  5, 4, LAST_MAP
+	warp  3,  0, 0, SAFARI_ZONE_CENTER
+	warp  4,  0, 1, SAFARI_ZONE_CENTER
 
 	def_signs
 
--- a/data/maps/objects/SafariZoneNorth.asm
+++ b/data/maps/objects/SafariZoneNorth.asm
@@ -2,19 +2,19 @@
 	db $0 ; border block
 
 	def_warps
-	warp 2, 35, 0, SAFARI_ZONE_WEST
-	warp 3, 35, 1, SAFARI_ZONE_WEST
-	warp 8, 35, 2, SAFARI_ZONE_WEST
-	warp 9, 35, 3, SAFARI_ZONE_WEST
+	warp  2, 35, 0, SAFARI_ZONE_WEST
+	warp  3, 35, 1, SAFARI_ZONE_WEST
+	warp  8, 35, 2, SAFARI_ZONE_WEST
+	warp  9, 35, 3, SAFARI_ZONE_WEST
 	warp 20, 35, 4, SAFARI_ZONE_CENTER
 	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_NORTH_REST_HOUSE
+	warp 35,  3, 0, SAFARI_ZONE_NORTH_REST_HOUSE
 
 	def_signs
-	sign 36, 4, 3 ; SafariZoneNorthText3
-	sign 4, 25, 4 ; SafariZoneNorthText4
+	sign 36,  4, 3 ; SafariZoneNorthText3
+	sign  4, 25, 4 ; SafariZoneNorthText4
 	sign 13, 31, 5 ; SafariZoneNorthText5
 	sign 19, 33, 6 ; SafariZoneNorthText6
 	sign 26, 28, 7 ; SafariZoneNorthText7
--- a/data/maps/objects/SafariZoneNorthRestHouse.asm
+++ b/data/maps/objects/SafariZoneNorthRestHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 8, SAFARI_ZONE_NORTH
-	warp 3, 7, 8, SAFARI_ZONE_NORTH
+	warp  2,  7, 8, SAFARI_ZONE_NORTH
+	warp  3,  7, 8, SAFARI_ZONE_NORTH
 
 	def_signs
 
--- a/data/maps/objects/SafariZoneSecretHouse.asm
+++ b/data/maps/objects/SafariZoneSecretHouse.asm
@@ -2,8 +2,8 @@
 	db $17 ; border block
 
 	def_warps
-	warp 2, 7, 6, SAFARI_ZONE_WEST
-	warp 3, 7, 6, SAFARI_ZONE_WEST
+	warp  2,  7, 6, SAFARI_ZONE_WEST
+	warp  3,  7, 6, SAFARI_ZONE_WEST
 
 	def_signs
 
--- a/data/maps/objects/SafariZoneWest.asm
+++ b/data/maps/objects/SafariZoneWest.asm
@@ -2,19 +2,19 @@
 	db $0 ; border block
 
 	def_warps
-	warp 20, 0, 0, SAFARI_ZONE_NORTH
-	warp 21, 0, 1, SAFARI_ZONE_NORTH
-	warp 26, 0, 2, SAFARI_ZONE_NORTH
-	warp 27, 0, 3, SAFARI_ZONE_NORTH
+	warp 20,  0, 0, SAFARI_ZONE_NORTH
+	warp 21,  0, 1, SAFARI_ZONE_NORTH
+	warp 26,  0, 2, SAFARI_ZONE_NORTH
+	warp 27,  0, 3, SAFARI_ZONE_NORTH
 	warp 29, 22, 2, SAFARI_ZONE_CENTER
 	warp 29, 23, 3, SAFARI_ZONE_CENTER
-	warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE
+	warp  3,  3, 0, SAFARI_ZONE_SECRET_HOUSE
 	warp 11, 11, 0, SAFARI_ZONE_WEST_REST_HOUSE
 
 	def_signs
 	sign 12, 12, 5 ; SafariZoneWestText5
-	sign 17, 3, 6 ; SafariZoneWestText6
-	sign 26, 4, 7 ; SafariZoneWestText7
+	sign 17,  3, 6 ; SafariZoneWestText6
+	sign 26,  4, 7 ; SafariZoneWestText7
 	sign 24, 22, 8 ; SafariZoneWestText8
 
 	def_objects
--- a/data/maps/objects/SafariZoneWestRestHouse.asm
+++ b/data/maps/objects/SafariZoneWestRestHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 7, SAFARI_ZONE_WEST
-	warp 3, 7, 7, SAFARI_ZONE_WEST
+	warp  2,  7, 7, SAFARI_ZONE_WEST
+	warp  3,  7, 7, SAFARI_ZONE_WEST
 
 	def_signs
 
--- a/data/maps/objects/SaffronCity.asm
+++ b/data/maps/objects/SaffronCity.asm
@@ -2,26 +2,26 @@
 	db $f ; border block
 
 	def_warps
-	warp 7, 5, 0, COPYCATS_HOUSE_1F
-	warp 26, 3, 0, FIGHTING_DOJO
-	warp 34, 3, 0, SAFFRON_GYM
+	warp  7,  5, 0, COPYCATS_HOUSE_1F
+	warp 26,  3, 0, FIGHTING_DOJO
+	warp 34,  3, 0, SAFFRON_GYM
 	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  9, 29, 0, SAFFRON_POKECENTER
 	warp 29, 29, 0, MR_PSYCHICS_HOUSE
 
 	def_signs
-	sign 17, 5, 16 ; SaffronCityText16
-	sign 27, 5, 17 ; SaffronCityText17
-	sign 35, 5, 18 ; SaffronCityText18
+	sign 17,  5, 16 ; SaffronCityText16
+	sign 27,  5, 17 ; SaffronCityText17
+	sign 35,  5, 18 ; SaffronCityText18
 	sign 26, 11, 19 ; MartSignText
 	sign 39, 19, 20 ; SaffronCityText20
-	sign 5, 21, 21 ; SaffronCityText21
+	sign  5, 21, 21 ; SaffronCityText21
 	sign 15, 21, 22 ; SaffronCityText22
 	sign 10, 29, 23 ; PokeCenterSignText
 	sign 27, 29, 24 ; SaffronCityText24
-	sign 1, 19, 25 ; SaffronCityText25
+	sign  1, 19, 25 ; SaffronCityText25
 
 	def_objects
 	object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person
--- a/data/maps/objects/SaffronGym.asm
+++ b/data/maps/objects/SaffronGym.asm
@@ -2,32 +2,32 @@
 	db $2e ; border block
 
 	def_warps
-	warp 8, 17, 2, LAST_MAP
-	warp 9, 17, 2, LAST_MAP
-	warp 1, 3, 22, SAFFRON_GYM
-	warp 5, 3, 15, SAFFRON_GYM
-	warp 1, 5, 18, SAFFRON_GYM
-	warp 5, 5, 8, SAFFRON_GYM
-	warp 1, 9, 27, SAFFRON_GYM
-	warp 5, 9, 16, SAFFRON_GYM
-	warp 1, 11, 5, SAFFRON_GYM
-	warp 5, 11, 13, SAFFRON_GYM
-	warp 1, 15, 23, SAFFRON_GYM
-	warp 5, 15, 30, SAFFRON_GYM
-	warp 1, 17, 17, SAFFRON_GYM
-	warp 5, 17, 9, SAFFRON_GYM
-	warp 9, 3, 26, SAFFRON_GYM
-	warp 11, 3, 3, SAFFRON_GYM
-	warp 9, 5, 7, SAFFRON_GYM
-	warp 11, 5, 12, SAFFRON_GYM
+	warp  8, 17, 2, LAST_MAP
+	warp  9, 17, 2, LAST_MAP
+	warp  1,  3, 22, SAFFRON_GYM
+	warp  5,  3, 15, SAFFRON_GYM
+	warp  1,  5, 18, SAFFRON_GYM
+	warp  5,  5, 8, SAFFRON_GYM
+	warp  1,  9, 27, SAFFRON_GYM
+	warp  5,  9, 16, SAFFRON_GYM
+	warp  1, 11, 5, SAFFRON_GYM
+	warp  5, 11, 13, SAFFRON_GYM
+	warp  1, 15, 23, SAFFRON_GYM
+	warp  5, 15, 30, SAFFRON_GYM
+	warp  1, 17, 17, SAFFRON_GYM
+	warp  5, 17, 9, SAFFRON_GYM
+	warp  9,  3, 26, SAFFRON_GYM
+	warp 11,  3, 3, SAFFRON_GYM
+	warp  9,  5, 7, SAFFRON_GYM
+	warp 11,  5, 12, SAFFRON_GYM
 	warp 11, 11, 4, SAFFRON_GYM
 	warp 11, 15, 31, SAFFRON_GYM
-	warp 15, 3, 24, SAFFRON_GYM
-	warp 19, 3, 28, SAFFRON_GYM
-	warp 15, 5, 2, SAFFRON_GYM
-	warp 19, 5, 10, SAFFRON_GYM
-	warp 15, 9, 20, SAFFRON_GYM
-	warp 19, 9, 29, SAFFRON_GYM
+	warp 15,  3, 24, SAFFRON_GYM
+	warp 19,  3, 28, SAFFRON_GYM
+	warp 15,  5, 2, SAFFRON_GYM
+	warp 19,  5, 10, SAFFRON_GYM
+	warp 15,  9, 20, SAFFRON_GYM
+	warp 19,  9, 29, SAFFRON_GYM
 	warp 15, 11, 14, SAFFRON_GYM
 	warp 19, 11, 6, SAFFRON_GYM
 	warp 15, 15, 21, SAFFRON_GYM
--- a/data/maps/objects/SaffronMart.asm
+++ b/data/maps/objects/SaffronMart.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 4, LAST_MAP
-	warp 4, 7, 4, LAST_MAP
+	warp  3,  7, 4, LAST_MAP
+	warp  4,  7, 4, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/SaffronPidgeyHouse.asm
+++ b/data/maps/objects/SaffronPidgeyHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 3, LAST_MAP
-	warp 3, 7, 3, LAST_MAP
+	warp  2,  7, 3, LAST_MAP
+	warp  3,  7, 3, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/SaffronPokecenter.asm
+++ b/data/maps/objects/SaffronPokecenter.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 6, LAST_MAP
-	warp 4, 7, 6, LAST_MAP
+	warp  3,  7, 6, LAST_MAP
+	warp  4,  7, 6, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/SeafoamIslands1F.asm
+++ b/data/maps/objects/SeafoamIslands1F.asm
@@ -2,12 +2,12 @@
 	db $7d ; border block
 
 	def_warps
-	warp 4, 17, 0, LAST_MAP
-	warp 5, 17, 0, LAST_MAP
+	warp  4, 17, 0, LAST_MAP
+	warp  5, 17, 0, LAST_MAP
 	warp 26, 17, 1, LAST_MAP
 	warp 27, 17, 1, LAST_MAP
-	warp 7, 5, 1, SEAFOAM_ISLANDS_B1F
-	warp 25, 3, 6, SEAFOAM_ISLANDS_B1F
+	warp  7,  5, 1, SEAFOAM_ISLANDS_B1F
+	warp 25,  3, 6, SEAFOAM_ISLANDS_B1F
 	warp 23, 15, 4, SEAFOAM_ISLANDS_B1F
 
 	def_signs
--- a/data/maps/objects/SeafoamIslandsB1F.asm
+++ b/data/maps/objects/SeafoamIslandsB1F.asm
@@ -2,13 +2,13 @@
 	db $7d ; border block
 
 	def_warps
-	warp 4, 2, 0, SEAFOAM_ISLANDS_B2F
-	warp 7, 5, 4, SEAFOAM_ISLANDS_1F
-	warp 13, 7, 2, SEAFOAM_ISLANDS_B2F
+	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
+	warp 25,  3, 5, SEAFOAM_ISLANDS_1F
 
 	def_signs
 
--- a/data/maps/objects/SeafoamIslandsB2F.asm
+++ b/data/maps/objects/SeafoamIslandsB2F.asm
@@ -2,11 +2,11 @@
 	db $7d ; border block
 
 	def_warps
-	warp 5, 3, 0, SEAFOAM_ISLANDS_B1F
-	warp 5, 13, 0, SEAFOAM_ISLANDS_B3F
-	warp 13, 7, 2, SEAFOAM_ISLANDS_B1F
+	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,  3, 3, SEAFOAM_ISLANDS_B3F
 	warp 25, 11, 5, SEAFOAM_ISLANDS_B1F
 	warp 25, 14, 4, SEAFOAM_ISLANDS_B3F
 
--- a/data/maps/objects/SeafoamIslandsB3F.asm
+++ b/data/maps/objects/SeafoamIslandsB3F.asm
@@ -2,10 +2,10 @@
 	db $7d ; border block
 
 	def_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  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
--- a/data/maps/objects/SeafoamIslandsB4F.asm
+++ b/data/maps/objects/SeafoamIslandsB4F.asm
@@ -4,12 +4,12 @@
 	def_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
+	warp 11,  7, 1, SEAFOAM_ISLANDS_B3F
+	warp 25,  4, 2, SEAFOAM_ISLANDS_B3F
 
 	def_signs
-	sign 9, 15, 4 ; SeafoamIslands5Text4
-	sign 23, 1, 5 ; SeafoamIslands5Text5
+	sign  9, 15, 4 ; SeafoamIslands5Text4
+	sign 23,  1, 5 ; SeafoamIslands5Text5
 
 	def_objects
 	object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person
--- a/data/maps/objects/SilphCo10F.asm
+++ b/data/maps/objects/SilphCo10F.asm
@@ -2,12 +2,12 @@
 	db $2e ; border block
 
 	def_warps
-	warp 8, 0, 0, SILPH_CO_9F
-	warp 10, 0, 0, SILPH_CO_11F
-	warp 12, 0, 0, SILPH_CO_ELEVATOR
-	warp 9, 11, 3, SILPH_CO_4F
+	warp  8,  0, 0, SILPH_CO_9F
+	warp 10,  0, 0, SILPH_CO_11F
+	warp 12,  0, 0, SILPH_CO_ELEVATOR
+	warp  9, 11, 3, SILPH_CO_4F
 	warp 13, 15, 5, SILPH_CO_4F
-	warp 13, 7, 6, SILPH_CO_4F
+	warp 13,  7, 6, SILPH_CO_4F
 
 	def_signs
 
--- a/data/maps/objects/SilphCo11F.asm
+++ b/data/maps/objects/SilphCo11F.asm
@@ -2,10 +2,10 @@
 	db $d ; border block
 
 	def_warps
-	warp 9, 0, 1, SILPH_CO_10F
-	warp 13, 0, 0, SILPH_CO_ELEVATOR
-	warp 5, 5, 9, LAST_MAP
-	warp 3, 2, 3, SILPH_CO_7F
+	warp  9,  0, 1, SILPH_CO_10F
+	warp 13,  0, 0, SILPH_CO_ELEVATOR
+	warp  5,  5, 9, LAST_MAP
+	warp  3,  2, 3, SILPH_CO_7F
 
 	def_signs
 
--- a/data/maps/objects/SilphCo1F.asm
+++ b/data/maps/objects/SilphCo1F.asm
@@ -4,8 +4,8 @@
 	def_warps
 	warp 10, 17, 5, LAST_MAP
 	warp 11, 17, 5, LAST_MAP
-	warp 26, 0, 0, SILPH_CO_2F
-	warp 20, 0, 0, SILPH_CO_ELEVATOR
+	warp 26,  0, 0, SILPH_CO_2F
+	warp 20,  0, 0, SILPH_CO_ELEVATOR
 	warp 16, 10, 6, SILPH_CO_3F
 
 	def_signs
--- a/data/maps/objects/SilphCo2F.asm
+++ b/data/maps/objects/SilphCo2F.asm
@@ -2,13 +2,13 @@
 	db $2e ; border block
 
 	def_warps
-	warp 24, 0, 2, SILPH_CO_1F
-	warp 26, 0, 0, SILPH_CO_3F
-	warp 20, 0, 0, SILPH_CO_ELEVATOR
-	warp 3, 3, 6, SILPH_CO_3F
-	warp 13, 3, 4, SILPH_CO_8F
+	warp 24,  0, 2, SILPH_CO_1F
+	warp 26,  0, 0, SILPH_CO_3F
+	warp 20,  0, 0, SILPH_CO_ELEVATOR
+	warp  3,  3, 6, SILPH_CO_3F
+	warp 13,  3, 4, SILPH_CO_8F
 	warp 27, 15, 5, SILPH_CO_8F
-	warp 9, 15, 4, SILPH_CO_6F
+	warp  9, 15, 4, SILPH_CO_6F
 
 	def_signs
 
--- a/data/maps/objects/SilphCo3F.asm
+++ b/data/maps/objects/SilphCo3F.asm
@@ -2,14 +2,14 @@
 	db $2e ; border block
 
 	def_warps
-	warp 26, 0, 1, SILPH_CO_2F
-	warp 24, 0, 0, SILPH_CO_4F
-	warp 20, 0, 0, SILPH_CO_ELEVATOR
+	warp 26,  0, 1, SILPH_CO_2F
+	warp 24,  0, 0, SILPH_CO_4F
+	warp 20,  0, 0, SILPH_CO_ELEVATOR
 	warp 23, 11, 9, SILPH_CO_3F
-	warp 3, 3, 5, SILPH_CO_5F
-	warp 3, 15, 6, SILPH_CO_5F
-	warp 27, 3, 3, SILPH_CO_2F
-	warp 3, 11, 3, SILPH_CO_9F
+	warp  3,  3, 5, SILPH_CO_5F
+	warp  3, 15, 6, SILPH_CO_5F
+	warp 27,  3, 3, SILPH_CO_2F
+	warp  3, 11, 3, SILPH_CO_9F
 	warp 11, 11, 4, SILPH_CO_7F
 	warp 27, 15, 3, SILPH_CO_3F
 
--- a/data/maps/objects/SilphCo4F.asm
+++ b/data/maps/objects/SilphCo4F.asm
@@ -2,12 +2,12 @@
 	db $2e ; border block
 
 	def_warps
-	warp 24, 0, 1, SILPH_CO_3F
-	warp 26, 0, 1, SILPH_CO_5F
-	warp 20, 0, 0, SILPH_CO_ELEVATOR
-	warp 11, 7, 3, SILPH_CO_10F
-	warp 17, 3, 3, SILPH_CO_6F
-	warp 3, 15, 4, SILPH_CO_10F
+	warp 24,  0, 1, SILPH_CO_3F
+	warp 26,  0, 1, SILPH_CO_5F
+	warp 20,  0, 0, SILPH_CO_ELEVATOR
+	warp 11,  7, 3, SILPH_CO_10F
+	warp 17,  3, 3, SILPH_CO_6F
+	warp  3, 15, 4, SILPH_CO_10F
 	warp 17, 11, 5, SILPH_CO_10F
 
 	def_signs
--- a/data/maps/objects/SilphCo5F.asm
+++ b/data/maps/objects/SilphCo5F.asm
@@ -2,13 +2,13 @@
 	db $2e ; border block
 
 	def_warps
-	warp 24, 0, 1, SILPH_CO_6F
-	warp 26, 0, 1, SILPH_CO_4F
-	warp 20, 0, 0, SILPH_CO_ELEVATOR
-	warp 27, 3, 5, SILPH_CO_7F
-	warp 9, 15, 4, SILPH_CO_9F
-	warp 11, 5, 4, SILPH_CO_3F
-	warp 3, 15, 5, SILPH_CO_3F
+	warp 24,  0, 1, SILPH_CO_6F
+	warp 26,  0, 1, SILPH_CO_4F
+	warp 20,  0, 0, SILPH_CO_ELEVATOR
+	warp 27,  3, 5, SILPH_CO_7F
+	warp  9, 15, 4, SILPH_CO_9F
+	warp 11,  5, 4, SILPH_CO_3F
+	warp  3, 15, 5, SILPH_CO_3F
 
 	def_signs
 
--- a/data/maps/objects/SilphCo6F.asm
+++ b/data/maps/objects/SilphCo6F.asm
@@ -2,11 +2,11 @@
 	db $2e ; border block
 
 	def_warps
-	warp 16, 0, 1, SILPH_CO_7F
-	warp 14, 0, 0, SILPH_CO_5F
-	warp 18, 0, 0, SILPH_CO_ELEVATOR
-	warp 3, 3, 4, SILPH_CO_4F
-	warp 23, 3, 6, SILPH_CO_2F
+	warp 16,  0, 1, SILPH_CO_7F
+	warp 14,  0, 0, SILPH_CO_5F
+	warp 18,  0, 0, SILPH_CO_ELEVATOR
+	warp  3,  3, 4, SILPH_CO_4F
+	warp 23,  3, 6, SILPH_CO_2F
 
 	def_signs
 
--- a/data/maps/objects/SilphCo7F.asm
+++ b/data/maps/objects/SilphCo7F.asm
@@ -2,11 +2,11 @@
 	db $2e ; border block
 
 	def_warps
-	warp 16, 0, 1, SILPH_CO_8F
-	warp 22, 0, 0, SILPH_CO_6F
-	warp 18, 0, 0, SILPH_CO_ELEVATOR
-	warp 5, 7, 3, SILPH_CO_11F
-	warp 5, 3, 8, SILPH_CO_3F
+	warp 16,  0, 1, SILPH_CO_8F
+	warp 22,  0, 0, SILPH_CO_6F
+	warp 18,  0, 0, SILPH_CO_ELEVATOR
+	warp  5,  7, 3, SILPH_CO_11F
+	warp  5,  3, 8, SILPH_CO_3F
 	warp 21, 15, 3, SILPH_CO_5F
 
 	def_signs
--- a/data/maps/objects/SilphCo8F.asm
+++ b/data/maps/objects/SilphCo8F.asm
@@ -2,13 +2,13 @@
 	db $2e ; border block
 
 	def_warps
-	warp 16, 0, 1, SILPH_CO_9F
-	warp 14, 0, 0, SILPH_CO_7F
-	warp 18, 0, 0, SILPH_CO_ELEVATOR
-	warp 3, 11, 6, SILPH_CO_8F
-	warp 3, 15, 4, SILPH_CO_2F
-	warp 11, 5, 5, SILPH_CO_2F
-	warp 11, 9, 3, SILPH_CO_8F
+	warp 16,  0, 1, SILPH_CO_9F
+	warp 14,  0, 0, SILPH_CO_7F
+	warp 18,  0, 0, SILPH_CO_ELEVATOR
+	warp  3, 11, 6, SILPH_CO_8F
+	warp  3, 15, 4, SILPH_CO_2F
+	warp 11,  5, 5, SILPH_CO_2F
+	warp 11,  9, 3, SILPH_CO_8F
 
 	def_signs
 
--- a/data/maps/objects/SilphCo9F.asm
+++ b/data/maps/objects/SilphCo9F.asm
@@ -2,10 +2,10 @@
 	db $2e ; border block
 
 	def_warps
-	warp 14, 0, 0, SILPH_CO_10F
-	warp 16, 0, 0, SILPH_CO_8F
-	warp 18, 0, 0, SILPH_CO_ELEVATOR
-	warp 9, 3, 7, SILPH_CO_3F
+	warp 14,  0, 0, SILPH_CO_10F
+	warp 16,  0, 0, SILPH_CO_8F
+	warp 18,  0, 0, SILPH_CO_ELEVATOR
+	warp  9,  3, 7, SILPH_CO_3F
 	warp 17, 15, 4, SILPH_CO_5F
 
 	def_signs
--- a/data/maps/objects/SilphCoElevator.asm
+++ b/data/maps/objects/SilphCoElevator.asm
@@ -2,11 +2,11 @@
 	db $f ; border block
 
 	def_warps
-	warp 1, 3, 0, UNUSED_MAP_ED
-	warp 2, 3, 0, UNUSED_MAP_ED
+	warp  1,  3, 0, UNUSED_MAP_ED
+	warp  2,  3, 0, UNUSED_MAP_ED
 
 	def_signs
-	sign 3, 0, 1 ; SilphCoElevatorText1
+	sign  3,  0, 1 ; SilphCoElevatorText1
 
 	def_objects
 
--- a/data/maps/objects/UndergroundPathNorthSouth.asm
+++ b/data/maps/objects/UndergroundPathNorthSouth.asm
@@ -2,8 +2,8 @@
 	db $1 ; border block
 
 	def_warps
-	warp 5, 4, 2, UNDERGROUND_PATH_ROUTE_5
-	warp 2, 41, 2, UNDERGROUND_PATH_ROUTE_6
+	warp  5,  4, 2, UNDERGROUND_PATH_ROUTE_5
+	warp  2, 41, 2, UNDERGROUND_PATH_ROUTE_6
 
 	def_signs
 
--- a/data/maps/objects/UndergroundPathRoute5.asm
+++ b/data/maps/objects/UndergroundPathRoute5.asm
@@ -2,9 +2,9 @@
 	db $a ; border block
 
 	def_warps
-	warp 3, 7, 3, LAST_MAP
-	warp 4, 7, 3, LAST_MAP
-	warp 4, 4, 0, UNDERGROUND_PATH_NORTH_SOUTH
+	warp  3,  7, 3, LAST_MAP
+	warp  4,  7, 3, LAST_MAP
+	warp  4,  4, 0, UNDERGROUND_PATH_NORTH_SOUTH
 
 	def_signs
 
--- a/data/maps/objects/UndergroundPathRoute6.asm
+++ b/data/maps/objects/UndergroundPathRoute6.asm
@@ -2,9 +2,9 @@
 	db $a ; border block
 
 	def_warps
-	warp 3, 7, 3, LAST_MAP
-	warp 4, 7, 3, LAST_MAP
-	warp 4, 4, 1, UNDERGROUND_PATH_NORTH_SOUTH
+	warp  3,  7, 3, LAST_MAP
+	warp  4,  7, 3, LAST_MAP
+	warp  4,  4, 1, UNDERGROUND_PATH_NORTH_SOUTH
 
 	def_signs
 
--- a/data/maps/objects/UndergroundPathRoute7.asm
+++ b/data/maps/objects/UndergroundPathRoute7.asm
@@ -2,9 +2,9 @@
 	db $a ; border block
 
 	def_warps
-	warp 3, 7, 4, LAST_MAP
-	warp 4, 7, 4, LAST_MAP
-	warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST
+	warp  3,  7, 4, LAST_MAP
+	warp  4,  7, 4, LAST_MAP
+	warp  4,  4, 0, UNDERGROUND_PATH_WEST_EAST
 
 	def_signs
 
--- a/data/maps/objects/UndergroundPathRoute7Copy.asm
+++ b/data/maps/objects/UndergroundPathRoute7Copy.asm
@@ -2,9 +2,9 @@
 	db $a ; border block
 
 	def_warps
-	warp 3, 7, 5, LAST_MAP
-	warp 4, 7, 5, LAST_MAP
-	warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST
+	warp  3,  7, 5, LAST_MAP
+	warp  4,  7, 5, LAST_MAP
+	warp  4,  4, 0, UNDERGROUND_PATH_WEST_EAST
 
 	def_signs
 
--- a/data/maps/objects/UndergroundPathRoute8.asm
+++ b/data/maps/objects/UndergroundPathRoute8.asm
@@ -2,9 +2,9 @@
 	db $a ; border block
 
 	def_warps
-	warp 3, 7, 4, LAST_MAP
-	warp 4, 7, 4, LAST_MAP
-	warp 4, 4, 1, UNDERGROUND_PATH_WEST_EAST
+	warp  3,  7, 4, LAST_MAP
+	warp  4,  7, 4, LAST_MAP
+	warp  4,  4, 1, UNDERGROUND_PATH_WEST_EAST
 
 	def_signs
 
--- a/data/maps/objects/UndergroundPathWestEast.asm
+++ b/data/maps/objects/UndergroundPathWestEast.asm
@@ -2,8 +2,8 @@
 	db $1 ; border block
 
 	def_warps
-	warp 2, 5, 2, UNDERGROUND_PATH_ROUTE_7
-	warp 47, 2, 2, UNDERGROUND_PATH_ROUTE_8
+	warp  2,  5, 2, UNDERGROUND_PATH_ROUTE_7
+	warp 47,  2, 2, UNDERGROUND_PATH_ROUTE_8
 
 	def_signs
 
--- a/data/maps/objects/VermilionCity.asm
+++ b/data/maps/objects/VermilionCity.asm
@@ -2,8 +2,8 @@
 	db $43 ; border block
 
 	def_warps
-	warp 11, 3, 0, VERMILION_POKECENTER
-	warp 9, 13, 0, POKEMON_FAN_CLUB
+	warp 11,  3, 0, VERMILION_POKECENTER
+	warp  9, 13, 0, POKEMON_FAN_CLUB
 	warp 23, 13, 0, VERMILION_MART
 	warp 12, 19, 0, VERMILION_GYM
 	warp 23, 19, 0, VERMILION_PIDGEY_HOUSE
@@ -10,15 +10,15 @@
 	warp 18, 31, 0, VERMILION_DOCK
 	warp 19, 31, 0, VERMILION_DOCK
 	warp 15, 13, 0, VERMILION_TRADE_HOUSE
-	warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE
+	warp  7,  3, 0, VERMILION_OLD_ROD_HOUSE
 
 	def_signs
-	sign 27, 3, 7 ; VermilionCityText7
-	sign 37, 13, 8 ; VermilionCityText8
-	sign 24, 13, 9 ; MartSignText
-	sign 12, 3, 10 ; PokeCenterSignText
-	sign 7, 13, 11 ; VermilionCityText11
-	sign 7, 19, 12 ; VermilionCityText12
+	sign 27,  3,  7 ; VermilionCityText7
+	sign 37, 13,  8 ; VermilionCityText8
+	sign 24, 13,  9 ; MartSignText
+	sign 12,  3, 10 ; PokeCenterSignText
+	sign  7, 13, 11 ; VermilionCityText11
+	sign  7, 19, 12 ; VermilionCityText12
 	sign 29, 15, 13 ; VermilionCityText13
 
 	def_objects
--- a/data/maps/objects/VermilionDock.asm
+++ b/data/maps/objects/VermilionDock.asm
@@ -2,8 +2,8 @@
 	db $f ; border block
 
 	def_warps
-	warp 14, 0, 5, LAST_MAP
-	warp 14, 2, 1, SS_ANNE_1F
+	warp 14,  0, 5, LAST_MAP
+	warp 14,  2, 1, SS_ANNE_1F
 
 	def_signs
 
--- a/data/maps/objects/VermilionGym.asm
+++ b/data/maps/objects/VermilionGym.asm
@@ -2,8 +2,8 @@
 	db $3 ; border block
 
 	def_warps
-	warp 4, 17, 3, LAST_MAP
-	warp 5, 17, 3, LAST_MAP
+	warp  4, 17, 3, LAST_MAP
+	warp  5, 17, 3, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/VermilionMart.asm
+++ b/data/maps/objects/VermilionMart.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 2, LAST_MAP
-	warp 4, 7, 2, LAST_MAP
+	warp  3,  7, 2, LAST_MAP
+	warp  4,  7, 2, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/VermilionOldRodHouse.asm
+++ b/data/maps/objects/VermilionOldRodHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 8, LAST_MAP
-	warp 3, 7, 8, LAST_MAP
+	warp  2,  7, 8, LAST_MAP
+	warp  3,  7, 8, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/VermilionPidgeyHouse.asm
+++ b/data/maps/objects/VermilionPidgeyHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 4, LAST_MAP
-	warp 3, 7, 4, LAST_MAP
+	warp  2,  7, 4, LAST_MAP
+	warp  3,  7, 4, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/VermilionPokecenter.asm
+++ b/data/maps/objects/VermilionPokecenter.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 0, LAST_MAP
-	warp 4, 7, 0, LAST_MAP
+	warp  3,  7, 0, LAST_MAP
+	warp  4,  7, 0, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/VermilionTradeHouse.asm
+++ b/data/maps/objects/VermilionTradeHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 7, LAST_MAP
-	warp 3, 7, 7, LAST_MAP
+	warp  2,  7, 7, LAST_MAP
+	warp  3,  7, 7, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/VictoryRoad1F.asm
+++ b/data/maps/objects/VictoryRoad1F.asm
@@ -2,9 +2,9 @@
 	db $7d ; border block
 
 	def_warps
-	warp 8, 17, 2, LAST_MAP
-	warp 9, 17, 2, LAST_MAP
-	warp 1, 1, 0, VICTORY_ROAD_2F
+	warp  8, 17, 2, LAST_MAP
+	warp  9, 17, 2, LAST_MAP
+	warp  1,  1, 0, VICTORY_ROAD_2F
 
 	def_signs
 
--- a/data/maps/objects/VictoryRoad2F.asm
+++ b/data/maps/objects/VictoryRoad2F.asm
@@ -2,13 +2,13 @@
 	db $7d ; border block
 
 	def_warps
-	warp 0, 8, 2, VICTORY_ROAD_1F
-	warp 29, 7, 3, LAST_MAP
-	warp 29, 8, 3, LAST_MAP
-	warp 23, 7, 0, VICTORY_ROAD_3F
+	warp  0,  8, 2, VICTORY_ROAD_1F
+	warp 29,  7, 3, LAST_MAP
+	warp 29,  8, 3, LAST_MAP
+	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
+	warp 27,  7, 1, VICTORY_ROAD_3F
+	warp  1,  1, 3, VICTORY_ROAD_3F
 
 	def_signs
 
--- a/data/maps/objects/VictoryRoad3F.asm
+++ b/data/maps/objects/VictoryRoad3F.asm
@@ -2,10 +2,10 @@
 	db $7d ; border block
 
 	def_warps
-	warp 23, 7, 3, VICTORY_ROAD_2F
-	warp 26, 8, 5, VICTORY_ROAD_2F
+	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
+	warp  2,  0, 6, VICTORY_ROAD_2F
 
 	def_signs
 
--- a/data/maps/objects/ViridianCity.asm
+++ b/data/maps/objects/ViridianCity.asm
@@ -5,16 +5,16 @@
 	warp 23, 25, 0, VIRIDIAN_POKECENTER
 	warp 29, 19, 0, VIRIDIAN_MART
 	warp 21, 15, 0, VIRIDIAN_SCHOOL_HOUSE
-	warp 21, 9, 0, VIRIDIAN_NICKNAME_HOUSE
-	warp 32, 7, 0, VIRIDIAN_GYM
+	warp 21,  9, 0, VIRIDIAN_NICKNAME_HOUSE
+	warp 32,  7, 0, VIRIDIAN_GYM
 
 	def_signs
-	sign 17, 17, 8 ; ViridianCityText8
-	sign 19, 1, 9 ; ViridianCityText9
+	sign 17, 17,  8 ; ViridianCityText8
+	sign 19,  1,  9 ; ViridianCityText9
 	sign 21, 29, 10 ; ViridianCityText10
 	sign 30, 19, 11 ; MartSignText
 	sign 24, 25, 12 ; PokeCenterSignText
-	sign 27, 7, 13 ; ViridianCityText13
+	sign 27,  7, 13 ; ViridianCityText13
 
 	def_objects
 	object SPRITE_YOUNGSTER, 13, 20, WALK, ANY_DIR, 1 ; person
--- a/data/maps/objects/ViridianForest.asm
+++ b/data/maps/objects/ViridianForest.asm
@@ -2,8 +2,8 @@
 	db $3 ; border block
 
 	def_warps
-	warp 1, 0, 2, VIRIDIAN_FOREST_NORTH_GATE
-	warp 2, 0, 3, VIRIDIAN_FOREST_NORTH_GATE
+	warp  1,  0, 2, VIRIDIAN_FOREST_NORTH_GATE
+	warp  2,  0, 3, 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
@@ -10,12 +10,12 @@
 	warp 18, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
 
 	def_signs
-	sign 24, 40, 9 ; ViridianForestText9
+	sign 24, 40,  9 ; ViridianForestText9
 	sign 16, 32, 10 ; ViridianForestText10
 	sign 26, 17, 11 ; ViridianForestText11
-	sign 4, 24, 12 ; ViridianForestText12
+	sign  4, 24, 12 ; ViridianForestText12
 	sign 18, 45, 13 ; ViridianForestText13
-	sign 2, 1, 14 ; ViridianForestText14
+	sign  2,  1, 14 ; ViridianForestText14
 
 	def_objects
 	object SPRITE_YOUNGSTER, 16, 43, STAY, NONE, 1 ; person
--- a/data/maps/objects/ViridianForestNorthGate.asm
+++ b/data/maps/objects/ViridianForestNorthGate.asm
@@ -2,10 +2,10 @@
 	db $a ; border block
 
 	def_warps
-	warp 4, 0, 1, LAST_MAP
-	warp 5, 0, 1, LAST_MAP
-	warp 4, 7, 0, VIRIDIAN_FOREST
-	warp 5, 7, 0, VIRIDIAN_FOREST
+	warp  4,  0, 1, LAST_MAP
+	warp  5,  0, 1, LAST_MAP
+	warp  4,  7, 0, VIRIDIAN_FOREST
+	warp  5,  7, 0, VIRIDIAN_FOREST
 
 	def_signs
 
--- a/data/maps/objects/ViridianForestSouthGate.asm
+++ b/data/maps/objects/ViridianForestSouthGate.asm
@@ -2,10 +2,10 @@
 	db $a ; border block
 
 	def_warps
-	warp 4, 0, 3, VIRIDIAN_FOREST
-	warp 5, 0, 4, VIRIDIAN_FOREST
-	warp 4, 7, 5, LAST_MAP
-	warp 5, 7, 5, LAST_MAP
+	warp  4,  0, 3, VIRIDIAN_FOREST
+	warp  5,  0, 4, VIRIDIAN_FOREST
+	warp  4,  7, 5, LAST_MAP
+	warp  5,  7, 5, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/ViridianMart.asm
+++ b/data/maps/objects/ViridianMart.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 1, LAST_MAP
-	warp 4, 7, 1, LAST_MAP
+	warp  3,  7, 1, LAST_MAP
+	warp  4,  7, 1, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/ViridianNicknameHouse.asm
+++ b/data/maps/objects/ViridianNicknameHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 3, LAST_MAP
-	warp 3, 7, 3, LAST_MAP
+	warp  2,  7, 3, LAST_MAP
+	warp  3,  7, 3, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/ViridianPokecenter.asm
+++ b/data/maps/objects/ViridianPokecenter.asm
@@ -2,8 +2,8 @@
 	db $0 ; border block
 
 	def_warps
-	warp 3, 7, 0, LAST_MAP
-	warp 4, 7, 0, LAST_MAP
+	warp  3,  7, 0, LAST_MAP
+	warp  4,  7, 0, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/ViridianSchoolHouse.asm
+++ b/data/maps/objects/ViridianSchoolHouse.asm
@@ -2,8 +2,8 @@
 	db $a ; border block
 
 	def_warps
-	warp 2, 7, 2, LAST_MAP
-	warp 3, 7, 2, LAST_MAP
+	warp  2,  7, 2, LAST_MAP
+	warp  3,  7, 2, LAST_MAP
 
 	def_signs
 
--- a/data/maps/objects/WardensHouse.asm
+++ b/data/maps/objects/WardensHouse.asm
@@ -2,12 +2,12 @@
 	db $17 ; border block
 
 	def_warps
-	warp 4, 7, 3, LAST_MAP
-	warp 5, 7, 3, LAST_MAP
+	warp  4,  7, 3, LAST_MAP
+	warp  5,  7, 3, LAST_MAP
 
 	def_signs
-	sign 4, 3, 4 ; FuchsiaHouse2Text4
-	sign 5, 3, 5 ; FuchsiaHouse2Text5
+	sign  4,  3, 4 ; FuchsiaHouse2Text4
+	sign  5,  3, 5 ; FuchsiaHouse2Text5
 
 	def_objects
 	object SPRITE_WARDEN, 2, 3, STAY, NONE, 1 ; person