shithub: pokered

Download patch

ref: d48a318dbf4b9e07da57980adb5894f5eadb11f7
parent: 30acb46b988d4bb54af761696123778acd8517e3
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Sun Sep 26 19:20:57 EDT 2021 

Align `object_event` coordinates

Fixes #336


--- a/data/maps/objects/AgathasRoom.asm
+++ b/data/maps/objects/AgathasRoom.asm
@@ -10,6 +10,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 2, SPRITE_AGATHA, STAY, DOWN, 1, OPP_AGATHA, 1
+	object_event  5,  2, SPRITE_AGATHA, STAY, DOWN, 1, OPP_AGATHA, 1
 
 	def_warps_to AGATHAS_ROOM
--- a/data/maps/objects/BikeShop.asm
+++ b/data/maps/objects/BikeShop.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 6, 2, SPRITE_BIKE_SHOP_CLERK, STAY, NONE, 1 ; person
-	object_event 5, 6, SPRITE_MIDDLE_AGED_WOMAN, WALK, UP_DOWN, 2 ; person
-	object_event 1, 3, SPRITE_YOUNGSTER, STAY, UP, 3 ; person
+	object_event  6,  2, SPRITE_BIKE_SHOP_CLERK, STAY, NONE, 1 ; person
+	object_event  5,  6, SPRITE_MIDDLE_AGED_WOMAN, WALK, UP_DOWN, 2 ; person
+	object_event  1,  3, SPRITE_YOUNGSTER, STAY, UP, 3 ; person
 
 	def_warps_to BIKE_SHOP
--- a/data/maps/objects/BillsHouse.asm
+++ b/data/maps/objects/BillsHouse.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 6, 5, SPRITE_MONSTER, STAY, NONE, 1 ; person
-	object_event 4, 4, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person
-	object_event 6, 5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
+	object_event  6,  5, SPRITE_MONSTER, STAY, NONE, 1 ; person
+	object_event  4,  4, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person
+	object_event  6,  5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
 
 	def_warps_to BILLS_HOUSE
--- a/data/maps/objects/BluesHouse.asm
+++ b/data/maps/objects/BluesHouse.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1 ; Daisy, sitting by map
-	object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 ; Daisy, walking around
-	object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0 ; map on table
+	object_event  2,  3, SPRITE_DAISY, STAY, RIGHT, 1 ; Daisy, sitting by map
+	object_event  6,  4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 ; Daisy, walking around
+	object_event  3,  3, SPRITE_POKEDEX, STAY, NONE, 3, 0 ; map on table
 
 	def_warps_to BLUES_HOUSE
--- a/data/maps/objects/BrunosRoom.asm
+++ b/data/maps/objects/BrunosRoom.asm
@@ -10,6 +10,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 2, SPRITE_BRUNO, STAY, DOWN, 1, OPP_BRUNO, 1
+	object_event  5,  2, SPRITE_BRUNO, STAY, DOWN, 1, OPP_BRUNO, 1
 
 	def_warps_to BRUNOS_ROOM
--- a/data/maps/objects/CeladonChiefHouse.asm
+++ b/data/maps/objects/CeladonChiefHouse.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 2, SPRITE_GRAMPS, STAY, DOWN, 1 ; person
-	object_event 1, 4, SPRITE_ROCKET, WALK, ANY_DIR, 2 ; person
-	object_event 5, 6, SPRITE_SAILOR, STAY, LEFT, 3 ; person
+	object_event  4,  2, SPRITE_GRAMPS, STAY, DOWN, 1 ; person
+	object_event  1,  4, SPRITE_ROCKET, WALK, ANY_DIR, 2 ; person
+	object_event  5,  6, SPRITE_SAILOR, STAY, LEFT, 3 ; person
 
 	def_warps_to CELADON_CHIEF_HOUSE
--- a/data/maps/objects/CeladonCity.asm
+++ b/data/maps/objects/CeladonCity.asm
@@ -28,7 +28,7 @@
 	bg_event 27, 21, 18 ; CeladonCityText18
 
 	def_object_events
-	object_event 8, 17, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person
+	object_event  8, 17, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person
 	object_event 11, 28, SPRITE_GRAMPS, STAY, UP, 2 ; person
 	object_event 14, 19, SPRITE_GIRL, WALK, UP_DOWN, 3 ; person
 	object_event 25, 22, SPRITE_GRAMPS, STAY, DOWN, 4 ; person
--- a/data/maps/objects/CeladonDiner.asm
+++ b/data/maps/objects/CeladonDiner.asm
@@ -8,10 +8,10 @@
 	def_bg_events
 
 	def_object_events
-	object_event 8, 5, SPRITE_COOK, WALK, LEFT_RIGHT, 1 ; person
-	object_event 7, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person
-	object_event 1, 4, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 3 ; person
-	object_event 5, 3, SPRITE_FISHER, STAY, RIGHT, 4 ; person
-	object_event 0, 1, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person
+	object_event  8,  5, SPRITE_COOK, WALK, LEFT_RIGHT, 1 ; person
+	object_event  7,  2, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person
+	object_event  1,  4, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 3 ; person
+	object_event  5,  3, SPRITE_FISHER, STAY, RIGHT, 4 ; person
+	object_event  0,  1, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person
 
 	def_warps_to CELADON_DINER
--- a/data/maps/objects/CeladonGym.asm
+++ b/data/maps/objects/CeladonGym.asm
@@ -8,13 +8,13 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 3, SPRITE_ERIKA, STAY, DOWN, 1, OPP_ERIKA, 1
-	object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 17
-	object_event 7, 10, SPRITE_BEAUTY, STAY, LEFT, 3, OPP_BEAUTY, 1
-	object_event 9, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11
-	object_event 1, 5, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 2
-	object_event 6, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 18
-	object_event 3, 3, SPRITE_BEAUTY, STAY, DOWN, 7, OPP_BEAUTY, 3
-	object_event 5, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1
+	object_event  4,  3, SPRITE_ERIKA, STAY, DOWN, 1, OPP_ERIKA, 1
+	object_event  2, 11, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 17
+	object_event  7, 10, SPRITE_BEAUTY, STAY, LEFT, 3, OPP_BEAUTY, 1
+	object_event  9,  5, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11
+	object_event  1,  5, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 2
+	object_event  6,  3, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 18
+	object_event  3,  3, SPRITE_BEAUTY, STAY, DOWN, 7, OPP_BEAUTY, 3
+	object_event  5,  3, SPRITE_COOLTRAINER_F, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1
 
 	def_warps_to CELADON_GYM
--- a/data/maps/objects/CeladonHotel.asm
+++ b/data/maps/objects/CeladonHotel.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 1, SPRITE_GRANNY, STAY, DOWN, 1 ; person
-	object_event 2, 4, SPRITE_BEAUTY, STAY, NONE, 2 ; person
-	object_event 8, 4, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person
+	object_event  3,  1, SPRITE_GRANNY, STAY, DOWN, 1 ; person
+	object_event  2,  4, SPRITE_BEAUTY, STAY, NONE, 2 ; person
+	object_event  8,  4, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person
 
 	def_warps_to CELADON_HOTEL
--- a/data/maps/objects/CeladonMansion1F.asm
+++ b/data/maps/objects/CeladonMansion1F.asm
@@ -12,9 +12,9 @@
 	bg_event  4,  9, 5 ; CeladonMansion1Text5
 
 	def_object_events
-	object_event 0, 5, SPRITE_MONSTER, STAY, RIGHT, 1 ; person
-	object_event 1, 5, SPRITE_GRANNY, STAY, DOWN, 2 ; person
-	object_event 1, 8, SPRITE_FAIRY, WALK, LEFT_RIGHT, 3 ; person
-	object_event 4, 4, SPRITE_MONSTER, WALK, UP_DOWN, 4 ; person
+	object_event  0,  5, SPRITE_MONSTER, STAY, RIGHT, 1 ; person
+	object_event  1,  5, SPRITE_GRANNY, STAY, DOWN, 2 ; person
+	object_event  1,  8, SPRITE_FAIRY, WALK, LEFT_RIGHT, 3 ; person
+	object_event  4,  4, SPRITE_MONSTER, WALK, UP_DOWN, 4 ; person
 
 	def_warps_to CELADON_MANSION_1F
--- a/data/maps/objects/CeladonMansion3F.asm
+++ b/data/maps/objects/CeladonMansion3F.asm
@@ -14,9 +14,9 @@
 	bg_event  4,  9, 8 ; CeladonMansion3Text8
 
 	def_object_events
-	object_event 0, 4, SPRITE_BIKE_SHOP_CLERK, STAY, UP, 1 ; person
-	object_event 3, 4, SPRITE_CLERK, STAY, UP, 2 ; person
-	object_event 0, 7, SPRITE_SUPER_NERD, STAY, UP, 3 ; person
-	object_event 2, 3, SPRITE_SILPH_WORKER, STAY, NONE, 4 ; person
+	object_event  0,  4, SPRITE_BIKE_SHOP_CLERK, STAY, UP, 1 ; person
+	object_event  3,  4, SPRITE_CLERK, STAY, UP, 2 ; person
+	object_event  0,  7, SPRITE_SUPER_NERD, STAY, UP, 3 ; person
+	object_event  2,  3, SPRITE_SILPH_WORKER, STAY, NONE, 4 ; person
 
 	def_warps_to CELADON_MANSION_3F
--- a/data/maps/objects/CeladonMansionRoofHouse.asm
+++ b/data/maps/objects/CeladonMansionRoofHouse.asm
@@ -8,7 +8,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 2, SPRITE_HIKER, STAY, DOWN, 1 ; person
-	object_event 4, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person
+	object_event  2,  2, SPRITE_HIKER, STAY, DOWN, 1 ; person
+	object_event  4,  3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person
 
 	def_warps_to CELADON_MANSION_ROOF_HOUSE
--- a/data/maps/objects/CeladonMart1F.asm
+++ b/data/maps/objects/CeladonMart1F.asm
@@ -14,6 +14,6 @@
 	bg_event 14,  1, 3 ; CeladonMart1Text3
 
 	def_object_events
-	object_event 8, 3, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person
+	object_event  8,  3, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person
 
 	def_warps_to CELADON_MART_1F
--- a/data/maps/objects/CeladonMart2F.asm
+++ b/data/maps/objects/CeladonMart2F.asm
@@ -10,9 +10,9 @@
 	bg_event 14,  1, 5 ; CeladonMart2Text5
 
 	def_object_events
-	object_event 5, 3, SPRITE_CLERK, STAY, DOWN, 1 ; person
-	object_event 6, 3, SPRITE_CLERK, STAY, DOWN, 2 ; person
-	object_event 19, 5, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person
-	object_event 14, 4, SPRITE_GIRL, WALK, UP_DOWN, 4 ; person
+	object_event  5,  3, SPRITE_CLERK, STAY, DOWN, 1 ; person
+	object_event  6,  3, SPRITE_CLERK, STAY, DOWN, 2 ; person
+	object_event 19,  5, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person
+	object_event 14,  4, SPRITE_GIRL, WALK, UP_DOWN, 4 ; person
 
 	def_warps_to CELADON_MART_2F
--- a/data/maps/objects/CeladonMart3F.asm
+++ b/data/maps/objects/CeladonMart3F.asm
@@ -21,10 +21,10 @@
 	bg_event 10,  1, 17 ; CeladonMart3Text17
 
 	def_object_events
-	object_event 16, 5, SPRITE_CLERK, STAY, NONE, 1 ; person
-	object_event 11, 6, SPRITE_GAMEBOY_KID, STAY, RIGHT, 2 ; person
-	object_event 7, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; person
-	object_event 8, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 4 ; person
-	object_event 2, 5, SPRITE_LITTLE_BOY, STAY, UP, 5 ; person
+	object_event 16,  5, SPRITE_CLERK, STAY, NONE, 1 ; person
+	object_event 11,  6, SPRITE_GAMEBOY_KID, STAY, RIGHT, 2 ; person
+	object_event  7,  2, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; person
+	object_event  8,  2, SPRITE_GAMEBOY_KID, STAY, DOWN, 4 ; person
+	object_event  2,  5, SPRITE_LITTLE_BOY, STAY, UP, 5 ; person
 
 	def_warps_to CELADON_MART_3F
--- a/data/maps/objects/CeladonMart4F.asm
+++ b/data/maps/objects/CeladonMart4F.asm
@@ -10,8 +10,8 @@
 	bg_event 14,  1, 4 ; CeladonMart4Text4
 
 	def_object_events
-	object_event 5, 7, SPRITE_CLERK, STAY, NONE, 1 ; person
-	object_event 15, 5, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 2 ; person
-	object_event 5, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 3 ; person
+	object_event  5,  7, SPRITE_CLERK, STAY, NONE, 1 ; person
+	object_event 15,  5, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 2 ; person
+	object_event  5,  2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 3 ; person
 
 	def_warps_to CELADON_MART_4F
--- a/data/maps/objects/CeladonMart5F.asm
+++ b/data/maps/objects/CeladonMart5F.asm
@@ -10,9 +10,9 @@
 	bg_event 14,  1, 5 ; CeladonMart5Text5
 
 	def_object_events
-	object_event 14, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 1 ; person
-	object_event 2, 6, SPRITE_SAILOR, STAY, NONE, 2 ; person
-	object_event 5, 3, SPRITE_CLERK, STAY, DOWN, 3 ; person
-	object_event 6, 3, SPRITE_CLERK, STAY, DOWN, 4 ; person
+	object_event 14,  5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 1 ; person
+	object_event  2,  6, SPRITE_SAILOR, STAY, NONE, 2 ; person
+	object_event  5,  3, SPRITE_CLERK, STAY, DOWN, 3 ; person
+	object_event  6,  3, SPRITE_CLERK, STAY, DOWN, 4 ; person
 
 	def_warps_to CELADON_MART_5F
--- a/data/maps/objects/CeladonMartRoof.asm
+++ b/data/maps/objects/CeladonMartRoof.asm
@@ -11,7 +11,7 @@
 	bg_event 13,  2, 6 ; CeladonMartRoofText6
 
 	def_object_events
-	object_event 10, 4, SPRITE_SUPER_NERD, STAY, LEFT, 1 ; person
-	object_event 5, 5, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 2 ; person
+	object_event 10,  4, SPRITE_SUPER_NERD, STAY, LEFT, 1 ; person
+	object_event  5,  5, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 2 ; person
 
 	def_warps_to CELADON_MART_ROOF
--- a/data/maps/objects/CeladonPokecenter.asm
+++ b/data/maps/objects/CeladonPokecenter.asm
@@ -8,9 +8,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
-	object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person
-	object_event 10, 5, SPRITE_BEAUTY, WALK, ANY_DIR, 3 ; person
-	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
+	object_event  3,  1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event  7,  3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person
+	object_event 10,  5, SPRITE_BEAUTY, WALK, ANY_DIR, 3 ; person
+	object_event 11,  2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to CELADON_POKECENTER
--- a/data/maps/objects/CeruleanBadgeHouse.asm
+++ b/data/maps/objects/CeruleanBadgeHouse.asm
@@ -9,6 +9,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 3, SPRITE_MIDDLE_AGED_MAN, STAY, RIGHT, 1 ; person
+	object_event  5,  3, SPRITE_MIDDLE_AGED_MAN, STAY, RIGHT, 1 ; person
 
 	def_warps_to CERULEAN_BADGE_HOUSE
--- a/data/maps/objects/CeruleanCave1F.asm
+++ b/data/maps/objects/CeruleanCave1F.asm
@@ -15,8 +15,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 7, 13, SPRITE_POKE_BALL, STAY, NONE, 1, FULL_RESTORE
-	object_event 19, 3, SPRITE_POKE_BALL, STAY, NONE, 2, MAX_ELIXER
-	object_event 5, 0, SPRITE_POKE_BALL, STAY, NONE, 3, NUGGET
+	object_event  7, 13, SPRITE_POKE_BALL, STAY, NONE, 1, FULL_RESTORE
+	object_event 19,  3, SPRITE_POKE_BALL, STAY, NONE, 2, MAX_ELIXER
+	object_event  5,  0, SPRITE_POKE_BALL, STAY, NONE, 3, NUGGET
 
 	def_warps_to CERULEAN_CAVE_1F
--- a/data/maps/objects/CeruleanCave2F.asm
+++ b/data/maps/objects/CeruleanCave2F.asm
@@ -12,8 +12,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 29, 9, SPRITE_POKE_BALL, STAY, NONE, 1, PP_UP
-	object_event 4, 15, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL
-	object_event 13, 6, SPRITE_POKE_BALL, STAY, NONE, 3, FULL_RESTORE
+	object_event 29,  9, SPRITE_POKE_BALL, STAY, NONE, 1, PP_UP
+	object_event  4, 15, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL
+	object_event 13,  6, SPRITE_POKE_BALL, STAY, NONE, 3, FULL_RESTORE
 
 	def_warps_to CERULEAN_CAVE_2F
--- a/data/maps/objects/CeruleanCaveB1F.asm
+++ b/data/maps/objects/CeruleanCaveB1F.asm
@@ -8,7 +8,7 @@
 
 	def_object_events
 	object_event 27, 13, SPRITE_MONSTER, STAY, DOWN, 1, MEWTWO, 70
-	object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL
-	object_event 18, 1, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE
+	object_event 16,  9, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL
+	object_event 18,  1, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE
 
 	def_warps_to CERULEAN_CAVE_B1F
--- a/data/maps/objects/CeruleanCity.asm
+++ b/data/maps/objects/CeruleanCity.asm
@@ -22,16 +22,16 @@
 	bg_event 27, 21, 17 ; CeruleanCityText17
 
 	def_object_events
-	object_event 20, 2, SPRITE_BLUE, STAY, DOWN, 1 ; person
-	object_event 30, 8, SPRITE_ROCKET, STAY, NONE, 2, OPP_ROCKET, 5
+	object_event 20,  2, SPRITE_BLUE, STAY, DOWN, 1 ; person
+	object_event 30,  8, SPRITE_ROCKET, STAY, NONE, 2, OPP_ROCKET, 5
 	object_event 31, 20, SPRITE_COOLTRAINER_M, STAY, DOWN, 3 ; person
 	object_event 15, 18, SPRITE_SUPER_NERD, WALK, UP_DOWN, 4 ; person
-	object_event 9, 21, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 5 ; person
+	object_event  9, 21, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 5 ; person
 	object_event 28, 12, SPRITE_GUARD, STAY, DOWN, 6 ; person
 	object_event 29, 26, SPRITE_COOLTRAINER_F, STAY, LEFT, 7 ; person
 	object_event 28, 26, SPRITE_MONSTER, STAY, DOWN, 8 ; person
-	object_event 9, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 9 ; person
-	object_event 4, 12, SPRITE_SUPER_NERD, STAY, DOWN, 10 ; person
+	object_event  9, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 9 ; person
+	object_event  4, 12, SPRITE_SUPER_NERD, STAY, DOWN, 10 ; person
 	object_event 27, 12, SPRITE_GUARD, STAY, DOWN, 11 ; person
 
 	def_warps_to CERULEAN_CITY
--- a/data/maps/objects/CeruleanGym.asm
+++ b/data/maps/objects/CeruleanGym.asm
@@ -8,9 +8,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 2, SPRITE_BRUNETTE_GIRL, STAY, DOWN, 1, OPP_MISTY, 1
-	object_event 2, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1
-	object_event 8, 7, SPRITE_SWIMMER, STAY, LEFT, 3, OPP_SWIMMER, 1
-	object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 4 ; person
+	object_event  4,  2, SPRITE_BRUNETTE_GIRL, STAY, DOWN, 1, OPP_MISTY, 1
+	object_event  2,  3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1
+	object_event  8,  7, SPRITE_SWIMMER, STAY, LEFT, 3, OPP_SWIMMER, 1
+	object_event  7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 4 ; person
 
 	def_warps_to CERULEAN_GYM
--- a/data/maps/objects/CeruleanMart.asm
+++ b/data/maps/objects/CeruleanMart.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
-	object_event 3, 4, SPRITE_COOLTRAINER_M, WALK, UP_DOWN, 2 ; person
-	object_event 6, 2, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
+	object_event  0,  5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
+	object_event  3,  4, SPRITE_COOLTRAINER_M, WALK, UP_DOWN, 2 ; person
+	object_event  6,  2, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
 
 	def_warps_to CERULEAN_MART
--- a/data/maps/objects/CeruleanPokecenter.asm
+++ b/data/maps/objects/CeruleanPokecenter.asm
@@ -8,9 +8,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
-	object_event 10, 5, SPRITE_SUPER_NERD, WALK, ANY_DIR, 2 ; person
-	object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
-	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
+	object_event  3,  1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event 10,  5, SPRITE_SUPER_NERD, WALK, ANY_DIR, 2 ; person
+	object_event  4,  3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
+	object_event 11,  2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to CERULEAN_POKECENTER
--- a/data/maps/objects/CeruleanTradeHouse.asm
+++ b/data/maps/objects/CeruleanTradeHouse.asm
@@ -8,7 +8,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 4, SPRITE_GRANNY, STAY, LEFT, 1 ; person
-	object_event 1, 2, SPRITE_GAMBLER, STAY, NONE, 2 ; person
+	object_event  5,  4, SPRITE_GRANNY, STAY, LEFT, 1 ; person
+	object_event  1,  2, SPRITE_GAMBLER, STAY, NONE, 2 ; person
 
 	def_warps_to CERULEAN_TRADE_HOUSE
--- a/data/maps/objects/CeruleanTrashedHouse.asm
+++ b/data/maps/objects/CeruleanTrashedHouse.asm
@@ -10,7 +10,7 @@
 	bg_event  3,  0, 3 ; CeruleanHouseTrashedText3
 
 	def_object_events
-	object_event 2, 1, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person
-	object_event 5, 6, SPRITE_GIRL, WALK, LEFT_RIGHT, 2 ; person
+	object_event  2,  1, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person
+	object_event  5,  6, SPRITE_GIRL, WALK, LEFT_RIGHT, 2 ; person
 
 	def_warps_to CERULEAN_TRASHED_HOUSE
--- a/data/maps/objects/ChampionsRoom.asm
+++ b/data/maps/objects/ChampionsRoom.asm
@@ -10,7 +10,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 2, SPRITE_BLUE, STAY, DOWN, 1 ; person
-	object_event 3, 7, SPRITE_OAK, STAY, UP, 2 ; person
+	object_event  4,  2, SPRITE_BLUE, STAY, DOWN, 1 ; person
+	object_event  3,  7, SPRITE_OAK, STAY, UP, 2 ; person
 
 	def_warps_to CHAMPIONS_ROOM
--- a/data/maps/objects/CinnabarGym.asm
+++ b/data/maps/objects/CinnabarGym.asm
@@ -8,14 +8,14 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 3, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 1, OPP_BLAINE, 1
-	object_event 17, 2, SPRITE_SUPER_NERD, STAY, DOWN, 2, OPP_SUPER_NERD, 9
-	object_event 17, 8, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_BURGLAR, 4
-	object_event 11, 4, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_SUPER_NERD, 10
-	object_event 11, 8, SPRITE_SUPER_NERD, STAY, DOWN, 5, OPP_BURGLAR, 5
+	object_event  3,  3, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 1, OPP_BLAINE, 1
+	object_event 17,  2, SPRITE_SUPER_NERD, STAY, DOWN, 2, OPP_SUPER_NERD, 9
+	object_event 17,  8, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_BURGLAR, 4
+	object_event 11,  4, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_SUPER_NERD, 10
+	object_event 11,  8, SPRITE_SUPER_NERD, STAY, DOWN, 5, OPP_BURGLAR, 5
 	object_event 11, 14, SPRITE_SUPER_NERD, STAY, DOWN, 6, OPP_SUPER_NERD, 11
-	object_event 3, 14, SPRITE_SUPER_NERD, STAY, DOWN, 7, OPP_BURGLAR, 6
-	object_event 3, 8, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_SUPER_NERD, 12
+	object_event  3, 14, SPRITE_SUPER_NERD, STAY, DOWN, 7, OPP_BURGLAR, 6
+	object_event  3,  8, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_SUPER_NERD, 12
 	object_event 16, 13, SPRITE_GYM_GUIDE, STAY, DOWN, 9 ; person
 
 	def_warps_to CINNABAR_GYM
--- a/data/maps/objects/CinnabarIsland.asm
+++ b/data/maps/objects/CinnabarIsland.asm
@@ -16,7 +16,7 @@
 	bg_event 13,  3, 7 ; CinnabarIslandText7
 
 	def_object_events
-	object_event 12, 5, SPRITE_GIRL, WALK, LEFT_RIGHT, 1 ; person
-	object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person
+	object_event 12,  5, SPRITE_GIRL, WALK, LEFT_RIGHT, 1 ; person
+	object_event 14,  6, SPRITE_GAMBLER, STAY, NONE, 2 ; person
 
 	def_warps_to CINNABAR_ISLAND
--- a/data/maps/objects/CinnabarLab.asm
+++ b/data/maps/objects/CinnabarLab.asm
@@ -15,6 +15,6 @@
 	bg_event 17,  4, 5 ; Lab1Text5
 
 	def_object_events
-	object_event 1, 3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person
+	object_event  1,  3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person
 
 	def_warps_to CINNABAR_LAB
--- a/data/maps/objects/CinnabarLabFossilRoom.asm
+++ b/data/maps/objects/CinnabarLabFossilRoom.asm
@@ -8,7 +8,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 2, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person
-	object_event 7, 6, SPRITE_SCIENTIST, STAY, UP, 2 ; person
+	object_event  5,  2, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person
+	object_event  7,  6, SPRITE_SCIENTIST, STAY, UP, 2 ; person
 
 	def_warps_to CINNABAR_LAB_FOSSIL_ROOM
--- a/data/maps/objects/CinnabarLabMetronomeRoom.asm
+++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm
@@ -11,7 +11,7 @@
 	bg_event  2,  1, 5 ; Lab3Text5
 
 	def_object_events
-	object_event 7, 2, SPRITE_SCIENTIST, STAY, DOWN, 1 ; person
-	object_event 2, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 2 ; person
+	object_event  7,  2, SPRITE_SCIENTIST, STAY, DOWN, 1 ; person
+	object_event  2,  3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 2 ; person
 
 	def_warps_to CINNABAR_LAB_METRONOME_ROOM
--- a/data/maps/objects/CinnabarLabTradeRoom.asm
+++ b/data/maps/objects/CinnabarLabTradeRoom.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person
-	object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person
-	object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person
+	object_event  3,  2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person
+	object_event  1,  4, SPRITE_GRAMPS, STAY, NONE, 2 ; person
+	object_event  5,  5, SPRITE_BEAUTY, STAY, UP, 3 ; person
 
 	def_warps_to CINNABAR_LAB_TRADE_ROOM
--- a/data/maps/objects/CinnabarMart.asm
+++ b/data/maps/objects/CinnabarMart.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
-	object_event 6, 2, SPRITE_ERIKA, STAY, NONE, 2 ; person
-	object_event 3, 4, SPRITE_SCIENTIST, STAY, NONE, 3 ; person
+	object_event  0,  5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
+	object_event  6,  2, SPRITE_ERIKA, STAY, NONE, 2 ; person
+	object_event  3,  4, SPRITE_SCIENTIST, STAY, NONE, 3 ; person
 
 	def_warps_to CINNABAR_MART
--- a/data/maps/objects/CinnabarPokecenter.asm
+++ b/data/maps/objects/CinnabarPokecenter.asm
@@ -8,9 +8,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
-	object_event 9, 4, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 2 ; person
-	object_event 2, 6, SPRITE_GENTLEMAN, STAY, NONE, 3 ; person
-	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
+	object_event  3,  1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event  9,  4, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 2 ; person
+	object_event  2,  6, SPRITE_GENTLEMAN, STAY, NONE, 3 ; person
+	object_event 11,  2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to CINNABAR_POKECENTER
--- a/data/maps/objects/Colosseum.asm
+++ b/data/maps/objects/Colosseum.asm
@@ -6,6 +6,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 2, SPRITE_RED, STAY, 0, 1 ; person
+	object_event  2,  2, SPRITE_RED, STAY, 0, 1 ; person
 
 	def_warps_to COLOSSEUM
--- a/data/maps/objects/CopycatsHouse1F.asm
+++ b/data/maps/objects/CopycatsHouse1F.asm
@@ -9,8 +9,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, DOWN, 1 ; person
-	object_event 5, 4, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 2 ; person
-	object_event 1, 4, SPRITE_FAIRY, WALK, UP_DOWN, 3 ; person
+	object_event  2,  2, SPRITE_MIDDLE_AGED_WOMAN, STAY, DOWN, 1 ; person
+	object_event  5,  4, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 2 ; person
+	object_event  1,  4, SPRITE_FAIRY, WALK, UP_DOWN, 3 ; person
 
 	def_warps_to COPYCATS_HOUSE_1F
--- a/data/maps/objects/CopycatsHouse2F.asm
+++ b/data/maps/objects/CopycatsHouse2F.asm
@@ -9,10 +9,10 @@
 	bg_event  0,  1, 7 ; CopycatsHouse2FText7
 
 	def_object_events
-	object_event 4, 3, SPRITE_BRUNETTE_GIRL, WALK, ANY_DIR, 1 ; person
-	object_event 4, 6, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person
-	object_event 5, 1, SPRITE_MONSTER, STAY, DOWN, 3 ; person
-	object_event 2, 0, SPRITE_BIRD, STAY, DOWN, 4 ; person
-	object_event 1, 6, SPRITE_FAIRY, STAY, RIGHT, 5 ; person
+	object_event  4,  3, SPRITE_BRUNETTE_GIRL, WALK, ANY_DIR, 1 ; person
+	object_event  4,  6, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person
+	object_event  5,  1, SPRITE_MONSTER, STAY, DOWN, 3 ; person
+	object_event  2,  0, SPRITE_BIRD, STAY, DOWN, 4 ; person
+	object_event  1,  6, SPRITE_FAIRY, STAY, RIGHT, 5 ; person
 
 	def_warps_to COPYCATS_HOUSE_2F
--- a/data/maps/objects/Daycare.asm
+++ b/data/maps/objects/Daycare.asm
@@ -8,6 +8,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 3, SPRITE_GENTLEMAN, STAY, RIGHT, 1 ; person
+	object_event  2,  3, SPRITE_GENTLEMAN, STAY, RIGHT, 1 ; person
 
 	def_warps_to DAYCARE
--- a/data/maps/objects/DiglettsCaveRoute11.asm
+++ b/data/maps/objects/DiglettsCaveRoute11.asm
@@ -9,6 +9,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 3, SPRITE_GAMBLER, STAY, NONE, 1 ; person
+	object_event  2,  3, SPRITE_GAMBLER, STAY, NONE, 1 ; person
 
 	def_warps_to DIGLETTS_CAVE_ROUTE_11
--- a/data/maps/objects/DiglettsCaveRoute2.asm
+++ b/data/maps/objects/DiglettsCaveRoute2.asm
@@ -9,6 +9,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person
+	object_event  3,  3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person
 
 	def_warps_to DIGLETTS_CAVE_ROUTE_2
--- a/data/maps/objects/FightingDojo.asm
+++ b/data/maps/objects/FightingDojo.asm
@@ -8,12 +8,12 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, 1
-	object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, 2
-	object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, 3
-	object_event 5, 5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 4
-	object_event 5, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 5
-	object_event 4, 1, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
-	object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, 7 ; person
+	object_event  5,  3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, 1
+	object_event  3,  4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, 2
+	object_event  3,  6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, 3
+	object_event  5,  5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 4
+	object_event  5,  7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 5
+	object_event  4,  1, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
+	object_event  5,  1, SPRITE_POKE_BALL, STAY, NONE, 7 ; person
 
 	def_warps_to FIGHTING_DOJO
--- a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm
+++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 3, SPRITE_MIDDLE_AGED_WOMAN, STAY, RIGHT, 1 ; person
-	object_event 7, 2, SPRITE_GAMBLER, STAY, UP, 2 ; person
-	object_event 5, 5, SPRITE_YOUNGSTER, STAY, NONE, 3 ; person
+	object_event  2,  3, SPRITE_MIDDLE_AGED_WOMAN, STAY, RIGHT, 1 ; person
+	object_event  7,  2, SPRITE_GAMBLER, STAY, UP, 2 ; person
+	object_event  5,  5, SPRITE_YOUNGSTER, STAY, NONE, 3 ; person
 
 	def_warps_to FUCHSIA_BILLS_GRANDPAS_HOUSE
--- a/data/maps/objects/FuchsiaCity.asm
+++ b/data/maps/objects/FuchsiaCity.asm
@@ -32,12 +32,12 @@
 	object_event 10, 12, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
 	object_event 28, 17, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
 	object_event 30, 14, SPRITE_FISHER, STAY, DOWN, 3 ; person
-	object_event 24, 8, SPRITE_YOUNGSTER, STAY, UP, 4 ; person
-	object_event 31, 5, SPRITE_FAIRY, WALK, ANY_DIR, 5 ; person
-	object_event 25, 6, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
-	object_event 12, 6, SPRITE_MONSTER, WALK, LEFT_RIGHT, 7 ; person
+	object_event 24,  8, SPRITE_YOUNGSTER, STAY, UP, 4 ; person
+	object_event 31,  5, SPRITE_FAIRY, WALK, ANY_DIR, 5 ; person
+	object_event 25,  6, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
+	object_event 12,  6, SPRITE_MONSTER, WALK, LEFT_RIGHT, 7 ; person
 	object_event 30, 12, SPRITE_MONSTER, WALK, LEFT_RIGHT, 8 ; person
-	object_event 8, 17, SPRITE_SEEL, WALK, ANY_DIR, 9 ; person
-	object_event 6, 5, SPRITE_FOSSIL, STAY, NONE, 10 ; person
+	object_event  8, 17, SPRITE_SEEL, WALK, ANY_DIR, 9 ; person
+	object_event  6,  5, SPRITE_FOSSIL, STAY, NONE, 10 ; person
 
 	def_warps_to FUCHSIA_CITY
--- a/data/maps/objects/FuchsiaGoodRodHouse.asm
+++ b/data/maps/objects/FuchsiaGoodRodHouse.asm
@@ -9,6 +9,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 3, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person
+	object_event  5,  3, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person
 
 	def_warps_to FUCHSIA_GOOD_ROD_HOUSE
--- a/data/maps/objects/FuchsiaGym.asm
+++ b/data/maps/objects/FuchsiaGym.asm
@@ -8,13 +8,13 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 10, SPRITE_KOGA, STAY, DOWN, 1, OPP_KOGA, 1
-	object_event 8, 13, SPRITE_ROCKER, STAY, DOWN, 2, OPP_JUGGLER, 7
-	object_event 7, 8, SPRITE_ROCKER, STAY, RIGHT, 3, OPP_JUGGLER, 3
-	object_event 1, 12, SPRITE_ROCKER, STAY, DOWN, 4, OPP_JUGGLER, 8
-	object_event 3, 5, SPRITE_ROCKER, STAY, UP, 5, OPP_TAMER, 1
-	object_event 8, 2, SPRITE_ROCKER, STAY, DOWN, 6, OPP_TAMER, 2
-	object_event 2, 7, SPRITE_ROCKER, STAY, LEFT, 7, OPP_JUGGLER, 4
-	object_event 7, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 8 ; person
+	object_event  4, 10, SPRITE_KOGA, STAY, DOWN, 1, OPP_KOGA, 1
+	object_event  8, 13, SPRITE_ROCKER, STAY, DOWN, 2, OPP_JUGGLER, 7
+	object_event  7,  8, SPRITE_ROCKER, STAY, RIGHT, 3, OPP_JUGGLER, 3
+	object_event  1, 12, SPRITE_ROCKER, STAY, DOWN, 4, OPP_JUGGLER, 8
+	object_event  3,  5, SPRITE_ROCKER, STAY, UP, 5, OPP_TAMER, 1
+	object_event  8,  2, SPRITE_ROCKER, STAY, DOWN, 6, OPP_TAMER, 2
+	object_event  2,  7, SPRITE_ROCKER, STAY, LEFT, 7, OPP_JUGGLER, 4
+	object_event  7, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 8 ; person
 
 	def_warps_to FUCHSIA_GYM
--- a/data/maps/objects/FuchsiaMart.asm
+++ b/data/maps/objects/FuchsiaMart.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
-	object_event 4, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 2 ; person
-	object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, UP_DOWN, 3 ; person
+	object_event  0,  5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
+	object_event  4,  2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 2 ; person
+	object_event  6,  5, SPRITE_COOLTRAINER_F, WALK, UP_DOWN, 3 ; person
 
 	def_warps_to FUCHSIA_MART
--- a/data/maps/objects/FuchsiaMeetingRoom.asm
+++ b/data/maps/objects/FuchsiaMeetingRoom.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 1, SPRITE_SAFARI_ZONE_WORKER, STAY, DOWN, 1 ; person
-	object_event 0, 2, SPRITE_SAFARI_ZONE_WORKER, STAY, UP, 2 ; person
-	object_event 10, 1, SPRITE_SAFARI_ZONE_WORKER, STAY, DOWN, 3 ; person
+	object_event  4,  1, SPRITE_SAFARI_ZONE_WORKER, STAY, DOWN, 1 ; person
+	object_event  0,  2, SPRITE_SAFARI_ZONE_WORKER, STAY, UP, 2 ; person
+	object_event 10,  1, SPRITE_SAFARI_ZONE_WORKER, STAY, DOWN, 3 ; person
 
 	def_warps_to FUCHSIA_MEETING_ROOM
--- a/data/maps/objects/FuchsiaPokecenter.asm
+++ b/data/maps/objects/FuchsiaPokecenter.asm
@@ -8,9 +8,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
-	object_event 2, 3, SPRITE_ROCKER, STAY, NONE, 2 ; person
-	object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
-	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
+	object_event  3,  1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event  2,  3, SPRITE_ROCKER, STAY, NONE, 2 ; person
+	object_event  6,  5, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
+	object_event 11,  2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to FUCHSIA_POKECENTER
--- a/data/maps/objects/GameCorner.asm
+++ b/data/maps/objects/GameCorner.asm
@@ -10,16 +10,16 @@
 	bg_event  9,  4, 12 ; CeladonGameCornerText12
 
 	def_object_events
-	object_event 2, 6, SPRITE_BEAUTY, STAY, DOWN, 1 ; person
-	object_event 5, 6, SPRITE_CLERK, STAY, DOWN, 2 ; person
-	object_event 2, 10, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 3 ; person
-	object_event 2, 13, SPRITE_BEAUTY, STAY, LEFT, 4 ; person
-	object_event 5, 11, SPRITE_FISHING_GURU, STAY, RIGHT, 5 ; person
-	object_event 8, 11, SPRITE_MIDDLE_AGED_WOMAN, STAY, LEFT, 6 ; person
-	object_event 8, 14, SPRITE_GYM_GUIDE, STAY, LEFT, 7 ; person
+	object_event  2,  6, SPRITE_BEAUTY, STAY, DOWN, 1 ; person
+	object_event  5,  6, SPRITE_CLERK, STAY, DOWN, 2 ; person
+	object_event  2, 10, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 3 ; person
+	object_event  2, 13, SPRITE_BEAUTY, STAY, LEFT, 4 ; person
+	object_event  5, 11, SPRITE_FISHING_GURU, STAY, RIGHT, 5 ; person
+	object_event  8, 11, SPRITE_MIDDLE_AGED_WOMAN, STAY, LEFT, 6 ; person
+	object_event  8, 14, SPRITE_GYM_GUIDE, STAY, LEFT, 7 ; person
 	object_event 11, 15, SPRITE_GAMBLER, STAY, RIGHT, 8 ; person
 	object_event 14, 11, SPRITE_CLERK, STAY, LEFT, 9 ; person
 	object_event 17, 13, SPRITE_GENTLEMAN, STAY, RIGHT, 10 ; person
-	object_event 9, 5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7
+	object_event  9,  5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7
 
 	def_warps_to GAME_CORNER
--- a/data/maps/objects/GameCornerPrizeRoom.asm
+++ b/data/maps/objects/GameCornerPrizeRoom.asm
@@ -11,7 +11,7 @@
 	bg_event  6,  2, 5 ; CeladonPrizeRoomText5
 
 	def_object_events
-	object_event 1, 4, SPRITE_BALDING_GUY, STAY, NONE, 1 ; person
-	object_event 7, 3, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
+	object_event  1,  4, SPRITE_BALDING_GUY, STAY, NONE, 1 ; person
+	object_event  7,  3, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
 
 	def_warps_to GAME_CORNER_PRIZE_ROOM
--- a/data/maps/objects/HallOfFame.asm
+++ b/data/maps/objects/HallOfFame.asm
@@ -8,6 +8,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 2, SPRITE_OAK, STAY, DOWN, 1 ; person
+	object_event  5,  2, SPRITE_OAK, STAY, DOWN, 1 ; person
 
 	def_warps_to HALL_OF_FAME
--- a/data/maps/objects/IndigoPlateauLobby.asm
+++ b/data/maps/objects/IndigoPlateauLobby.asm
@@ -9,10 +9,10 @@
 	def_bg_events
 
 	def_object_events
-	object_event 7, 5, SPRITE_NURSE, STAY, DOWN, 1 ; person
-	object_event 4, 9, SPRITE_GYM_GUIDE, STAY, RIGHT, 2 ; person
-	object_event 5, 1, SPRITE_COOLTRAINER_F, STAY, DOWN, 3 ; person
-	object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 4 ; person
-	object_event 13, 6, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 5 ; person
+	object_event  7,  5, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event  4,  9, SPRITE_GYM_GUIDE, STAY, RIGHT, 2 ; person
+	object_event  5,  1, SPRITE_COOLTRAINER_F, STAY, DOWN, 3 ; person
+	object_event  0,  5, SPRITE_CLERK, STAY, RIGHT, 4 ; person
+	object_event 13,  6, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 5 ; person
 
 	def_warps_to INDIGO_PLATEAU_LOBBY
--- a/data/maps/objects/LancesRoom.asm
+++ b/data/maps/objects/LancesRoom.asm
@@ -9,6 +9,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 6, 1, SPRITE_LANCE, STAY, DOWN, 1, OPP_LANCE, 1
+	object_event  6,  1, SPRITE_LANCE, STAY, DOWN, 1, OPP_LANCE, 1
 
 	def_warps_to LANCES_ROOM
--- a/data/maps/objects/LavenderCuboneHouse.asm
+++ b/data/maps/objects/LavenderCuboneHouse.asm
@@ -8,7 +8,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 5, SPRITE_MONSTER, STAY, UP, 1 ; person
-	object_event 2, 4, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 2 ; person
+	object_event  3,  5, SPRITE_MONSTER, STAY, UP, 1 ; person
+	object_event  2,  4, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 2 ; person
 
 	def_warps_to LAVENDER_CUBONE_HOUSE
--- a/data/maps/objects/LavenderMart.asm
+++ b/data/maps/objects/LavenderMart.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
-	object_event 3, 4, SPRITE_BALDING_GUY, STAY, NONE, 2 ; person
-	object_event 7, 2, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
+	object_event  0,  5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
+	object_event  3,  4, SPRITE_BALDING_GUY, STAY, NONE, 2 ; person
+	object_event  7,  2, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
 
 	def_warps_to LAVENDER_MART
--- a/data/maps/objects/LavenderPokecenter.asm
+++ b/data/maps/objects/LavenderPokecenter.asm
@@ -8,9 +8,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
-	object_event 5, 3, SPRITE_GENTLEMAN, STAY, NONE, 2 ; person
-	object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 3 ; person
-	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
+	object_event  3,  1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event  5,  3, SPRITE_GENTLEMAN, STAY, NONE, 2 ; person
+	object_event  2,  6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 3 ; person
+	object_event 11,  2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to LAVENDER_POKECENTER
--- a/data/maps/objects/LavenderTown.asm
+++ b/data/maps/objects/LavenderTown.asm
@@ -18,8 +18,8 @@
 	bg_event 17,  7, 9 ; LavenderTownText9
 
 	def_object_events
-	object_event 15, 9, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person
-	object_event 9, 10, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person
-	object_event 8, 7, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person
+	object_event 15,  9, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person
+	object_event  9, 10, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person
+	object_event  8,  7, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person
 
 	def_warps_to LAVENDER_TOWN
--- a/data/maps/objects/LoreleisRoom.asm
+++ b/data/maps/objects/LoreleisRoom.asm
@@ -10,6 +10,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 2, SPRITE_LORELEI, STAY, DOWN, 1, OPP_LORELEI, 1
+	object_event  5,  2, SPRITE_LORELEI, STAY, DOWN, 1, OPP_LORELEI, 1
 
 	def_warps_to LORELEIS_ROOM
--- a/data/maps/objects/MrFujisHouse.asm
+++ b/data/maps/objects/MrFujisHouse.asm
@@ -8,11 +8,11 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 5, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person
-	object_event 6, 3, SPRITE_LITTLE_GIRL, STAY, DOWN, 2 ; person
-	object_event 6, 4, SPRITE_MONSTER, STAY, UP, 3 ; person
-	object_event 1, 3, SPRITE_MONSTER, STAY, NONE, 4 ; person
-	object_event 3, 1, SPRITE_MR_FUJI, STAY, NONE, 5 ; person
-	object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 6 ; person
+	object_event  3,  5, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person
+	object_event  6,  3, SPRITE_LITTLE_GIRL, STAY, DOWN, 2 ; person
+	object_event  6,  4, SPRITE_MONSTER, STAY, UP, 3 ; person
+	object_event  1,  3, SPRITE_MONSTER, STAY, NONE, 4 ; person
+	object_event  3,  1, SPRITE_MR_FUJI, STAY, NONE, 5 ; person
+	object_event  3,  3, SPRITE_POKEDEX, STAY, NONE, 6 ; person
 
 	def_warps_to MR_FUJIS_HOUSE
--- a/data/maps/objects/MrPsychicsHouse.asm
+++ b/data/maps/objects/MrPsychicsHouse.asm
@@ -8,6 +8,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 3, SPRITE_FISHING_GURU, STAY, LEFT, 1 ; person
+	object_event  5,  3, SPRITE_FISHING_GURU, STAY, LEFT, 1 ; person
 
 	def_warps_to MR_PSYCHICS_HOUSE
--- a/data/maps/objects/MtMoon1F.asm
+++ b/data/maps/objects/MtMoon1F.asm
@@ -12,18 +12,18 @@
 	bg_event 15, 23, 14 ; MtMoon1Text14
 
 	def_object_events
-	object_event 5, 6, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 1
+	object_event  5,  6, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 1
 	object_event 12, 16, SPRITE_YOUNGSTER, STAY, RIGHT, 2, OPP_YOUNGSTER, 3
-	object_event 30, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, 3, OPP_LASS, 5
+	object_event 30,  4, SPRITE_COOLTRAINER_F, STAY, DOWN, 3, OPP_LASS, 5
 	object_event 24, 31, SPRITE_SUPER_NERD, STAY, UP, 4, OPP_SUPER_NERD, 1
 	object_event 16, 23, SPRITE_COOLTRAINER_F, STAY, DOWN, 5, OPP_LASS, 6
-	object_event 7, 22, SPRITE_YOUNGSTER, STAY, DOWN, 6, OPP_BUG_CATCHER, 7
+	object_event  7, 22, SPRITE_YOUNGSTER, STAY, DOWN, 6, OPP_BUG_CATCHER, 7
 	object_event 30, 27, SPRITE_YOUNGSTER, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8
-	object_event 2, 20, SPRITE_POKE_BALL, STAY, NONE, 8, POTION
-	object_event 2, 2, SPRITE_POKE_BALL, STAY, NONE, 9, MOON_STONE
+	object_event  2, 20, SPRITE_POKE_BALL, STAY, NONE, 8, POTION
+	object_event  2,  2, SPRITE_POKE_BALL, STAY, NONE, 9, MOON_STONE
 	object_event 35, 31, SPRITE_POKE_BALL, STAY, NONE, 10, RARE_CANDY
 	object_event 36, 23, SPRITE_POKE_BALL, STAY, NONE, 11, ESCAPE_ROPE
 	object_event 20, 33, SPRITE_POKE_BALL, STAY, NONE, 12, POTION
-	object_event 5, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_WATER_GUN
+	object_event  5, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_WATER_GUN
 
 	def_warps_to MT_MOON_1F
--- a/data/maps/objects/MtMoonB2F.asm
+++ b/data/maps/objects/MtMoonB2F.asm
@@ -10,14 +10,14 @@
 	def_bg_events
 
 	def_object_events
-	object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
+	object_event 12,  8, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
 	object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 1
 	object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2
 	object_event 29, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3
 	object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 4
-	object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 6 ; person
-	object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person
+	object_event 12,  6, SPRITE_FOSSIL, STAY, NONE, 6 ; person
+	object_event 13,  6, SPRITE_FOSSIL, STAY, NONE, 7 ; person
 	object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 8, HP_UP
-	object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_PUNCH
+	object_event 29,  5, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_PUNCH
 
 	def_warps_to MT_MOON_B2F
--- a/data/maps/objects/MtMoonPokecenter.asm
+++ b/data/maps/objects/MtMoonPokecenter.asm
@@ -8,11 +8,11 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
-	object_event 4, 3, SPRITE_YOUNGSTER, STAY, UP, 2 ; person
-	object_event 7, 3, SPRITE_GENTLEMAN, STAY, UP, 3 ; person
-	object_event 10, 6, SPRITE_MIDDLE_AGED_MAN, WALK, LEFT_RIGHT, 4 ; person
-	object_event 7, 2, SPRITE_CLIPBOARD, STAY, NONE, 5 ; person
-	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person
+	object_event  3,  1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event  4,  3, SPRITE_YOUNGSTER, STAY, UP, 2 ; person
+	object_event  7,  3, SPRITE_GENTLEMAN, STAY, UP, 3 ; person
+	object_event 10,  6, SPRITE_MIDDLE_AGED_MAN, WALK, LEFT_RIGHT, 4 ; person
+	object_event  7,  2, SPRITE_CLIPBOARD, STAY, NONE, 5 ; person
+	object_event 11,  2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person
 
 	def_warps_to MT_MOON_POKECENTER
--- a/data/maps/objects/Museum1F.asm
+++ b/data/maps/objects/Museum1F.asm
@@ -11,10 +11,10 @@
 	def_bg_events
 
 	def_object_events
-	object_event 12, 4, SPRITE_SCIENTIST, STAY, LEFT, 1 ; person
-	object_event 1, 4, SPRITE_GAMBLER, STAY, NONE, 2 ; person
-	object_event 15, 2, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
-	object_event 17, 4, SPRITE_SCIENTIST, STAY, NONE, 4 ; person
-	object_event 16, 2, SPRITE_OLD_AMBER, STAY, NONE, 5 ; person
+	object_event 12,  4, SPRITE_SCIENTIST, STAY, LEFT, 1 ; person
+	object_event  1,  4, SPRITE_GAMBLER, STAY, NONE, 2 ; person
+	object_event 15,  2, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
+	object_event 17,  4, SPRITE_SCIENTIST, STAY, NONE, 4 ; person
+	object_event 16,  2, SPRITE_OLD_AMBER, STAY, NONE, 5 ; person
 
 	def_warps_to MUSEUM_1F
--- a/data/maps/objects/Museum2F.asm
+++ b/data/maps/objects/Museum2F.asm
@@ -9,10 +9,10 @@
 	bg_event  2,  5, 7 ; Museum2FText7
 
 	def_object_events
-	object_event 1, 7, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
-	object_event 0, 5, SPRITE_GRAMPS, STAY, DOWN, 2 ; person
-	object_event 7, 5, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
-	object_event 11, 5, SPRITE_BRUNETTE_GIRL, STAY, NONE, 4 ; person
-	object_event 12, 5, SPRITE_HIKER, STAY, DOWN, 5 ; person
+	object_event  1,  7, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
+	object_event  0,  5, SPRITE_GRAMPS, STAY, DOWN, 2 ; person
+	object_event  7,  5, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
+	object_event 11,  5, SPRITE_BRUNETTE_GIRL, STAY, NONE, 4 ; person
+	object_event 12,  5, SPRITE_HIKER, STAY, DOWN, 5 ; person
 
 	def_warps_to MUSEUM_2F
--- a/data/maps/objects/NameRatersHouse.asm
+++ b/data/maps/objects/NameRatersHouse.asm
@@ -8,6 +8,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 3, SPRITE_SILPH_PRESIDENT, STAY, LEFT, 1 ; person
+	object_event  5,  3, SPRITE_SILPH_PRESIDENT, STAY, LEFT, 1 ; person
 
 	def_warps_to NAME_RATERS_HOUSE
--- a/data/maps/objects/OaksLab.asm
+++ b/data/maps/objects/OaksLab.asm
@@ -8,16 +8,16 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 3, SPRITE_BLUE, STAY, NONE, 1, OPP_RIVAL1, 1
-	object_event 6, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person
-	object_event 7, 3, SPRITE_POKE_BALL, STAY, NONE, 3 ; person
-	object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, 4 ; person
-	object_event 5, 2, SPRITE_OAK, STAY, DOWN, 5 ; person
-	object_event 2, 1, SPRITE_POKEDEX, STAY, NONE, 6 ; person
-	object_event 3, 1, SPRITE_POKEDEX, STAY, NONE, 7 ; person
-	object_event 5, 10, SPRITE_OAK, STAY, UP, 8 ; person
-	object_event 1, 9, SPRITE_GIRL, WALK, UP_DOWN, 9 ; person
-	object_event 2, 10, SPRITE_SCIENTIST, STAY, NONE, 10 ; person
-	object_event 8, 10, SPRITE_SCIENTIST, STAY, NONE, 11 ; person
+	object_event  4,  3, SPRITE_BLUE, STAY, NONE, 1, OPP_RIVAL1, 1
+	object_event  6,  3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person
+	object_event  7,  3, SPRITE_POKE_BALL, STAY, NONE, 3 ; person
+	object_event  8,  3, SPRITE_POKE_BALL, STAY, NONE, 4 ; person
+	object_event  5,  2, SPRITE_OAK, STAY, DOWN, 5 ; person
+	object_event  2,  1, SPRITE_POKEDEX, STAY, NONE, 6 ; person
+	object_event  3,  1, SPRITE_POKEDEX, STAY, NONE, 7 ; person
+	object_event  5, 10, SPRITE_OAK, STAY, UP, 8 ; person
+	object_event  1,  9, SPRITE_GIRL, WALK, UP_DOWN, 9 ; person
+	object_event  2, 10, SPRITE_SCIENTIST, STAY, NONE, 10 ; person
+	object_event  8, 10, SPRITE_SCIENTIST, STAY, NONE, 11 ; person
 
 	def_warps_to OAKS_LAB
--- a/data/maps/objects/PalletTown.asm
+++ b/data/maps/objects/PalletTown.asm
@@ -13,8 +13,8 @@
 	bg_event 11,  5, 7 ; PalletTownText7
 
 	def_object_events
-	object_event 8, 5, SPRITE_OAK, STAY, NONE, 1 ; person
-	object_event 3, 8, SPRITE_GIRL, WALK, ANY_DIR, 2 ; person
+	object_event  8,  5, SPRITE_OAK, STAY, NONE, 1 ; person
+	object_event  3,  8, SPRITE_GIRL, WALK, ANY_DIR, 2 ; person
 	object_event 11, 14, SPRITE_FISHER, WALK, ANY_DIR, 3 ; person
 
 	def_warps_to PALLET_TOWN
--- a/data/maps/objects/PewterCity.asm
+++ b/data/maps/objects/PewterCity.asm
@@ -20,7 +20,7 @@
 	bg_event 25, 23, 12 ; PewterCityText12
 
 	def_object_events
-	object_event 8, 15, SPRITE_COOLTRAINER_F, STAY, NONE, 1 ; person
+	object_event  8, 15, SPRITE_COOLTRAINER_F, STAY, NONE, 1 ; person
 	object_event 17, 25, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person
 	object_event 27, 17, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
 	object_event 26, 25, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 4 ; person
--- a/data/maps/objects/PewterGym.asm
+++ b/data/maps/objects/PewterGym.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 1, SPRITE_SUPER_NERD, STAY, DOWN, 1, OPP_BROCK, 1
-	object_event 3, 6, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1
-	object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 3 ; person
+	object_event  4,  1, SPRITE_SUPER_NERD, STAY, DOWN, 1, OPP_BROCK, 1
+	object_event  3,  6, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1
+	object_event  7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 3 ; person
 
 	def_warps_to PEWTER_GYM
--- a/data/maps/objects/PewterMart.asm
+++ b/data/maps/objects/PewterMart.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
-	object_event 3, 3, SPRITE_YOUNGSTER, WALK, UP_DOWN, 2 ; person
-	object_event 5, 5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
+	object_event  0,  5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
+	object_event  3,  3, SPRITE_YOUNGSTER, WALK, UP_DOWN, 2 ; person
+	object_event  5,  5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
 
 	def_warps_to PEWTER_MART
--- a/data/maps/objects/PewterNidoranHouse.asm
+++ b/data/maps/objects/PewterNidoranHouse.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 5, SPRITE_MONSTER, STAY, LEFT, 1 ; person
-	object_event 3, 5, SPRITE_LITTLE_BOY, STAY, RIGHT, 2 ; person
-	object_event 1, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person
+	object_event  4,  5, SPRITE_MONSTER, STAY, LEFT, 1 ; person
+	object_event  3,  5, SPRITE_LITTLE_BOY, STAY, RIGHT, 2 ; person
+	object_event  1,  2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person
 
 	def_warps_to PEWTER_NIDORAN_HOUSE
--- a/data/maps/objects/PewterPokecenter.asm
+++ b/data/maps/objects/PewterPokecenter.asm
@@ -8,9 +8,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
-	object_event 11, 7, SPRITE_GENTLEMAN, STAY, LEFT, 2 ; person
-	object_event 1, 3, SPRITE_FAIRY, STAY, DOWN, 3 ; person
-	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
+	object_event  3,  1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event 11,  7, SPRITE_GENTLEMAN, STAY, LEFT, 2 ; person
+	object_event  1,  3, SPRITE_FAIRY, STAY, DOWN, 3 ; person
+	object_event 11,  2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to PEWTER_POKECENTER
--- a/data/maps/objects/PewterSpeechHouse.asm
+++ b/data/maps/objects/PewterSpeechHouse.asm
@@ -8,7 +8,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 3, SPRITE_GAMBLER, STAY, RIGHT, 1 ; person
-	object_event 4, 5, SPRITE_YOUNGSTER, STAY, NONE, 2 ; person
+	object_event  2,  3, SPRITE_GAMBLER, STAY, RIGHT, 1 ; person
+	object_event  4,  5, SPRITE_YOUNGSTER, STAY, NONE, 2 ; person
 
 	def_warps_to PEWTER_SPEECH_HOUSE
--- a/data/maps/objects/PokemonFanClub.asm
+++ b/data/maps/objects/PokemonFanClub.asm
@@ -10,11 +10,11 @@
 	bg_event  6,  0, 8 ; FanClubText8
 
 	def_object_events
-	object_event 6, 3, SPRITE_FISHER, STAY, LEFT, 1 ; person
-	object_event 1, 3, SPRITE_GIRL, STAY, RIGHT, 2 ; person
-	object_event 6, 4, SPRITE_FAIRY, STAY, LEFT, 3 ; person
-	object_event 1, 4, SPRITE_SEEL, STAY, RIGHT, 4 ; person
-	object_event 3, 1, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person
-	object_event 5, 1, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person
+	object_event  6,  3, SPRITE_FISHER, STAY, LEFT, 1 ; person
+	object_event  1,  3, SPRITE_GIRL, STAY, RIGHT, 2 ; person
+	object_event  6,  4, SPRITE_FAIRY, STAY, LEFT, 3 ; person
+	object_event  1,  4, SPRITE_SEEL, STAY, RIGHT, 4 ; person
+	object_event  3,  1, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person
+	object_event  5,  1, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person
 
 	def_warps_to POKEMON_FAN_CLUB
--- a/data/maps/objects/PokemonMansion1F.asm
+++ b/data/maps/objects/PokemonMansion1F.asm
@@ -15,7 +15,7 @@
 
 	def_object_events
 	object_event 17, 17, SPRITE_SCIENTIST, STAY, LEFT, 1, OPP_SCIENTIST, 4
-	object_event 14, 3, SPRITE_POKE_BALL, STAY, NONE, 2, ESCAPE_ROPE
+	object_event 14,  3, SPRITE_POKE_BALL, STAY, NONE, 2, ESCAPE_ROPE
 	object_event 18, 21, SPRITE_POKE_BALL, STAY, NONE, 3, CARBOS
 
 	def_warps_to POKEMON_MANSION_1F
--- a/data/maps/objects/PokemonMansion2F.asm
+++ b/data/maps/objects/PokemonMansion2F.asm
@@ -10,9 +10,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 17, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 7
-	object_event 28, 7, SPRITE_POKE_BALL, STAY, NONE, 2, CALCIUM
-	object_event 18, 2, SPRITE_POKEDEX, STAY, NONE, 3 ; person
-	object_event 3, 22, SPRITE_POKEDEX, STAY, NONE, 4 ; person
+	object_event  3, 17, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 7
+	object_event 28,  7, SPRITE_POKE_BALL, STAY, NONE, 2, CALCIUM
+	object_event 18,  2, SPRITE_POKEDEX, STAY, NONE, 3 ; person
+	object_event  3, 22, SPRITE_POKEDEX, STAY, NONE, 4 ; person
 
 	def_warps_to POKEMON_MANSION_2F
--- a/data/maps/objects/PokemonMansion3F.asm
+++ b/data/maps/objects/PokemonMansion3F.asm
@@ -9,10 +9,10 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 11, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8
+	object_event  5, 11, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8
 	object_event 20, 11, SPRITE_SCIENTIST, STAY, LEFT, 2, OPP_SCIENTIST, 12
-	object_event 1, 16, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_POTION
-	object_event 25, 5, SPRITE_POKE_BALL, STAY, NONE, 4, IRON
-	object_event 6, 12, SPRITE_POKEDEX, STAY, NONE, 5 ; person
+	object_event  1, 16, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_POTION
+	object_event 25,  5, SPRITE_POKE_BALL, STAY, NONE, 4, IRON
+	object_event  6, 12, SPRITE_POKEDEX, STAY, NONE, 5 ; person
 
 	def_warps_to POKEMON_MANSION_3F
--- a/data/maps/objects/PokemonMansionB1F.asm
+++ b/data/maps/objects/PokemonMansionB1F.asm
@@ -9,11 +9,11 @@
 	def_object_events
 	object_event 16, 23, SPRITE_SUPER_NERD, STAY, NONE, 1, OPP_BURGLAR, 9
 	object_event 27, 11, SPRITE_SCIENTIST, STAY, DOWN, 2, OPP_SCIENTIST, 13
-	object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 3, RARE_CANDY
-	object_event 1, 22, SPRITE_POKE_BALL, STAY, NONE, 4, FULL_RESTORE
+	object_event 10,  2, SPRITE_POKE_BALL, STAY, NONE, 3, RARE_CANDY
+	object_event  1, 22, SPRITE_POKE_BALL, STAY, NONE, 4, FULL_RESTORE
 	object_event 19, 25, SPRITE_POKE_BALL, STAY, NONE, 5, TM_BLIZZARD
-	object_event 5, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_SOLARBEAM
+	object_event  5,  4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_SOLARBEAM
 	object_event 16, 20, SPRITE_POKEDEX, STAY, NONE, 7 ; person
-	object_event 5, 13, SPRITE_POKE_BALL, STAY, NONE, 8, SECRET_KEY
+	object_event  5, 13, SPRITE_POKE_BALL, STAY, NONE, 8, SECRET_KEY
 
 	def_warps_to POKEMON_MANSION_B1F
--- a/data/maps/objects/PokemonTower1F.asm
+++ b/data/maps/objects/PokemonTower1F.asm
@@ -10,9 +10,9 @@
 
 	def_object_events
 	object_event 15, 13, SPRITE_LINK_RECEPTIONIST, STAY, UP, 1 ; person
-	object_event 6, 8, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person
-	object_event 8, 12, SPRITE_BALDING_GUY, STAY, NONE, 3 ; person
-	object_event 13, 7, SPRITE_GIRL, STAY, NONE, 4 ; person
-	object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, 5 ; person
+	object_event  6,  8, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person
+	object_event  8, 12, SPRITE_BALDING_GUY, STAY, NONE, 3 ; person
+	object_event 13,  7, SPRITE_GIRL, STAY, NONE, 4 ; person
+	object_event 17,  7, SPRITE_CHANNELER, STAY, LEFT, 5 ; person
 
 	def_warps_to POKEMON_TOWER_1F
--- a/data/maps/objects/PokemonTower2F.asm
+++ b/data/maps/objects/PokemonTower2F.asm
@@ -8,7 +8,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 14, 5, SPRITE_BLUE, STAY, NONE, 1 ; person
-	object_event 3, 7, SPRITE_CHANNELER, STAY, RIGHT, 2 ; person
+	object_event 14,  5, SPRITE_BLUE, STAY, NONE, 1 ; person
+	object_event  3,  7, SPRITE_CHANNELER, STAY, RIGHT, 2 ; person
 
 	def_warps_to POKEMON_TOWER_2F
--- a/data/maps/objects/PokemonTower3F.asm
+++ b/data/maps/objects/PokemonTower3F.asm
@@ -8,9 +8,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 12, 3, SPRITE_CHANNELER, STAY, LEFT, 1, OPP_CHANNELER, 5
-	object_event 9, 8, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 6
+	object_event 12,  3, SPRITE_CHANNELER, STAY, LEFT, 1, OPP_CHANNELER, 5
+	object_event  9,  8, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 6
 	object_event 10, 13, SPRITE_CHANNELER, STAY, DOWN, 3, OPP_CHANNELER, 8
-	object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, 4, ESCAPE_ROPE
+	object_event 12,  1, SPRITE_POKE_BALL, STAY, NONE, 4, ESCAPE_ROPE
 
 	def_warps_to POKEMON_TOWER_3F
--- a/data/maps/objects/PokemonTower4F.asm
+++ b/data/maps/objects/PokemonTower4F.asm
@@ -8,11 +8,11 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 9
-	object_event 15, 7, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 10
+	object_event  5, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 9
+	object_event 15,  7, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 10
 	object_event 14, 12, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 12
 	object_event 12, 10, SPRITE_POKE_BALL, STAY, NONE, 4, ELIXER
-	object_event 9, 10, SPRITE_POKE_BALL, STAY, NONE, 5, AWAKENING
+	object_event  9, 10, SPRITE_POKE_BALL, STAY, NONE, 5, AWAKENING
 	object_event 12, 16, SPRITE_POKE_BALL, STAY, NONE, 6, HP_UP
 
 	def_warps_to POKEMON_TOWER_4F
--- a/data/maps/objects/PokemonTower5F.asm
+++ b/data/maps/objects/PokemonTower5F.asm
@@ -8,11 +8,11 @@
 	def_bg_events
 
 	def_object_events
-	object_event 12, 8, SPRITE_CHANNELER, STAY, NONE, 1 ; person
-	object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, 2, OPP_CHANNELER, 14
-	object_event 14, 3, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 16
-	object_event 6, 10, SPRITE_CHANNELER, STAY, RIGHT, 4, OPP_CHANNELER, 17
-	object_event 9, 16, SPRITE_CHANNELER, STAY, RIGHT, 5, OPP_CHANNELER, 18
-	object_event 6, 14, SPRITE_POKE_BALL, STAY, NONE, 6, NUGGET
+	object_event 12,  8, SPRITE_CHANNELER, STAY, NONE, 1 ; person
+	object_event 17,  7, SPRITE_CHANNELER, STAY, LEFT, 2, OPP_CHANNELER, 14
+	object_event 14,  3, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 16
+	object_event  6, 10, SPRITE_CHANNELER, STAY, RIGHT, 4, OPP_CHANNELER, 17
+	object_event  9, 16, SPRITE_CHANNELER, STAY, RIGHT, 5, OPP_CHANNELER, 18
+	object_event  6, 14, SPRITE_POKE_BALL, STAY, NONE, 6, NUGGET
 
 	def_warps_to POKEMON_TOWER_5F
--- a/data/maps/objects/PokemonTower6F.asm
+++ b/data/maps/objects/PokemonTower6F.asm
@@ -9,9 +9,9 @@
 
 	def_object_events
 	object_event 12, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 19
-	object_event 9, 5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20
-	object_event 16, 5, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 21
-	object_event 6, 8, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
+	object_event  9,  5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20
+	object_event 16,  5, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 21
+	object_event  6,  8, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
 	object_event 14, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY
 
 	def_warps_to POKEMON_TOWER_6F
--- a/data/maps/objects/PokemonTower7F.asm
+++ b/data/maps/objects/PokemonTower7F.asm
@@ -7,9 +7,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 9, 11, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 19
-	object_event 12, 9, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 20
-	object_event 9, 7, SPRITE_ROCKET, STAY, RIGHT, 3, OPP_ROCKET, 21
-	object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, 4 ; person
+	object_event  9, 11, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 19
+	object_event 12,  9, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 20
+	object_event  9,  7, SPRITE_ROCKET, STAY, RIGHT, 3, OPP_ROCKET, 21
+	object_event 10,  3, SPRITE_MR_FUJI, STAY, DOWN, 4 ; person
 
 	def_warps_to POKEMON_TOWER_7F
--- a/data/maps/objects/PowerPlant.asm
+++ b/data/maps/objects/PowerPlant.asm
@@ -9,7 +9,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 9, 20, SPRITE_POKE_BALL, STAY, NONE, 1, VOLTORB, 40
+	object_event  9, 20, SPRITE_POKE_BALL, STAY, NONE, 1, VOLTORB, 40
 	object_event 32, 18, SPRITE_POKE_BALL, STAY, NONE, 2, VOLTORB, 40
 	object_event 21, 25, SPRITE_POKE_BALL, STAY, NONE, 3, VOLTORB, 40
 	object_event 25, 18, SPRITE_POKE_BALL, STAY, NONE, 4, ELECTRODE, 43
@@ -17,10 +17,10 @@
 	object_event 26, 28, SPRITE_POKE_BALL, STAY, NONE, 6, VOLTORB, 40
 	object_event 21, 14, SPRITE_POKE_BALL, STAY, NONE, 7, ELECTRODE, 43
 	object_event 37, 32, SPRITE_POKE_BALL, STAY, NONE, 8, VOLTORB, 40
-	object_event 4, 9, SPRITE_BIRD, STAY, UP, 9, ZAPDOS, 50
-	object_event 7, 25, SPRITE_POKE_BALL, STAY, NONE, 10, CARBOS
-	object_event 28, 3, SPRITE_POKE_BALL, STAY, NONE, 11, HP_UP
-	object_event 34, 3, SPRITE_POKE_BALL, STAY, NONE, 12, RARE_CANDY
+	object_event  4,  9, SPRITE_BIRD, STAY, UP, 9, ZAPDOS, 50
+	object_event  7, 25, SPRITE_POKE_BALL, STAY, NONE, 10, CARBOS
+	object_event 28,  3, SPRITE_POKE_BALL, STAY, NONE, 11, HP_UP
+	object_event 34,  3, SPRITE_POKE_BALL, STAY, NONE, 12, RARE_CANDY
 	object_event 26, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_THUNDER
 	object_event 20, 32, SPRITE_POKE_BALL, STAY, NONE, 14, TM_REFLECT
 
--- a/data/maps/objects/RedsHouse1F.asm
+++ b/data/maps/objects/RedsHouse1F.asm
@@ -10,6 +10,6 @@
 	bg_event  3,  1, 2 ; TV
 
 	def_object_events
-	object_event 5, 4, SPRITE_MOM, STAY, LEFT, 1 ; Mom
+	object_event  5,  4, SPRITE_MOM, STAY, LEFT, 1 ; Mom
 
 	def_warps_to REDS_HOUSE_1F
--- a/data/maps/objects/RockTunnel1F.asm
+++ b/data/maps/objects/RockTunnel1F.asm
@@ -15,10 +15,10 @@
 	bg_event 11, 29, 8 ; RockTunnel1Text8
 
 	def_object_events
-	object_event 7, 5, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 12
-	object_event 5, 16, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 13
+	object_event  7,  5, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 12
+	object_event  5, 16, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 13
 	object_event 17, 15, SPRITE_HIKER, STAY, LEFT, 3, OPP_HIKER, 14
-	object_event 23, 8, SPRITE_SUPER_NERD, STAY, LEFT, 4, OPP_POKEMANIAC, 7
+	object_event 23,  8, SPRITE_SUPER_NERD, STAY, LEFT, 4, OPP_POKEMANIAC, 7
 	object_event 37, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17
 	object_event 22, 24, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18
 	object_event 32, 24, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19
--- a/data/maps/objects/RockTunnelB1F.asm
+++ b/data/maps/objects/RockTunnelB1F.asm
@@ -11,12 +11,12 @@
 
 	def_object_events
 	object_event 11, 13, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9
-	object_event 6, 10, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 9
-	object_event 3, 5, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_POKEMANIAC, 3
+	object_event  6, 10, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 9
+	object_event  3,  5, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_POKEMANIAC, 3
 	object_event 20, 21, SPRITE_SUPER_NERD, STAY, RIGHT, 4, OPP_POKEMANIAC, 4
 	object_event 30, 10, SPRITE_HIKER, STAY, DOWN, 5, OPP_HIKER, 10
 	object_event 14, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10
-	object_event 33, 5, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 11
+	object_event 33,  5, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 11
 	object_event 26, 30, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_POKEMANIAC, 5
 
 	def_warps_to ROCK_TUNNEL_B1F
--- a/data/maps/objects/RockTunnelPokecenter.asm
+++ b/data/maps/objects/RockTunnelPokecenter.asm
@@ -8,9 +8,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
-	object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person
-	object_event 2, 5, SPRITE_FISHER, STAY, NONE, 3 ; person
-	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
+	object_event  3,  1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event  7,  3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person
+	object_event  2,  5, SPRITE_FISHER, STAY, NONE, 3 ; person
+	object_event 11,  2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to ROCK_TUNNEL_POKECENTER
--- a/data/maps/objects/RocketHideoutB1F.asm
+++ b/data/maps/objects/RocketHideoutB1F.asm
@@ -11,12 +11,12 @@
 	def_bg_events
 
 	def_object_events
-	object_event 26, 8, SPRITE_ROCKET, STAY, LEFT, 1, OPP_ROCKET, 8
-	object_event 12, 6, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 9
+	object_event 26,  8, SPRITE_ROCKET, STAY, LEFT, 1, OPP_ROCKET, 8
+	object_event 12,  6, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 9
 	object_event 18, 17, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 10
 	object_event 15, 25, SPRITE_ROCKET, STAY, RIGHT, 4, OPP_ROCKET, 11
 	object_event 28, 18, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 12
 	object_event 11, 14, SPRITE_POKE_BALL, STAY, NONE, 6, ESCAPE_ROPE
-	object_event 9, 17, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION
+	object_event  9, 17, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION
 
 	def_warps_to ROCKET_HIDEOUT_B1F
--- a/data/maps/objects/RocketHideoutB2F.asm
+++ b/data/maps/objects/RocketHideoutB2F.asm
@@ -12,9 +12,9 @@
 
 	def_object_events
 	object_event 20, 12, SPRITE_ROCKET, STAY, DOWN, 1, OPP_ROCKET, 13
-	object_event 1, 11, SPRITE_POKE_BALL, STAY, NONE, 2, MOON_STONE
-	object_event 16, 8, SPRITE_POKE_BALL, STAY, NONE, 3, NUGGET
-	object_event 6, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_HORN_DRILL
-	object_event 3, 21, SPRITE_POKE_BALL, STAY, NONE, 5, SUPER_POTION
+	object_event  1, 11, SPRITE_POKE_BALL, STAY, NONE, 2, MOON_STONE
+	object_event 16,  8, SPRITE_POKE_BALL, STAY, NONE, 3, NUGGET
+	object_event  6, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_HORN_DRILL
+	object_event  3, 21, SPRITE_POKE_BALL, STAY, NONE, 5, SUPER_POTION
 
 	def_warps_to ROCKET_HIDEOUT_B2F
--- a/data/maps/objects/RocketHideoutB4F.asm
+++ b/data/maps/objects/RocketHideoutB4F.asm
@@ -9,14 +9,14 @@
 	def_bg_events
 
 	def_object_events
-	object_event 25, 3, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 1
+	object_event 25,  3, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 1
 	object_event 23, 12, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 16
 	object_event 26, 12, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 17
-	object_event 11, 2, SPRITE_ROCKET, STAY, DOWN, 4, OPP_ROCKET, 18
+	object_event 11,  2, SPRITE_ROCKET, STAY, DOWN, 4, OPP_ROCKET, 18
 	object_event 10, 12, SPRITE_POKE_BALL, STAY, NONE, 5, HP_UP
-	object_event 9, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_RAZOR_WIND
+	object_event  9,  4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_RAZOR_WIND
 	object_event 12, 20, SPRITE_POKE_BALL, STAY, NONE, 7, IRON
-	object_event 25, 2, SPRITE_POKE_BALL, STAY, NONE, 8, SILPH_SCOPE
-	object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 9, LIFT_KEY
+	object_event 25,  2, SPRITE_POKE_BALL, STAY, NONE, 8, SILPH_SCOPE
+	object_event 10,  2, SPRITE_POKE_BALL, STAY, NONE, 9, LIFT_KEY
 
 	def_warps_to ROCKET_HIDEOUT_B4F
--- a/data/maps/objects/Route1.asm
+++ b/data/maps/objects/Route1.asm
@@ -7,7 +7,7 @@
 	bg_event  9, 27, 3 ; Route1Text3
 
 	def_object_events
-	object_event 5, 24, SPRITE_YOUNGSTER, WALK, UP_DOWN, 1 ; person
+	object_event  5, 24, SPRITE_YOUNGSTER, WALK, UP_DOWN, 1 ; person
 	object_event 15, 13, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 2 ; person
 
 	def_warps_to ROUTE_1
--- a/data/maps/objects/Route10.asm
+++ b/data/maps/objects/Route10.asm
@@ -15,10 +15,10 @@
 
 	def_object_events
 	object_event 10, 44, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1
-	object_event 3, 57, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 7
+	object_event  3, 57, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 7
 	object_event 14, 64, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_POKEMANIAC, 2
-	object_event 7, 25, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7
-	object_event 3, 61, SPRITE_HIKER, STAY, DOWN, 5, OPP_HIKER, 8
-	object_event 7, 54, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8
+	object_event  7, 25, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7
+	object_event  3, 61, SPRITE_HIKER, STAY, DOWN, 5, OPP_HIKER, 8
+	object_event  7, 54, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8
 
 	def_warps_to ROUTE_10
--- a/data/maps/objects/Route11.asm
+++ b/data/maps/objects/Route11.asm
@@ -13,13 +13,13 @@
 
 	def_object_events
 	object_event 10, 14, SPRITE_GAMBLER, STAY, DOWN, 1, OPP_GAMBLER, 1
-	object_event 26, 9, SPRITE_GAMBLER, STAY, DOWN, 2, OPP_GAMBLER, 2
-	object_event 13, 5, SPRITE_YOUNGSTER, STAY, LEFT, 3, OPP_YOUNGSTER, 9
+	object_event 26,  9, SPRITE_GAMBLER, STAY, DOWN, 2, OPP_GAMBLER, 2
+	object_event 13,  5, SPRITE_YOUNGSTER, STAY, LEFT, 3, OPP_YOUNGSTER, 9
 	object_event 36, 11, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_ENGINEER, 2
-	object_event 22, 4, SPRITE_YOUNGSTER, STAY, UP, 5, OPP_YOUNGSTER, 10
-	object_event 45, 7, SPRITE_GAMBLER, STAY, DOWN, 6, OPP_GAMBLER, 3
-	object_event 33, 3, SPRITE_GAMBLER, STAY, UP, 7, OPP_GAMBLER, 4
-	object_event 43, 5, SPRITE_YOUNGSTER, STAY, RIGHT, 8, OPP_YOUNGSTER, 11
+	object_event 22,  4, SPRITE_YOUNGSTER, STAY, UP, 5, OPP_YOUNGSTER, 10
+	object_event 45,  7, SPRITE_GAMBLER, STAY, DOWN, 6, OPP_GAMBLER, 3
+	object_event 33,  3, SPRITE_GAMBLER, STAY, UP, 7, OPP_GAMBLER, 4
+	object_event 43,  5, SPRITE_YOUNGSTER, STAY, RIGHT, 8, OPP_YOUNGSTER, 11
 	object_event 45, 16, SPRITE_SUPER_NERD, STAY, LEFT, 9, OPP_ENGINEER, 3
 	object_event 22, 12, SPRITE_YOUNGSTER, STAY, UP, 10, OPP_YOUNGSTER, 12
 
--- a/data/maps/objects/Route11Gate1F.asm
+++ b/data/maps/objects/Route11Gate1F.asm
@@ -11,6 +11,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 1, SPRITE_GUARD, STAY, NONE, 1 ; person
+	object_event  4,  1, SPRITE_GUARD, STAY, NONE, 1 ; person
 
 	def_warps_to ROUTE_11_GATE_1F
--- a/data/maps/objects/Route11Gate2F.asm
+++ b/data/maps/objects/Route11Gate2F.asm
@@ -9,7 +9,7 @@
 	bg_event  6,  2, 4 ; Route11GateUpstairsText4
 
 	def_object_events
-	object_event 4, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
-	object_event 2, 6, SPRITE_SCIENTIST, STAY, NONE, 2 ; person
+	object_event  4,  2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
+	object_event  2,  6, SPRITE_SCIENTIST, STAY, NONE, 2 ; person
 
 	def_warps_to ROUTE_11_GATE_2F
--- a/data/maps/objects/Route12.asm
+++ b/data/maps/objects/Route12.asm
@@ -14,13 +14,13 @@
 	def_object_events
 	object_event 10, 62, SPRITE_SNORLAX, STAY, DOWN, 1 ; person
 	object_event 14, 31, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 3
-	object_event 5, 39, SPRITE_FISHER, STAY, UP, 3, OPP_FISHER, 4
+	object_event  5, 39, SPRITE_FISHER, STAY, UP, 3, OPP_FISHER, 4
 	object_event 11, 92, SPRITE_COOLTRAINER_M, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9
 	object_event 14, 76, SPRITE_SUPER_NERD, STAY, UP, 5, OPP_ROCKER, 2
 	object_event 12, 40, SPRITE_FISHER, STAY, LEFT, 6, OPP_FISHER, 5
-	object_event 9, 52, SPRITE_FISHER, STAY, RIGHT, 7, OPP_FISHER, 6
-	object_event 6, 87, SPRITE_FISHER, STAY, DOWN, 8, OPP_FISHER, 11
+	object_event  9, 52, SPRITE_FISHER, STAY, RIGHT, 7, OPP_FISHER, 6
+	object_event  6, 87, SPRITE_FISHER, STAY, DOWN, 8, OPP_FISHER, 11
 	object_event 14, 35, SPRITE_POKE_BALL, STAY, NONE, 9, TM_PAY_DAY
-	object_event 5, 89, SPRITE_POKE_BALL, STAY, NONE, 10, IRON
+	object_event  5, 89, SPRITE_POKE_BALL, STAY, NONE, 10, IRON
 
 	def_warps_to ROUTE_12
--- a/data/maps/objects/Route12Gate1F.asm
+++ b/data/maps/objects/Route12Gate1F.asm
@@ -11,6 +11,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 1, 3, SPRITE_GUARD, STAY, NONE, 1 ; person
+	object_event  1,  3, SPRITE_GUARD, STAY, NONE, 1 ; person
 
 	def_warps_to ROUTE_12_GATE_1F
--- a/data/maps/objects/Route12Gate2F.asm
+++ b/data/maps/objects/Route12Gate2F.asm
@@ -9,6 +9,6 @@
 	bg_event  6,  2, 3 ; Route12GateUpstairsText3
 
 	def_object_events
-	object_event 3, 4, SPRITE_BRUNETTE_GIRL, WALK, UP_DOWN, 1 ; person
+	object_event  3,  4, SPRITE_BRUNETTE_GIRL, WALK, UP_DOWN, 1 ; person
 
 	def_warps_to ROUTE_12_GATE_2F
--- a/data/maps/objects/Route12SuperRodHouse.asm
+++ b/data/maps/objects/Route12SuperRodHouse.asm
@@ -8,6 +8,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 4, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person
+	object_event  2,  4, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person
 
 	def_warps_to ROUTE_12_SUPER_ROD_HOUSE
--- a/data/maps/objects/Route13.asm
+++ b/data/maps/objects/Route13.asm
@@ -11,13 +11,13 @@
 	def_object_events
 	object_event 49, 10, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1
 	object_event 48, 10, SPRITE_COOLTRAINER_F, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12
-	object_event 27, 9, SPRITE_COOLTRAINER_F, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13
+	object_event 27,  9, SPRITE_COOLTRAINER_F, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13
 	object_event 23, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14
-	object_event 50, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15
-	object_event 12, 4, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2
-	object_event 33, 6, SPRITE_BEAUTY, STAY, DOWN, 7, OPP_BEAUTY, 4
-	object_event 32, 6, SPRITE_BEAUTY, STAY, DOWN, 8, OPP_BEAUTY, 5
-	object_event 10, 7, SPRITE_BIKER, STAY, UP, 9, OPP_BIKER, 1
-	object_event 7, 13, SPRITE_COOLTRAINER_M, STAY, UP, 10, OPP_BIRD_KEEPER, 3
+	object_event 50,  5, SPRITE_COOLTRAINER_F, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15
+	object_event 12,  4, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2
+	object_event 33,  6, SPRITE_BEAUTY, STAY, DOWN, 7, OPP_BEAUTY, 4
+	object_event 32,  6, SPRITE_BEAUTY, STAY, DOWN, 8, OPP_BEAUTY, 5
+	object_event 10,  7, SPRITE_BIKER, STAY, UP, 9, OPP_BIKER, 1
+	object_event  7, 13, SPRITE_COOLTRAINER_M, STAY, UP, 10, OPP_BIRD_KEEPER, 3
 
 	def_warps_to ROUTE_13
--- a/data/maps/objects/Route14.asm
+++ b/data/maps/objects/Route14.asm
@@ -7,15 +7,15 @@
 	bg_event 17, 13, 11 ; Route14Text11
 
 	def_object_events
-	object_event 4, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14
-	object_event 15, 6, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15
+	object_event  4,  4, SPRITE_COOLTRAINER_M, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14
+	object_event 15,  6, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15
 	object_event 12, 11, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16
 	object_event 14, 15, SPRITE_COOLTRAINER_M, STAY, UP, 4, OPP_BIRD_KEEPER, 17
 	object_event 15, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4
-	object_event 6, 49, SPRITE_COOLTRAINER_M, STAY, UP, 6, OPP_BIRD_KEEPER, 5
-	object_event 5, 39, SPRITE_BIKER, STAY, DOWN, 7, OPP_BIKER, 13
-	object_event 4, 30, SPRITE_BIKER, STAY, RIGHT, 8, OPP_BIKER, 14
+	object_event  6, 49, SPRITE_COOLTRAINER_M, STAY, UP, 6, OPP_BIRD_KEEPER, 5
+	object_event  5, 39, SPRITE_BIKER, STAY, DOWN, 7, OPP_BIKER, 13
+	object_event  4, 30, SPRITE_BIKER, STAY, RIGHT, 8, OPP_BIKER, 14
 	object_event 15, 30, SPRITE_BIKER, STAY, LEFT, 9, OPP_BIKER, 15
-	object_event 4, 31, SPRITE_BIKER, STAY, RIGHT, 10, OPP_BIKER, 2
+	object_event  4, 31, SPRITE_BIKER, STAY, RIGHT, 10, OPP_BIKER, 2
 
 	def_warps_to ROUTE_14
--- a/data/maps/objects/Route15.asm
+++ b/data/maps/objects/Route15.asm
@@ -19,8 +19,8 @@
 	object_event 41, 10, SPRITE_BEAUTY, STAY, RIGHT, 6, OPP_BEAUTY, 10
 	object_event 48, 10, SPRITE_BIKER, STAY, DOWN, 7, OPP_BIKER, 3
 	object_event 46, 10, SPRITE_BIKER, STAY, DOWN, 8, OPP_BIKER, 4
-	object_event 37, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22
+	object_event 37,  5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22
 	object_event 18, 13, SPRITE_COOLTRAINER_F, STAY, UP, 10, OPP_JR_TRAINER_F, 23
-	object_event 18, 5, SPRITE_POKE_BALL, STAY, NONE, 11, TM_RAGE
+	object_event 18,  5, SPRITE_POKE_BALL, STAY, NONE, 11, TM_RAGE
 
 	def_warps_to ROUTE_15
--- a/data/maps/objects/Route15Gate1F.asm
+++ b/data/maps/objects/Route15Gate1F.asm
@@ -11,6 +11,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 1, SPRITE_GUARD, STAY, NONE, 1 ; person
+	object_event  4,  1, SPRITE_GUARD, STAY, NONE, 1 ; person
 
 	def_warps_to ROUTE_15_GATE_1F
--- a/data/maps/objects/Route15Gate2F.asm
+++ b/data/maps/objects/Route15Gate2F.asm
@@ -8,6 +8,6 @@
 	bg_event  6,  2, 2 ; Route15GateUpstairsText2
 
 	def_object_events
-	object_event 4, 2, SPRITE_SCIENTIST, STAY, DOWN, 1
+	object_event  4,  2, SPRITE_SCIENTIST, STAY, DOWN, 1
 
 	def_warps_to ROUTE_15_GATE_2F
--- a/data/maps/objects/Route16.asm
+++ b/data/maps/objects/Route16.asm
@@ -20,9 +20,9 @@
 	object_event 17, 12, SPRITE_BIKER, STAY, LEFT, 1, OPP_BIKER, 5
 	object_event 14, 13, SPRITE_BIKER, STAY, RIGHT, 2, OPP_CUE_BALL, 1
 	object_event 11, 12, SPRITE_BIKER, STAY, UP, 3, OPP_CUE_BALL, 2
-	object_event 9, 11, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 6
-	object_event 6, 10, SPRITE_BIKER, STAY, RIGHT, 5, OPP_CUE_BALL, 3
-	object_event 3, 12, SPRITE_BIKER, STAY, RIGHT, 6, OPP_BIKER, 7
+	object_event  9, 11, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 6
+	object_event  6, 10, SPRITE_BIKER, STAY, RIGHT, 5, OPP_CUE_BALL, 3
+	object_event  3, 12, SPRITE_BIKER, STAY, RIGHT, 6, OPP_BIKER, 7
 	object_event 26, 10, SPRITE_SNORLAX, STAY, DOWN, 7 ; person
 
 	def_warps_to ROUTE_16
--- a/data/maps/objects/Route16FlyHouse.asm
+++ b/data/maps/objects/Route16FlyHouse.asm
@@ -8,7 +8,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 3, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 1 ; person
-	object_event 6, 4, SPRITE_BIRD, WALK, ANY_DIR, 2 ; person
+	object_event  2,  3, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 1 ; person
+	object_event  6,  4, SPRITE_BIRD, WALK, ANY_DIR, 2 ; person
 
 	def_warps_to ROUTE_16_FLY_HOUSE
--- a/data/maps/objects/Route16Gate1F.asm
+++ b/data/maps/objects/Route16Gate1F.asm
@@ -15,7 +15,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 5, SPRITE_GUARD, STAY, DOWN, 1 ; person
-	object_event 4, 3, SPRITE_GAMBLER, STAY, NONE, 2 ; person
+	object_event  4,  5, SPRITE_GUARD, STAY, DOWN, 1 ; person
+	object_event  4,  3, SPRITE_GAMBLER, STAY, NONE, 2 ; person
 
 	def_warps_to ROUTE_16_GATE_1F
--- a/data/maps/objects/Route16Gate2F.asm
+++ b/data/maps/objects/Route16Gate2F.asm
@@ -9,7 +9,7 @@
 	bg_event  6,  2, 4 ; Route16GateUpstairsText4
 
 	def_object_events
-	object_event 4, 2, SPRITE_LITTLE_BOY, STAY, NONE, 1 ; person
-	object_event 2, 5, SPRITE_LITTLE_GIRL, WALK, LEFT_RIGHT, 2 ; person
+	object_event  4,  2, SPRITE_LITTLE_BOY, STAY, NONE, 1 ; person
+	object_event  2,  5, SPRITE_LITTLE_GIRL, WALK, LEFT_RIGHT, 2 ; person
 
 	def_warps_to ROUTE_16_GATE_2F
--- a/data/maps/objects/Route17.asm
+++ b/data/maps/objects/Route17.asm
@@ -14,13 +14,13 @@
 	def_object_events
 	object_event 12, 19, SPRITE_BIKER, STAY, LEFT, 1, OPP_CUE_BALL, 4
 	object_event 11, 16, SPRITE_BIKER, STAY, RIGHT, 2, OPP_CUE_BALL, 5
-	object_event 4, 18, SPRITE_BIKER, STAY, UP, 3, OPP_BIKER, 8
-	object_event 7, 32, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 9
+	object_event  4, 18, SPRITE_BIKER, STAY, UP, 3, OPP_BIKER, 8
+	object_event  7, 32, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 9
 	object_event 14, 34, SPRITE_BIKER, STAY, RIGHT, 5, OPP_BIKER, 10
 	object_event 17, 58, SPRITE_BIKER, STAY, LEFT, 6, OPP_CUE_BALL, 6
-	object_event 2, 68, SPRITE_BIKER, STAY, RIGHT, 7, OPP_CUE_BALL, 7
+	object_event  2, 68, SPRITE_BIKER, STAY, RIGHT, 7, OPP_CUE_BALL, 7
 	object_event 14, 98, SPRITE_BIKER, STAY, RIGHT, 8, OPP_CUE_BALL, 8
-	object_event 5, 98, SPRITE_BIKER, STAY, LEFT, 9, OPP_BIKER, 11
+	object_event  5, 98, SPRITE_BIKER, STAY, LEFT, 9, OPP_BIKER, 11
 	object_event 10, 118, SPRITE_BIKER, STAY, DOWN, 10, OPP_BIKER, 12
 
 	def_warps_to ROUTE_17
--- a/data/maps/objects/Route18Gate1F.asm
+++ b/data/maps/objects/Route18Gate1F.asm
@@ -11,6 +11,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 1, SPRITE_GUARD, STAY, DOWN, 1 ; person
+	object_event  4,  1, SPRITE_GUARD, STAY, DOWN, 1 ; person
 
 	def_warps_to ROUTE_18_GATE_1F
--- a/data/maps/objects/Route18Gate2F.asm
+++ b/data/maps/objects/Route18Gate2F.asm
@@ -9,6 +9,6 @@
 	bg_event  6,  2, 3 ; Route18GateUpstairsText3
 
 	def_object_events
-	object_event 4, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
+	object_event  4,  2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
 
 	def_warps_to ROUTE_18_GATE_2F
--- a/data/maps/objects/Route19.asm
+++ b/data/maps/objects/Route19.asm
@@ -7,15 +7,15 @@
 	bg_event 11,  9, 11 ; Route19Text11
 
 	def_object_events
-	object_event 8, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_SWIMMER, 2
-	object_event 13, 7, SPRITE_COOLTRAINER_M,STAY, LEFT, 2, OPP_SWIMMER, 3
+	object_event  8,  7, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_SWIMMER, 2
+	object_event 13,  7, SPRITE_COOLTRAINER_M,STAY, LEFT, 2, OPP_SWIMMER, 3
 	object_event 13, 25, SPRITE_SWIMMER, STAY, LEFT, 3, OPP_SWIMMER, 4
-	object_event 4, 27, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_SWIMMER, 5
+	object_event  4, 27, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_SWIMMER, 5
 	object_event 16, 31, SPRITE_SWIMMER, STAY, UP, 5, OPP_SWIMMER, 6
-	object_event 9, 11, SPRITE_SWIMMER, STAY, DOWN, 6, OPP_SWIMMER, 7
-	object_event 8, 43, SPRITE_SWIMMER, STAY, LEFT, 7, OPP_BEAUTY, 12
+	object_event  9, 11, SPRITE_SWIMMER, STAY, DOWN, 6, OPP_SWIMMER, 7
+	object_event  8, 43, SPRITE_SWIMMER, STAY, LEFT, 7, OPP_BEAUTY, 12
 	object_event 11, 43, SPRITE_SWIMMER, STAY, RIGHT, 8, OPP_BEAUTY, 13
-	object_event 9, 42, SPRITE_SWIMMER, STAY, UP, 9, OPP_SWIMMER, 8
+	object_event  9, 42, SPRITE_SWIMMER, STAY, UP, 9, OPP_SWIMMER, 8
 	object_event 10, 44, SPRITE_SWIMMER, STAY, DOWN, 10, OPP_BEAUTY, 14
 
 	def_warps_to ROUTE_19
--- a/data/maps/objects/Route20.asm
+++ b/data/maps/objects/Route20.asm
@@ -10,15 +10,15 @@
 	bg_event 57, 11, 12 ; Route20Text12
 
 	def_object_events
-	object_event 87, 8, SPRITE_SWIMMER, STAY, UP, 1, OPP_SWIMMER, 9
+	object_event 87,  8, SPRITE_SWIMMER, STAY, UP, 1, OPP_SWIMMER, 9
 	object_event 68, 11, SPRITE_SWIMMER, STAY, UP, 2, OPP_BEAUTY, 15
 	object_event 45, 10, SPRITE_SWIMMER, STAY, DOWN, 3, OPP_BEAUTY, 6
 	object_event 55, 14, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24
 	object_event 38, 13, SPRITE_SWIMMER, STAY, DOWN, 5, OPP_SWIMMER, 10
 	object_event 87, 13, SPRITE_SWIMMER, STAY, UP, 6, OPP_SWIMMER, 11
-	object_event 34, 9, SPRITE_COOLTRAINER_M, STAY, UP, 7, OPP_BIRD_KEEPER, 11
-	object_event 25, 7, SPRITE_SWIMMER, STAY, UP, 8, OPP_BEAUTY, 7
+	object_event 34,  9, SPRITE_COOLTRAINER_M, STAY, UP, 7, OPP_BIRD_KEEPER, 11
+	object_event 25,  7, SPRITE_SWIMMER, STAY, UP, 8, OPP_BEAUTY, 7
 	object_event 24, 12, SPRITE_SWIMMER, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16
-	object_event 15, 8, SPRITE_SWIMMER, STAY, UP, 10, OPP_BEAUTY, 8
+	object_event 15,  8, SPRITE_SWIMMER, STAY, UP, 10, OPP_BEAUTY, 8
 
 	def_warps_to ROUTE_20
--- a/data/maps/objects/Route21.asm
+++ b/data/maps/objects/Route21.asm
@@ -6,12 +6,12 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 24, SPRITE_FISHER, STAY, LEFT, 1, OPP_FISHER, 7
-	object_event 6, 25, SPRITE_FISHER, STAY, DOWN, 2, OPP_FISHER, 9
+	object_event  4, 24, SPRITE_FISHER, STAY, LEFT, 1, OPP_FISHER, 7
+	object_event  6, 25, SPRITE_FISHER, STAY, DOWN, 2, OPP_FISHER, 9
 	object_event 10, 31, SPRITE_SWIMMER, STAY, UP, 3, OPP_SWIMMER, 12
 	object_event 12, 30, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_CUE_BALL, 9
 	object_event 16, 63, SPRITE_SWIMMER, STAY, DOWN, 5, OPP_SWIMMER, 13
-	object_event 5, 71, SPRITE_SWIMMER, STAY, RIGHT, 6, OPP_SWIMMER, 14
+	object_event  5, 71, SPRITE_SWIMMER, STAY, RIGHT, 6, OPP_SWIMMER, 14
 	object_event 15, 71, SPRITE_SWIMMER, STAY, LEFT, 7, OPP_SWIMMER, 15
 	object_event 14, 56, SPRITE_FISHER, STAY, LEFT, 8, OPP_FISHER, 8
 	object_event 17, 57, SPRITE_FISHER, STAY, RIGHT, 9, OPP_FISHER, 10
--- a/data/maps/objects/Route22.asm
+++ b/data/maps/objects/Route22.asm
@@ -8,7 +8,7 @@
 	bg_event  7, 11, 3 ; Route22FrontGateText
 
 	def_object_events
-	object_event 25, 5, SPRITE_BLUE, STAY, NONE, 1 ; person
-	object_event 25, 5, SPRITE_BLUE, STAY, NONE, 2 ; person
+	object_event 25,  5, SPRITE_BLUE, STAY, NONE, 1 ; person
+	object_event 25,  5, SPRITE_BLUE, STAY, NONE, 2 ; person
 
 	def_warps_to ROUTE_22
--- a/data/maps/objects/Route22Gate.asm
+++ b/data/maps/objects/Route22Gate.asm
@@ -10,6 +10,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 6, 2, SPRITE_GUARD, STAY, LEFT, 1 ; person
+	object_event  6,  2, SPRITE_GUARD, STAY, LEFT, 1 ; person
 
 	def_warps_to ROUTE_22_GATE
--- a/data/maps/objects/Route23.asm
+++ b/data/maps/objects/Route23.asm
@@ -11,12 +11,12 @@
 	bg_event  3, 33, 8 ; Route23Text8
 
 	def_object_events
-	object_event 4, 35, SPRITE_GUARD, STAY, DOWN, 1 ; person
+	object_event  4, 35, SPRITE_GUARD, STAY, DOWN, 1 ; person
 	object_event 10, 56, SPRITE_GUARD, STAY, DOWN, 2 ; person
-	object_event 8, 85, SPRITE_SWIMMER, STAY, DOWN, 3 ; person
+	object_event  8, 85, SPRITE_SWIMMER, STAY, DOWN, 3 ; person
 	object_event 11, 96, SPRITE_SWIMMER, STAY, DOWN, 4 ; person
 	object_event 12, 105, SPRITE_GUARD, STAY, DOWN, 5 ; person
-	object_event 8, 119, SPRITE_GUARD, STAY, DOWN, 6 ; person
-	object_event 8, 136, SPRITE_GUARD, STAY, DOWN, 7 ; person
+	object_event  8, 119, SPRITE_GUARD, STAY, DOWN, 6 ; person
+	object_event  8, 136, SPRITE_GUARD, STAY, DOWN, 7 ; person
 
 	def_warps_to ROUTE_23
--- a/data/maps/objects/Route24.asm
+++ b/data/maps/objects/Route24.asm
@@ -7,12 +7,12 @@
 
 	def_object_events
 	object_event 11, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_ROCKET, 6
-	object_event 5, 20, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_JR_TRAINER_M, 2
+	object_event  5, 20, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_JR_TRAINER_M, 2
 	object_event 11, 19, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3
 	object_event 10, 22, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_LASS, 7
 	object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 4
 	object_event 10, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, 6, OPP_LASS, 8
 	object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, 7, OPP_BUG_CATCHER, 9
-	object_event 10, 5, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER_WAVE
+	object_event 10,  5, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER_WAVE
 
 	def_warps_to ROUTE_24
--- a/data/maps/objects/Route25.asm
+++ b/data/maps/objects/Route25.asm
@@ -8,15 +8,15 @@
 	bg_event 43,  3, 11 ; Route25Text11
 
 	def_object_events
-	object_event 14, 2, SPRITE_YOUNGSTER, STAY, DOWN, 1, OPP_YOUNGSTER, 5
-	object_event 18, 5, SPRITE_YOUNGSTER, STAY, UP, 2, OPP_YOUNGSTER, 6
-	object_event 24, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2
-	object_event 18, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_LASS, 9
-	object_event 32, 3, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 7
-	object_event 37, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 10
-	object_event 8, 4, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 2
-	object_event 23, 9, SPRITE_HIKER, STAY, UP, 8, OPP_HIKER, 3
-	object_event 13, 7, SPRITE_HIKER, STAY, RIGHT, 9, OPP_HIKER, 4
-	object_event 22, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_SEISMIC_TOSS
+	object_event 14,  2, SPRITE_YOUNGSTER, STAY, DOWN, 1, OPP_YOUNGSTER, 5
+	object_event 18,  5, SPRITE_YOUNGSTER, STAY, UP, 2, OPP_YOUNGSTER, 6
+	object_event 24,  4, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2
+	object_event 18,  8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_LASS, 9
+	object_event 32,  3, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 7
+	object_event 37,  4, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 10
+	object_event  8,  4, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 2
+	object_event 23,  9, SPRITE_HIKER, STAY, UP, 8, OPP_HIKER, 3
+	object_event 13,  7, SPRITE_HIKER, STAY, RIGHT, 9, OPP_HIKER, 4
+	object_event 22,  2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_SEISMIC_TOSS
 
 	def_warps_to ROUTE_25
--- a/data/maps/objects/Route2Gate.asm
+++ b/data/maps/objects/Route2Gate.asm
@@ -10,7 +10,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 1, 4, SPRITE_SCIENTIST, STAY, LEFT, 1 ; person
-	object_event 5, 4, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 2 ; person
+	object_event  1,  4, SPRITE_SCIENTIST, STAY, LEFT, 1 ; person
+	object_event  5,  4, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 2 ; person
 
 	def_warps_to ROUTE_2_GATE
--- a/data/maps/objects/Route2TradeHouse.asm
+++ b/data/maps/objects/Route2TradeHouse.asm
@@ -8,7 +8,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 4, SPRITE_SCIENTIST, STAY, RIGHT, 1 ; person
-	object_event 4, 1, SPRITE_GAMEBOY_KID, STAY, DOWN, 2 ; person
+	object_event  2,  4, SPRITE_SCIENTIST, STAY, RIGHT, 1 ; person
+	object_event  4,  1, SPRITE_GAMEBOY_KID, STAY, DOWN, 2 ; person
 
 	def_warps_to ROUTE_2_TRADE_HOUSE
--- a/data/maps/objects/Route3.asm
+++ b/data/maps/objects/Route3.asm
@@ -8,13 +8,13 @@
 
 	def_object_events
 	object_event 57, 11, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person
-	object_event 10, 6, SPRITE_YOUNGSTER, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4
-	object_event 14, 4, SPRITE_YOUNGSTER, STAY, DOWN, 3, OPP_YOUNGSTER, 1
-	object_event 16, 9, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 1
-	object_event 19, 5, SPRITE_YOUNGSTER, STAY, DOWN, 5, OPP_BUG_CATCHER, 5
-	object_event 23, 4, SPRITE_COOLTRAINER_F, STAY, LEFT, 6, OPP_LASS, 2
-	object_event 22, 9, SPRITE_YOUNGSTER, STAY, LEFT, 7, OPP_YOUNGSTER, 2
-	object_event 24, 6, SPRITE_YOUNGSTER, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6
+	object_event 10,  6, SPRITE_YOUNGSTER, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4
+	object_event 14,  4, SPRITE_YOUNGSTER, STAY, DOWN, 3, OPP_YOUNGSTER, 1
+	object_event 16,  9, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 1
+	object_event 19,  5, SPRITE_YOUNGSTER, STAY, DOWN, 5, OPP_BUG_CATCHER, 5
+	object_event 23,  4, SPRITE_COOLTRAINER_F, STAY, LEFT, 6, OPP_LASS, 2
+	object_event 22,  9, SPRITE_YOUNGSTER, STAY, LEFT, 7, OPP_YOUNGSTER, 2
+	object_event 24,  6, SPRITE_YOUNGSTER, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6
 	object_event 33, 10, SPRITE_COOLTRAINER_F, STAY, UP, 9, OPP_LASS, 3
 
 	def_warps_to ROUTE_3
--- a/data/maps/objects/Route4.asm
+++ b/data/maps/objects/Route4.asm
@@ -12,8 +12,8 @@
 	bg_event 27,  7, 6 ; Route4Text6
 
 	def_object_events
-	object_event 9, 8, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 1 ; person
-	object_event 63, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 4
-	object_event 57, 3, SPRITE_POKE_BALL, STAY, NONE, 3, TM_WHIRLWIND
+	object_event  9,  8, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 1 ; person
+	object_event 63,  3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 4
+	object_event 57,  3, SPRITE_POKE_BALL, STAY, NONE, 3, TM_WHIRLWIND
 
 	def_warps_to ROUTE_4
--- a/data/maps/objects/Route5Gate.asm
+++ b/data/maps/objects/Route5Gate.asm
@@ -10,6 +10,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 1, 3, SPRITE_GUARD, STAY, RIGHT, 1 ; person
+	object_event  1,  3, SPRITE_GUARD, STAY, RIGHT, 1 ; person
 
 	def_warps_to ROUTE_5_GATE
--- a/data/maps/objects/Route6.asm
+++ b/data/maps/objects/Route6.asm
@@ -13,7 +13,7 @@
 	def_object_events
 	object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4
 	object_event 11, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2
-	object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10
+	object_event  0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10
 	object_event 11, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5
 	object_event 11, 30, SPRITE_COOLTRAINER_F, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3
 	object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, 6, OPP_BUG_CATCHER, 11
--- a/data/maps/objects/Route6Gate.asm
+++ b/data/maps/objects/Route6Gate.asm
@@ -10,6 +10,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 6, 2, SPRITE_GUARD, STAY, LEFT, 1 ; person
+	object_event  6,  2, SPRITE_GUARD, STAY, LEFT, 1 ; person
 
 	def_warps_to ROUTE_6_GATE
--- a/data/maps/objects/Route7Gate.asm
+++ b/data/maps/objects/Route7Gate.asm
@@ -10,6 +10,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 1, SPRITE_GUARD, STAY, DOWN, 1 ; person
+	object_event  3,  1, SPRITE_GUARD, STAY, DOWN, 1 ; person
 
 	def_warps_to ROUTE_7_GATE
--- a/data/maps/objects/Route8.asm
+++ b/data/maps/objects/Route8.asm
@@ -12,13 +12,13 @@
 	bg_event 17,  3, 10 ; Route8Text10
 
 	def_object_events
-	object_event 8, 5, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 3
-	object_event 13, 9, SPRITE_GAMBLER, STAY, UP, 2, OPP_GAMBLER, 5
-	object_event 42, 6, SPRITE_SUPER_NERD, STAY, UP, 3, OPP_SUPER_NERD, 4
-	object_event 26, 3, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 13
-	object_event 26, 4, SPRITE_SUPER_NERD, STAY, RIGHT, 5, OPP_SUPER_NERD, 5
-	object_event 26, 5, SPRITE_COOLTRAINER_F, STAY, LEFT, 6, OPP_LASS, 14
-	object_event 26, 6, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_LASS, 15
+	object_event  8,  5, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 3
+	object_event 13,  9, SPRITE_GAMBLER, STAY, UP, 2, OPP_GAMBLER, 5
+	object_event 42,  6, SPRITE_SUPER_NERD, STAY, UP, 3, OPP_SUPER_NERD, 4
+	object_event 26,  3, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 13
+	object_event 26,  4, SPRITE_SUPER_NERD, STAY, RIGHT, 5, OPP_SUPER_NERD, 5
+	object_event 26,  5, SPRITE_COOLTRAINER_F, STAY, LEFT, 6, OPP_LASS, 14
+	object_event 26,  6, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_LASS, 15
 	object_event 46, 13, SPRITE_GAMBLER, STAY, DOWN, 8, OPP_GAMBLER, 7
 	object_event 51, 12, SPRITE_COOLTRAINER_F, STAY, LEFT, 9, OPP_LASS, 16
 
--- a/data/maps/objects/Route8Gate.asm
+++ b/data/maps/objects/Route8Gate.asm
@@ -10,6 +10,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 1, SPRITE_GUARD, STAY, DOWN, 1 ; person
+	object_event  2,  1, SPRITE_GUARD, STAY, DOWN, 1 ; person
 
 	def_warps_to ROUTE_8_GATE
--- a/data/maps/objects/Route9.asm
+++ b/data/maps/objects/Route9.asm
@@ -8,14 +8,14 @@
 
 	def_object_events
 	object_event 13, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5
-	object_event 24, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7
-	object_event 31, 7, SPRITE_COOLTRAINER_M, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8
-	object_event 48, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6
+	object_event 24,  7, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7
+	object_event 31,  7, SPRITE_COOLTRAINER_M, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8
+	object_event 48,  8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6
 	object_event 16, 15, SPRITE_HIKER, STAY, LEFT, 5, OPP_HIKER, 11
-	object_event 43, 3, SPRITE_HIKER, STAY, LEFT, 6, OPP_HIKER, 6
-	object_event 22, 2, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_BUG_CATCHER, 13
+	object_event 43,  3, SPRITE_HIKER, STAY, LEFT, 6, OPP_HIKER, 6
+	object_event 22,  2, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_BUG_CATCHER, 13
 	object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, 8, OPP_HIKER, 5
-	object_event 40, 8, SPRITE_YOUNGSTER, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14
+	object_event 40,  8, SPRITE_YOUNGSTER, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14
 	object_event 10, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_TELEPORT
 
 	def_warps_to ROUTE_9
--- a/data/maps/objects/SSAnne1F.asm
+++ b/data/maps/objects/SSAnne1F.asm
@@ -17,7 +17,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 12, 6, SPRITE_WAITER, WALK, LEFT_RIGHT, 1 ; person
-	object_event 27, 5, SPRITE_SAILOR, STAY, NONE, 2 ; person
+	object_event 12,  6, SPRITE_WAITER, WALK, LEFT_RIGHT, 1 ; person
+	object_event 27,  5, SPRITE_SAILOR, STAY, NONE, 2 ; person
 
 	def_warps_to SS_ANNE_1F
--- a/data/maps/objects/SSAnne1FRooms.asm
+++ b/data/maps/objects/SSAnne1FRooms.asm
@@ -12,14 +12,14 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 3, SPRITE_GENTLEMAN, STAY, LEFT, 1, OPP_GENTLEMAN, 1
-	object_event 11, 4, SPRITE_GENTLEMAN, STAY, UP, 2, OPP_GENTLEMAN, 2
+	object_event  2,  3, SPRITE_GENTLEMAN, STAY, LEFT, 1, OPP_GENTLEMAN, 1
+	object_event 11,  4, SPRITE_GENTLEMAN, STAY, UP, 2, OPP_GENTLEMAN, 2
 	object_event 11, 14, SPRITE_YOUNGSTER, STAY, UP, 3, OPP_YOUNGSTER, 8
 	object_event 13, 11, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 11
-	object_event 22, 3, SPRITE_GIRL, WALK, UP_DOWN, 5 ; person
-	object_event 0, 14, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 6 ; person
-	object_event 2, 11, SPRITE_LITTLE_GIRL, STAY, DOWN, 7 ; person
-	object_event 3, 11, SPRITE_FAIRY, STAY, DOWN, 8 ; person
+	object_event 22,  3, SPRITE_GIRL, WALK, UP_DOWN, 5 ; person
+	object_event  0, 14, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 6 ; person
+	object_event  2, 11, SPRITE_LITTLE_GIRL, STAY, DOWN, 7 ; person
+	object_event  3, 11, SPRITE_FAIRY, STAY, DOWN, 8 ; person
 	object_event 10, 13, SPRITE_GIRL, STAY, RIGHT, 9 ; person
 	object_event 12, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_BODY_SLAM
 	object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 11 ; person
--- a/data/maps/objects/SSAnne2F.asm
+++ b/data/maps/objects/SSAnne2F.asm
@@ -15,7 +15,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 7, SPRITE_WAITER, WALK, UP_DOWN, 1 ; person
-	object_event 36, 4, SPRITE_BLUE, STAY, DOWN, 2, OPP_RIVAL1, 1
+	object_event  3,  7, SPRITE_WAITER, WALK, UP_DOWN, 1 ; person
+	object_event 36,  4, SPRITE_BLUE, STAY, DOWN, 2, OPP_RIVAL1, 1
 
 	def_warps_to SS_ANNE_2F
--- a/data/maps/objects/SSAnne2FRooms.asm
+++ b/data/maps/objects/SSAnne2FRooms.asm
@@ -18,15 +18,15 @@
 	def_bg_events
 
 	def_object_events
-	object_event 10, 2, SPRITE_GENTLEMAN, STAY, RIGHT, 1, OPP_GENTLEMAN, 3
-	object_event 13, 4, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 1
-	object_event 0, 14, SPRITE_GENTLEMAN, STAY, RIGHT, 3, OPP_GENTLEMAN, 5
-	object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_LASS, 12
-	object_event 1, 2, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person
-	object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_ETHER
-	object_event 21, 2, SPRITE_GENTLEMAN, STAY, DOWN, 7 ; person
-	object_event 22, 1, SPRITE_GRAMPS, STAY, DOWN, 8 ; person
-	object_event 0, 12, SPRITE_POKE_BALL, STAY, NONE, 9, RARE_CANDY
+	object_event 10,  2, SPRITE_GENTLEMAN, STAY, RIGHT, 1, OPP_GENTLEMAN, 3
+	object_event 13,  4, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 1
+	object_event  0, 14, SPRITE_GENTLEMAN, STAY, RIGHT, 3, OPP_GENTLEMAN, 5
+	object_event  2, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_LASS, 12
+	object_event  1,  2, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person
+	object_event 12,  1, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_ETHER
+	object_event 21,  2, SPRITE_GENTLEMAN, STAY, DOWN, 7 ; person
+	object_event 22,  1, SPRITE_GRAMPS, STAY, DOWN, 8 ; person
+	object_event  0, 12, SPRITE_POKE_BALL, STAY, NONE, 9, RARE_CANDY
 	object_event 12, 12, SPRITE_GENTLEMAN, STAY, DOWN, 10 ; person
 	object_event 11, 14, SPRITE_LITTLE_BOY, STAY, NONE, 11 ; person
 	object_event 22, 12, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 12 ; person
--- a/data/maps/objects/SSAnne3F.asm
+++ b/data/maps/objects/SSAnne3F.asm
@@ -8,6 +8,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 9, 3, SPRITE_SAILOR, WALK, LEFT_RIGHT, 1 ; person
+	object_event  9,  3, SPRITE_SAILOR, WALK, LEFT_RIGHT, 1 ; person
 
 	def_warps_to SS_ANNE_3F
--- a/data/maps/objects/SSAnneB1FRooms.asm
+++ b/data/maps/objects/SSAnneB1FRooms.asm
@@ -16,16 +16,16 @@
 	def_bg_events
 
 	def_object_events
-	object_event 0, 13, SPRITE_SAILOR, STAY, DOWN, 1, OPP_SAILOR, 3
-	object_event 2, 11, SPRITE_SAILOR, STAY, DOWN, 2, OPP_SAILOR, 4
-	object_event 12, 3, SPRITE_SAILOR, STAY, LEFT, 3, OPP_SAILOR, 5
-	object_event 22, 2, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 6
-	object_event 0, 2, SPRITE_SAILOR, STAY, RIGHT, 5, OPP_SAILOR, 7
-	object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, 6, OPP_FISHER, 2
+	object_event  0, 13, SPRITE_SAILOR, STAY, DOWN, 1, OPP_SAILOR, 3
+	object_event  2, 11, SPRITE_SAILOR, STAY, DOWN, 2, OPP_SAILOR, 4
+	object_event 12,  3, SPRITE_SAILOR, STAY, LEFT, 3, OPP_SAILOR, 5
+	object_event 22,  2, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 6
+	object_event  0,  2, SPRITE_SAILOR, STAY, RIGHT, 5, OPP_SAILOR, 7
+	object_event  0,  4, SPRITE_FISHER, STAY, RIGHT, 6, OPP_FISHER, 2
 	object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, 7 ; person
 	object_event 11, 12, SPRITE_MONSTER, STAY, NONE, 8 ; person
-	object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER
-	object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST
+	object_event 20,  2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER
+	object_event 10,  2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST
 	object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_POTION
 
 	def_warps_to SS_ANNE_B1F_ROOMS
--- a/data/maps/objects/SSAnneBow.asm
+++ b/data/maps/objects/SSAnneBow.asm
@@ -8,10 +8,10 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 2, SPRITE_SUPER_NERD, STAY, UP, 1 ; person
-	object_event 4, 9, SPRITE_SAILOR, STAY, NONE, 2 ; person
-	object_event 7, 11, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
-	object_event 4, 4, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 1
-	object_event 10, 8, SPRITE_SAILOR, STAY, UP, 5, OPP_SAILOR, 2
+	object_event  5,  2, SPRITE_SUPER_NERD, STAY, UP, 1 ; person
+	object_event  4,  9, SPRITE_SAILOR, STAY, NONE, 2 ; person
+	object_event  7, 11, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
+	object_event  4,  4, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 1
+	object_event 10,  8, SPRITE_SAILOR, STAY, UP, 5, OPP_SAILOR, 2
 
 	def_warps_to SS_ANNE_BOW
--- a/data/maps/objects/SSAnneCaptainsRoom.asm
+++ b/data/maps/objects/SSAnneCaptainsRoom.asm
@@ -9,6 +9,6 @@
 	bg_event  1,  2, 3 ; SSAnne7Text3
 
 	def_object_events
-	object_event 4, 2, SPRITE_CAPTAIN, STAY, UP, 1 ; person
+	object_event  4,  2, SPRITE_CAPTAIN, STAY, UP, 1 ; person
 
 	def_warps_to SS_ANNE_CAPTAINS_ROOM
--- a/data/maps/objects/SSAnneKitchen.asm
+++ b/data/maps/objects/SSAnneKitchen.asm
@@ -7,11 +7,11 @@
 	def_bg_events
 
 	def_object_events
-	object_event 1, 8, SPRITE_COOK, WALK, UP_DOWN, 1 ; person
-	object_event 5, 8, SPRITE_COOK, WALK, UP_DOWN, 2 ; person
-	object_event 9, 7, SPRITE_COOK, WALK, UP_DOWN, 3 ; person
-	object_event 13, 6, SPRITE_COOK, STAY, NONE, 4 ; person
-	object_event 13, 8, SPRITE_COOK, STAY, NONE, 5 ; person
+	object_event  1,  8, SPRITE_COOK, WALK, UP_DOWN, 1 ; person
+	object_event  5,  8, SPRITE_COOK, WALK, UP_DOWN, 2 ; person
+	object_event  9,  7, SPRITE_COOK, WALK, UP_DOWN, 3 ; person
+	object_event 13,  6, SPRITE_COOK, STAY, NONE, 4 ; person
+	object_event 13,  8, SPRITE_COOK, STAY, NONE, 5 ; person
 	object_event 13, 10, SPRITE_COOK, STAY, NONE, 6 ; person
 	object_event 11, 13, SPRITE_COOK, STAY, UP, 7 ; person
 
--- a/data/maps/objects/SafariZoneCenterRestHouse.asm
+++ b/data/maps/objects/SafariZoneCenterRestHouse.asm
@@ -8,7 +8,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 2, SPRITE_GIRL, STAY, DOWN, 1 ; person
-	object_event 1, 4, SPRITE_SCIENTIST, WALK, UP_DOWN, 2 ; person
+	object_event  3,  2, SPRITE_GIRL, STAY, DOWN, 1 ; person
+	object_event  1,  4, SPRITE_SCIENTIST, WALK, UP_DOWN, 2 ; person
 
 	def_warps_to SAFARI_ZONE_CENTER_REST_HOUSE
--- a/data/maps/objects/SafariZoneEast.asm
+++ b/data/maps/objects/SafariZoneEast.asm
@@ -15,7 +15,7 @@
 
 	def_object_events
 	object_event 21, 10, SPRITE_POKE_BALL, STAY, NONE, 1, FULL_RESTORE
-	object_event 3, 7, SPRITE_POKE_BALL, STAY, NONE, 2, MAX_POTION
+	object_event  3,  7, SPRITE_POKE_BALL, STAY, NONE, 2, MAX_POTION
 	object_event 20, 13, SPRITE_POKE_BALL, STAY, NONE, 3, CARBOS
 	object_event 15, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_EGG_BOMB
 
--- a/data/maps/objects/SafariZoneEastRestHouse.asm
+++ b/data/maps/objects/SafariZoneEastRestHouse.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 1, 3, SPRITE_SCIENTIST, WALK, UP_DOWN, 1 ; person
-	object_event 4, 2, SPRITE_ROCKER, STAY, NONE, 2 ; person
-	object_event 5, 2, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person
+	object_event  1,  3, SPRITE_SCIENTIST, WALK, UP_DOWN, 1 ; person
+	object_event  4,  2, SPRITE_ROCKER, STAY, NONE, 2 ; person
+	object_event  5,  2, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person
 
 	def_warps_to SAFARI_ZONE_EAST_REST_HOUSE
--- a/data/maps/objects/SafariZoneGate.asm
+++ b/data/maps/objects/SafariZoneGate.asm
@@ -10,7 +10,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 6, 2, SPRITE_SAFARI_ZONE_WORKER, STAY, LEFT, 1 ; person
-	object_event 1, 4, SPRITE_SAFARI_ZONE_WORKER, STAY, RIGHT, 2 ; person
+	object_event  6,  2, SPRITE_SAFARI_ZONE_WORKER, STAY, LEFT, 1 ; person
+	object_event  1,  4, SPRITE_SAFARI_ZONE_WORKER, STAY, RIGHT, 2 ; person
 
 	def_warps_to SAFARI_ZONE_GATE
--- a/data/maps/objects/SafariZoneNorth.asm
+++ b/data/maps/objects/SafariZoneNorth.asm
@@ -20,7 +20,7 @@
 	bg_event 26, 28, 7 ; SafariZoneNorthText7
 
 	def_object_events
-	object_event 25, 1, SPRITE_POKE_BALL, STAY, NONE, 1, PROTEIN
-	object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, 2, TM_SKULL_BASH
+	object_event 25,  1, SPRITE_POKE_BALL, STAY, NONE, 1, PROTEIN
+	object_event 19,  7, SPRITE_POKE_BALL, STAY, NONE, 2, TM_SKULL_BASH
 
 	def_warps_to SAFARI_ZONE_NORTH
--- a/data/maps/objects/SafariZoneNorthRestHouse.asm
+++ b/data/maps/objects/SafariZoneNorthRestHouse.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 6, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person
-	object_event 3, 4, SPRITE_SAFARI_ZONE_WORKER, STAY, NONE, 2 ; person
-	object_event 1, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 3 ; person
+	object_event  6,  3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person
+	object_event  3,  4, SPRITE_SAFARI_ZONE_WORKER, STAY, NONE, 2 ; person
+	object_event  1,  5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 3 ; person
 
 	def_warps_to SAFARI_ZONE_NORTH_REST_HOUSE
--- a/data/maps/objects/SafariZoneSecretHouse.asm
+++ b/data/maps/objects/SafariZoneSecretHouse.asm
@@ -8,6 +8,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 3, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person
+	object_event  3,  3, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person
 
 	def_warps_to SAFARI_ZONE_SECRET_HOUSE
--- a/data/maps/objects/SafariZoneWest.asm
+++ b/data/maps/objects/SafariZoneWest.asm
@@ -18,9 +18,9 @@
 	bg_event 24, 22, 8 ; SafariZoneWestText8
 
 	def_object_events
-	object_event 8, 20, SPRITE_POKE_BALL, STAY, NONE, 1, MAX_POTION
-	object_event 9, 7, SPRITE_POKE_BALL, STAY, NONE, 2, TM_DOUBLE_TEAM
+	object_event  8, 20, SPRITE_POKE_BALL, STAY, NONE, 1, MAX_POTION
+	object_event  9,  7, SPRITE_POKE_BALL, STAY, NONE, 2, TM_DOUBLE_TEAM
 	object_event 18, 18, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE
-	object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, 4, GOLD_TEETH
+	object_event 19,  7, SPRITE_POKE_BALL, STAY, NONE, 4, GOLD_TEETH
 
 	def_warps_to SAFARI_ZONE_WEST
--- a/data/maps/objects/SafariZoneWestRestHouse.asm
+++ b/data/maps/objects/SafariZoneWestRestHouse.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 4, SPRITE_SCIENTIST, WALK, ANY_DIR, 1 ; person
-	object_event 0, 2, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2 ; person
-	object_event 6, 2, SPRITE_ERIKA, STAY, DOWN, 3 ; person
+	object_event  4,  4, SPRITE_SCIENTIST, WALK, ANY_DIR, 1 ; person
+	object_event  0,  2, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2 ; person
+	object_event  6,  2, SPRITE_ERIKA, STAY, DOWN, 3 ; person
 
 	def_warps_to SAFARI_ZONE_WEST_REST_HOUSE
--- a/data/maps/objects/SaffronCity.asm
+++ b/data/maps/objects/SaffronCity.asm
@@ -24,19 +24,19 @@
 	bg_event  1, 19, 25 ; SaffronCityText25
 
 	def_object_events
-	object_event 7, 6, SPRITE_ROCKET, STAY, NONE, 1 ; person
-	object_event 20, 8, SPRITE_ROCKET, WALK, LEFT_RIGHT, 2 ; person
-	object_event 34, 4, SPRITE_ROCKET, STAY, NONE, 3 ; person
+	object_event  7,  6, SPRITE_ROCKET, STAY, NONE, 1 ; person
+	object_event 20,  8, SPRITE_ROCKET, WALK, LEFT_RIGHT, 2 ; person
+	object_event 34,  4, SPRITE_ROCKET, STAY, NONE, 3 ; person
 	object_event 13, 12, SPRITE_ROCKET, STAY, NONE, 4 ; person
 	object_event 11, 25, SPRITE_ROCKET, WALK, LEFT_RIGHT, 5 ; person
 	object_event 32, 13, SPRITE_ROCKET, WALK, LEFT_RIGHT, 6 ; person
 	object_event 18, 30, SPRITE_ROCKET, WALK, LEFT_RIGHT, 7 ; person
-	object_event 8, 14, SPRITE_SCIENTIST, WALK, ANY_DIR, 8 ; person
+	object_event  8, 14, SPRITE_SCIENTIST, WALK, ANY_DIR, 8 ; person
 	object_event 23, 23, SPRITE_SILPH_WORKER, STAY, NONE, 9 ; person
 	object_event 17, 30, SPRITE_ERIKA, WALK, LEFT_RIGHT, 10 ; person
 	object_event 30, 12, SPRITE_GENTLEMAN, STAY, DOWN, 11 ; person
 	object_event 31, 12, SPRITE_BIRD, STAY, DOWN, 12 ; person
-	object_event 18, 8, SPRITE_ROCKER, STAY, UP, 13 ; person
+	object_event 18,  8, SPRITE_ROCKER, STAY, UP, 13 ; person
 	object_event 18, 22, SPRITE_ROCKET, STAY, DOWN, 14 ; person
 	object_event 19, 22, SPRITE_ROCKET, STAY, DOWN, 15 ; person
 
--- a/data/maps/objects/SaffronGym.asm
+++ b/data/maps/objects/SaffronGym.asm
@@ -38,14 +38,14 @@
 	def_bg_events
 
 	def_object_events
-	object_event 9, 8, SPRITE_GIRL, STAY, DOWN, 1, OPP_SABRINA, 1
-	object_event 10, 1, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 22
-	object_event 17, 1, SPRITE_YOUNGSTER, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1
-	object_event 3, 7, SPRITE_CHANNELER, STAY, DOWN, 4, OPP_CHANNELER, 23
-	object_event 17, 7, SPRITE_YOUNGSTER, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2
-	object_event 3, 13, SPRITE_CHANNELER, STAY, DOWN, 6, OPP_CHANNELER, 24
+	object_event  9,  8, SPRITE_GIRL, STAY, DOWN, 1, OPP_SABRINA, 1
+	object_event 10,  1, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 22
+	object_event 17,  1, SPRITE_YOUNGSTER, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1
+	object_event  3,  7, SPRITE_CHANNELER, STAY, DOWN, 4, OPP_CHANNELER, 23
+	object_event 17,  7, SPRITE_YOUNGSTER, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2
+	object_event  3, 13, SPRITE_CHANNELER, STAY, DOWN, 6, OPP_CHANNELER, 24
 	object_event 17, 13, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3
-	object_event 3, 1, SPRITE_YOUNGSTER, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4
+	object_event  3,  1, SPRITE_YOUNGSTER, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4
 	object_event 10, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 9 ; person
 
 	def_warps_to SAFFRON_GYM
--- a/data/maps/objects/SaffronMart.asm
+++ b/data/maps/objects/SaffronMart.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
-	object_event 4, 2, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person
-	object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 3 ; person
+	object_event  0,  5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
+	object_event  4,  2, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person
+	object_event  6,  5, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 3 ; person
 
 	def_warps_to SAFFRON_MART
--- a/data/maps/objects/SaffronPidgeyHouse.asm
+++ b/data/maps/objects/SaffronPidgeyHouse.asm
@@ -8,9 +8,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 3, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 1 ; person
-	object_event 0, 4, SPRITE_BIRD, WALK, UP_DOWN, 2 ; person
-	object_event 4, 1, SPRITE_YOUNGSTER, STAY, DOWN, 3 ; person
-	object_event 3, 3, SPRITE_PAPER, STAY, NONE, 4 ; person
+	object_event  2,  3, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 1 ; person
+	object_event  0,  4, SPRITE_BIRD, WALK, UP_DOWN, 2 ; person
+	object_event  4,  1, SPRITE_YOUNGSTER, STAY, DOWN, 3 ; person
+	object_event  3,  3, SPRITE_PAPER, STAY, NONE, 4 ; person
 
 	def_warps_to SAFFRON_PIDGEY_HOUSE
--- a/data/maps/objects/SaffronPokecenter.asm
+++ b/data/maps/objects/SaffronPokecenter.asm
@@ -8,9 +8,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
-	object_event 5, 5, SPRITE_BEAUTY, STAY, NONE, 2 ; person
-	object_event 8, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
-	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
+	object_event  3,  1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event  5,  5, SPRITE_BEAUTY, STAY, NONE, 2 ; person
+	object_event  8,  3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
+	object_event 11,  2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to SAFFRON_POKECENTER
--- a/data/maps/objects/SeafoamIslands1F.asm
+++ b/data/maps/objects/SeafoamIslands1F.asm
@@ -14,7 +14,7 @@
 
 	def_object_events
 	object_event 18, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
-	object_event 26, 7, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+	object_event 26,  7, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
 
 	def_warps_to SEAFOAM_ISLANDS_1F
 
--- a/data/maps/objects/SeafoamIslandsB1F.asm
+++ b/data/maps/objects/SeafoamIslandsB1F.asm
@@ -13,7 +13,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 17, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
-	object_event 22, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+	object_event 17,  6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
+	object_event 22,  6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
 
 	def_warps_to SEAFOAM_ISLANDS_B1F
--- a/data/maps/objects/SeafoamIslandsB2F.asm
+++ b/data/maps/objects/SeafoamIslandsB2F.asm
@@ -13,7 +13,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 18, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
-	object_event 23, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+	object_event 18,  6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
+	object_event 23,  6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
 
 	def_warps_to SEAFOAM_ISLANDS_B2F
--- a/data/maps/objects/SeafoamIslandsB3F.asm
+++ b/data/maps/objects/SeafoamIslandsB3F.asm
@@ -13,11 +13,11 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
-	object_event 3, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
-	object_event 8, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
-	object_event 9, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person
-	object_event 18, 6, SPRITE_BOULDER, STAY, NONE, 5 ; person
-	object_event 19, 6, SPRITE_BOULDER, STAY, NONE, 6 ; person
+	object_event  5, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
+	object_event  3, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+	object_event  8, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
+	object_event  9, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person
+	object_event 18,  6, SPRITE_BOULDER, STAY, NONE, 5 ; person
+	object_event 19,  6, SPRITE_BOULDER, STAY, NONE, 6 ; person
 
 	def_warps_to SEAFOAM_ISLANDS_B3F
--- a/data/maps/objects/SeafoamIslandsB4F.asm
+++ b/data/maps/objects/SeafoamIslandsB4F.asm
@@ -12,8 +12,8 @@
 	bg_event 23,  1, 5 ; SeafoamIslands5Text5
 
 	def_object_events
-	object_event 4, 15, SPRITE_BOULDER, STAY, NONE, 1 ; person
-	object_event 5, 15, SPRITE_BOULDER, STAY, NONE, 2 ; person
-	object_event 6, 1, SPRITE_BIRD, STAY, DOWN, 3, ARTICUNO, 50
+	object_event  4, 15, SPRITE_BOULDER, STAY, NONE, 1 ; person
+	object_event  5, 15, SPRITE_BOULDER, STAY, NONE, 2 ; person
+	object_event  6,  1, SPRITE_BIRD, STAY, DOWN, 3, ARTICUNO, 50
 
 	def_warps_to SEAFOAM_ISLANDS_B4F
--- a/data/maps/objects/SilphCo10F.asm
+++ b/data/maps/objects/SilphCo10F.asm
@@ -12,11 +12,11 @@
 	def_bg_events
 
 	def_object_events
-	object_event 1, 9, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 39
-	object_event 10, 2, SPRITE_SCIENTIST, STAY, LEFT, 2, OPP_SCIENTIST, 11
-	object_event 9, 15, SPRITE_ERIKA, WALK, ANY_DIR, 3 ; person
-	object_event 2, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_EARTHQUAKE
-	object_event 4, 14, SPRITE_POKE_BALL, STAY, NONE, 5, RARE_CANDY
-	object_event 5, 11, SPRITE_POKE_BALL, STAY, NONE, 6, CARBOS
+	object_event  1,  9, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 39
+	object_event 10,  2, SPRITE_SCIENTIST, STAY, LEFT, 2, OPP_SCIENTIST, 11
+	object_event  9, 15, SPRITE_ERIKA, WALK, ANY_DIR, 3 ; person
+	object_event  2, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_EARTHQUAKE
+	object_event  4, 14, SPRITE_POKE_BALL, STAY, NONE, 5, RARE_CANDY
+	object_event  5, 11, SPRITE_POKE_BALL, STAY, NONE, 6, CARBOS
 
 	def_warps_to SILPH_CO_10F
--- a/data/maps/objects/SilphCo11F.asm
+++ b/data/maps/objects/SilphCo11F.asm
@@ -10,10 +10,10 @@
 	def_bg_events
 
 	def_object_events
-	object_event 7, 5, SPRITE_SILPH_PRESIDENT, STAY, DOWN, 1 ; person
-	object_event 10, 5, SPRITE_BEAUTY, STAY, DOWN, 2 ; person
-	object_event 6, 9, SPRITE_GIOVANNI, STAY, DOWN, 3, OPP_GIOVANNI, 2
-	object_event 3, 16, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 41
-	object_event 15, 9, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 40
+	object_event  7,  5, SPRITE_SILPH_PRESIDENT, STAY, DOWN, 1 ; person
+	object_event 10,  5, SPRITE_BEAUTY, STAY, DOWN, 2 ; person
+	object_event  6,  9, SPRITE_GIOVANNI, STAY, DOWN, 3, OPP_GIOVANNI, 2
+	object_event  3, 16, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 41
+	object_event 15,  9, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 40
 
 	def_warps_to SILPH_CO_11F
--- a/data/maps/objects/SilphCo1F.asm
+++ b/data/maps/objects/SilphCo1F.asm
@@ -11,6 +11,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person
+	object_event  4,  2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person
 
 	def_warps_to SILPH_CO_1F
--- a/data/maps/objects/SilphCo2F.asm
+++ b/data/maps/objects/SilphCo2F.asm
@@ -13,10 +13,10 @@
 	def_bg_events
 
 	def_object_events
-	object_event 10, 1, SPRITE_ERIKA, STAY, UP, 1 ; person
-	object_event 5, 12, SPRITE_SCIENTIST, STAY, DOWN, 2, OPP_SCIENTIST, 2
+	object_event 10,  1, SPRITE_ERIKA, STAY, UP, 1 ; person
+	object_event  5, 12, SPRITE_SCIENTIST, STAY, DOWN, 2, OPP_SCIENTIST, 2
 	object_event 24, 13, SPRITE_SCIENTIST, STAY, LEFT, 3, OPP_SCIENTIST, 3
 	object_event 16, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 23
-	object_event 24, 7, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 24
+	object_event 24,  7, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 24
 
 	def_warps_to SILPH_CO_2F
--- a/data/maps/objects/SilphCo3F.asm
+++ b/data/maps/objects/SilphCo3F.asm
@@ -16,9 +16,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 24, 8, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
-	object_event 20, 7, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 25
-	object_event 7, 9, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 4
-	object_event 8, 5, SPRITE_POKE_BALL, STAY, NONE, 4, HYPER_POTION
+	object_event 24,  8, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
+	object_event 20,  7, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 25
+	object_event  7,  9, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 4
+	object_event  8,  5, SPRITE_POKE_BALL, STAY, NONE, 4, HYPER_POTION
 
 	def_warps_to SILPH_CO_3F
--- a/data/maps/objects/SilphCo4F.asm
+++ b/data/maps/objects/SilphCo4F.asm
@@ -13,12 +13,12 @@
 	def_bg_events
 
 	def_object_events
-	object_event 6, 2, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
-	object_event 9, 14, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 26
-	object_event 14, 6, SPRITE_SCIENTIST, STAY, LEFT, 3, OPP_SCIENTIST, 5
+	object_event  6,  2, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
+	object_event  9, 14, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 26
+	object_event 14,  6, SPRITE_SCIENTIST, STAY, LEFT, 3, OPP_SCIENTIST, 5
 	object_event 26, 10, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 27
-	object_event 3, 9, SPRITE_POKE_BALL, STAY, NONE, 5, FULL_HEAL
-	object_event 4, 7, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_REVIVE
-	object_event 5, 8, SPRITE_POKE_BALL, STAY, NONE, 7, ESCAPE_ROPE
+	object_event  3,  9, SPRITE_POKE_BALL, STAY, NONE, 5, FULL_HEAL
+	object_event  4,  7, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_REVIVE
+	object_event  5,  8, SPRITE_POKE_BALL, STAY, NONE, 7, ESCAPE_ROPE
 
 	def_warps_to SILPH_CO_4F
--- a/data/maps/objects/SilphCo5F.asm
+++ b/data/maps/objects/SilphCo5F.asm
@@ -13,16 +13,16 @@
 	def_bg_events
 
 	def_object_events
-	object_event 13, 9, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
-	object_event 8, 16, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 28
-	object_event 8, 3, SPRITE_SCIENTIST, STAY, RIGHT, 3, OPP_SCIENTIST, 6
+	object_event 13,  9, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
+	object_event  8, 16, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 28
+	object_event  8,  3, SPRITE_SCIENTIST, STAY, RIGHT, 3, OPP_SCIENTIST, 6
 	object_event 18, 10, SPRITE_ROCKER, STAY, UP, 4, OPP_JUGGLER, 1
-	object_event 28, 4, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 29
-	object_event 2, 13, SPRITE_POKE_BALL, STAY, NONE, 6, TM_TAKE_DOWN
-	object_event 4, 6, SPRITE_POKE_BALL, STAY, NONE, 7, PROTEIN
+	object_event 28,  4, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 29
+	object_event  2, 13, SPRITE_POKE_BALL, STAY, NONE, 6, TM_TAKE_DOWN
+	object_event  4,  6, SPRITE_POKE_BALL, STAY, NONE, 7, PROTEIN
 	object_event 21, 16, SPRITE_POKE_BALL, STAY, NONE, 8, CARD_KEY
 	object_event 22, 12, SPRITE_CLIPBOARD, STAY, NONE, 9 ; person
 	object_event 25, 10, SPRITE_CLIPBOARD, STAY, NONE, 10 ; person
-	object_event 24, 6, SPRITE_CLIPBOARD, STAY, NONE, 11 ; person
+	object_event 24,  6, SPRITE_CLIPBOARD, STAY, NONE, 11 ; person
 
 	def_warps_to SILPH_CO_5F
--- a/data/maps/objects/SilphCo6F.asm
+++ b/data/maps/objects/SilphCo6F.asm
@@ -11,15 +11,15 @@
 	def_bg_events
 
 	def_object_events
-	object_event 10, 6, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
-	object_event 20, 6, SPRITE_SILPH_WORKER, STAY, NONE, 2 ; person
-	object_event 21, 6, SPRITE_ERIKA, STAY, DOWN, 3 ; person
+	object_event 10,  6, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
+	object_event 20,  6, SPRITE_SILPH_WORKER, STAY, NONE, 2 ; person
+	object_event 21,  6, SPRITE_ERIKA, STAY, DOWN, 3 ; person
 	object_event 11, 10, SPRITE_ERIKA, STAY, RIGHT, 4 ; person
 	object_event 18, 13, SPRITE_SILPH_WORKER, STAY, UP, 5 ; person
-	object_event 17, 3, SPRITE_ROCKET, STAY, RIGHT, 6, OPP_ROCKET, 30
-	object_event 7, 8, SPRITE_SCIENTIST, STAY, DOWN, 7, OPP_SCIENTIST, 7
+	object_event 17,  3, SPRITE_ROCKET, STAY, RIGHT, 6, OPP_ROCKET, 30
+	object_event  7,  8, SPRITE_SCIENTIST, STAY, DOWN, 7, OPP_SCIENTIST, 7
 	object_event 14, 15, SPRITE_ROCKET, STAY, LEFT, 8, OPP_ROCKET, 31
-	object_event 3, 12, SPRITE_POKE_BALL, STAY, NONE, 9, HP_UP
-	object_event 2, 15, SPRITE_POKE_BALL, STAY, NONE, 10, X_ACCURACY
+	object_event  3, 12, SPRITE_POKE_BALL, STAY, NONE, 9, HP_UP
+	object_event  2, 15, SPRITE_POKE_BALL, STAY, NONE, 10, X_ACCURACY
 
 	def_warps_to SILPH_CO_6F
--- a/data/maps/objects/SilphCo7F.asm
+++ b/data/maps/objects/SilphCo7F.asm
@@ -12,16 +12,16 @@
 	def_bg_events
 
 	def_object_events
-	object_event 1, 5, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
+	object_event  1,  5, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
 	object_event 13, 13, SPRITE_SILPH_WORKER, STAY, UP, 2 ; person
-	object_event 7, 10, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person
-	object_event 10, 8, SPRITE_ERIKA, STAY, NONE, 4 ; person
-	object_event 13, 1, SPRITE_ROCKET, STAY, DOWN, 5, OPP_ROCKET, 32
-	object_event 2, 13, SPRITE_SCIENTIST, STAY, DOWN, 6, OPP_SCIENTIST, 8
-	object_event 20, 2, SPRITE_ROCKET, STAY, LEFT, 7, OPP_ROCKET, 33
+	object_event  7, 10, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person
+	object_event 10,  8, SPRITE_ERIKA, STAY, NONE, 4 ; person
+	object_event 13,  1, SPRITE_ROCKET, STAY, DOWN, 5, OPP_ROCKET, 32
+	object_event  2, 13, SPRITE_SCIENTIST, STAY, DOWN, 6, OPP_SCIENTIST, 8
+	object_event 20,  2, SPRITE_ROCKET, STAY, LEFT, 7, OPP_ROCKET, 33
 	object_event 19, 14, SPRITE_ROCKET, STAY, RIGHT, 8, OPP_ROCKET, 34
-	object_event 3, 7, SPRITE_BLUE, STAY, UP, 9 ; person
-	object_event 1, 9, SPRITE_POKE_BALL, STAY, NONE, 10, CALCIUM
+	object_event  3,  7, SPRITE_BLUE, STAY, UP, 9 ; person
+	object_event  1,  9, SPRITE_POKE_BALL, STAY, NONE, 10, CALCIUM
 	object_event 24, 11, SPRITE_POKE_BALL, STAY, NONE, 11, TM_SWORDS_DANCE
 
 	def_warps_to SILPH_CO_7F
--- a/data/maps/objects/SilphCo8F.asm
+++ b/data/maps/objects/SilphCo8F.asm
@@ -13,9 +13,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 4, 2, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
-	object_event 19, 2, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 35
-	object_event 10, 2, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 9
+	object_event  4,  2, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
+	object_event 19,  2, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 35
+	object_event 10,  2, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 9
 	object_event 12, 15, SPRITE_ROCKET, STAY, RIGHT, 4, OPP_ROCKET, 36
 
 	def_warps_to SILPH_CO_8F
--- a/data/maps/objects/SilphCo9F.asm
+++ b/data/maps/objects/SilphCo9F.asm
@@ -11,8 +11,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 14, SPRITE_NURSE, STAY, DOWN, 1 ; person
-	object_event 2, 4, SPRITE_ROCKET, STAY, UP, 2, OPP_ROCKET, 37
+	object_event  3, 14, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event  2,  4, SPRITE_ROCKET, STAY, UP, 2, OPP_ROCKET, 37
 	object_event 21, 13, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 10
 	object_event 13, 16, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 38
 
--- a/data/maps/objects/TradeCenter.asm
+++ b/data/maps/objects/TradeCenter.asm
@@ -6,6 +6,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 2, SPRITE_RED, STAY, 0, 1 ; person
+	object_event  2,  2, SPRITE_RED, STAY, 0, 1 ; person
 
 	def_warps_to TRADE_CENTER
--- a/data/maps/objects/UndergroundPathRoute5.asm
+++ b/data/maps/objects/UndergroundPathRoute5.asm
@@ -9,6 +9,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 3, SPRITE_LITTLE_GIRL, STAY, NONE, 1 ; person
+	object_event  2,  3, SPRITE_LITTLE_GIRL, STAY, NONE, 1 ; person
 
 	def_warps_to UNDERGROUND_PATH_ROUTE_5
--- a/data/maps/objects/UndergroundPathRoute6.asm
+++ b/data/maps/objects/UndergroundPathRoute6.asm
@@ -9,6 +9,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 3, SPRITE_GIRL, STAY, NONE, 1 ; person
+	object_event  2,  3, SPRITE_GIRL, STAY, NONE, 1 ; person
 
 	def_warps_to UNDERGROUND_PATH_ROUTE_6
--- a/data/maps/objects/UndergroundPathRoute7.asm
+++ b/data/maps/objects/UndergroundPathRoute7.asm
@@ -9,6 +9,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 1 ; person
+	object_event  2,  4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 1 ; person
 
 	def_warps_to UNDERGROUND_PATH_ROUTE_7
--- a/data/maps/objects/UndergroundPathRoute7Copy.asm
+++ b/data/maps/objects/UndergroundPathRoute7Copy.asm
@@ -9,7 +9,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 2, SPRITE_GIRL, STAY, NONE, 1 ; person
-	object_event 2, 4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 2 ; person
+	object_event  3,  2, SPRITE_GIRL, STAY, NONE, 1 ; person
+	object_event  2,  4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 2 ; person
 
 	def_warps_to UNDERGROUND_PATH_ROUTE_7_COPY
--- a/data/maps/objects/UndergroundPathRoute8.asm
+++ b/data/maps/objects/UndergroundPathRoute8.asm
@@ -9,6 +9,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 4, SPRITE_GIRL, STAY, NONE, 1 ; person
+	object_event  3,  4, SPRITE_GIRL, STAY, NONE, 1 ; person
 
 	def_warps_to UNDERGROUND_PATH_ROUTE_8
--- a/data/maps/objects/VermilionCity.asm
+++ b/data/maps/objects/VermilionCity.asm
@@ -22,11 +22,11 @@
 	bg_event 29, 15, 13 ; VermilionCityText13
 
 	def_object_events
-	object_event 19, 7, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person
-	object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person
+	object_event 19,  7, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person
+	object_event 14,  6, SPRITE_GAMBLER, STAY, NONE, 2 ; person
 	object_event 19, 30, SPRITE_SAILOR, STAY, UP, 3 ; person
-	object_event 30, 7, SPRITE_GAMBLER, STAY, NONE, 4 ; person
-	object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person
+	object_event 30,  7, SPRITE_GAMBLER, STAY, NONE, 4 ; person
+	object_event 29,  9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person
 	object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person
 
 	def_warps_to VERMILION_CITY
--- a/data/maps/objects/VermilionGym.asm
+++ b/data/maps/objects/VermilionGym.asm
@@ -8,10 +8,10 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 1, SPRITE_ROCKER, STAY, DOWN, 1, OPP_LT_SURGE, 1
-	object_event 9, 6, SPRITE_GENTLEMAN, STAY, LEFT, 2, OPP_GENTLEMAN, 3
-	object_event 3, 8, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_ROCKER, 1
-	object_event 0, 10, SPRITE_SAILOR, STAY, RIGHT, 4, OPP_SAILOR, 8
-	object_event 4, 14, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person
+	object_event  5,  1, SPRITE_ROCKER, STAY, DOWN, 1, OPP_LT_SURGE, 1
+	object_event  9,  6, SPRITE_GENTLEMAN, STAY, LEFT, 2, OPP_GENTLEMAN, 3
+	object_event  3,  8, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_ROCKER, 1
+	object_event  0, 10, SPRITE_SAILOR, STAY, RIGHT, 4, OPP_SAILOR, 8
+	object_event  4, 14, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person
 
 	def_warps_to VERMILION_GYM
--- a/data/maps/objects/VermilionMart.asm
+++ b/data/maps/objects/VermilionMart.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
-	object_event 5, 6, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person
-	object_event 3, 3, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
+	object_event  0,  5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
+	object_event  5,  6, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person
+	object_event  3,  3, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
 
 	def_warps_to VERMILION_MART
--- a/data/maps/objects/VermilionOldRodHouse.asm
+++ b/data/maps/objects/VermilionOldRodHouse.asm
@@ -8,6 +8,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 4, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person
+	object_event  2,  4, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person
 
 	def_warps_to VERMILION_OLD_ROD_HOUSE
--- a/data/maps/objects/VermilionPidgeyHouse.asm
+++ b/data/maps/objects/VermilionPidgeyHouse.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 3, SPRITE_YOUNGSTER, STAY, LEFT, 1 ; person
-	object_event 3, 5, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person
-	object_event 4, 3, SPRITE_PAPER, STAY, NONE, 3 ; person
+	object_event  5,  3, SPRITE_YOUNGSTER, STAY, LEFT, 1 ; person
+	object_event  3,  5, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person
+	object_event  4,  3, SPRITE_PAPER, STAY, NONE, 3 ; person
 
 	def_warps_to VERMILION_PIDGEY_HOUSE
--- a/data/maps/objects/VermilionPokecenter.asm
+++ b/data/maps/objects/VermilionPokecenter.asm
@@ -8,9 +8,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
-	object_event 10, 5, SPRITE_FISHING_GURU, STAY, NONE, 2 ; person
-	object_event 5, 4, SPRITE_SAILOR, STAY, NONE, 3 ; person
-	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
+	object_event  3,  1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event 10,  5, SPRITE_FISHING_GURU, STAY, NONE, 2 ; person
+	object_event  5,  4, SPRITE_SAILOR, STAY, NONE, 3 ; person
+	object_event 11,  2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to VERMILION_POKECENTER
--- a/data/maps/objects/VermilionTradeHouse.asm
+++ b/data/maps/objects/VermilionTradeHouse.asm
@@ -8,6 +8,6 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 5, SPRITE_LITTLE_GIRL, STAY, UP, 1 ; person
+	object_event  3,  5, SPRITE_LITTLE_GIRL, STAY, UP, 1 ; person
 
 	def_warps_to VERMILION_TRADE_HOUSE
--- a/data/maps/objects/VictoryRoad1F.asm
+++ b/data/maps/objects/VictoryRoad1F.asm
@@ -9,12 +9,12 @@
 	def_bg_events
 
 	def_object_events
-	object_event 7, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5
-	object_event 3, 2, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5
-	object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, 3, TM_SKY_ATTACK
-	object_event 9, 2, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
-	object_event 5, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
-	object_event 14, 2, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
-	object_event 2, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
+	object_event  7,  5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5
+	object_event  3,  2, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5
+	object_event 11,  0, SPRITE_POKE_BALL, STAY, NONE, 3, TM_SKY_ATTACK
+	object_event  9,  2, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
+	object_event  5, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
+	object_event 14,  2, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
+	object_event  2, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
 
 	def_warps_to VICTORY_ROAD_1F
--- a/data/maps/objects/VictoryRoad2F.asm
+++ b/data/maps/objects/VictoryRoad2F.asm
@@ -13,18 +13,18 @@
 	def_bg_events
 
 	def_object_events
-	object_event 12, 9, SPRITE_HIKER, STAY, LEFT, 1, OPP_BLACKBELT, 9
+	object_event 12,  9, SPRITE_HIKER, STAY, LEFT, 1, OPP_BLACKBELT, 9
 	object_event 21, 13, SPRITE_SUPER_NERD, STAY, LEFT, 2, OPP_JUGGLER, 2
-	object_event 19, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_TAMER, 5
-	object_event 4, 2, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_POKEMANIAC, 6
-	object_event 26, 3, SPRITE_SUPER_NERD, STAY, LEFT, 5, OPP_JUGGLER, 5
-	object_event 11, 5, SPRITE_BIRD, STAY, UP, 6, MOLTRES, 50
-	object_event 27, 5, SPRITE_POKE_BALL, STAY, NONE, 7, TM_SUBMISSION
-	object_event 18, 9, SPRITE_POKE_BALL, STAY, NONE, 8, FULL_HEAL
-	object_event 9, 11, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_KICK
-	object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, 10, GUARD_SPEC
-	object_event 4, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person
-	object_event 5, 5, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person
+	object_event 19,  8, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_TAMER, 5
+	object_event  4,  2, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_POKEMANIAC, 6
+	object_event 26,  3, SPRITE_SUPER_NERD, STAY, LEFT, 5, OPP_JUGGLER, 5
+	object_event 11,  5, SPRITE_BIRD, STAY, UP, 6, MOLTRES, 50
+	object_event 27,  5, SPRITE_POKE_BALL, STAY, NONE, 7, TM_SUBMISSION
+	object_event 18,  9, SPRITE_POKE_BALL, STAY, NONE, 8, FULL_HEAL
+	object_event  9, 11, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_KICK
+	object_event 11,  0, SPRITE_POKE_BALL, STAY, NONE, 10, GUARD_SPEC
+	object_event  4, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person
+	object_event  5,  5, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person
 	object_event 23, 16, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person
 
 	def_warps_to VICTORY_ROAD_2F
--- a/data/maps/objects/VictoryRoad3F.asm
+++ b/data/maps/objects/VictoryRoad3F.asm
@@ -10,13 +10,13 @@
 	def_bg_events
 
 	def_object_events
-	object_event 28, 5, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2
-	object_event 7, 13, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2
-	object_event 6, 14, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3
-	object_event 13, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3
-	object_event 26, 5, SPRITE_POKE_BALL, STAY, NONE, 5, MAX_REVIVE
-	object_event 7, 7, SPRITE_POKE_BALL, STAY, NONE, 6, TM_EXPLOSION
-	object_event 22, 3, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
+	object_event 28,  5, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2
+	object_event  7, 13, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2
+	object_event  6, 14, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3
+	object_event 13,  3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3
+	object_event 26,  5, SPRITE_POKE_BALL, STAY, NONE, 5, MAX_REVIVE
+	object_event  7,  7, SPRITE_POKE_BALL, STAY, NONE, 6, TM_EXPLOSION
+	object_event 22,  3, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
 	object_event 13, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person
 	object_event 24, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person
 	object_event 22, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person
--- a/data/maps/objects/ViridianCity.asm
+++ b/data/maps/objects/ViridianCity.asm
@@ -18,11 +18,11 @@
 
 	def_object_events
 	object_event 13, 20, SPRITE_YOUNGSTER, WALK, ANY_DIR, 1 ; person
-	object_event 30, 8, SPRITE_GAMBLER, STAY, NONE, 2 ; person
+	object_event 30,  8, SPRITE_GAMBLER, STAY, NONE, 2 ; person
 	object_event 30, 25, SPRITE_YOUNGSTER, WALK, ANY_DIR, 3 ; person
-	object_event 17, 9, SPRITE_GIRL, STAY, RIGHT, 4 ; person
-	object_event 18, 9, SPRITE_GAMBLER_ASLEEP, STAY, NONE, 5 ; person
-	object_event 6, 23, SPRITE_FISHER, STAY, DOWN, 6 ; person
-	object_event 17, 5, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 7 ; person
+	object_event 17,  9, SPRITE_GIRL, STAY, RIGHT, 4 ; person
+	object_event 18,  9, SPRITE_GAMBLER_ASLEEP, STAY, NONE, 5 ; person
+	object_event  6, 23, SPRITE_FISHER, STAY, DOWN, 6 ; person
+	object_event 17,  5, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 7 ; person
 
 	def_warps_to VIRIDIAN_CITY
--- a/data/maps/objects/ViridianForest.asm
+++ b/data/maps/objects/ViridianForest.asm
@@ -21,10 +21,10 @@
 	object_event 16, 43, SPRITE_YOUNGSTER, STAY, NONE, 1 ; person
 	object_event 30, 33, SPRITE_YOUNGSTER, STAY, LEFT, 2, OPP_BUG_CATCHER, 1
 	object_event 30, 19, SPRITE_YOUNGSTER, STAY, LEFT, 3, OPP_BUG_CATCHER, 2
-	object_event 2, 18, SPRITE_YOUNGSTER, STAY, LEFT, 4, OPP_BUG_CATCHER, 3
+	object_event  2, 18, SPRITE_YOUNGSTER, STAY, LEFT, 4, OPP_BUG_CATCHER, 3
 	object_event 25, 11, SPRITE_POKE_BALL, STAY, NONE, 5, ANTIDOTE
 	object_event 12, 29, SPRITE_POKE_BALL, STAY, NONE, 6, POTION
-	object_event 1, 31, SPRITE_POKE_BALL, STAY, NONE, 7, POKE_BALL
+	object_event  1, 31, SPRITE_POKE_BALL, STAY, NONE, 7, POKE_BALL
 	object_event 27, 40, SPRITE_YOUNGSTER, STAY, NONE, 8 ; person
 
 	def_warps_to VIRIDIAN_FOREST
--- a/data/maps/objects/ViridianForestNorthGate.asm
+++ b/data/maps/objects/ViridianForestNorthGate.asm
@@ -10,7 +10,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 2, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person
-	object_event 2, 5, SPRITE_GRAMPS, STAY, NONE, 2 ; person
+	object_event  3,  2, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person
+	object_event  2,  5, SPRITE_GRAMPS, STAY, NONE, 2 ; person
 
 	def_warps_to VIRIDIAN_FOREST_NORTH_GATE
--- a/data/maps/objects/ViridianForestSouthGate.asm
+++ b/data/maps/objects/ViridianForestSouthGate.asm
@@ -10,7 +10,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 8, 4, SPRITE_GIRL, STAY, LEFT, 1 ; person
-	object_event 2, 4, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 2 ; person
+	object_event  8,  4, SPRITE_GIRL, STAY, LEFT, 1 ; person
+	object_event  2,  4, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 2 ; person
 
 	def_warps_to VIRIDIAN_FOREST_SOUTH_GATE
--- a/data/maps/objects/ViridianGym.asm
+++ b/data/maps/objects/ViridianGym.asm
@@ -8,16 +8,16 @@
 	def_bg_events
 
 	def_object_events
-	object_event 2, 1, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 3
-	object_event 12, 7, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9
+	object_event  2,  1, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 3
+	object_event 12,  7, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9
 	object_event 11, 11, SPRITE_HIKER, STAY, UP, 3, OPP_BLACKBELT, 6
-	object_event 10, 7, SPRITE_ROCKER, STAY, DOWN, 4, OPP_TAMER, 3
-	object_event 3, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 7
-	object_event 13, 5, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10
-	object_event 10, 1, SPRITE_HIKER, STAY, DOWN, 7, OPP_BLACKBELT, 8
-	object_event 2, 16, SPRITE_ROCKER, STAY, RIGHT, 8, OPP_TAMER, 4
-	object_event 6, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1
+	object_event 10,  7, SPRITE_ROCKER, STAY, DOWN, 4, OPP_TAMER, 3
+	object_event  3,  7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 7
+	object_event 13,  5, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10
+	object_event 10,  1, SPRITE_HIKER, STAY, DOWN, 7, OPP_BLACKBELT, 8
+	object_event  2, 16, SPRITE_ROCKER, STAY, RIGHT, 8, OPP_TAMER, 4
+	object_event  6,  5, SPRITE_COOLTRAINER_M, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1
 	object_event 16, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 10 ; person
-	object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 11, REVIVE
+	object_event 16,  9, SPRITE_POKE_BALL, STAY, NONE, 11, REVIVE
 
 	def_warps_to VIRIDIAN_GYM
--- a/data/maps/objects/ViridianMart.asm
+++ b/data/maps/objects/ViridianMart.asm
@@ -8,8 +8,8 @@
 	def_bg_events
 
 	def_object_events
-	object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
-	object_event 5, 5, SPRITE_YOUNGSTER, WALK, UP_DOWN, 2 ; person
-	object_event 3, 3, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
+	object_event  0,  5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
+	object_event  5,  5, SPRITE_YOUNGSTER, WALK, UP_DOWN, 2 ; person
+	object_event  3,  3, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
 
 	def_warps_to VIRIDIAN_MART
--- a/data/maps/objects/ViridianNicknameHouse.asm
+++ b/data/maps/objects/ViridianNicknameHouse.asm
@@ -8,9 +8,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 5, 3, SPRITE_BALDING_GUY, STAY, NONE, 1 ; person
-	object_event 1, 4, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 2 ; person
-	object_event 5, 5, SPRITE_BIRD, WALK, LEFT_RIGHT, 3 ; person
-	object_event 4, 0, SPRITE_CLIPBOARD, STAY, NONE, 4 ; person
+	object_event  5,  3, SPRITE_BALDING_GUY, STAY, NONE, 1 ; person
+	object_event  1,  4, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 2 ; person
+	object_event  5,  5, SPRITE_BIRD, WALK, LEFT_RIGHT, 3 ; person
+	object_event  4,  0, SPRITE_CLIPBOARD, STAY, NONE, 4 ; person
 
 	def_warps_to VIRIDIAN_NICKNAME_HOUSE
--- a/data/maps/objects/ViridianPokecenter.asm
+++ b/data/maps/objects/ViridianPokecenter.asm
@@ -8,9 +8,9 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
-	object_event 10, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 2 ; person
-	object_event 4, 3, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
-	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
+	object_event  3,  1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event 10,  5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 2 ; person
+	object_event  4,  3, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
+	object_event 11,  2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to VIRIDIAN_POKECENTER
--- a/data/maps/objects/ViridianSchoolHouse.asm
+++ b/data/maps/objects/ViridianSchoolHouse.asm
@@ -8,7 +8,7 @@
 	def_bg_events
 
 	def_object_events
-	object_event 3, 5, SPRITE_BRUNETTE_GIRL, STAY, UP, 1 ; person
-	object_event 4, 1, SPRITE_COOLTRAINER_F, STAY, DOWN, 2 ; person
+	object_event  3,  5, SPRITE_BRUNETTE_GIRL, STAY, UP, 1 ; person
+	object_event  4,  1, SPRITE_COOLTRAINER_F, STAY, DOWN, 2 ; person
 
 	def_warps_to VIRIDIAN_SCHOOL_HOUSE
--- a/data/maps/objects/WardensHouse.asm
+++ b/data/maps/objects/WardensHouse.asm
@@ -10,8 +10,8 @@
 	bg_event  5,  3, 5 ; FuchsiaHouse2Text5
 
 	def_object_events
-	object_event 2, 3, SPRITE_WARDEN, STAY, NONE, 1 ; person
-	object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, 2, RARE_CANDY
-	object_event 8, 4, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
+	object_event  2,  3, SPRITE_WARDEN, STAY, NONE, 1 ; person
+	object_event  8,  3, SPRITE_POKE_BALL, STAY, NONE, 2, RARE_CANDY
+	object_event  8,  4, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
 
 	def_warps_to WARDENS_HOUSE