summaryrefslogtreecommitdiff
path: root/data/maps/Route134
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route134')
-rw-r--r--data/maps/Route134/connections.inc8
-rw-r--r--data/maps/Route134/events.inc16
-rw-r--r--data/maps/Route134/header.inc15
-rw-r--r--data/maps/Route134/map.json175
-rw-r--r--data/maps/Route134/scripts.inc2
5 files changed, 176 insertions, 40 deletions
diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc
deleted file mode 100644
index 861c82b4d..000000000
--- a/data/maps/Route134/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route134_MapConnectionsList: @ 8486D04
- connection left, 0, MAP_SLATEPORT_CITY
- connection right, 0, MAP_ROUTE133
-
-Route134_MapConnections: @ 8486D1C
- .4byte 0x2
- .4byte Route134_MapConnectionsList
-
diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc
deleted file mode 100644
index 8caf4da1e..000000000
--- a/data/maps/Route134/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route134_EventObjects: @ 852CD98
- object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1F7653, 0
- object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1F766A, 0
- object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0
- object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 24, 23, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 1, 6, Route134_EventScript_1F7681, 0
- object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0
- object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 43, 23, 1, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0
- object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0
- object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0
- object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0
- object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_ITEM_ROUTE_134_CARBOS
- object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_ITEM_ROUTE_134_STAR_PIECE
-
-Route134_MapEvents:: @ 852CEA0
- map_events Route134_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc
deleted file mode 100644
index 8204e2815..000000000
--- a/data/maps/Route134/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route134: @ 8482A14
- .4byte Route134_Layout
- .4byte Route134_MapEvents
- .4byte Route134_MapScripts
- .4byte Route134_MapConnections
- .2byte MUS_GRANROAD
- .2byte 50
- .byte MAPSEC_ROUTE_134
- .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/Route134/map.json b/data/maps/Route134/map.json
new file mode 100644
index 000000000..8b3a9518e
--- /dev/null
+++ b/data/maps/Route134/map.json
@@ -0,0 +1,175 @@
+{
+ "id": "MAP_ROUTE134",
+ "name": "Route134",
+ "layout": "LAYOUT_ROUTE134",
+ "music": "MUS_GRANROAD",
+ "region_map_section": "MAPSEC_ROUTE_134",
+ "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": "left",
+ "offset": 0,
+ "map": "MAP_SLATEPORT_CITY"
+ },
+ {
+ "direction": "right",
+ "offset": 0,
+ "map": "MAP_ROUTE133"
+ }
+ ],
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 49,
+ "y": 9,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT",
+ "movement_range_x": 3,
+ "movement_range_y": 5,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "2",
+ "script": "Route134_EventScript_1F7653",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 58,
+ "y": 7,
+ "elevation": 1,
+ "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": "Route134_EventScript_1F766A",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+ "x": 41,
+ "y": 23,
+ "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": "2",
+ "script": "Route134_EventScript_1F7698",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+ "x": 24,
+ "y": 23,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+ "movement_range_x": 0,
+ "movement_range_y": 3,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "6",
+ "script": "Route134_EventScript_1F7681",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+ "x": 49,
+ "y": 16,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT",
+ "movement_range_x": 6,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "5",
+ "script": "Route134_EventScript_1F76AF",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+ "x": 43,
+ "y": 23,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "2",
+ "script": "Route134_EventScript_1F76F4",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+ "x": 24,
+ "y": 30,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN",
+ "movement_range_x": 0,
+ "movement_range_y": 3,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "6",
+ "script": "Route134_EventScript_1F770B",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+ "x": 50,
+ "y": 16,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+ "movement_range_x": 6,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "5",
+ "script": "Route134_EventScript_1F76DD",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+ "x": 63,
+ "y": 14,
+ "elevation": 3,
+ "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": "3",
+ "script": "Route134_EventScript_1F76C6",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 50,
+ "y": 17,
+ "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": "Route134_EventScript_29109A",
+ "flag": "FLAG_ITEM_ROUTE_134_CARBOS"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 22,
+ "y": 27,
+ "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": "Route134_EventScript_2910A7",
+ "flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE"
+ }
+ ],
+ "warp_events": [],
+ "coord_events": [],
+ "bg_events": []
+} \ No newline at end of file
diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc
index f6f4feee3..a941e19b5 100644
--- a/data/maps/Route134/scripts.inc
+++ b/data/maps/Route134/scripts.inc
@@ -1,5 +1,5 @@
Route134_MapScripts:: @ 81F7644
- map_script 5, Route134_MapScript1_1F764A
+ map_script MAP_SCRIPT_ON_RESUME, Route134_MapScript1_1F764A
.byte 0
Route134_MapScript1_1F764A: @ 81F764A
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 16:59:57 +0000