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

2 files changed, 81 insertions, 81 deletions

diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc
index a19a70f33..97ae62fe6 100644
--- a/data/maps/Route120/events.inc
+++ b/data/maps/Route120/events.inc
@@ -1,89 +1,89 @@
 Route120_EventObjects: @ 852B3F8
-	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, 12, 0, 0, 0, 46, BerryTreeScript, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, 12, 0, 0, 0, 45, BerryTreeScript, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, 12, 0, 0, 0, 44, BerryTreeScript, 0
-	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, 12, 0, 0, 0, 43, BerryTreeScript, 0
-	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, 12, 0, 0, 0, 37, BerryTreeScript, 0
-	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, 12, 0, 0, 0, 38, BerryTreeScript, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, 12, 0, 0, 0, 39, BerryTreeScript, 0
-	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, 12, 0, 0, 0, 40, BerryTreeScript, 0
-	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, 12, 0, 0, 0, 41, BerryTreeScript, 0
-	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, 12, 0, 0, 0, 42, BerryTreeScript, 0
-	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0
-	object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0
-	object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_1F5850, 0
-	object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_1F5867, 0
-	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_1F587E, 0
-	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F48, 1030
-	object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE76, 798
-	object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE56, 798
-	object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF16, 902
-	object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF36, 902
-	object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, 1, 0, 0, 0, 0, Route120_EventScript_2906BB, 17
-	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F55, 1031
-	object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_1F5527, 0
-	object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 31, 37, 3, 15, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0
-	object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0
-	object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_1F590E, 0
-	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, 9, 0, 0, 1, 3, Route120_EventScript_1F5925, 0
-	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, 1, 1, 1, 0, 0, Route120_EventScript_290F6F, 1108
-	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, 1, 1, 1, 0, 0, Route120_EventScript_290F62, 1107
-	object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, 76, 1, 1, 0, 0, Route120_EventScript_1F57BC, 970
-	object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, 8, 1, 1, 0, 0, Route120_EventScript_1F5641, 972
-	object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, 1, 1, 1, 0, 0, Route120_EventScript_2906BB, 20
-	object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, 1, 1, 1, 0, 0, Route120_EventScript_2906BB, 18
-	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, 58, 1, 1, 1, 3, Route120_EventScript_1F593C, 0
-	object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, 57, 1, 1, 1, 3, Route120_EventScript_1F5953, 0
-	object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, 8, 1, 1, 0, 0, 0x0, 981
-	object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, 76, 1, 1, 0, 0, Route120_EventScript_2722DB, 982
-	object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, 76, 1, 1, 0, 0, Route120_EventScript_2722E8, 985
-	object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, 76, 1, 1, 0, 0, Route120_EventScript_2722F5, 986
-	object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, 76, 1, 1, 0, 0, Route120_EventScript_27230F, 988
-	object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, 76, 1, 1, 0, 0, Route120_EventScript_272302, 987
-	object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, 7, 1, 1, 1, 3, Route120_EventScript_1F5981, 0
-	object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 14, 34, 3, 10, 1, 1, 1, 3, Route120_EventScript_1F596A, 0
-	object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, 1, 1, 1, 0, 0, Route120_EventScript_290F7C, 1148
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 46, BerryTreeScript, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 45, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 44, BerryTreeScript, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 43, BerryTreeScript, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 37, BerryTreeScript, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 38, BerryTreeScript, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 39, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 40, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 41, BerryTreeScript, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 42, BerryTreeScript, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0
+	object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0
+	object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route120_EventScript_1F5850, 0
+	object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route120_EventScript_1F5867, 0
+	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route120_EventScript_1F587E, 0
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F48, 1030
+	object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE76, 798
+	object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE56, 798
+	object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF16, 902
+	object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF36, 902
+	object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_2906BB, 17
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F55, 1031
+	object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route120_EventScript_1F5527, 0
+	object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 31, 37, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0
+	object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 4, Route120_EventScript_1F590E, 0
+	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route120_EventScript_1F5925, 0
+	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F6F, 1108
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, 1107
+	object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, 970
+	object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, 972
+	object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 20
+	object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 18
+	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F593C, 0
+	object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F5953, 0
+	object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 981
+	object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722DB, 982
+	object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722E8, 985
+	object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722F5, 986
+	object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_27230F, 988
+	object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_272302, 987
+	object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route120_EventScript_1F5981, 0
+	object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 14, 34, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route120_EventScript_1F596A, 0
+	object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, 1148
 
 Route120_MapWarps: @ 852B818
 	warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB
 	warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB
 
 Route120_MapCoordEvents: @ 852B828
-	coord_event 7, 15, 0, 0, 3, 0, 0, 0x0
-	coord_event 7, 16, 0, 0, 3, 0, 0, 0x0
-	coord_event 22, 61, 3, 0, 3, 0, 0, 0x0
-	coord_event 12, 64, 3, 0, 3, 0, 0, 0x0
-	coord_event 35, 63, 3, 0, 1, 0, 0, 0x0
-	coord_event 36, 63, 3, 0, 1, 0, 0, 0x0
-	coord_event 37, 63, 3, 0, 1, 0, 0, 0x0
-	coord_event 38, 63, 3, 0, 1, 0, 0, 0x0
-	coord_event 32, 88, 5, 0, 1, 0, 0, 0x0
-	coord_event 28, 15, 0, 0, 2, 0, 0, 0x0
-	coord_event 28, 16, 0, 0, 2, 0, 0, 0x0
-	coord_event 28, 17, 3, 0, 2, 0, 0, 0x0
-	coord_event 32, 89, 5, 0, 1, 0, 0, 0x0
-	coord_event 32, 90, 5, 0, 1, 0, 0, 0x0
-	coord_event 32, 91, 5, 0, 1, 0, 0, 0x0
-	coord_event 10, 75, 3, 0, 1, 0, 0, 0x0
-	coord_event 11, 75, 3, 0, 1, 0, 0, 0x0
-	coord_event 12, 75, 3, 0, 1, 0, 0, 0x0
-	coord_event 13, 75, 3, 0, 1, 0, 0, 0x0
+	coord_weather_event 7, 15, 0, COORD_EVENT_WEATHER_RAIN_LIGHT
+	coord_weather_event 7, 16, 0, COORD_EVENT_WEATHER_RAIN_LIGHT
+	coord_weather_event 22, 61, 3, COORD_EVENT_WEATHER_RAIN_LIGHT
+	coord_weather_event 12, 64, 3, COORD_EVENT_WEATHER_RAIN_LIGHT
+	coord_weather_event 35, 63, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 36, 63, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 37, 63, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 38, 63, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 32, 88, 5, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 28, 15, 0, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 28, 16, 0, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 28, 17, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 32, 89, 5, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 32, 90, 5, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 32, 91, 5, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 10, 75, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 11, 75, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 12, 75, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS
 
 Route120_MapBGEvents: @ 852B958
-	bg_event 27, 3, 3, 0, 0, Route120_EventScript_1F57C5
-	bg_event 38, 88, 3, 0, 0, Route120_EventScript_1F57CE
-	bg_event 28, 62, 0, 8, 0, 101, 0, 0
-	bg_event 30, 62, 0, 8, 0, ITEM_HEART_SCALE, 0, 0
-	bg_event 26, 10, 0, 8, 0, ITEM_LUCKY_PUNCH, 0, 0
-	bg_event 29, 85, 5, 8, 0, 232, 0, 0
-	bg_event 18, 12, 0, 8, 0, ITEM_SUN_STONE, 0, 0
-	bg_event 38, 54, 0, 8, 0, ITEM_SOFT_SAND, 0, 0
-	bg_event 31, 23, 0, 8, 0, ITEM_SPELL_TAG, 0, 0
-	bg_event 9, 1, 3, 7, 0, ITEM_RARE_CANDY, 71, 0
-	bg_event 31, 11, 3, 7, 0, ITEM_REVIVE, 84, 0
-	bg_event 0, 86, 3, 7, 0, ITEM_RARE_CANDY, 69, 0
-	bg_event 24, 42, 3, 7, 0, ITEM_ZINC, 70, 0
-	bg_event 5, 76, 0, 8, 0, ITEM_HARD_STONE, 0, 0
+	bg_event 27, 3, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57C5
+	bg_event 38, 88, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57CE
+	bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1
+	bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4_1
+	bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3_2
+	bg_secret_base_event 29, 85, 5, SECRET_BASE_SHRUB4_2
+	bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2_3
+	bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1_3
+	bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2_3
+	bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, 71
+	bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, 84
+	bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, 69
+	bg_hidden_item_event 24, 42, 3, ITEM_ZINC, 70
+	bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4
 
 Route120_MapEvents:: @ 852BA00
 	map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents
diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc
index 9b8d641d9..a3b062bca 100644
--- a/data/maps/Route120/header.inc
+++ b/data/maps/Route120/header.inc
@@ -5,11 +5,11 @@ Route120: @ 848288C
 	.4byte Route120_MapConnections
 	.2byte MUS_DOORO_X3
 	.2byte 36
-	.byte 35
+	.byte MAPSEC_ROUTE_120
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL