Use ANY_DIR, UP_DOWN, and LEFT_RIGHT for map objects

66 files changed, 98 insertions, 98 deletions

diff --git a/data/maps/objects/BikeShop.asm b/data/maps/objects/BikeShop.asm
index cf321c2a..7f699ed6 100755
--- a/data/maps/objects/BikeShop.asm
+++ b/data/maps/objects/BikeShop.asm
@@ -9,7 +9,7 @@ BikeShop_Object:
 
 	db 3 ; objects
 	object SPRITE_BIKE_SHOP_CLERK, 6, 2, STAY, NONE, 1 ; person
-	object SPRITE_MIDDLE_AGED_WOMAN, 5, 6, WALK, 1, 2 ; person
+	object SPRITE_MIDDLE_AGED_WOMAN, 5, 6, WALK, UP_DOWN, 2 ; person
 	object SPRITE_YOUNGSTER, 1, 3, STAY, UP, 3 ; person
 
 	; warp-to
diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm
index 3dbdad84..76c80d60 100755
--- a/data/maps/objects/BluesHouse.asm
+++ b/data/maps/objects/BluesHouse.asm
@@ -9,7 +9,7 @@ BluesHouse_Object:
 
 	db 3 ; objects
 	object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map
-	object SPRITE_DAISY, 6, 4, WALK, 1, 2, 0 ; Daisy, walking around
+	object SPRITE_DAISY, 6, 4, WALK, UP_DOWN, 2, 0 ; Daisy, walking around
 	object SPRITE_POKEDEX, 3, 3, STAY, NONE, 3, 0 ; map on table
 
 	; warp-to
diff --git a/data/maps/objects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm
index 28206d10..acf484f1 100755
--- a/data/maps/objects/CeladonChiefHouse.asm
+++ b/data/maps/objects/CeladonChiefHouse.asm
@@ -9,7 +9,7 @@ CeladonChiefHouse_Object:
 
 	db 3 ; objects
 	object SPRITE_GRAMPS, 4, 2, STAY, DOWN, 1 ; person
-	object SPRITE_ROCKET, 1, 4, WALK, 0, 2 ; person
+	object SPRITE_ROCKET, 1, 4, WALK, ANY_DIR, 2 ; person
 	object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person
 
 	; warp-to
diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm
index 446f6754..bf4cbc84 100755
--- a/data/maps/objects/CeladonCity.asm
+++ b/data/maps/objects/CeladonCity.asm
@@ -28,15 +28,15 @@ CeladonCity_Object:
 	sign 27, 21, 18 ; CeladonCityText18
 
 	db 9 ; objects
-	object SPRITE_LITTLE_GIRL, 8, 17, WALK, 0, 1 ; person
+	object SPRITE_LITTLE_GIRL, 8, 17, WALK, ANY_DIR, 1 ; person
 	object SPRITE_GRAMPS, 11, 28, STAY, UP, 2 ; person
-	object SPRITE_GIRL, 14, 19, WALK, 1, 3 ; person
+	object SPRITE_GIRL, 14, 19, WALK, UP_DOWN, 3 ; person
 	object SPRITE_GRAMPS, 25, 22, STAY, DOWN, 4 ; person
 	object SPRITE_GRAMPS, 22, 16, STAY, DOWN, 5 ; person
 	object SPRITE_FISHER, 32, 12, STAY, LEFT, 6 ; person
 	object SPRITE_MONSTER, 30, 12, STAY, RIGHT, 7 ; person
-	object SPRITE_ROCKET, 32, 29, WALK, 2, 8 ; person
-	object SPRITE_ROCKET, 42, 14, WALK, 2, 9 ; person
+	object SPRITE_ROCKET, 32, 29, WALK, LEFT_RIGHT, 8 ; person
+	object SPRITE_ROCKET, 42, 14, WALK, LEFT_RIGHT, 9 ; person
 
 	; warp-to
 	warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F
diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm
index c0925ca2..9b732187 100755
--- a/data/maps/objects/CeladonDiner.asm
+++ b/data/maps/objects/CeladonDiner.asm
@@ -8,7 +8,7 @@ CeladonDiner_Object:
 	db 0 ; signs
 
 	db 5 ; objects
-	object SPRITE_COOK, 8, 5, WALK, 2, 1 ; person
+	object SPRITE_COOK, 8, 5, WALK, LEFT_RIGHT, 1 ; person
 	object SPRITE_MIDDLE_AGED_WOMAN, 7, 2, STAY, NONE, 2 ; person
 	object SPRITE_MIDDLE_AGED_MAN, 1, 4, STAY, DOWN, 3 ; person
 	object SPRITE_FISHER, 5, 3, STAY, RIGHT, 4 ; person
diff --git a/data/maps/objects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm
index afa55936..9d318843 100755
--- a/data/maps/objects/CeladonHotel.asm
+++ b/data/maps/objects/CeladonHotel.asm
@@ -10,7 +10,7 @@ CeladonHotel_Object:
 	db 3 ; objects
 	object SPRITE_GRANNY, 3, 1, STAY, DOWN, 1 ; person
 	object SPRITE_BEAUTY, 2, 4, STAY, NONE, 2 ; person
-	object SPRITE_SUPER_NERD, 8, 4, WALK, 2, 3 ; person
+	object SPRITE_SUPER_NERD, 8, 4, WALK, LEFT_RIGHT, 3 ; person
 
 	; warp-to
 	warp_to 3, 7, CELADON_HOTEL_WIDTH
diff --git a/data/maps/objects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm
index 1e142d44..abb3006c 100755
--- a/data/maps/objects/CeladonMansion1F.asm
+++ b/data/maps/objects/CeladonMansion1F.asm
@@ -14,8 +14,8 @@ CeladonMansion1F_Object:
 	db 4 ; objects
 	object SPRITE_MONSTER, 0, 5, STAY, RIGHT, 1 ; person
 	object SPRITE_GRANNY, 1, 5, STAY, DOWN, 2 ; person
-	object SPRITE_FAIRY, 1, 8, WALK, 2, 3 ; person
-	object SPRITE_MONSTER, 4, 4, WALK, 1, 4 ; person
+	object SPRITE_FAIRY, 1, 8, WALK, LEFT_RIGHT, 3 ; person
+	object SPRITE_MONSTER, 4, 4, WALK, UP_DOWN, 4 ; person
 
 	; warp-to
 	warp_to 4, 11, CELADON_MANSION_1F_WIDTH
diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm
index 5cc5c6e2..dfd12d3c 100755
--- a/data/maps/objects/CeladonMart2F.asm
+++ b/data/maps/objects/CeladonMart2F.asm
@@ -13,7 +13,7 @@ CeladonMart2F_Object:
 	object SPRITE_CLERK, 5, 3, STAY, DOWN, 1 ; person
 	object SPRITE_CLERK, 6, 3, STAY, DOWN, 2 ; person
 	object SPRITE_MIDDLE_AGED_MAN, 19, 5, STAY, NONE, 3 ; person
-	object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person
+	object SPRITE_GIRL, 14, 4, WALK, UP_DOWN, 4 ; person
 
 	; warp-to
 	warp_to 12, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_1F
diff --git a/data/maps/objects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm
index 8f71b4b0..3949529b 100755
--- a/data/maps/objects/CeladonMart4F.asm
+++ b/data/maps/objects/CeladonMart4F.asm
@@ -11,8 +11,8 @@ CeladonMart4F_Object:
 
 	db 3 ; objects
 	object SPRITE_CLERK, 5, 7, STAY, NONE, 1 ; person
-	object SPRITE_SUPER_NERD, 15, 5, WALK, 2, 2 ; person
-	object SPRITE_YOUNGSTER, 5, 2, WALK, 2, 3 ; person
+	object SPRITE_SUPER_NERD, 15, 5, WALK, LEFT_RIGHT, 2 ; person
+	object SPRITE_YOUNGSTER, 5, 2, WALK, LEFT_RIGHT, 3 ; person
 
 	; warp-to
 	warp_to 12, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_3F
diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm
index 4d3fb865..61a7428e 100755
--- a/data/maps/objects/CeladonMart5F.asm
+++ b/data/maps/objects/CeladonMart5F.asm
@@ -10,7 +10,7 @@ CeladonMart5F_Object:
 	sign 14, 1, 5 ; CeladonMart5Text5
 
 	db 4 ; objects
-	object SPRITE_GENTLEMAN, 14, 5, WALK, 1, 1 ; person
+	object SPRITE_GENTLEMAN, 14, 5, WALK, UP_DOWN, 1 ; person
 	object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person
 	object SPRITE_CLERK, 5, 3, STAY, DOWN, 3 ; person
 	object SPRITE_CLERK, 6, 3, STAY, DOWN, 4 ; person
diff --git a/data/maps/objects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm
index 4e81b9a3..b358183e 100755
--- a/data/maps/objects/CeladonMartRoof.asm
+++ b/data/maps/objects/CeladonMartRoof.asm
@@ -12,7 +12,7 @@ CeladonMartRoof_Object:
 
 	db 2 ; objects
 	object SPRITE_SUPER_NERD, 10, 4, STAY, LEFT, 1 ; person
-	object SPRITE_LITTLE_GIRL, 5, 5, WALK, 0, 2 ; person
+	object SPRITE_LITTLE_GIRL, 5, 5, WALK, ANY_DIR, 2 ; person
 
 	; warp-to
 	warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5F
diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm
index 3a48cd95..a3392021 100755
--- a/data/maps/objects/CeladonPokecenter.asm
+++ b/data/maps/objects/CeladonPokecenter.asm
@@ -9,8 +9,8 @@ CeladonPokecenter_Object:
 
 	db 4 ; objects
 	object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
-	object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person
-	object SPRITE_BEAUTY, 10, 5, WALK, 0, 3 ; person
+	object SPRITE_GENTLEMAN, 7, 3, WALK, LEFT_RIGHT, 2 ; person
+	object SPRITE_BEAUTY, 10, 5, WALK, ANY_DIR, 3 ; person
 	object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
 
 	; warp-to
diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm
index 858fcb28..a7601890 100755
--- a/data/maps/objects/CeruleanCity.asm
+++ b/data/maps/objects/CeruleanCity.asm
@@ -25,12 +25,12 @@ CeruleanCity_Object:
 	object SPRITE_BLUE, 20, 2, STAY, DOWN, 1 ; person
 	object SPRITE_ROCKET, 30, 8, STAY, NONE, 2, OPP_ROCKET, 5
 	object SPRITE_COOLTRAINER_M, 31, 20, STAY, DOWN, 3 ; person
-	object SPRITE_SUPER_NERD, 15, 18, WALK, 1, 4 ; person
-	object SPRITE_SUPER_NERD, 9, 21, WALK, 2, 5 ; person
+	object SPRITE_SUPER_NERD, 15, 18, WALK, UP_DOWN, 4 ; person
+	object SPRITE_SUPER_NERD, 9, 21, WALK, LEFT_RIGHT, 5 ; person
 	object SPRITE_GUARD, 28, 12, STAY, DOWN, 6 ; person
 	object SPRITE_COOLTRAINER_F, 29, 26, STAY, LEFT, 7 ; person
 	object SPRITE_MONSTER, 28, 26, STAY, DOWN, 8 ; person
-	object SPRITE_COOLTRAINER_F, 9, 27, WALK, 2, 9 ; person
+	object SPRITE_COOLTRAINER_F, 9, 27, WALK, LEFT_RIGHT, 9 ; person
 	object SPRITE_SUPER_NERD, 4, 12, STAY, DOWN, 10 ; person
 	object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person
 
diff --git a/data/maps/objects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm
index d724c08b..c6fc6d6f 100755
--- a/data/maps/objects/CeruleanMart.asm
+++ b/data/maps/objects/CeruleanMart.asm
@@ -9,8 +9,8 @@ CeruleanMart_Object:
 
 	db 3 ; objects
 	object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
-	object SPRITE_COOLTRAINER_M, 3, 4, WALK, 1, 2 ; person
-	object SPRITE_COOLTRAINER_F, 6, 2, WALK, 2, 3 ; person
+	object SPRITE_COOLTRAINER_M, 3, 4, WALK, UP_DOWN, 2 ; person
+	object SPRITE_COOLTRAINER_F, 6, 2, WALK, LEFT_RIGHT, 3 ; person
 
 	; warp-to
 	warp_to 3, 7, CERULEAN_MART_WIDTH
diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm
index 0f485dfe..f9c2715a 100755
--- a/data/maps/objects/CeruleanPokecenter.asm
+++ b/data/maps/objects/CeruleanPokecenter.asm
@@ -9,7 +9,7 @@ CeruleanPokecenter_Object:
 
 	db 4 ; objects
 	object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
-	object SPRITE_SUPER_NERD, 10, 5, WALK, 0, 2 ; person
+	object SPRITE_SUPER_NERD, 10, 5, WALK, ANY_DIR, 2 ; person
 	object SPRITE_GENTLEMAN, 4, 3, STAY, DOWN, 3 ; person
 	object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
 
diff --git a/data/maps/objects/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm
index 0ea45a1c..ad29a6ad 100755
--- a/data/maps/objects/CeruleanTrashedHouse.asm
+++ b/data/maps/objects/CeruleanTrashedHouse.asm
@@ -11,7 +11,7 @@ CeruleanTrashedHouse_Object:
 
 	db 2 ; objects
 	object SPRITE_FISHING_GURU, 2, 1, STAY, DOWN, 1 ; person
-	object SPRITE_GIRL, 5, 6, WALK, 2, 2 ; person
+	object SPRITE_GIRL, 5, 6, WALK, LEFT_RIGHT, 2 ; person
 
 	; warp-to
 	warp_to 2, 7, CERULEAN_TRASHED_HOUSE_WIDTH
diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm
index 1932e134..1cb3e28c 100755
--- a/data/maps/objects/CinnabarIsland.asm
+++ b/data/maps/objects/CinnabarIsland.asm
@@ -16,7 +16,7 @@ CinnabarIsland_Object:
 	sign 13, 3, 7 ; CinnabarIslandText7
 
 	db 2 ; objects
-	object SPRITE_GIRL, 12, 5, WALK, 2, 1 ; person
+	object SPRITE_GIRL, 12, 5, WALK, LEFT_RIGHT, 1 ; person
 	object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
 
 	; warp-to
diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm
index d77c26df..9ab531c2 100755
--- a/data/maps/objects/CinnabarLabFossilRoom.asm
+++ b/data/maps/objects/CinnabarLabFossilRoom.asm
@@ -8,7 +8,7 @@ CinnabarLabFossilRoom_Object:
 	db 0 ; signs
 
 	db 2 ; objects
-	object SPRITE_SCIENTIST, 5, 2, WALK, 2, 1 ; person
+	object SPRITE_SCIENTIST, 5, 2, WALK, LEFT_RIGHT, 1 ; person
 	object SPRITE_SCIENTIST, 7, 6, STAY, UP, 2 ; person
 
 	; warp-to
diff --git a/data/maps/objects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm
index 06f4fb99..d3250af3 100755
--- a/data/maps/objects/CinnabarLabMetronomeRoom.asm
+++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm
@@ -12,7 +12,7 @@ CinnabarLabMetronomeRoom_Object:
 
 	db 2 ; objects
 	object SPRITE_SCIENTIST, 7, 2, STAY, DOWN, 1 ; person
-	object SPRITE_SCIENTIST, 2, 3, WALK, 2, 2 ; person
+	object SPRITE_SCIENTIST, 2, 3, WALK, LEFT_RIGHT, 2 ; person
 
 	; warp-to
 	warp_to 2, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB
diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm
index 06af2353..051bcac1 100755
--- a/data/maps/objects/CinnabarPokecenter.asm
+++ b/data/maps/objects/CinnabarPokecenter.asm
@@ -9,7 +9,7 @@ CinnabarPokecenter_Object:
 
 	db 4 ; objects
 	object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
-	object SPRITE_COOLTRAINER_F, 9, 4, WALK, 0, 2 ; person
+	object SPRITE_COOLTRAINER_F, 9, 4, WALK, ANY_DIR, 2 ; person
 	object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person
 	object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
 
diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm
index e02339cd..167022e8 100755
--- a/data/maps/objects/CopycatsHouse1F.asm
+++ b/data/maps/objects/CopycatsHouse1F.asm
@@ -11,7 +11,7 @@ CopycatsHouse1F_Object:
 	db 3 ; objects
 	object SPRITE_MIDDLE_AGED_WOMAN, 2, 2, STAY, DOWN, 1 ; person
 	object SPRITE_MIDDLE_AGED_MAN, 5, 4, STAY, LEFT, 2 ; person
-	object SPRITE_FAIRY, 1, 4, WALK, 1, 3 ; person
+	object SPRITE_FAIRY, 1, 4, WALK, UP_DOWN, 3 ; person
 
 	; warp-to
 	warp_to 2, 7, COPYCATS_HOUSE_1F_WIDTH
diff --git a/data/maps/objects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm
index 73d7daf2..0b9713ae 100755
--- a/data/maps/objects/CopycatsHouse2F.asm
+++ b/data/maps/objects/CopycatsHouse2F.asm
@@ -9,8 +9,8 @@ CopycatsHouse2F_Object:
 	sign 0, 1, 7 ; CopycatsHouse2FText7
 
 	db 5 ; objects
-	object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, 0, 1 ; person
-	object SPRITE_BIRD, 4, 6, WALK, 2, 2 ; person
+	object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, ANY_DIR, 1 ; person
+	object SPRITE_BIRD, 4, 6, WALK, LEFT_RIGHT, 2 ; person
 	object SPRITE_MONSTER, 5, 1, STAY, DOWN, 3 ; person
 	object SPRITE_BIRD, 2, 0, STAY, DOWN, 4 ; person
 	object SPRITE_FAIRY, 1, 6, STAY, RIGHT, 5 ; person
diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm
index 5a09f864..c5f0ef58 100755
--- a/data/maps/objects/FuchsiaCity.asm
+++ b/data/maps/objects/FuchsiaCity.asm
@@ -29,15 +29,15 @@ FuchsiaCity_Object:
 	sign 7, 7, 24 ; FuchsiaCityText24
 
 	db 10 ; objects
-	object SPRITE_YOUNGSTER, 10, 12, WALK, 2, 1 ; person
-	object SPRITE_GAMBLER, 28, 17, WALK, 2, 2 ; person
+	object SPRITE_YOUNGSTER, 10, 12, WALK, LEFT_RIGHT, 1 ; person
+	object SPRITE_GAMBLER, 28, 17, WALK, LEFT_RIGHT, 2 ; person
 	object SPRITE_FISHER, 30, 14, STAY, DOWN, 3 ; person
 	object SPRITE_YOUNGSTER, 24, 8, STAY, UP, 4 ; person
-	object SPRITE_FAIRY, 31, 5, WALK, 0, 5 ; person
+	object SPRITE_FAIRY, 31, 5, WALK, ANY_DIR, 5 ; person
 	object SPRITE_POKE_BALL, 25, 6, STAY, NONE, 6 ; person
-	object SPRITE_MONSTER, 12, 6, WALK, 2, 7 ; person
-	object SPRITE_MONSTER, 30, 12, WALK, 2, 8 ; person
-	object SPRITE_SEEL, 8, 17, WALK, 0, 9 ; person
+	object SPRITE_MONSTER, 12, 6, WALK, LEFT_RIGHT, 7 ; person
+	object SPRITE_MONSTER, 30, 12, WALK, LEFT_RIGHT, 8 ; person
+	object SPRITE_SEEL, 8, 17, WALK, ANY_DIR, 9 ; person
 	object SPRITE_FOSSIL, 6, 5, STAY, NONE, 10 ; person
 
 	; warp-to
diff --git a/data/maps/objects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm
index f9f7ad9c..901a1b49 100755
--- a/data/maps/objects/FuchsiaMart.asm
+++ b/data/maps/objects/FuchsiaMart.asm
@@ -10,7 +10,7 @@ FuchsiaMart_Object:
 	db 3 ; objects
 	object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
 	object SPRITE_MIDDLE_AGED_MAN, 4, 2, STAY, NONE, 2 ; person
-	object SPRITE_COOLTRAINER_F, 6, 5, WALK, 1, 3 ; person
+	object SPRITE_COOLTRAINER_F, 6, 5, WALK, UP_DOWN, 3 ; person
 
 	; warp-to
 	warp_to 3, 7, FUCHSIA_MART_WIDTH
diff --git a/data/maps/objects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm
index 31f1cdc9..1b656f3f 100755
--- a/data/maps/objects/FuchsiaPokecenter.asm
+++ b/data/maps/objects/FuchsiaPokecenter.asm
@@ -10,7 +10,7 @@ FuchsiaPokecenter_Object:
 	db 4 ; objects
 	object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
 	object SPRITE_ROCKER, 2, 3, STAY, NONE, 2 ; person
-	object SPRITE_COOLTRAINER_F, 6, 5, WALK, 2, 3 ; person
+	object SPRITE_COOLTRAINER_F, 6, 5, WALK, LEFT_RIGHT, 3 ; person
 	object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
 
 	; warp-to
diff --git a/data/maps/objects/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm
index 6d1a80c4..06f96b08 100755
--- a/data/maps/objects/GameCornerPrizeRoom.asm
+++ b/data/maps/objects/GameCornerPrizeRoom.asm
@@ -12,7 +12,7 @@ GameCornerPrizeRoom_Object:
 
 	db 2 ; objects
 	object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person
-	object SPRITE_GAMBLER, 7, 3, WALK, 2, 2 ; person
+	object SPRITE_GAMBLER, 7, 3, WALK, LEFT_RIGHT, 2 ; person
 
 	; warp-to
 	warp_to 4, 7, GAME_CORNER_PRIZE_ROOM_WIDTH
diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm
index 61d978b4..da764b2c 100755
--- a/data/maps/objects/LavenderPokecenter.asm
+++ b/data/maps/objects/LavenderPokecenter.asm
@@ -10,7 +10,7 @@ LavenderPokecenter_Object:
 	db 4 ; objects
 	object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
 	object SPRITE_GENTLEMAN, 5, 3, STAY, NONE, 2 ; person
-	object SPRITE_LITTLE_GIRL, 2, 6, WALK, 1, 3 ; person
+	object SPRITE_LITTLE_GIRL, 2, 6, WALK, UP_DOWN, 3 ; person
 	object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
 
 	; warp-to
diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm
index 3c7b2965..46fcaec5 100755
--- a/data/maps/objects/LavenderTown.asm
+++ b/data/maps/objects/LavenderTown.asm
@@ -18,9 +18,9 @@ LavenderTown_Object:
 	sign 17, 7, 9 ; LavenderTownText9
 
 	db 3 ; objects
-	object SPRITE_LITTLE_GIRL, 15, 9, WALK, 0, 1 ; person
+	object SPRITE_LITTLE_GIRL, 15, 9, WALK, ANY_DIR, 1 ; person
 	object SPRITE_COOLTRAINER_M, 9, 10, STAY, NONE, 2 ; person
-	object SPRITE_SUPER_NERD, 8, 7, WALK, 2, 3 ; person
+	object SPRITE_SUPER_NERD, 8, 7, WALK, LEFT_RIGHT, 3 ; person
 
 	; warp-to
 	warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER
diff --git a/data/maps/objects/MtMoonPokecenter.asm b/data/maps/objects/MtMoonPokecenter.asm
index 55fc4d29..5c154ac5 100755
--- a/data/maps/objects/MtMoonPokecenter.asm
+++ b/data/maps/objects/MtMoonPokecenter.asm
@@ -11,7 +11,7 @@ MtMoonPokecenter_Object:
 	object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
 	object SPRITE_YOUNGSTER, 4, 3, STAY, UP, 2 ; person
 	object SPRITE_GENTLEMAN, 7, 3, STAY, UP, 3 ; person
-	object SPRITE_MIDDLE_AGED_MAN, 10, 6, WALK, 2, 4 ; person
+	object SPRITE_MIDDLE_AGED_MAN, 10, 6, WALK, LEFT_RIGHT, 4 ; person
 	object SPRITE_CLIPBOARD, 7, 2, STAY, NONE, 5 ; person
 	object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 6 ; person
 
diff --git a/data/maps/objects/Museum2F.asm b/data/maps/objects/Museum2F.asm
index a07fa944..525df06f 100755
--- a/data/maps/objects/Museum2F.asm
+++ b/data/maps/objects/Museum2F.asm
@@ -9,7 +9,7 @@ Museum2F_Object:
 	sign 2, 5, 7 ; Museum2FText7
 
 	db 5 ; objects
-	object SPRITE_YOUNGSTER, 1, 7, WALK, 2, 1 ; person
+	object SPRITE_YOUNGSTER, 1, 7, WALK, LEFT_RIGHT, 1 ; person
 	object SPRITE_GRAMPS, 0, 5, STAY, DOWN, 2 ; person
 	object SPRITE_SCIENTIST, 7, 5, STAY, DOWN, 3 ; person
 	object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person
diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm
index 3e1a90c0..1a784f83 100755
--- a/data/maps/objects/OaksLab.asm
+++ b/data/maps/objects/OaksLab.asm
@@ -16,7 +16,7 @@ OaksLab_Object:
 	object SPRITE_POKEDEX, 2, 1, STAY, NONE, 6 ; person
 	object SPRITE_POKEDEX, 3, 1, STAY, NONE, 7 ; person
 	object SPRITE_OAK, 5, 10, STAY, UP, 8 ; person
-	object SPRITE_GIRL, 1, 9, WALK, 1, 9 ; person
+	object SPRITE_GIRL, 1, 9, WALK, UP_DOWN, 9 ; person
 	object SPRITE_SCIENTIST, 2, 10, STAY, NONE, 10 ; person
 	object SPRITE_SCIENTIST, 8, 10, STAY, NONE, 11 ; person
 
diff --git a/data/maps/objects/PalletTown.asm b/data/maps/objects/PalletTown.asm
index a385df65..2bd306fe 100755
--- a/data/maps/objects/PalletTown.asm
+++ b/data/maps/objects/PalletTown.asm
@@ -14,8 +14,8 @@ PalletTown_Object:
 
 	db 3 ; objects
 	object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person
-	object SPRITE_GIRL, 3, 8, WALK, 0, 2 ; person
-	object SPRITE_FISHER, 11, 14, WALK, 0, 3 ; person
+	object SPRITE_GIRL, 3, 8, WALK, ANY_DIR, 2 ; person
+	object SPRITE_FISHER, 11, 14, WALK, ANY_DIR, 3 ; person
 
 	; warp-to
 	warp_to 5, 5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F
diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm
index 4a0c25e0..804ded7f 100755
--- a/data/maps/objects/PewterCity.asm
+++ b/data/maps/objects/PewterCity.asm
@@ -23,7 +23,7 @@ PewterCity_Object:
 	object SPRITE_COOLTRAINER_F, 8, 15, STAY, NONE, 1 ; person
 	object SPRITE_COOLTRAINER_M, 17, 25, STAY, NONE, 2 ; person
 	object SPRITE_SUPER_NERD, 27, 17, STAY, NONE, 3 ; person
-	object SPRITE_SUPER_NERD, 26, 25, WALK, 2, 4 ; person
+	object SPRITE_SUPER_NERD, 26, 25, WALK, LEFT_RIGHT, 4 ; person
 	object SPRITE_YOUNGSTER, 35, 16, STAY, DOWN, 5 ; person
 
 	; warp-to
diff --git a/data/maps/objects/PewterMart.asm b/data/maps/objects/PewterMart.asm
index 3c096825..01e2cbdc 100755
--- a/data/maps/objects/PewterMart.asm
+++ b/data/maps/objects/PewterMart.asm
@@ -9,7 +9,7 @@ PewterMart_Object:
 
 	db 3 ; objects
 	object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
-	object SPRITE_YOUNGSTER, 3, 3, WALK, 1, 2 ; person
+	object SPRITE_YOUNGSTER, 3, 3, WALK, UP_DOWN, 2 ; person
 	object SPRITE_SUPER_NERD, 5, 5, STAY, NONE, 3 ; person
 
 	; warp-to
diff --git a/data/maps/objects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm
index 1df7d282..2cc2c9d3 100755
--- a/data/maps/objects/PokemonMansion2F.asm
+++ b/data/maps/objects/PokemonMansion2F.asm
@@ -10,7 +10,7 @@ PokemonMansion2F_Object:
 	db 0 ; signs
 
 	db 4 ; objects
-	object SPRITE_SUPER_NERD, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7
+	object SPRITE_SUPER_NERD, 3, 17, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 7
 	object SPRITE_POKE_BALL, 28, 7, STAY, NONE, 2, CALCIUM
 	object SPRITE_POKEDEX, 18, 2, STAY, NONE, 3 ; person
 	object SPRITE_POKEDEX, 3, 22, STAY, NONE, 4 ; person
diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm
index fc0149c9..86696592 100755
--- a/data/maps/objects/PokemonMansion3F.asm
+++ b/data/maps/objects/PokemonMansion3F.asm
@@ -9,7 +9,7 @@ PokemonMansion3F_Object:
 	db 0 ; signs
 
 	db 5 ; objects
-	object SPRITE_SUPER_NERD, 5, 11, WALK, 2, 1, OPP_BURGLAR, 8
+	object SPRITE_SUPER_NERD, 5, 11, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8
 	object SPRITE_SCIENTIST, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12
 	object SPRITE_POKE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION
 	object SPRITE_POKE_BALL, 25, 5, STAY, NONE, 4, IRON
diff --git a/data/maps/objects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm
index a0527467..7c7654d9 100755
--- a/data/maps/objects/RockTunnelPokecenter.asm
+++ b/data/maps/objects/RockTunnelPokecenter.asm
@@ -9,7 +9,7 @@ RockTunnelPokecenter_Object:
 
 	db 4 ; objects
 	object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
-	object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person
+	object SPRITE_GENTLEMAN, 7, 3, WALK, LEFT_RIGHT, 2 ; person
 	object SPRITE_FISHER, 2, 5, STAY, NONE, 3 ; person
 	object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
 
diff --git a/data/maps/objects/Route1.asm b/data/maps/objects/Route1.asm
index 7d0de139..f51ece6a 100755
--- a/data/maps/objects/Route1.asm
+++ b/data/maps/objects/Route1.asm
@@ -7,8 +7,8 @@ Route1_Object:
 	sign 9, 27, 3 ; Route1Text3
 
 	db 2 ; objects
-	object SPRITE_YOUNGSTER, 5, 24, WALK, 1, 1 ; person
-	object SPRITE_YOUNGSTER, 15, 13, WALK, 2, 2 ; person
+	object SPRITE_YOUNGSTER, 5, 24, WALK, UP_DOWN, 1 ; person
+	object SPRITE_YOUNGSTER, 15, 13, WALK, LEFT_RIGHT, 2 ; person
 
 	; warp-to (unused)
 	warp_to 2, 7, 4
diff --git a/data/maps/objects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm
index 3730bae0..68d6b98e 100755
--- a/data/maps/objects/Route11Gate2F.asm
+++ b/data/maps/objects/Route11Gate2F.asm
@@ -9,7 +9,7 @@ Route11Gate2F_Object:
 	sign 6, 2, 4 ; Route11GateUpstairsText4
 
 	db 2 ; objects
-	object SPRITE_YOUNGSTER, 4, 2, WALK, 2, 1 ; person
+	object SPRITE_YOUNGSTER, 4, 2, WALK, LEFT_RIGHT, 1 ; person
 	object SPRITE_SCIENTIST, 2, 6, STAY, NONE, 2 ; person
 
 	; warp-to
diff --git a/data/maps/objects/Route12Gate2F.asm b/data/maps/objects/Route12Gate2F.asm
index cc6c1c19..186f3f49 100755
--- a/data/maps/objects/Route12Gate2F.asm
+++ b/data/maps/objects/Route12Gate2F.asm
@@ -9,7 +9,7 @@ Route12Gate2F_Object:
 	sign 6, 2, 3 ; Route12GateUpstairsText3
 
 	db 1 ; objects
-	object SPRITE_BRUNETTE_GIRL, 3, 4, WALK, 1, 1 ; person
+	object SPRITE_BRUNETTE_GIRL, 3, 4, WALK, UP_DOWN, 1 ; person
 
 	; warp-to
 	warp_to 7, 7, ROUTE_12_GATE_2F_WIDTH ; ROUTE_12_GATE_1F
diff --git a/data/maps/objects/Route16FlyHouse.asm b/data/maps/objects/Route16FlyHouse.asm
index b6a5b345..979eece1 100755
--- a/data/maps/objects/Route16FlyHouse.asm
+++ b/data/maps/objects/Route16FlyHouse.asm
@@ -9,7 +9,7 @@ Route16FlyHouse_Object:
 
 	db 2 ; objects
 	object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person
-	object SPRITE_BIRD, 6, 4, WALK, 0, 2 ; person
+	object SPRITE_BIRD, 6, 4, WALK, ANY_DIR, 2 ; person
 
 	; warp-to
 	warp_to 2, 7, ROUTE_16_FLY_HOUSE_WIDTH
diff --git a/data/maps/objects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm
index bb5e1129..21dddd07 100755
--- a/data/maps/objects/Route16Gate2F.asm
+++ b/data/maps/objects/Route16Gate2F.asm
@@ -10,7 +10,7 @@ Route16Gate2F_Object:
 
 	db 2 ; objects
 	object SPRITE_LITTLE_BOY, 4, 2, STAY, NONE, 1 ; person
-	object SPRITE_LITTLE_GIRL, 2, 5, WALK, 2, 2 ; person
+	object SPRITE_LITTLE_GIRL, 2, 5, WALK, LEFT_RIGHT, 2 ; person
 
 	; warp-to
 	warp_to 7, 7, ROUTE_16_GATE_2F_WIDTH ; ROUTE_16_GATE_1F
diff --git a/data/maps/objects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm
index 5f0a4246..ba5896b8 100755
--- a/data/maps/objects/Route18Gate2F.asm
+++ b/data/maps/objects/Route18Gate2F.asm
@@ -9,7 +9,7 @@ Route18Gate2F_Object:
 	sign 6, 2, 3 ; Route18GateUpstairsText3
 
 	db 1 ; objects
-	object SPRITE_YOUNGSTER, 4, 2, WALK, 2, 1 ; person
+	object SPRITE_YOUNGSTER, 4, 2, WALK, LEFT_RIGHT, 1 ; person
 
 	; warp-to
 	warp_to 7, 7, ROUTE_18_GATE_2F_WIDTH ; ROUTE_18_GATE_1F
diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm
index 2243a83c..f4d78598 100755
--- a/data/maps/objects/Route2Gate.asm
+++ b/data/maps/objects/Route2Gate.asm
@@ -11,7 +11,7 @@ Route2Gate_Object:
 
 	db 2 ; objects
 	object SPRITE_SCIENTIST, 1, 4, STAY, LEFT, 1 ; person
-	object SPRITE_YOUNGSTER, 5, 4, WALK, 2, 2 ; person
+	object SPRITE_YOUNGSTER, 5, 4, WALK, LEFT_RIGHT, 2 ; person
 
 	; warp-to
 	warp_to 4, 0, ROUTE_2_GATE_WIDTH
diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm
index 6683e14d..fb073cd5 100755
--- a/data/maps/objects/Route4.asm
+++ b/data/maps/objects/Route4.asm
@@ -12,7 +12,7 @@ Route4_Object:
 	sign 27, 7, 6 ; Route4Text6
 
 	db 3 ; objects
-	object SPRITE_COOLTRAINER_F, 9, 8, WALK, 0, 1 ; person
+	object SPRITE_COOLTRAINER_F, 9, 8, WALK, ANY_DIR, 1 ; person
 	object SPRITE_COOLTRAINER_F, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4
 	object SPRITE_POKE_BALL, 57, 3, STAY, NONE, 3, TM_WHIRLWIND
 
diff --git a/data/maps/objects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm
index 3e454f06..600fb50a 100755
--- a/data/maps/objects/SSAnne1F.asm
+++ b/data/maps/objects/SSAnne1F.asm
@@ -17,7 +17,7 @@ SSAnne1F_Object:
 	db 0 ; signs
 
 	db 2 ; objects
-	object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person
+	object SPRITE_WAITER, 12, 6, WALK, LEFT_RIGHT, 1 ; person
 	object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person
 
 	; warp-to
diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm
index 3a637fb8..ea135562 100755
--- a/data/maps/objects/SSAnne1FRooms.asm
+++ b/data/maps/objects/SSAnne1FRooms.asm
@@ -16,13 +16,13 @@ SSAnne1FRooms_Object:
 	object SPRITE_GENTLEMAN, 11, 4, STAY, UP, 2, OPP_GENTLEMAN, 2
 	object SPRITE_YOUNGSTER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8
 	object SPRITE_COOLTRAINER_F, 13, 11, STAY, LEFT, 4, OPP_LASS, 11
-	object SPRITE_GIRL, 22, 3, WALK, 1, 5 ; person
+	object SPRITE_GIRL, 22, 3, WALK, UP_DOWN, 5 ; person
 	object SPRITE_MIDDLE_AGED_MAN, 0, 14, STAY, NONE, 6 ; person
 	object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person
 	object SPRITE_FAIRY, 3, 11, STAY, DOWN, 8 ; person
 	object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person
 	object SPRITE_POKE_BALL, 12, 15, STAY, NONE, 10, TM_BODY_SLAM
-	object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person
+	object SPRITE_GENTLEMAN, 21, 13, WALK, LEFT_RIGHT, 11 ; person
 
 	; warp-to
 	warp_to 0, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm
index 9a08b781..97dbbcc1 100755
--- a/data/maps/objects/SSAnne2F.asm
+++ b/data/maps/objects/SSAnne2F.asm
@@ -15,7 +15,7 @@ SSAnne2F_Object:
 	db 0 ; signs
 
 	db 2 ; objects
-	object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person
+	object SPRITE_WAITER, 3, 7, WALK, UP_DOWN, 1 ; person
 	object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_RIVAL1, 1
 
 	; warp-to
diff --git a/data/maps/objects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm
index f0bfc17b..cd493a96 100755
--- a/data/maps/objects/SSAnne3F.asm
+++ b/data/maps/objects/SSAnne3F.asm
@@ -8,7 +8,7 @@ SSAnne3F_Object:
 	db 0 ; signs
 
 	db 1 ; objects
-	object SPRITE_SAILOR, 9, 3, WALK, 2, 1 ; person
+	object SPRITE_SAILOR, 9, 3, WALK, LEFT_RIGHT, 1 ; person
 
 	; warp-to
 	warp_to 0, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_BOW
diff --git a/data/maps/objects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm
index b5771e68..5ef35e02 100755
--- a/data/maps/objects/SSAnneKitchen.asm
+++ b/data/maps/objects/SSAnneKitchen.asm
@@ -7,9 +7,9 @@ SSAnneKitchen_Object:
 	db 0 ; signs
 
 	db 7 ; objects
-	object SPRITE_COOK, 1, 8, WALK, 1, 1 ; person
-	object SPRITE_COOK, 5, 8, WALK, 1, 2 ; person
-	object SPRITE_COOK, 9, 7, WALK, 1, 3 ; person
+	object SPRITE_COOK, 1, 8, WALK, UP_DOWN, 1 ; person
+	object SPRITE_COOK, 5, 8, WALK, UP_DOWN, 2 ; person
+	object SPRITE_COOK, 9, 7, WALK, UP_DOWN, 3 ; person
 	object SPRITE_COOK, 13, 6, STAY, NONE, 4 ; person
 	object SPRITE_COOK, 13, 8, STAY, NONE, 5 ; person
 	object SPRITE_COOK, 13, 10, STAY, NONE, 6 ; person
diff --git a/data/maps/objects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm
index d681696e..705873c9 100755
--- a/data/maps/objects/SafariZoneCenterRestHouse.asm
+++ b/data/maps/objects/SafariZoneCenterRestHouse.asm
@@ -9,7 +9,7 @@ SafariZoneCenterRestHouse_Object:
 
 	db 2 ; objects
 	object SPRITE_GIRL, 3, 2, STAY, DOWN, 1 ; person
-	object SPRITE_SCIENTIST, 1, 4, WALK, 1, 2 ; person
+	object SPRITE_SCIENTIST, 1, 4, WALK, UP_DOWN, 2 ; person
 
 	; warp-to
 	warp_to 2, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER
diff --git a/data/maps/objects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm
index d478a902..c6b866bc 100755
--- a/data/maps/objects/SafariZoneEastRestHouse.asm
+++ b/data/maps/objects/SafariZoneEastRestHouse.asm
@@ -8,7 +8,7 @@ SafariZoneEastRestHouse_Object:
 	db 0 ; signs
 
 	db 3 ; objects
-	object SPRITE_SCIENTIST, 1, 3, WALK, 1, 1 ; person
+	object SPRITE_SCIENTIST, 1, 3, WALK, UP_DOWN, 1 ; person
 	object SPRITE_ROCKER, 4, 2, STAY, NONE, 2 ; person
 	object SPRITE_SILPH_WORKER, 5, 2, STAY, NONE, 3 ; person
 
diff --git a/data/maps/objects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm
index 6eb9aac9..be460fe0 100755
--- a/data/maps/objects/SafariZoneNorthRestHouse.asm
+++ b/data/maps/objects/SafariZoneNorthRestHouse.asm
@@ -8,9 +8,9 @@ SafariZoneNorthRestHouse_Object:
 	db 0 ; signs
 
 	db 3 ; objects
-	object SPRITE_SCIENTIST, 6, 3, WALK, 2, 1 ; person
+	object SPRITE_SCIENTIST, 6, 3, WALK, LEFT_RIGHT, 1 ; person
 	object SPRITE_SAFARI_ZONE_WORKER, 3, 4, STAY, NONE, 2 ; person
-	object SPRITE_GENTLEMAN, 1, 5, WALK, 1, 3 ; person
+	object SPRITE_GENTLEMAN, 1, 5, WALK, UP_DOWN, 3 ; person
 
 	; warp-to
 	warp_to 2, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH
diff --git a/data/maps/objects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm
index 0338667f..1fa6a3cc 100755
--- a/data/maps/objects/SafariZoneWestRestHouse.asm
+++ b/data/maps/objects/SafariZoneWestRestHouse.asm
@@ -8,7 +8,7 @@ SafariZoneWestRestHouse_Object:
 	db 0 ; signs
 
 	db 3 ; objects
-	object SPRITE_SCIENTIST, 4, 4, WALK, 0, 1 ; person
+	object SPRITE_SCIENTIST, 4, 4, WALK, ANY_DIR, 1 ; person
 	object SPRITE_COOLTRAINER_M, 0, 2, STAY, RIGHT, 2 ; person
 	object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person
 
diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm
index 332f13af..4dcc7a71 100755
--- a/data/maps/objects/SaffronCity.asm
+++ b/data/maps/objects/SaffronCity.asm
@@ -25,15 +25,15 @@ SaffronCity_Object:
 
 	db 15 ; objects
 	object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person
-	object SPRITE_ROCKET, 20, 8, WALK, 2, 2 ; person
+	object SPRITE_ROCKET, 20, 8, WALK, LEFT_RIGHT, 2 ; person
 	object SPRITE_ROCKET, 34, 4, STAY, NONE, 3 ; person
 	object SPRITE_ROCKET, 13, 12, STAY, NONE, 4 ; person
-	object SPRITE_ROCKET, 11, 25, WALK, 2, 5 ; person
-	object SPRITE_ROCKET, 32, 13, WALK, 2, 6 ; person
-	object SPRITE_ROCKET, 18, 30, WALK, 2, 7 ; person
-	object SPRITE_SCIENTIST, 8, 14, WALK, 0, 8 ; person
+	object SPRITE_ROCKET, 11, 25, WALK, LEFT_RIGHT, 5 ; person
+	object SPRITE_ROCKET, 32, 13, WALK, LEFT_RIGHT, 6 ; person
+	object SPRITE_ROCKET, 18, 30, WALK, LEFT_RIGHT, 7 ; person
+	object SPRITE_SCIENTIST, 8, 14, WALK, ANY_DIR, 8 ; person
 	object SPRITE_SILPH_WORKER, 23, 23, STAY, NONE, 9 ; person
-	object SPRITE_ERIKA, 17, 30, WALK, 2, 10 ; person
+	object SPRITE_ERIKA, 17, 30, WALK, LEFT_RIGHT, 10 ; person
 	object SPRITE_GENTLEMAN, 30, 12, STAY, DOWN, 11 ; person
 	object SPRITE_BIRD, 31, 12, STAY, DOWN, 12 ; person
 	object SPRITE_ROCKER, 18, 8, STAY, UP, 13 ; person
diff --git a/data/maps/objects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm
index 5ad06c75..4680f018 100755
--- a/data/maps/objects/SaffronMart.asm
+++ b/data/maps/objects/SaffronMart.asm
@@ -10,7 +10,7 @@ SaffronMart_Object:
 	db 3 ; objects
 	object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
 	object SPRITE_SUPER_NERD, 4, 2, STAY, NONE, 2 ; person
-	object SPRITE_COOLTRAINER_F, 6, 5, WALK, 0, 3 ; person
+	object SPRITE_COOLTRAINER_F, 6, 5, WALK, ANY_DIR, 3 ; person
 
 	; warp-to
 	warp_to 3, 7, SAFFRON_MART_WIDTH
diff --git a/data/maps/objects/SaffronPidgeyHouse.asm b/data/maps/objects/SaffronPidgeyHouse.asm
index b0b52166..ac0d3f27 100755
--- a/data/maps/objects/SaffronPidgeyHouse.asm
+++ b/data/maps/objects/SaffronPidgeyHouse.asm
@@ -9,7 +9,7 @@ SaffronPidgeyHouse_Object:
 
 	db 4 ; objects
 	object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person
-	object SPRITE_BIRD, 0, 4, WALK, 1, 2 ; person
+	object SPRITE_BIRD, 0, 4, WALK, UP_DOWN, 2 ; person
 	object SPRITE_YOUNGSTER, 4, 1, STAY, DOWN, 3 ; person
 	object SPRITE_PAPER, 3, 3, STAY, NONE, 4 ; person
 
diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm
index 770601ae..d13b10cd 100755
--- a/data/maps/objects/SilphCo10F.asm
+++ b/data/maps/objects/SilphCo10F.asm
@@ -14,7 +14,7 @@ SilphCo10F_Object:
 	db 6 ; objects
 	object SPRITE_ROCKET, 1, 9, STAY, RIGHT, 1, OPP_ROCKET, 39
 	object SPRITE_SCIENTIST, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11
-	object SPRITE_ERIKA, 9, 15, WALK, 0, 3 ; person
+	object SPRITE_ERIKA, 9, 15, WALK, ANY_DIR, 3 ; person
 	object SPRITE_POKE_BALL, 2, 12, STAY, NONE, 4, TM_EARTHQUAKE
 	object SPRITE_POKE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY
 	object SPRITE_POKE_BALL, 5, 11, STAY, NONE, 6, CARBOS
diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm
index 692ef5dd..c23db7c6 100755
--- a/data/maps/objects/VermilionCity.asm
+++ b/data/maps/objects/VermilionCity.asm
@@ -22,12 +22,12 @@ VermilionCity_Object:
 	sign 29, 15, 13 ; VermilionCityText13
 
 	db 6 ; objects
-	object SPRITE_BEAUTY, 19, 7, WALK, 2, 1 ; person
+	object SPRITE_BEAUTY, 19, 7, WALK, LEFT_RIGHT, 1 ; person
 	object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
 	object SPRITE_SAILOR, 19, 30, STAY, UP, 3 ; person
 	object SPRITE_GAMBLER, 30, 7, STAY, NONE, 4 ; person
-	object SPRITE_MONSTER, 29, 9, WALK, 1, 5 ; person
-	object SPRITE_SAILOR, 25, 27, WALK, 2, 6 ; person
+	object SPRITE_MONSTER, 29, 9, WALK, UP_DOWN, 5 ; person
+	object SPRITE_SAILOR, 25, 27, WALK, LEFT_RIGHT, 6 ; person
 
 	; warp-to
 	warp_to 11, 3, VERMILION_CITY_WIDTH ; VERMILION_POKECENTER
diff --git a/data/maps/objects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm
index f7b358de..76291be8 100755
--- a/data/maps/objects/VermilionMart.asm
+++ b/data/maps/objects/VermilionMart.asm
@@ -10,7 +10,7 @@ VermilionMart_Object:
 	db 3 ; objects
 	object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
 	object SPRITE_COOLTRAINER_M, 5, 6, STAY, NONE, 2 ; person
-	object SPRITE_COOLTRAINER_F, 3, 3, WALK, 2, 3 ; person
+	object SPRITE_COOLTRAINER_F, 3, 3, WALK, LEFT_RIGHT, 3 ; person
 
 	; warp-to
 	warp_to 3, 7, VERMILION_MART_WIDTH
diff --git a/data/maps/objects/VermilionPidgeyHouse.asm b/data/maps/objects/VermilionPidgeyHouse.asm
index fbd39231..11ef4a08 100755
--- a/data/maps/objects/VermilionPidgeyHouse.asm
+++ b/data/maps/objects/VermilionPidgeyHouse.asm
@@ -9,7 +9,7 @@ VermilionPidgeyHouse_Object:
 
 	db 3 ; objects
 	object SPRITE_YOUNGSTER, 5, 3, STAY, LEFT, 1 ; person
-	object SPRITE_BIRD, 3, 5, WALK, 2, 2 ; person
+	object SPRITE_BIRD, 3, 5, WALK, LEFT_RIGHT, 2 ; person
 	object SPRITE_PAPER, 4, 3, STAY, NONE, 3 ; person
 
 	; warp-to
diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm
index 02543af8..540dadd6 100755
--- a/data/maps/objects/ViridianCity.asm
+++ b/data/maps/objects/ViridianCity.asm
@@ -17,13 +17,13 @@ ViridianCity_Object:
 	sign 27, 7, 13 ; ViridianCityText13
 
 	db 7 ; objects
-	object SPRITE_YOUNGSTER, 13, 20, WALK, 0, 1 ; person
+	object SPRITE_YOUNGSTER, 13, 20, WALK, ANY_DIR, 1 ; person
 	object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person
-	object SPRITE_YOUNGSTER, 30, 25, WALK, 0, 3 ; person
+	object SPRITE_YOUNGSTER, 30, 25, WALK, ANY_DIR, 3 ; person
 	object SPRITE_GIRL, 17, 9, STAY, RIGHT, 4 ; person
 	object SPRITE_GAMBLER_ASLEEP, 18, 9, STAY, NONE, 5 ; person
 	object SPRITE_FISHER, 6, 23, STAY, DOWN, 6 ; person
-	object SPRITE_GAMBLER, 17, 5, WALK, 2, 7 ; person
+	object SPRITE_GAMBLER, 17, 5, WALK, LEFT_RIGHT, 7 ; person
 
 	; warp-to
 	warp_to 23, 25, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_POKECENTER
diff --git a/data/maps/objects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm
index 8ce39de5..95478e37 100755
--- a/data/maps/objects/ViridianForestSouthGate.asm
+++ b/data/maps/objects/ViridianForestSouthGate.asm
@@ -11,7 +11,7 @@ ViridianForestSouthGate_Object:
 
 	db 2 ; objects
 	object SPRITE_GIRL, 8, 4, STAY, LEFT, 1 ; person
-	object SPRITE_LITTLE_GIRL, 2, 4, WALK, 1, 2 ; person
+	object SPRITE_LITTLE_GIRL, 2, 4, WALK, UP_DOWN, 2 ; person
 
 	; warp-to
 	warp_to 4, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST
diff --git a/data/maps/objects/ViridianMart.asm b/data/maps/objects/ViridianMart.asm
index 9c8b7497..fde88d0b 100755
--- a/data/maps/objects/ViridianMart.asm
+++ b/data/maps/objects/ViridianMart.asm
@@ -9,7 +9,7 @@ ViridianMart_Object:
 
 	db 3 ; objects
 	object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
-	object SPRITE_YOUNGSTER, 5, 5, WALK, 1, 2 ; person
+	object SPRITE_YOUNGSTER, 5, 5, WALK, UP_DOWN, 2 ; person
 	object SPRITE_COOLTRAINER_M, 3, 3, STAY, NONE, 3 ; person
 
 	; warp-to
diff --git a/data/maps/objects/ViridianNicknameHouse.asm b/data/maps/objects/ViridianNicknameHouse.asm
index eea883a4..23d60a28 100755
--- a/data/maps/objects/ViridianNicknameHouse.asm
+++ b/data/maps/objects/ViridianNicknameHouse.asm
@@ -9,8 +9,8 @@ ViridianNicknameHouse_Object:
 
 	db 4 ; objects
 	object SPRITE_BALDING_GUY, 5, 3, STAY, NONE, 1 ; person
-	object SPRITE_LITTLE_GIRL, 1, 4, WALK, 1, 2 ; person
-	object SPRITE_BIRD, 5, 5, WALK, 2, 3 ; person
+	object SPRITE_LITTLE_GIRL, 1, 4, WALK, UP_DOWN, 2 ; person
+	object SPRITE_BIRD, 5, 5, WALK, LEFT_RIGHT, 3 ; person
 	object SPRITE_CLIPBOARD, 4, 0, STAY, NONE, 4 ; person
 
 	; warp-to
diff --git a/data/maps/objects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm
index b2410218..00b3e16c 100755
--- a/data/maps/objects/ViridianPokecenter.asm
+++ b/data/maps/objects/ViridianPokecenter.asm
@@ -9,7 +9,7 @@ ViridianPokecenter_Object:
 
 	db 4 ; objects
 	object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
-	object SPRITE_GENTLEMAN, 10, 5, WALK, 1, 2 ; person
+	object SPRITE_GENTLEMAN, 10, 5, WALK, UP_DOWN, 2 ; person
 	object SPRITE_COOLTRAINER_M, 4, 3, STAY, NONE, 3 ; person
 	object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person