Merge pull request #2 from pret/master

sync with source repo

2 files changed, 80 insertions, 80 deletions

diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc
index 0fc1b015b..3f17c6c3d 100644
--- a/data/maps/Route123/events.inc
+++ b/data/maps/Route123/events.inc
@@ -1,87 +1,87 @@
 Route123_EventObjects: @ 852BDBC
-	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, 12, 0, 0, 0, 58, BerryTreeScript, 0
-	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, 12, 0, 0, 0, 59, BerryTreeScript, 0
-	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, 12, 0, 0, 0, 60, BerryTreeScript, 0
-	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, 12, 0, 0, 0, 61, BerryTreeScript, 0
-	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, 12, 0, 0, 0, 62, BerryTreeScript, 0
-	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, 12, 0, 0, 0, 63, BerryTreeScript, 0
-	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, 12, 0, 0, 0, 64, BerryTreeScript, 0
-	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0
-	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0
-	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 0, 65, BerryTreeScript, 0
-	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, 12, 0, 0, 0, 72, BerryTreeScript, 0
-	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, 12, 0, 0, 0, 73, BerryTreeScript, 0
-	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 74, BerryTreeScript, 0
-	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, 12, 0, 0, 0, 79, BerryTreeScript, 0
-	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, 12, 0, 0, 0, 14, BerryTreeScript, 0
-	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 0, 15, BerryTreeScript, 0
-	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 30, BerryTreeScript, 0
-	object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 17
-	object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 18
-	object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 19
-	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032
-	object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_1F6151, 0
-	object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, 12, 0, 0, 0, 87, BerryTreeScript, 0
-	object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, 12, 0, 0, 0, 88, BerryTreeScript, 0
-	object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, 12, 0, 0, 0, 89, BerryTreeScript, 0
-	object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0
-	object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0
-	object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0
-	object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, 9, 0, 0, 1, 7, Route123_EventScript_1F620A, 0
-	object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F626C, 0
-	object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, 8, 0, 0, 1, 4, Route123_EventScript_1F6304, 0
-	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FBD, 1104
-	object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FCA, 1109
-	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 138, 14, 3, 57, 1, 1, 1, 1, Route123_EventScript_1F6377, 0
-	object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 138, 16, 3, 7, 1, 1, 1, 1, Route123_EventScript_1F6360, 0
-	object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, 7, 1, 1, 1, 4, Route123_EventScript_1F6349, 0
-	object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 66, 16, 3, 8, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0
-	object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 66, 19, 3, 7, 1, 1, 1, 2, Route123_EventScript_1F6332, 0
-	object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 49, 19, 3, 7, 1, 1, 1, 2, Route123_EventScript_1F631B, 0
-	object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FD7, 1152
-	object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 16, 3, 7, 1, 1, 1, 3, Route123_EventScript_1F638E, 0
-	object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, 26, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0
-	object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FE4, 1153
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 58, BerryTreeScript, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 59, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 60, BerryTreeScript, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 61, BerryTreeScript, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 62, BerryTreeScript, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 63, BerryTreeScript, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 64, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 65, BerryTreeScript, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 72, BerryTreeScript, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 73, BerryTreeScript, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 74, BerryTreeScript, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 79, BerryTreeScript, 0
+	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 14, BerryTreeScript, 0
+	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 15, BerryTreeScript, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 30, BerryTreeScript, 0
+	object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 17
+	object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 18
+	object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 19
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032
+	object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, Route123_EventScript_1F6151, 0
+	object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 87, BerryTreeScript, 0
+	object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 88, BerryTreeScript, 0
+	object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 89, BerryTreeScript, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 9, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0
+	object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0
+	object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0
+	object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route123_EventScript_1F620A, 0
+	object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F626C, 0
+	object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route123_EventScript_1F6304, 0
+	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FBD, 1104
+	object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FCA, 1109
+	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 138, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 1, Route123_EventScript_1F6377, 0
+	object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 138, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route123_EventScript_1F6360, 0
+	object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route123_EventScript_1F6349, 0
+	object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 66, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0
+	object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 66, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F6332, 0
+	object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 49, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F631B, 0
+	object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FD7, 1152
+	object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route123_EventScript_1F638E, 0
+	object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0
+	object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FE4, 1153
 
 Route123_MapWarps: @ 852C1C4
 	warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE
 
 Route123_MapCoordEvents: @ 852C1CC
-	coord_event 90, 16, 3, 0, 21, 0, 0, 0x0
-	coord_event 92, 9, 3, 0, 21, 0, 0, 0x0
-	coord_event 93, 12, 3, 0, 21, 0, 0, 0x0
-	coord_event 92, 13, 3, 0, 21, 0, 0, 0x0
-	coord_event 91, 14, 3, 0, 21, 0, 0, 0x0
-	coord_event 19, 13, 3, 0, 21, 0, 0, 0x0
-	coord_event 19, 12, 3, 0, 21, 0, 0, 0x0
-	coord_event 34, 13, 3, 0, 21, 0, 0, 0x0
-	coord_event 19, 14, 3, 0, 21, 0, 0, 0x0
-	coord_event 19, 15, 3, 0, 21, 0, 0, 0x0
-	coord_event 19, 16, 3, 0, 21, 0, 0, 0x0
-	coord_event 108, 14, 3, 0, 2, 0, 0, 0x0
-	coord_event 109, 15, 3, 0, 2, 0, 0, 0x0
-	coord_event 110, 16, 3, 0, 2, 0, 0, 0x0
-	coord_event 111, 17, 3, 0, 2, 0, 0, 0x0
-	coord_event 112, 18, 3, 0, 2, 0, 0, 0x0
-	coord_event 9, 12, 3, 0, 2, 0, 0, 0x0
-	coord_event 9, 13, 3, 0, 2, 0, 0, 0x0
-	coord_event 9, 14, 3, 0, 2, 0, 0, 0x0
-	coord_event 9, 15, 3, 0, 2, 0, 0, 0x0
-	coord_event 9, 16, 3, 0, 2, 0, 0, 0x0
-	coord_event 94, 10, 3, 0, 21, 0, 0, 0x0
+	coord_weather_event 90, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 92, 9, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 93, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 92, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 91, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 19, 15, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 19, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 108, 14, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 109, 15, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 110, 16, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 111, 17, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 112, 18, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 9, 12, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 9, 13, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 9, 14, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 9, 15, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 9, 16, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
 
 Route123_MapBGEvents: @ 852C32C
-	bg_event 117, 10, 0, 0, 0, Route123_EventScript_1F61B3
-	bg_event 47, 3, 0, 8, 0, 82, 0, 0
-	bg_event 49, 3, 0, 8, 0, 92, 0, 0
-	bg_event 10, 12, 3, 0, 0, Route123_EventScript_1F61AA
-	bg_event 75, 1, 3, 7, 0, ITEM_SUPER_REPEL, 7, 0
-	bg_event 20, 7, 3, 0, 0, Route123_EventScript_1F61BC
-	bg_event 57, 5, 0, 8, 0, ITEM_SUPER_REPEL, 0, 0
-	bg_event 12, 1, 3, 7, 0, ITEM_REVIVE, 41, 0
-	bg_event 91, 15, 3, 7, 0, ITEM_HYPER_POTION, 74, 0
-	bg_event 139, 15, 3, 7, 0, ITEM_PP_UP, 99, 0
-	bg_event 138, 18, 3, 7, 0, ITEM_RARE_CANDY, 110, 0
+	bg_event 117, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61B3
+	bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2
+	bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2
+	bg_event 10, 12, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61AA
+	bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, 7
+	bg_event 20, 7, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61BC
+	bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3
+	bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, 41
+	bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, 74
+	bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, 99
+	bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, 110
 
 Route123_MapEvents:: @ 852C3B0
 	map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents
diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc
index 7d7a4590f..9eba6be87 100644
--- a/data/maps/Route123/header.inc
+++ b/data/maps/Route123/header.inc
@@ -5,11 +5,11 @@ Route123: @ 84828E0
 	.4byte Route123_MapConnections
 	.2byte MUS_DOORO_X4
 	.2byte 39
-	.byte 38
+	.byte MAPSEC_ROUTE_123
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL