diff options
Diffstat (limited to 'data/maps/Route114')
| -rw-r--r-- | data/maps/Route114/connections.inc | 8 | ||||
| -rw-r--r-- | data/maps/Route114/events.inc | 53 | ||||
| -rw-r--r-- | data/maps/Route114/header.inc | 15 | ||||
| -rw-r--r-- | data/maps/Route114/map.json | 509 | ||||
| -rw-r--r-- | data/maps/Route114/scripts.inc | 32 |
5 files changed, 525 insertions, 92 deletions
diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc deleted file mode 100644 index 760c2ddc0..000000000 --- a/data/maps/Route114/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route114_MapConnectionsList: @ 84869F4 - connection left, 40, MAP_ROUTE115 - connection right, 0, MAP_FALLARBOR_TOWN - -Route114_MapConnections: @ 8486A0C - .4byte 0x2 - .4byte Route114_MapConnectionsList - diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc deleted file mode 100644 index 55ea12195..000000000 --- a/data/maps/Route114/events.inc +++ /dev/null @@ -1,53 +0,0 @@ -Route114_EventObjects: @ 8529E68 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 77, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 78, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route114_EventScript_1F2640, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route114_EventScript_1F2657, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route114_EventScript_1F266E, 0 - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route114_EventScript_1F2685, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route114_EventScript_1F269C, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 68, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E03, FLAG_ITEM_ROUTE_114_RARE_CANDY - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E10, FLAG_ITEM_ROUTE_114_PROTEIN - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_11 - object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0 - object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F2612, 0 - object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 27, 42, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route114_EventScript_1F2582, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route114_EventScript_1F2777, 0 - object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route114_EventScript_1F2760, 0 - object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 30, 58, 5, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0 - object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_12 - object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_13 - object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_14 - object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_15 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F27A9, 0 - object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F278E, 0 - object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 28, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route114_EventScript_1F27DB, 0 - object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 26, 72, 5, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, Route114_EventScript_1F27C4, 0 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_290E1D, FLAG_ITEM_ROUTE_114_ENERGY_POWDER - object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route114_EventScript_1F27F2, 0 - -Route114_MapWarps: @ 852A0F0 - warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R - warp_def 29, 5, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE - warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE - warp_def 6, 46, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 7, 4, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route114_MapBGEvents: @ 852A118 - bg_event 7, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2625 - bg_event 31, 7, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F262E - bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1 - bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2_1 - bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3_1 - bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4_1 - bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2 - bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2 - bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2637 - bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS - bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 - bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE - -Route114_MapEvents:: @ 852A1A8 - map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents - diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc deleted file mode 100644 index 318efdbaf..000000000 --- a/data/maps/Route114/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114: @ 84827E4 - .4byte Route114_Layout - .4byte Route114_MapEvents - .4byte Route114_MapScripts - .4byte Route114_MapConnections - .2byte MUS_DOORO_X1 - .2byte 30 - .byte MAPSEC_ROUTE_114 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .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/Route114/map.json b/data/maps/Route114/map.json new file mode 100644 index 000000000..9d1002910 --- /dev/null +++ b/data/maps/Route114/map.json @@ -0,0 +1,509 @@ +{ + "id": "MAP_ROUTE114", + "name": "Route114", + "layout": "LAYOUT_ROUTE114", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_114", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 40, + "map": "MAP_ROUTE115" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_FALLARBOR_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 43, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "77", + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "78", + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 15, + "y": 65, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", + "script": "Route114_EventScript_1F2640", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 30, + "y": 72, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", + "script": "Route114_EventScript_1F2657", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 22, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", + "script": "Route114_EventScript_1F266E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 19, + "y": 35, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", + "script": "Route114_EventScript_1F2685", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 20, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", + "script": "Route114_EventScript_1F269C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 45, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "68", + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route114_EventScript_290E03", + "flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 11, + "y": 37, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route114_EventScript_290E10", + "flag": "FLAG_ITEM_ROUTE_114_PROTEIN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 12, + "y": 43, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 19, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route114_EventScript_1F25D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 19, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route114_EventScript_1F2612", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 27, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route114_EventScript_1F2582", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 25, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route114_EventScript_1F2777", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 19, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route114_EventScript_1F2760", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 30, + "y": 58, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", + "script": "Route114_EventScript_1F26FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 29, + "y": 53, + "elevation": 5, + "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": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 30, + "y": 54, + "elevation": 5, + "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": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 22, + "y": 69, + "elevation": 7, + "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": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 11, + "y": 64, + "elevation": 5, + "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": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 24, + "y": 44, + "elevation": 3, + "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": "Route114_EventScript_1F27A9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 23, + "y": 44, + "elevation": 3, + "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": "Route114_EventScript_1F278E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 28, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", + "script": "Route114_EventScript_1F27DB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 26, + "y": 72, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", + "script": "Route114_EventScript_1F27C4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 19, + "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": "Route114_EventScript_290E1D", + "flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 28, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", + "script": "Route114_EventScript_1F27F2", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 63, + "elevation": 0, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 27, + "y": 36, + "elevation": 0, + "dest_map": "MAP_ROUTE114_LANETTES_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 46, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 4, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 7, + "y": 64, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_EventScript_1F2625" + }, + { + "type": "sign", + "x": 31, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_EventScript_1F262E" + }, + { + "type": "secret_base", + "x": 9, + "y": 47, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE1_1" + }, + { + "type": "secret_base", + "x": 30, + "y": 51, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE2_1" + }, + { + "type": "secret_base", + "x": 11, + "y": 62, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE3_1" + }, + { + "type": "secret_base", + "x": 19, + "y": 70, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE4_1" + }, + { + "type": "secret_base", + "x": 11, + "y": 27, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE3_2" + }, + { + "type": "secret_base", + "x": 12, + "y": 27, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE4_2" + }, + { + "type": "sign", + "x": 25, + "y": 38, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_EventScript_1F2637" + }, + { + "type": "hidden_item", + "x": 20, + "y": 57, + "elevation": 3, + "item": "ITEM_CARBOS", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS" + }, + { + "type": "secret_base", + "x": 32, + "y": 57, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE4_3" + }, + { + "type": "hidden_item", + "x": 7, + "y": 30, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 8f0c1c6ac..b03a2f228 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -1,33 +1,33 @@ Route114_MapScripts:: @ 81F252F - map_script 3, Route114_MapScript1_1F253F - map_script 1, Route114_MapScript1_1F2561 - map_script 2, Route114_MapScript2_1F2578 + map_script MAP_SCRIPT_ON_TRANSITION, Route114_MapScript1_1F253F + map_script MAP_SCRIPT_ON_LOAD, Route114_MapScript1_1F2561 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_MapScript2_1F2578 .byte 0 Route114_MapScript1_1F253F: @ 81F253F - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route114_EventScript_273D13 - compare VAR_0x4037, 1 - call_if_eq Route114_EventScript_273D1B - compare VAR_0x4037, 2 - call_if_eq Route114_EventScript_273D1B + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH + call_if_eq UnusualWeather_StartGroudonWeather + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH + call_if_eq UnusualWeather_StartGroudonWeather end Route114_MapScript1_1F2561: @ 81F2561 - compare VAR_0x4037, 1 - call_if_eq Route114_EventScript_273913 - compare VAR_0x4037, 2 - call_if_eq Route114_EventScript_273926 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114North + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114South end Route114_MapScript2_1F2578: @ 81F2578 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route114_EventScript_1F2582:: @ 81F2582 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_ROUTE_114_RECEIVED_BERRY, Route114_EventScript_1F25C7 msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT random 5 @@ -35,7 +35,7 @@ Route114_EventScript_1F2582:: @ 81F2582 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route114_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY msgbox Route114_Text_2A7034, MSGBOX_DEFAULT release @@ -53,7 +53,7 @@ Route114_EventScript_1F25D1:: @ 81F25D1 msgbox Route114_Text_1F2809, MSGBOX_DEFAULT giveitem_std ITEM_TM05 compare VAR_RESULT, 0 - goto_if_eq Route114_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM05 msgbox Route114_Text_1F2872, MSGBOX_DEFAULT release |