summaryrefslogtreecommitdiff
path: root/data/maps/Route124
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route124')
-rw-r--r--data/maps/Route124/connections.inc11
-rw-r--r--data/maps/Route124/events.inc23
-rw-r--r--data/maps/Route124/header.inc15
-rw-r--r--data/maps/Route124/map.json220
-rw-r--r--data/maps/Route124/scripts.inc4
5 files changed, 222 insertions, 51 deletions
diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc
deleted file mode 100644
index ed10daab9..000000000
--- a/data/maps/Route124/connections.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route124_MapConnectionsList: @ 8486B4C
- connection down, 0, MAP_ROUTE126
- connection left, 10, MAP_LILYCOVE_CITY
- connection right, 0, MAP_ROUTE125
- connection right, 40, MAP_MOSSDEEP_CITY
- connection dive, 0, MAP_UNDERWATER1
-
-Route124_MapConnections: @ 8486B88
- .4byte 0x5
- .4byte Route124_MapConnectionsList
-
diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc
deleted file mode 100644
index 4b52615fc..000000000
--- a/data/maps/Route124/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-Route124_EventObjects: @ 852C3C4
- object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_1F6585, 0
- object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 5, 3, 1, 7, Route124_EventScript_1F659C, 0
- object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0
- object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 6, 8, 1, 5, Route124_EventScript_1F6615, 0
- object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 2, Route124_EventScript_1F662C, 0
- object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, FLAG_ITEM_ROUTE_124_RED_SHARD
- object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, FLAG_ITEM_ROUTE_124_BLUE_SHARD
- object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, FLAG_ITEM_ROUTE_124_YELLOW_SHARD
- object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F6643, 0
- object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0
- object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0
- object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route124_EventScript_1F6722, 0
-
-Route124_MapWarps: @ 852C4E4
- warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE
-
-Route124_MapBGEvents: @ 852C4EC
- bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_1F657C
-
-Route124_MapEvents:: @ 852C4F8
- map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents
-
diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc
deleted file mode 100644
index c9ae442b7..000000000
--- a/data/maps/Route124/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route124: @ 84828FC
- .4byte Route124_Layout
- .4byte Route124_MapEvents
- .4byte Route124_MapScripts
- .4byte Route124_MapConnections
- .2byte MUS_DOORO_X3
- .2byte 40
- .byte MAPSEC_ROUTE_124
- .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/Route124/map.json b/data/maps/Route124/map.json
new file mode 100644
index 000000000..c1a22a2d0
--- /dev/null
+++ b/data/maps/Route124/map.json
@@ -0,0 +1,220 @@
+{
+ "id": "MAP_ROUTE124",
+ "name": "Route124",
+ "layout": "LAYOUT_ROUTE124",
+ "music": "MUS_DOORO_X3",
+ "region_map_section": "MAPSEC_ROUTE_124",
+ "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": "down",
+ "offset": 0,
+ "map": "MAP_ROUTE126"
+ },
+ {
+ "direction": "left",
+ "offset": 10,
+ "map": "MAP_LILYCOVE_CITY"
+ },
+ {
+ "direction": "right",
+ "offset": 0,
+ "map": "MAP_ROUTE125"
+ },
+ {
+ "direction": "right",
+ "offset": 40,
+ "map": "MAP_MOSSDEEP_CITY"
+ },
+ {
+ "direction": "dive",
+ "offset": 0,
+ "map": "MAP_UNDERWATER1"
+ }
+ ],
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 34,
+ "y": 25,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+ "movement_range_x": 5,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "Route124_EventScript_1F6585",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 61,
+ "y": 74,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT",
+ "movement_range_x": 5,
+ "movement_range_y": 3,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "7",
+ "script": "Route124_EventScript_1F659C",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 49,
+ "y": 45,
+ "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": "Route124_EventScript_1F65B3",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 7,
+ "y": 23,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+ "movement_range_x": 6,
+ "movement_range_y": 8,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "5",
+ "script": "Route124_EventScript_1F6615",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 58,
+ "y": 58,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+ "movement_range_x": 7,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "2",
+ "script": "Route124_EventScript_1F662C",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 28,
+ "y": 12,
+ "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": "Route124_EventScript_290FF1",
+ "flag": "FLAG_ITEM_ROUTE_124_RED_SHARD"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 31,
+ "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": "Route124_EventScript_290FFE",
+ "flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 58,
+ "y": 11,
+ "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": "Route124_EventScript_29100B",
+ "flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 18,
+ "y": 44,
+ "elevation": 1,
+ "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": "Route124_EventScript_1F6643",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING",
+ "x": 17,
+ "y": 44,
+ "elevation": 1,
+ "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": "Route124_EventScript_1F66A7",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 7,
+ "y": 29,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_FACE_UP",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "5",
+ "script": "Route124_EventScript_1F670B",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 69,
+ "y": 74,
+ "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": "Route124_EventScript_1F6722",
+ "flag": "0"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 70,
+ "y": 48,
+ "elevation": 3,
+ "dest_map": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE",
+ "dest_warp_id": 0
+ }
+ ],
+ "coord_events": [],
+ "bg_events": [
+ {
+ "type": "sign",
+ "x": 73,
+ "y": 48,
+ "elevation": 3,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "Route124_EventScript_1F657C"
+ }
+ ]
+} \ No newline at end of file
diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc
index 97aa6f4be..34e315792 100644
--- a/data/maps/Route124/scripts.inc
+++ b/data/maps/Route124/scripts.inc
@@ -1,9 +1,9 @@
Route124_MapScripts:: @ 81F656C
- map_script 3, Route124_MapScript1_1F6572
+ map_script MAP_SCRIPT_ON_TRANSITION, Route124_MapScript1_1F6572
.byte 0
Route124_MapScript1_1F6572: @ 81F6572
- call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_27207A
+ call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
end
Route124_EventScript_1F657C:: @ 81F657C
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 22:43:11 +0000