diff options
Diffstat (limited to 'data/maps/Route128')
-rw-r--r-- | data/maps/Route128/connections.inc | 10 | ||||
-rw-r--r-- | data/maps/Route128/events.inc | 20 | ||||
-rw-r--r-- | data/maps/Route128/header.inc | 15 | ||||
-rw-r--r-- | data/maps/Route128/map.json | 197 | ||||
-rw-r--r-- | data/maps/Route128/scripts.inc | 26 |
5 files changed, 210 insertions, 58 deletions
diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc deleted file mode 100644 index 5b2f0665d..000000000 --- a/data/maps/Route128/connections.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route128_MapConnectionsList: @ 8486C20 - connection up, 0, MAP_ROUTE127 - connection down, 0, MAP_ROUTE129 - connection right, -40, MAP_EVER_GRANDE_CITY - connection dive, 0, MAP_UNDERWATER4 - -Route128_MapConnections: @ 8486C50 - .4byte 0x4 - .4byte Route128_MapConnectionsList - diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc deleted file mode 100644 index 792ff5ca3..000000000 --- a/data/maps/Route128/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route128_EventObjects: @ 852C88C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0 - object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_STEVEN - object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_ARCHIE - object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_MAXIE - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0 - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0 - object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 - -Route128_MapBGEvents: @ 852C97C - bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 - bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 - bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 - -Route128_MapEvents:: @ 852C9A0 - map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents - diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc deleted file mode 100644 index 2875033e9..000000000 --- a/data/maps/Route128/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route128: @ 848296C - .4byte Route128_Layout - .4byte Route128_MapEvents - .4byte Route128_MapScripts - .4byte Route128_MapConnections - .2byte MUS_DOORO_X3 - .2byte 44 - .byte MAPSEC_ROUTE_128 - .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/Route128/map.json b/data/maps/Route128/map.json new file mode 100644 index 000000000..58246c247 --- /dev/null +++ b/data/maps/Route128/map.json @@ -0,0 +1,197 @@ +{ + "id": "MAP_ROUTE128", + "name": "Route128", + "layout": "LAYOUT_ROUTE128", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_128", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_OCEAN_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_ROUTE127" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE129" + }, + { + "direction": "right", + "offset": -40, + "map": "MAP_EVER_GRANDE_CITY" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER4" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 35, + "y": 33, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN", + "movement_range_x": 5, + "movement_range_y": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", + "script": "Route128_EventScript_1F6CBE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 78, + "y": 24, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 5, + "movement_range_y": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", + "script": "Route128_EventScript_1F6D20", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 40, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_128_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 37, + "y": 22, + "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": "0x0", + "flag": "FLAG_HIDE_ROUTE_128_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 38, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_128_MAXIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 63, + "y": 28, + "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": "0", + "script": "Route128_EventScript_1F6DB0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 47, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", + "script": "Route128_EventScript_1F6D99", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 24, + "y": 8, + "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": "Route128_EventScript_1F6D82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 101, + "y": 29, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", + "script": "Route128_EventScript_1F6DDE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 101, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", + "script": "Route128_EventScript_1F6DC7", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 49, + "y": 9, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1" + }, + { + "type": "hidden_item", + "x": 57, + "y": 21, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2" + }, + { + "type": "hidden_item", + "x": 31, + "y": 33, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3" + } + ] +}
\ No newline at end of file diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index bb4f8d150..84091ac3a 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -1,14 +1,14 @@ Route128_MapScripts:: @ 81F6B38 - map_script 3, Route128_MapScript1_1F6B43 - map_script 2, Route128_MapScript2_1F6B4D + map_script MAP_SCRIPT_ON_TRANSITION, Route128_MapScript1_1F6B43 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_MapScript2_1F6B4D .byte 0 Route128_MapScript1_1F6B43: @ 81F6B43 - call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end Route128_MapScript2_1F6B4D: @ 81F6B4D - map_script_2 VAR_0x407B, 1, Route128_EventScript_1F6B57 + map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_1F6B57 .2byte 0 Route128_EventScript_1F6B57:: @ 81F6B57 @@ -24,18 +24,18 @@ Route128_EventScript_1F6B57:: @ 81F6B57 closemessage applymovement 5, Route128_Movement_1F6CAD waitmovement 0 - applymovement 4, Route128_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CBB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C96 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement 5, Route128_Movement_1F6CA8 waitmovement 0 msgbox Route128_Text_1F704F, MSGBOX_DEFAULT @@ -53,19 +53,19 @@ Route128_EventScript_1F6B57:: @ 81F6B57 addobject 3 applymovement 3, Route128_Movement_1F6C87 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_1F6C85 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT - applymovement 3, Route128_Movement_2725AA + applymovement 3, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route128_Text_1F721B, MSGBOX_DEFAULT closemessage - applymovement 3, Route128_Movement_2725AA + applymovement 3, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 @@ -73,8 +73,8 @@ Route128_EventScript_1F6B57:: @ 81F6B57 delay 15 removeobject 3 waitfieldeffect 30 - clearflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x407B, 2 + clearflag FLAG_HIDE_MAP_NAME_POPUP + setvar VAR_ROUTE128_STATE, 2 releaseall end |