summaryrefslogtreecommitdiff
path: root/data/maps/Route105
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route105')
-rw-r--r--data/maps/Route105/connections.inc9
-rw-r--r--data/maps/Route105/events.inc20
-rw-r--r--data/maps/Route105/header.inc15
-rw-r--r--data/maps/Route105/map.json166
-rw-r--r--data/maps/Route105/scripts.inc26
5 files changed, 179 insertions, 57 deletions
diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc
deleted file mode 100644
index ac03944b7..000000000
--- a/data/maps/Route105/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route105_MapConnectionsList: @ 8486898
- connection up, 0, MAP_ROUTE104
- connection down, 0, MAP_ROUTE106
- connection dive, 0, MAP_UNDERWATER6
-
-Route105_MapConnections: @ 84868BC
- .4byte 0x3
- .4byte Route105_MapConnectionsList
-
diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc
deleted file mode 100644
index e22aa668c..000000000
--- a/data/maps/Route105/events.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route105_EventObjects: @ 85286F0
- object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route105_EventScript_1EE261, 0
- object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_1EE278, 0
- object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0
- object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0
- object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_290D33, FLAG_ITEM_ROUTE_105_IRON
- object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0
- object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0
- object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0
-
-Route105_MapWarps: @ 85287B0
- warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE
-
-Route105_MapBGEvents: @ 85287B8
- bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE
- bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL
-
-Route105_MapEvents:: @ 85287D0
- map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents
-
diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc
deleted file mode 100644
index 5c6b2fc15..000000000
--- a/data/maps/Route105/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route105: @ 84826E8
- .4byte Route105_Layout
- .4byte Route105_MapEvents
- .4byte Route105_MapScripts
- .4byte Route105_MapConnections
- .2byte MUS_NEXTROAD
- .2byte 21
- .byte MAPSEC_ROUTE_105
- .byte 0
- .byte WEATHER_SUNNY
- .byte MAP_TYPE_ROUTE
- .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/Route105/map.json b/data/maps/Route105/map.json
new file mode 100644
index 000000000..b42965229
--- /dev/null
+++ b/data/maps/Route105/map.json
@@ -0,0 +1,166 @@
+{
+ "id": "MAP_ROUTE105",
+ "name": "Route105",
+ "layout": "LAYOUT_ROUTE105",
+ "music": "MUS_NEXTROAD",
+ "region_map_section": "MAPSEC_ROUTE_105",
+ "requires_flash": false,
+ "weather": "WEATHER_SUNNY",
+ "map_type": "MAP_TYPE_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_ROUTE104"
+ },
+ {
+ "direction": "down",
+ "offset": 0,
+ "map": "MAP_ROUTE106"
+ },
+ {
+ "direction": "dive",
+ "offset": 0,
+ "map": "MAP_UNDERWATER6"
+ }
+ ],
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 19,
+ "y": 60,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "6",
+ "script": "Route105_EventScript_1EE261",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 27,
+ "y": 36,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT",
+ "movement_range_x": 7,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "Route105_EventScript_1EE278",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 8,
+ "y": 45,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN",
+ "movement_range_x": 0,
+ "movement_range_y": 7,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "Route105_EventScript_1EE28F",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 19,
+ "y": 9,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+ "movement_range_x": 0,
+ "movement_range_y": 5,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "Route105_EventScript_1EE2A6",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 8,
+ "y": 73,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "Route105_EventScript_290D33",
+ "flag": "FLAG_ITEM_ROUTE_105_IRON"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_HIKER",
+ "x": 17,
+ "y": 48,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+ "movement_range_x": 0,
+ "movement_range_y": 7,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "Route105_EventScript_1EE24A",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+ "x": 4,
+ "y": 54,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+ "movement_range_x": 0,
+ "movement_range_y": 2,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "2",
+ "script": "Route105_EventScript_1EE2BD",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_HIKER",
+ "x": 4,
+ "y": 58,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_UP",
+ "movement_range_x": 0,
+ "movement_range_y": 2,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "4",
+ "script": "Route105_EventScript_1EE2D4",
+ "flag": "0"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 9,
+ "y": 20,
+ "elevation": 0,
+ "dest_map": "MAP_ISLAND_CAVE",
+ "dest_warp_id": 0
+ }
+ ],
+ "coord_events": [],
+ "bg_events": [
+ {
+ "type": "hidden_item",
+ "x": 15,
+ "y": 68,
+ "elevation": 3,
+ "item": "ITEM_HEART_SCALE",
+ "flag": "FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE"
+ },
+ {
+ "type": "hidden_item",
+ "x": 5,
+ "y": 56,
+ "elevation": 3,
+ "item": "ITEM_BIG_PEARL",
+ "flag": "FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL"
+ }
+ ]
+} \ No newline at end of file
diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc
index b4213af5b..2b8ebe305 100644
--- a/data/maps/Route105/scripts.inc
+++ b/data/maps/Route105/scripts.inc
@@ -1,15 +1,15 @@
Route105_MapScripts:: @ 81EE1DB
- map_script 1, Route105_MapScript1_1EE1EB
- map_script 3, Route105_MapScript1_1EE21E
- map_script 2, Route105_MapScript2_1EE240
+ map_script MAP_SCRIPT_ON_LOAD, Route105_MapScript1_1EE1EB
+ map_script MAP_SCRIPT_ON_TRANSITION, Route105_MapScript1_1EE21E
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_MapScript2_1EE240
.byte 0
Route105_MapScript1_1EE1EB: @ 81EE1EB
call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_1EE20B
- compare VAR_0x4037, 9
- call_if_eq Route105_EventScript_2739AB
- compare VAR_0x4037, 10
- call_if_eq Route105_EventScript_273A18
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH
+ call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105North
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH
+ call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105South
end
Route105_EventScript_1EE20B:: @ 81EE20B
@@ -18,16 +18,16 @@ Route105_EventScript_1EE20B:: @ 81EE20B
return
Route105_MapScript1_1EE21E: @ 81EE21E
- compare VAR_0x4039, 1
+ compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route105_EventScript_273D13
- compare VAR_0x4037, 9
- call_if_eq Route105_EventScript_273D17
- compare VAR_0x4037, 10
- call_if_eq Route105_EventScript_273D17
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH
+ call_if_eq UnusualWeather_StartKyogreWeather
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH
+ call_if_eq UnusualWeather_StartKyogreWeather
end
Route105_MapScript2_1EE240: @ 81EE240
- map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+ map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
Route105_EventScript_1EE24A:: @ 81EE24A
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 12:59:37 +0000