summaryrefslogtreecommitdiff
path: root/data/maps/Route125
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route125')
-rw-r--r--data/maps/Route125/connections.inc9
-rw-r--r--data/maps/Route125/events.inc24
-rw-r--r--data/maps/Route125/header.inc15
-rw-r--r--data/maps/Route125/map.json204
-rw-r--r--data/maps/Route125/scripts.inc28
5 files changed, 218 insertions, 62 deletions
diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc
deleted file mode 100644
index 2b5f944c9..000000000
--- a/data/maps/Route125/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route125_MapConnectionsList: @ 8486B90
- connection down, 0, MAP_MOSSDEEP_CITY
- connection left, 0, MAP_ROUTE124
- connection dive, 0, MAP_UNDERWATER7
-
-Route125_MapConnections: @ 8486BB4
- .4byte 0x3
- .4byte Route125_MapConnectionsList
-
diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc
deleted file mode 100644
index 256802406..000000000
--- a/data/maps/Route125/events.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-Route125_EventObjects: @ 852C50C
- object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0
- object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0
- object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0
- object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 30, 28, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 9, 9, 1, 3, Route125_EventScript_1F67E9, 0
- object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route125_EventScript_1F6800, 0
- object_event 6, EVENT_OBJ_GFX_LASS, 0, 17, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F6862, 0
- object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F687D, 0
- object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 43, 19, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 2, 1, 1, 3, Route125_EventScript_1F6898, 0
- object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 48, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0
- object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route125_EventScript_291018, FLAG_ITEM_ROUTE_125_BIG_PEARL
-
-Route125_MapWarps: @ 852C5FC
- warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
-
-Route125_MapBGEvents: @ 852C604
- bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1_2
- bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4_2
- bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2_2
- bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2
-
-Route125_MapEvents:: @ 852C634
- map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents
-
diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc
deleted file mode 100644
index 12ea80531..000000000
--- a/data/maps/Route125/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route125: @ 8482918
- .4byte Route125_Layout
- .4byte Route125_MapEvents
- .4byte Route125_MapScripts
- .4byte Route125_MapConnections
- .2byte MUS_DOORO_X3
- .2byte 41
- .byte MAPSEC_ROUTE_125
- .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/Route125/map.json b/data/maps/Route125/map.json
new file mode 100644
index 000000000..0ce520fdd
--- /dev/null
+++ b/data/maps/Route125/map.json
@@ -0,0 +1,204 @@
+{
+ "id": "MAP_ROUTE125",
+ "name": "Route125",
+ "layout": "LAYOUT_ROUTE125",
+ "music": "MUS_DOORO_X3",
+ "region_map_section": "MAPSEC_ROUTE_125",
+ "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_MOSSDEEP_CITY"
+ },
+ {
+ "direction": "left",
+ "offset": 0,
+ "map": "MAP_ROUTE124"
+ },
+ {
+ "direction": "dive",
+ "offset": 0,
+ "map": "MAP_UNDERWATER7"
+ }
+ ],
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 7,
+ "y": 31,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "2",
+ "script": "Route125_EventScript_1F67A4",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 45,
+ "y": 9,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 2,
+ "movement_range_y": 5,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "2",
+ "script": "Route125_EventScript_1F67BB",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 38,
+ "y": 24,
+ "elevation": 1,
+ "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": "3",
+ "script": "Route125_EventScript_1F67D2",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 30,
+ "y": 28,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP",
+ "movement_range_x": 9,
+ "movement_range_y": 9,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "Route125_EventScript_1F67E9",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+ "x": 21,
+ "y": 30,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "2",
+ "script": "Route125_EventScript_1F6800",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_LASS",
+ "x": 17,
+ "y": 19,
+ "elevation": 3,
+ "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": "Route125_EventScript_1F6862",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_LASS",
+ "x": 18,
+ "y": 19,
+ "elevation": 3,
+ "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": "Route125_EventScript_1F687D",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+ "x": 43,
+ "y": 19,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
+ "movement_range_x": 2,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "Route125_EventScript_1F6898",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+ "x": 48,
+ "y": 19,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT",
+ "movement_range_x": 2,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "Route125_EventScript_1F68AF",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 46,
+ "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": "Route125_EventScript_291018",
+ "flag": "FLAG_ITEM_ROUTE_125_BIG_PEARL"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 22,
+ "y": 19,
+ "elevation": 0,
+ "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
+ "dest_warp_id": 0
+ }
+ ],
+ "coord_events": [],
+ "bg_events": [
+ {
+ "type": "secret_base",
+ "x": 53,
+ "y": 10,
+ "elevation": 0,
+ "secret_base_id": "SECRET_BASE_RED_CAVE1_2"
+ },
+ {
+ "type": "secret_base",
+ "x": 55,
+ "y": 11,
+ "elevation": 0,
+ "secret_base_id": "SECRET_BASE_RED_CAVE4_2"
+ },
+ {
+ "type": "secret_base",
+ "x": 7,
+ "y": 25,
+ "elevation": 0,
+ "secret_base_id": "SECRET_BASE_YELLOW_CAVE2_2"
+ },
+ {
+ "type": "secret_base",
+ "x": 24,
+ "y": 32,
+ "elevation": 0,
+ "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_2"
+ }
+ ]
+} \ No newline at end of file
diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc
index e5ad32697..8abcbe787 100644
--- a/data/maps/Route125/scripts.inc
+++ b/data/maps/Route125/scripts.inc
@@ -1,28 +1,28 @@
Route125_MapScripts:: @ 81F6748
- map_script 3, Route125_MapScript1_1F6758
- map_script 1, Route125_MapScript1_1F6783
- map_script 2, Route125_MapScript2_1F679A
+ map_script MAP_SCRIPT_ON_TRANSITION, Route125_MapScript1_1F6758
+ map_script MAP_SCRIPT_ON_LOAD, Route125_MapScript1_1F6783
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_MapScript2_1F679A
.byte 0
Route125_MapScript1_1F6758: @ 81F6758
- call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_27207A
- compare VAR_0x4039, 1
+ call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+ compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route125_EventScript_273D13
- compare VAR_0x4037, 11
- call_if_eq Route125_EventScript_273D17
- compare VAR_0x4037, 12
- call_if_eq Route125_EventScript_273D17
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST
+ call_if_eq UnusualWeather_StartKyogreWeather
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST
+ call_if_eq UnusualWeather_StartKyogreWeather
end
Route125_MapScript1_1F6783: @ 81F6783
- compare VAR_0x4037, 11
- call_if_eq Route125_EventScript_273A85
- compare VAR_0x4037, 12
- call_if_eq Route125_EventScript_273AF2
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST
+ call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125West
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST
+ call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125East
end
Route125_MapScript2_1F679A: @ 81F679A
- map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+ map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
Route125_EventScript_1F67A4:: @ 81F67A4
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-10 01:23:08 +0000