diff options
Diffstat (limited to 'data/maps/Route104')
| -rw-r--r-- | data/maps/Route104/connections.inc | 9 | ||||
| -rw-r--r-- | data/maps/Route104/events.inc | 64 | ||||
| -rw-r--r-- | data/maps/Route104/header.inc | 15 | ||||
| -rw-r--r-- | data/maps/Route104/map.json | 627 | ||||
| -rw-r--r-- | data/maps/Route104/scripts.inc | 30 |
5 files changed, 642 insertions, 103 deletions
diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc deleted file mode 100644 index ce605c828..000000000 --- a/data/maps/Route104/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route104_MapConnectionsList: @ 848686C - connection up, 0, MAP_RUSTBORO_CITY - connection down, 0, MAP_ROUTE105 - connection right, 50, MAP_PETALBURG_CITY - -Route104_MapConnections: @ 8486890 - .4byte 0x3 - .4byte Route104_MapConnectionsList - diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc deleted file mode 100644 index 53e868559..000000000 --- a/data/maps/Route104/events.inc +++ /dev/null @@ -1,64 +0,0 @@ -Route104_EventObjects: @ 85282E4 - object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED006, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route104_EventScript_1ED045, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 50, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED04E, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route104_EventScript_1ED090, 0 - object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT - object_event 8, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_104_MR_BRINEY - object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 8, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 9, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 10, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 11, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 12, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 13, BerryTreeScript, 0 - object_event 16, EVENT_OBJ_GFX_EXPERT_F, 0, 37, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route104_EventScript_1ECF8C, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 3, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 4, BerryTreeScript, 0 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 75, BerryTreeScript, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 76, BerryTreeScript, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route104_EventScript_290CFF, FLAG_ITEM_ROUTE_104_PP_UP - object_event 22, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_1ECFCD, FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST - object_event 23, EVENT_OBJ_GFX_TWIN, 0, 27, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED597, 0 - object_event 24, EVENT_OBJ_GFX_TWIN, 0, 28, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0 - object_event 25, EVENT_OBJ_GFX_RICH_BOY, 0, 21, 25, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 44, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0 - object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D0C, FLAG_ITEM_ROUTE_104_POKE_BALL - object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 5, 6, 1, 2, Route104_EventScript_1ED376, 0 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D19, FLAG_ITEM_ROUTE_104_X_ACCURACY - object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_2906BB, FLAG_TEMP_11 - object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D26, FLAG_ITEM_ROUTE_104_POTION - object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED057, 0 - object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0 - object_event 34, EVENT_OBJ_GFX_VAR_0, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, FLAG_HIDE_ROUTE_104_RIVAL - -Route104_MapWarps: @ 8528614 - warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE - warp_def 5, 18, 0, 0, MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP - warp_def 10, 30, 3, 0, MAP_PETALBURG_WOODS - warp_def 11, 30, 3, 1, MAP_PETALBURG_WOODS - warp_def 10, 38, 3, 2, MAP_PETALBURG_WOODS - warp_def 11, 38, 3, 3, MAP_PETALBURG_WOODS - warp_def 32, 42, 3, 4, MAP_PETALBURG_WOODS - warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS - -Route104_MapCoordEvents: @ 8528654 - coord_event 17, 51, 3, VAR_0x4063, 1, Route104_EventScript_1ECCB3 - -Route104_MapBGEvents: @ 8528664 - bg_event 20, 50, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED018 - bg_event 27, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED021 - bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED02A - bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED033 - bg_event 17, 23, 3, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED03C - bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION - bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL - bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_POTION - bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE - bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE - -Route104_MapEvents:: @ 85286DC - map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents - diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc deleted file mode 100644 index 101e690d5..000000000 --- a/data/maps/Route104/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104: @ 84826CC - .4byte Route104_Layout - .4byte Route104_MapEvents - .4byte Route104_MapScripts - .4byte Route104_MapConnections - .2byte MUS_NEXTROAD - .2byte 20 - .byte MAPSEC_ROUTE_104 - .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/Route104/map.json b/data/maps/Route104/map.json new file mode 100644 index 000000000..e14a73c29 --- /dev/null +++ b/data/maps/Route104/map.json @@ -0,0 +1,627 @@ +{ + "id": "MAP_ROUTE104", + "name": "Route104", + "layout": "LAYOUT_ROUTE104", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_104", + "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": "up", + "offset": 0, + "map": "MAP_RUSTBORO_CITY" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE105" + }, + { + "direction": "right", + "offset": 50, + "map": "MAP_PETALBURG_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 15, + "y": 60, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route104_EventScript_1ED00F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 25, + "y": 49, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route104_EventScript_1ED006", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 31, + "y": 24, + "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": "7", + "script": "Route104_EventScript_1ED38D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 27, + "y": 63, + "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": "Route104_EventScript_1ED045", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 30, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route104_EventScript_1ED04E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 28, + "y": 74, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route104_EventScript_1ED090", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "x": 12, + "y": 54, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 51, + "elevation": 4, + "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": "0x0", + "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 29, + "y": 8, + "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": "Route104_EventScript_1ED35F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 34, + "y": 6, + "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": "8", + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 35, + "y": 6, + "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": "9", + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 36, + "y": 6, + "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": "10", + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 22, + "y": 41, + "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": "11", + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 23, + "y": 41, + "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": "12", + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 24, + "y": 41, + "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": "13", + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 37, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route104_EventScript_1ECF8C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 22, + "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": "3", + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 23, + "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": "4", + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 24, + "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": "75", + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 25, + "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": "76", + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 39, + "y": 15, + "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": "Route104_EventScript_290CFF", + "flag": "FLAG_ITEM_ROUTE_104_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 8, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "Route104_EventScript_1ECFCD", + "flag": "FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 27, + "y": 15, + "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": "1", + "script": "Route104_EventScript_1ED597", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 28, + "y": 15, + "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": "1", + "script": "Route104_EventScript_1ED5B6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 21, + "y": 25, + "elevation": 3, + "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": "Route104_EventScript_1ED43B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 11, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", + "script": "Route104_EventScript_1ED4E9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "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": "Route104_EventScript_290D0C", + "flag": "FLAG_ITEM_ROUTE_104_POKE_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 18, + "y": 67, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 5, + "movement_range_y": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", + "script": "Route104_EventScript_1ED376", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 37, + "y": 22, + "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": "Route104_EventScript_290D19", + "flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 35, + "y": 22, + "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": "Route104_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 8, + "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": "Route104_EventScript_290D26", + "flag": "FLAG_ITEM_ROUTE_104_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 5, + "y": 26, + "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": "Route104_EventScript_1ED057", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 15, + "y": 59, + "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": "Route104_EventScript_1ED5D5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 17, + "y": 50, + "elevation": 0, + "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": "Route104_EventScript_1ECC9E", + "flag": "FLAG_HIDE_ROUTE_104_RIVAL" + } + ], + "warp_events": [ + { + "x": 17, + "y": 50, + "elevation": 0, + "dest_map": "MAP_ROUTE104_MR_BRINEYS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 18, + "elevation": 0, + "dest_map": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 30, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 30, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 38, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 38, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 3 + }, + { + "x": 32, + "y": 42, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 4 + }, + { + "x": 33, + "y": 42, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 5 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 51, + "elevation": 3, + "var": "VAR_0x4063", + "var_value": "1", + "script": "Route104_EventScript_1ECCB3" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 20, + "y": 50, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED018" + }, + { + "type": "sign", + "x": 27, + "y": 66, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED021" + }, + { + "type": "sign", + "x": 23, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED02A" + }, + { + "type": "sign", + "x": 7, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED033" + }, + { + "type": "sign", + "x": 17, + "y": 23, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED03C" + }, + { + "type": "hidden_item", + "x": 7, + "y": 6, + "elevation": 3, + "item": "ITEM_SUPER_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION" + }, + { + "type": "hidden_item", + "x": 3, + "y": 9, + "elevation": 3, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL" + }, + { + "type": "hidden_item", + "x": 14, + "y": 55, + "elevation": 3, + "item": "ITEM_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_POTION" + }, + { + "type": "hidden_item", + "x": 16, + "y": 72, + "elevation": 3, + "item": "ITEM_ANTIDOTE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE" + }, + { + "type": "hidden_item", + "x": 16, + "y": 64, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index e904f69b7..1daa9e52c 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -1,10 +1,10 @@ Route104_MapScripts:: @ 81ECC32 - map_script 2, Route104_MapScript2_1ECC3D - map_script 3, Route104_MapScript1_1ECC4E + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_MapScript2_1ECC3D + map_script MAP_SCRIPT_ON_TRANSITION, Route104_MapScript1_1ECC4E .byte 0 Route104_MapScript2_1ECC3D: @ 81ECC3D - map_script_2 VAR_0x408E, 1, Route104_EventScript_1ECC47 + map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_1ECC47 .2byte 0 Route104_EventScript_1ECC47:: @ 81ECC47 @@ -13,7 +13,7 @@ Route104_EventScript_1ECC47:: @ 81ECC47 end Route104_MapScript1_1ECC4E: @ 81ECC4E - call Route104_EventScript_271ED7 + call Common_EventScript_SetupRivalGender call Route104_EventScript_1ECC78 call Route104_EventScript_1ECC5E end @@ -29,7 +29,7 @@ Route104_EventScript_1ECC74:: @ 81ECC74 return Route104_EventScript_1ECC78:: @ 81ECC78 - compare VAR_0x408E, 1 + compare VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1 goto_if_ge Route104_EventScript_1ECC9D goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_1ECC9D goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECC9D @@ -42,16 +42,16 @@ Route104_EventScript_1ECC9D:: @ 81ECC9D Route104_EventScript_1ECC9E:: @ 81ECC9E lockall setvar VAR_0x8008, 1 - applymovement 34, Route104_Movement_27259E + applymovement 34, Common_Movement_FacePlayer waitmovement 0 goto Route104_EventScript_1ECD33 Route104_EventScript_1ECCB3:: @ 81ECCB3 lockall setflag FLAG_HIDE_RUSBORO_CITY_RIVAL - setvar VAR_0x405A, 8 + setvar VAR_RUSTBORO_STATE, 8 setvar VAR_0x4063, 2 - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 10 addobject 34 @@ -64,9 +64,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 setvar VAR_0x8008, 0 call Route104_EventScript_1E0DD1 playse SE_PIN - applymovement 34, Route104_Movement_272598 + applymovement 34, Common_Movement_ExclamationMark waitmovement 0 - applymovement 34, Route104_Movement_27259A + applymovement 34, Common_Movement_Delay48 waitmovement 0 goto Route104_EventScript_1ECD33 @@ -270,7 +270,7 @@ Route104_EventScript_1ECF8C:: @ 81ECF8C msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT giveitem_std ITEM_CHESTO_BERRY compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104 msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT release @@ -288,7 +288,7 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT giveitem_std ITEM_WHITE_HERB compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WHITE_HERB release end @@ -341,7 +341,7 @@ Route104_EventScript_1ED057:: @ 81ED057 msgbox Route104_Text_1ED838, MSGBOX_DEFAULT giveitem_std ITEM_TM09 compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM09 release end @@ -413,11 +413,11 @@ Route104_EventScript_1ED139:: @ 81ED139 call Route104_EventScript_2720A8 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT hideobjectat 7, MAP_ROUTE104 - copyvar VAR_0x4096, VAR_0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 - setvar VAR_0x408E, 0 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1B4 goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1BE end |