summaryrefslogtreecommitdiff
path: root/data/maps/Route126
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route126')
-rw-r--r--data/maps/Route126/connections.inc9
-rw-r--r--data/maps/Route126/events.inc14
-rw-r--r--data/maps/Route126/header.inc15
-rw-r--r--data/maps/Route126/map.json154
-rw-r--r--data/maps/Route126/scripts.inc4
5 files changed, 156 insertions, 40 deletions
diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc
deleted file mode 100644
index b1f0f6d81..000000000
--- a/data/maps/Route126/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route126_MapConnectionsList: @ 8486BBC
- connection up, 0, MAP_ROUTE124
- connection right, 0, MAP_ROUTE127
- connection dive, 0, MAP_UNDERWATER2
-
-Route126_MapConnections: @ 8486BE0
- .4byte 0x3
- .4byte Route126_MapConnectionsList
-
diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc
deleted file mode 100644
index 8754a0006..000000000
--- a/data/maps/Route126/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-Route126_EventObjects: @ 852C648
- object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0
- object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0
- object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_1F6904, 0
- object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route126_EventScript_1F691B, 0
- object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_291025, FLAG_ITEM_ROUTE_126_GREEN_SHARD
- object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6960, 0
- object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6977, 0
- object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6949, 0
- object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6932, 0
-
-Route126_MapEvents:: @ 852C720
- map_events Route126_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc
deleted file mode 100644
index 86225727f..000000000
--- a/data/maps/Route126/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route126: @ 8482934
- .4byte Route126_Layout
- .4byte Route126_MapEvents
- .4byte Route126_MapScripts
- .4byte Route126_MapConnections
- .2byte MUS_DOORO_X3
- .2byte 42
- .byte MAPSEC_ROUTE_126
- .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/Route126/map.json b/data/maps/Route126/map.json
new file mode 100644
index 000000000..ea63eb80d
--- /dev/null
+++ b/data/maps/Route126/map.json
@@ -0,0 +1,154 @@
+{
+ "id": "MAP_ROUTE126",
+ "name": "Route126",
+ "layout": "LAYOUT_ROUTE126",
+ "music": "MUS_DOORO_X3",
+ "region_map_section": "MAPSEC_ROUTE_126",
+ "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_ROUTE124"
+ },
+ {
+ "direction": "right",
+ "offset": 0,
+ "map": "MAP_ROUTE127"
+ },
+ {
+ "direction": "dive",
+ "offset": 0,
+ "map": "MAP_UNDERWATER2"
+ }
+ ],
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 51,
+ "y": 65,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN",
+ "movement_range_x": 10,
+ "movement_range_y": 3,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "Route126_EventScript_1F68D6",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 56,
+ "y": 22,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+ "movement_range_x": 9,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "Route126_EventScript_1F68ED",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 63,
+ "y": 43,
+ "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": "Route126_EventScript_1F6904",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 9,
+ "y": 48,
+ "elevation": 1,
+ "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": "Route126_EventScript_1F691B",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 14,
+ "y": 1,
+ "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": "Route126_EventScript_291025",
+ "flag": "FLAG_ITEM_ROUTE_126_GREEN_SHARD"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 15,
+ "y": 66,
+ "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": "Route126_EventScript_1F6960",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 7,
+ "y": 66,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "7",
+ "script": "Route126_EventScript_1F6977",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 64,
+ "y": 5,
+ "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": "Route126_EventScript_1F6949",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 56,
+ "y": 5,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "7",
+ "script": "Route126_EventScript_1F6932",
+ "flag": "0"
+ }
+ ],
+ "warp_events": [],
+ "coord_events": [],
+ "bg_events": []
+} \ No newline at end of file
diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc
index 4fa47e0bb..71bc77b28 100644
--- a/data/maps/Route126/scripts.inc
+++ b/data/maps/Route126/scripts.inc
@@ -1,9 +1,9 @@
Route126_MapScripts:: @ 81F68C6
- map_script 3, Route126_MapScript1_1F68CC
+ map_script MAP_SCRIPT_ON_TRANSITION, Route126_MapScript1_1F68CC
.byte 0
Route126_MapScript1_1F68CC: @ 81F68CC
- call_if_set FLAG_SYS_WEATHER_CTRL, Route126_EventScript_27207A
+ call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
end
Route126_EventScript_1F68D6:: @ 81F68D6
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 05:42:09 +0000