Merge branch 'master' of github.com:pret/pokeemerald

2 files changed, 25 insertions, 25 deletions

diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc
index e4bf74177..6581eb582 100644
--- a/data/maps/Route103/events.inc
+++ b/data/maps/Route103/events.inc
@@ -1,30 +1,30 @@
 Route103_EventObjects: @ 85280DC
-	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, 10, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723
-	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 11, 3, 18, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0
-	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0
-	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, 26, 0, 1, 1, 3, Route103_EventScript_1EC6D1, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, 12, 0, 0, 0, 5, BerryTreeScript, 0
-	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, 12, 0, 0, 0, 6, BerryTreeScript, 0
-	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, 12, 0, 0, 0, 7, BerryTreeScript, 0
-	object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, 2, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0
-	object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, 2, 1, 1, 0, 0, Route103_EventScript_272141, 898
-	object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 13, 3, 10, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0
-	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, 1, 1, 1, 0, 0, Route103_EventScript_290CE5, 1114
-	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, 1, 1, 1, 0, 0, Route103_EventScript_2906BB, 18
-	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, 1, 1, 1, 0, 0, Route103_EventScript_2906BB, 19
-	object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, 8, 1, 1, 1, 2, Route103_EventScript_1EC761, 0
-	object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 67, 9, 3, 7, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0
-	object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, 26, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0
-	object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, 25, 1, 3, 1, 5, Route103_EventScript_1EC778, 0
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, 1, 1, 1, 0, 0, Route103_EventScript_290CF2, 1137
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 1, 1, 3, Route103_EventScript_1EC6D1, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 5, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 6, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 7, BerryTreeScript, 0
+	object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0
+	object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_272141, 898
+	object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CE5, 1114
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 18
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 19
+	object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route103_EventScript_1EC761, 0
+	object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 67, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0
+	object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0
+	object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, 1137
 
 Route103_MapWarps: @ 85282BC
 	warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE
 
 Route103_MapBGEvents: @ 85282C4
-	bg_event 11, 9, 0, 0, 0, Route103_EventScript_1EC5EB
+	bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route103_EventScript_1EC5EB
 
 Route103_MapEvents:: @ 85282D0
 	map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents
diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc
index 1a8825bc1..c7510701e 100644
--- a/data/maps/Route103/header.inc
+++ b/data/maps/Route103/header.inc
@@ -5,11 +5,11 @@ Route103: @ 84826B0
 	.4byte Route103_MapConnections
 	.2byte MUS_DOORO1
 	.2byte 19
-	.byte 18
+	.byte MAPSEC_ROUTE_103
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL