Use movement type constants in object_event macros

1 files changed, 29 insertions, 29 deletions

diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc
index 17ddae47f..7cafdc402 100644
--- a/data/maps/Route121/events.inc
+++ b/data/maps/Route121/events.inc
@@ -1,33 +1,33 @@
 Route121_EventObjects: @ 852BA14
-	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, 10, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, 12, 0, 0, 0, 47, BerryTreeScript, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, 12, 0, 0, 0, 48, BerryTreeScript, 0
-	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, 12, 0, 0, 0, 49, BerryTreeScript, 0
-	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, 12, 0, 0, 0, 50, BerryTreeScript, 0
-	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, 12, 0, 0, 0, 51, BerryTreeScript, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, 12, 0, 0, 0, 52, BerryTreeScript, 0
-	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, 12, 0, 0, 0, 53, BerryTreeScript, 0
-	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, 12, 0, 0, 0, 54, BerryTreeScript, 0
-	object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0
-	object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0
-	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, 914
-	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, 914
-	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, 914
-	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 17
-	object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 18
-	object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0
-	object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, 9, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0
-	object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, 7, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0
-	object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0
-	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, 1, 1, 1, 0, 0, Route121_EventScript_290F89, 1103
-	object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, 1, 1, 1, 0, 0, Route121_EventScript_2906BB, 19
-	object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, 26, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0
-	object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 59, 8, 3, 8, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0
-	object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 59, 13, 3, 7, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0
-	object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 65, 9, 3, 18, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0
-	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 72, 9, 3, 17, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0
-	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, 1, 1, 1, 0, 0, Route121_EventScript_290F96, 1149
-	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, 1, 1, 1, 0, 0, Route121_EventScript_290FA3, 1150
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 47, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 48, BerryTreeScript, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 49, BerryTreeScript, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 50, BerryTreeScript, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 51, BerryTreeScript, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 52, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 53, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 54, BerryTreeScript, 0
+	object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0
+	object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0
+	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 914
+	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 914
+	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 914
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 17
+	object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 18
+	object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0
+	object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0
+	object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0
+	object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, 1103
+	object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, 19
+	object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0
+	object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 59, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0
+	object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 59, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0
+	object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 65, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0
+	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 72, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0
+	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, 1149
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, 1150
 
 Route121_MapWarps: @ 852BCCC
 	warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE