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

2 files changed, 33 insertions, 33 deletions

diff --git a/data/maps/BattleFrontier_OutsideWest/events.inc b/data/maps/BattleFrontier_OutsideWest/events.inc
index 643e26e2e..8095b6d6c 100644
--- a/data/maps/BattleFrontier_OutsideWest/events.inc
+++ b/data/maps/BattleFrontier_OutsideWest/events.inc
@@ -1,28 +1,28 @@
 BattleFrontier_OutsideWest_EventObjects: @ 853B350
-	object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, 2, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0
-	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, 10, 1, 1, 0, 0, 0x0, 0
-	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0
-	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0
-	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 27, 30, 0, 2, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0
-	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 41, 0, 2, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0
-	object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 28, 43, 0, 3, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0
-	object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 20, 0, 2, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0
-	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 13, 44, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0
-	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 14, 44, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0
-	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 23, 47, 0, 15, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0
-	object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 38, 27, 0, 2, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0
-	object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 45, 18, 0, 3, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0
-	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 9, 47, 0, 15, 1, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0
-	object_event 15, EVENT_OBJ_GFX_LASS, 0, 35, 5, 0, 2, 2, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0
-	object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 11, 66, 0, 9, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0
-	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 31, 31, 0, 8, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0
-	object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 48, 0, 18, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0
-	object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 38, 22, 0, 3, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0
-	object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 9, 0, 8, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0
-	object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 12, 10, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0
-	object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 10, 0, 23, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0
-	object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 8, 5, 0, 8, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0
-	object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 26, 0, 24, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0
+	object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 20, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 27, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 41, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0
+	object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 28, 43, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0
+	object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 20, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 13, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0
+	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 14, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 23, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0
+	object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 38, 27, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0
+	object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 45, 18, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0
+	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 9, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0
+	object_event 15, EVENT_OBJ_GFX_LASS, 0, 35, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0
+	object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 11, 66, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0
+	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 31, 31, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0
+	object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 48, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0
+	object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 38, 22, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0
+	object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 9, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0
+	object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 12, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0
+	object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 10, 0, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0
+	object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0
+	object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 26, 0, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0
 
 BattleFrontier_OutsideWest_MapWarps: @ 853B590
 	warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY
@@ -38,11 +38,11 @@ BattleFrontier_OutsideWest_MapWarps: @ 853B590
 	warp_def 39, 55, 0, 0, MAP_ARTISAN_CAVE_B1F
 
 BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8
-	bg_event 15, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4E2
-	bg_event 45, 30, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4F4
-	bg_event 16, 43, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4EB
-	bg_event 52, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A
-	bg_event 53, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A
+	bg_event 15, 18, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4E2
+	bg_event 45, 30, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4F4
+	bg_event 16, 43, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4EB
+	bg_event 52, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A
+	bg_event 53, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A
 
 BattleFrontier_OutsideWest_MapEvents:: @ 853B624
 	map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents
diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc
index 319ecec6a..a42ac30ff 100644
--- a/data/maps/BattleFrontier_OutsideWest/header.inc
+++ b/data/maps/BattleFrontier_OutsideWest/header.inc
@@ -5,11 +5,11 @@ BattleFrontier_OutsideWest: @ 84851AC
 	.4byte BattleFrontier_OutsideWest_MapConnections
 	.2byte MUS_B_FRONTIER
 	.2byte 265
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 3
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL