summaryrefslogtreecommitdiff
path: root/data/maps/Route129
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route129')
-rw-r--r--data/maps/Route129/connections.inc9
-rw-r--r--data/maps/Route129/events.inc10
-rw-r--r--data/maps/Route129/header.inc15
-rw-r--r--data/maps/Route129/map.json102
-rw-r--r--data/maps/Route129/scripts.inc30
5 files changed, 117 insertions, 49 deletions
diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc
deleted file mode 100644
index 1293e8235..000000000
--- a/data/maps/Route129/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route129_MapConnectionsList: @ 8486C58
- connection up, 0, MAP_ROUTE128
- connection left, 0, MAP_ROUTE130
- connection dive, 0, MAP_UNDERWATER5
-
-Route129_MapConnections: @ 8486C7C
- .4byte 0x3
- .4byte Route129_MapConnectionsList
-
diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc
deleted file mode 100644
index c127ec5e3..000000000
--- a/data/maps/Route129/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route129_EventObjects: @ 852C9B4
- object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0
- object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 5, 2, 1, 2, Route129_EventScript_1F7303, 0
- object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route129_EventScript_1F7331, 0
- object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, Route129_EventScript_1F731A, 0
- object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route129_EventScript_1F7348, 0
-
-Route129_MapEvents:: @ 852CA2C
- map_events Route129_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc
deleted file mode 100644
index 645cc7d92..000000000
--- a/data/maps/Route129/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route129: @ 8482988
- .4byte Route129_Layout
- .4byte Route129_MapEvents
- .4byte Route129_MapScripts
- .4byte Route129_MapConnections
- .2byte MUS_GRANROAD
- .2byte 45
- .byte MAPSEC_ROUTE_129
- .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/Route129/map.json b/data/maps/Route129/map.json
new file mode 100644
index 000000000..3183f9821
--- /dev/null
+++ b/data/maps/Route129/map.json
@@ -0,0 +1,102 @@
+{
+ "id": "MAP_ROUTE129",
+ "name": "Route129",
+ "layout": "LAYOUT_ROUTE129",
+ "music": "MUS_GRANROAD",
+ "region_map_section": "MAPSEC_ROUTE_129",
+ "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_ROUTE128"
+ },
+ {
+ "direction": "left",
+ "offset": 0,
+ "map": "MAP_ROUTE130"
+ },
+ {
+ "direction": "dive",
+ "offset": 0,
+ "map": "MAP_UNDERWATER5"
+ }
+ ],
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 28,
+ "y": 16,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT",
+ "movement_range_x": 3,
+ "movement_range_y": 4,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "Route129_EventScript_1F72EC",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 10,
+ "y": 14,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP",
+ "movement_range_x": 5,
+ "movement_range_y": 2,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "2",
+ "script": "Route129_EventScript_1F7303",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 13,
+ "y": 22,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "5",
+ "script": "Route129_EventScript_1F7331",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 35,
+ "y": 9,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "2",
+ "script": "Route129_EventScript_1F731A",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 13,
+ "y": 27,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "5",
+ "script": "Route129_EventScript_1F7348",
+ "flag": "0"
+ }
+ ],
+ "warp_events": [],
+ "coord_events": [],
+ "bg_events": []
+} \ No newline at end of file
diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc
index 177dc626a..25aa675a6 100644
--- a/data/maps/Route129/scripts.inc
+++ b/data/maps/Route129/scripts.inc
@@ -1,33 +1,33 @@
Route129_MapScripts:: @ 81F7284
- map_script 3, Route129_MapScript1_1F72AB
- map_script 1, Route129_MapScript1_1F7294
- map_script 2, Route129_MapScript2_1F72E2
+ map_script MAP_SCRIPT_ON_TRANSITION, Route129_MapScript1_1F72AB
+ map_script MAP_SCRIPT_ON_LOAD, Route129_MapScript1_1F7294
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_MapScript2_1F72E2
.byte 0
Route129_MapScript1_1F7294: @ 81F7294
- compare VAR_0x4037, 15
- call_if_eq Route129_EventScript_273C39
- compare VAR_0x4037, 16
- call_if_eq Route129_EventScript_273CA6
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST
+ call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129West
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST
+ call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129East
end
Route129_MapScript1_1F72AB: @ 81F72AB
- compare VAR_0x4039, 1
+ compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route129_EventScript_273D13
- compare VAR_0x405E, 4
+ compare VAR_RAYQUAZA_STATE, 4
call_if_ge Route129_EventScript_1F72D8
- compare VAR_0x4037, 15
- call_if_eq Route129_EventScript_273D17
- compare VAR_0x4037, 16
- call_if_eq Route129_EventScript_273D17
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST
+ call_if_eq UnusualWeather_StartKyogreWeather
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST
+ call_if_eq UnusualWeather_StartKyogreWeather
end
Route129_EventScript_1F72D8:: @ 81F72D8
- call_if_set FLAG_SYS_WEATHER_CTRL, Route129_EventScript_27207A
+ call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
return
Route129_MapScript2_1F72E2: @ 81F72E2
- map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+ map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
Route129_EventScript_1F72EC:: @ 81F72EC
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 11:49:36 +0000