From 5c1667b41a7d31df6d405d272833895bf8472cf6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 29 Jan 2019 16:55:25 -0600 Subject: Define layout constants --- data/maps/Route124/connections.inc | 6 +++--- data/maps/Route124/events.inc | 8 ++++---- data/maps/Route124/header.inc | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/Route124') diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc index ed10daab9..959719385 100644 --- a/data/maps/Route124/connections.inc +++ b/data/maps/Route124/connections.inc @@ -1,11 +1,11 @@ -Route124_MapConnectionsList: @ 8486B4C +Route124_MapConnectionsList: connection down, 0, MAP_ROUTE126 connection left, 10, MAP_LILYCOVE_CITY connection right, 0, MAP_ROUTE125 connection right, 40, MAP_MOSSDEEP_CITY connection dive, 0, MAP_UNDERWATER1 -Route124_MapConnections: @ 8486B88 - .4byte 0x5 +Route124_MapConnections: + .4byte 5 .4byte Route124_MapConnectionsList diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc index 4b52615fc..4096396e8 100644 --- a/data/maps/Route124/events.inc +++ b/data/maps/Route124/events.inc @@ -1,4 +1,4 @@ -Route124_EventObjects: @ 852C3C4 +Route124_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 @@ -12,12 +12,12 @@ Route124_EventObjects: @ 852C3C4 object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 -Route124_MapWarps: @ 852C4E4 +Route124_MapWarps: warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE -Route124_MapBGEvents: @ 852C4EC +Route124_MapBGEvents: bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_1F657C -Route124_MapEvents:: @ 852C4F8 +Route124_MapEvents:: map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index c9ae442b7..189d0dc51 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -1,10 +1,10 @@ -Route124: @ 84828FC +Route124: .4byte Route124_Layout .4byte Route124_MapEvents .4byte Route124_MapScripts .4byte Route124_MapConnections .2byte MUS_DOORO_X3 - .2byte 40 + .2byte LAYOUT_ROUTE124 .byte MAPSEC_ROUTE_124 .byte 0 .byte WEATHER_SUNNY -- cgit v1.2.3 From 29d6221935d3e8e01dc11b4023ba977ff433f3c9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 31 Jan 2019 15:51:20 -0600 Subject: Convert map data to JSON --- data/maps/Route124/connections.inc | 11 -- data/maps/Route124/events.inc | 23 ---- data/maps/Route124/header.inc | 15 --- data/maps/Route124/map.json | 220 +++++++++++++++++++++++++++++++++++++ 4 files changed, 220 insertions(+), 49 deletions(-) delete mode 100644 data/maps/Route124/connections.inc delete mode 100644 data/maps/Route124/events.inc delete mode 100644 data/maps/Route124/header.inc create mode 100644 data/maps/Route124/map.json (limited to 'data/maps/Route124') diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc deleted file mode 100644 index 959719385..000000000 --- a/data/maps/Route124/connections.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route124_MapConnectionsList: - connection down, 0, MAP_ROUTE126 - connection left, 10, MAP_LILYCOVE_CITY - connection right, 0, MAP_ROUTE125 - connection right, 40, MAP_MOSSDEEP_CITY - connection dive, 0, MAP_UNDERWATER1 - -Route124_MapConnections: - .4byte 5 - .4byte Route124_MapConnectionsList - diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc deleted file mode 100644 index 4096396e8..000000000 --- a/data/maps/Route124/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -Route124_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 6, 8, 1, 5, Route124_EventScript_1F6615, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 2, Route124_EventScript_1F662C, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, FLAG_ITEM_ROUTE_124_RED_SHARD - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, FLAG_ITEM_ROUTE_124_BLUE_SHARD - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, FLAG_ITEM_ROUTE_124_YELLOW_SHARD - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F6643, 0 - object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0 - object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 - object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 - -Route124_MapWarps: - warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE - -Route124_MapBGEvents: - bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_1F657C - -Route124_MapEvents:: - map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents - diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc deleted file mode 100644 index 189d0dc51..000000000 --- a/data/maps/Route124/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route124: - .4byte Route124_Layout - .4byte Route124_MapEvents - .4byte Route124_MapScripts - .4byte Route124_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE124 - .byte MAPSEC_ROUTE_124 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json new file mode 100644 index 000000000..1f3ef4f6c --- /dev/null +++ b/data/maps/Route124/map.json @@ -0,0 +1,220 @@ +{ + "id": "MAP_ROUTE124", + "name": "Route124", + "layout": "LAYOUT_ROUTE124", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_124", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE126" + }, + { + "direction": "left", + "offset": 10, + "map": "MAP_LILYCOVE_CITY" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE125" + }, + { + "direction": "right", + "offset": 40, + "map": "MAP_MOSSDEEP_CITY" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER1" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 34, + "y": 25, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 5, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route124_EventScript_1F6585", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 61, + "y": 74, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 5, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route124_EventScript_1F659C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 49, + "y": 45, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route124_EventScript_1F65B3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 7, + "y": 23, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 6, + "movement_range_y": 8, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route124_EventScript_1F6615", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 58, + "y": 58, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 7, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route124_EventScript_1F662C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 28, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route124_EventScript_290FF1", + "flag": "FLAG_ITEM_ROUTE_124_RED_SHARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route124_EventScript_290FFE", + "flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 58, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route124_EventScript_29100B", + "flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 18, + "y": 44, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route124_EventScript_1F6643", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "x": 17, + "y": 44, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route124_EventScript_1F66A7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 7, + "y": 29, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route124_EventScript_1F670B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 69, + "y": 74, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route124_EventScript_1F6722", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 70, + "y": 48, + "elevation": 3, + "dest_map": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 73, + "y": 48, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route124_EventScript_1F657C" + } + ] +} \ No newline at end of file -- cgit v1.2.3 From 19b76bffda07d8878c1ff1a9005e1b57c549ffce Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 16 Feb 2019 16:40:31 -0600 Subject: Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields --- data/maps/Route124/map.json | 48 ++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'data/maps/Route124') diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 1f3ef4f6c..7169a0299 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 5, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route124_EventScript_1F6585", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 5, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route124_EventScript_1F659C", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route124_EventScript_1F65B3", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 6, "movement_range_y": 8, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route124_EventScript_1F6615", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 7, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route124_EventScript_1F662C", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route124_EventScript_290FF1", "flag": "FLAG_ITEM_ROUTE_124_RED_SHARD" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route124_EventScript_290FFE", "flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route124_EventScript_29100B", "flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route124_EventScript_1F6643", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route124_EventScript_1F66A7", "flag": "0" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route124_EventScript_1F670B", "flag": "0" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route124_EventScript_1F6722", "flag": "0" } -- cgit v1.2.3 From 4582fd15456e2c84588026cdfbe70d6b6e558a35 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 19:52:11 -0500 Subject: Name a ton of commonly used event scripts --- data/maps/Route124/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route124') diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 97aa6f4be..9968d3a04 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -3,7 +3,7 @@ Route124_MapScripts:: @ 81F656C .byte 0 Route124_MapScript1_1F6572: @ 81F6572 - call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end Route124_EventScript_1F657C:: @ 81F657C -- cgit v1.2.3 From 8816aa527d7f3adfa10988ac661b9842bf78e64b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 02:28:32 -0500 Subject: Update map script files --- data/maps/Route124/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route124') diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 9968d3a04..34e315792 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -1,5 +1,5 @@ Route124_MapScripts:: @ 81F656C - map_script 3, Route124_MapScript1_1F6572 + map_script MAP_SCRIPT_ON_TRANSITION, Route124_MapScript1_1F6572 .byte 0 Route124_MapScript1_1F6572: @ 81F6572 -- cgit v1.2.3 From bf45b83c65026a84425e3bc1f99e269653ed8c8b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 27 Feb 2019 23:54:51 -0500 Subject: Finish documenting event vars --- data/maps/Route124/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route124') diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 7169a0299..c1a22a2d0 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_124", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, -- cgit v1.2.3