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

2 files changed, 39 insertions, 39 deletions

diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc
index d288400b5..0413b1be4 100644
--- a/data/maps/MossdeepCity/events.inc
+++ b/data/maps/MossdeepCity/events.inc
@@ -1,21 +1,21 @@
 MossdeepCity_EventObjects: @ 8527018
-	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0
-	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0
-	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0
-	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, 3, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0
-	object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043
-	object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0
-	object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, 10, 1, 1, 0, 0, MossdeepCity_EventScript_1E4B0B, 0
-	object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_1E4C26, 0
-	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, 8, 1, 1, 0, 0, 0x0, 823
-	object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, 7, 1, 1, 0, 0, 0x0, 823
-	object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, 8, 1, 1, 0, 0, 0x0, 823
-	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, 7, 1, 1, 0, 0, 0x0, 823
-	object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, 9, 1, 1, 0, 0, 0x0, 823
-	object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, 64, 3, 3, 0, 0, MossdeepCity_EventScript_2C81EE, 0
-	object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, 17, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788
-	object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, 64, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043
+	object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_EventScript_1E4B0B, 0
+	object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4C26, 0
+	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 823
+	object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 823
+	object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 823
+	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 823
+	object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 823
+	object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_2C81EE, 0
+	object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788
+	object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0
 
 MossdeepCity_MapWarps: @ 85271B0
 	warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1
@@ -30,26 +30,26 @@ MossdeepCity_MapWarps: @ 85271B0
 	warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F
 
 MossdeepCity_MapCoordEvents: @ 8527200
-	coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38
-	coord_event 26, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38
-	coord_event 32, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38
-	coord_event 33, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38
-	coord_event 42, 21, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
-	coord_event 41, 22, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
-	coord_event 41, 23, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
-	coord_event 41, 24, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
-	coord_event 40, 25, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
-	coord_event 40, 26, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
+	coord_event 25, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38
+	coord_event 26, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38
+	coord_event 32, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38
+	coord_event 33, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38
+	coord_event 42, 21, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
+	coord_event 41, 22, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
+	coord_event 41, 23, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
+	coord_event 41, 24, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
+	coord_event 40, 25, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
+	coord_event 40, 26, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
 
 MossdeepCity_MapBGEvents: @ 85272A0
-	bg_event 25, 16, 0, 0, 0, MossdeepCity_EventScript_1E4B26
-	bg_event 34, 9, 0, 0, 0, MossdeepCity_EventScript_1E4B1D
-	bg_event 29, 16, 0, 1, 0, MossdeepCity_EventScript_271E73
-	bg_event 38, 18, 0, 1, 0, MossdeepCity_EventScript_271E6A
-	bg_event 66, 16, 0, 0, 0, MossdeepCity_EventScript_1E4B2F
-	bg_event 30, 16, 0, 1, 0, MossdeepCity_EventScript_271E73
-	bg_event 39, 18, 0, 1, 0, MossdeepCity_EventScript_271E6A
-	bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_1E4B14
+	bg_event 25, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B26
+	bg_event 34, 9, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B1D
+	bg_event 29, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73
+	bg_event 38, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A
+	bg_event 66, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B2F
+	bg_event 30, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73
+	bg_event 39, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A
+	bg_event 57, 21, 7, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B14
 
 MossdeepCity_MapEvents:: @ 8527300
 	map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents
diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc
index fc5af866a..f5196d035 100644
--- a/data/maps/MossdeepCity/header.inc
+++ b/data/maps/MossdeepCity/header.inc
@@ -5,11 +5,11 @@ MossdeepCity: @ 8482560
 	.4byte MossdeepCity_MapConnections
 	.2byte MUS_GOTOWN
 	.2byte 7
-	.byte 13
+	.byte MAPSEC_MOSSDEEP_CITY
 	.byte 0
-	.byte 2
-	.byte 2
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_CITY
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL