summaryrefslogtreecommitdiff
path: root/data/maps/Route127
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route127')
-rw-r--r--data/maps/Route127/connections.inc10
-rw-r--r--data/maps/Route127/events.inc23
-rw-r--r--data/maps/Route127/header.inc15
-rw-r--r--data/maps/Route127/map.json221
-rw-r--r--data/maps/Route127/scripts.inc28
5 files changed, 235 insertions, 62 deletions
diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc
deleted file mode 100644
index 3ad7057a3..000000000
--- a/data/maps/Route127/connections.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route127_MapConnectionsList: @ 8486BE8
- connection up, 0, MAP_MOSSDEEP_CITY
- connection down, 0, MAP_ROUTE128
- connection left, 0, MAP_ROUTE126
- connection dive, 0, MAP_UNDERWATER3
-
-Route127_MapConnections: @ 8486C18
- .4byte 0x4
- .4byte Route127_MapConnectionsList
-
diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc
deleted file mode 100644
index 78dc26899..000000000
--- a/data/maps/Route127/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-Route127_EventObjects: @ 852C734
- object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0
- object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0
- object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, FLAG_ITEM_ROUTE_127_ZINC
- object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29103F, FLAG_ITEM_ROUTE_127_CARBOS
- object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0
- object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0
- object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0
- object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 15, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0
- object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0
- object_event 10, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0
- object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, FLAG_ITEM_ROUTE_127_RARE_CANDY
-
-Route127_MapBGEvents: @ 852C83C
- bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1
- bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2
- bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1
- bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3
- bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3
-
-Route127_MapEvents:: @ 852C878
- map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents
-
diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc
deleted file mode 100644
index b237a42ab..000000000
--- a/data/maps/Route127/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route127: @ 8482950
- .4byte Route127_Layout
- .4byte Route127_MapEvents
- .4byte Route127_MapScripts
- .4byte Route127_MapConnections
- .2byte MUS_DOORO_X3
- .2byte 43
- .byte MAPSEC_ROUTE_127
- .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/Route127/map.json b/data/maps/Route127/map.json
new file mode 100644
index 000000000..e4a68c3e1
--- /dev/null
+++ b/data/maps/Route127/map.json
@@ -0,0 +1,221 @@
+{
+ "id": "MAP_ROUTE127",
+ "name": "Route127",
+ "layout": "LAYOUT_ROUTE127",
+ "music": "MUS_DOORO_X3",
+ "region_map_section": "MAPSEC_ROUTE_127",
+ "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_MOSSDEEP_CITY"
+ },
+ {
+ "direction": "down",
+ "offset": 0,
+ "map": "MAP_ROUTE128"
+ },
+ {
+ "direction": "left",
+ "offset": 0,
+ "map": "MAP_ROUTE126"
+ },
+ {
+ "direction": "dive",
+ "offset": 0,
+ "map": "MAP_UNDERWATER3"
+ }
+ ],
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 45,
+ "y": 42,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "2",
+ "script": "Route127_EventScript_1F6A35",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 18,
+ "y": 68,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "4",
+ "script": "Route127_EventScript_1F6A4C",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 14,
+ "y": 6,
+ "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": "Route127_EventScript_291032",
+ "flag": "FLAG_ITEM_ROUTE_127_ZINC"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 64,
+ "y": 39,
+ "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": "Route127_EventScript_29103F",
+ "flag": "FLAG_ITEM_ROUTE_127_CARBOS"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+ "x": 42,
+ "y": 21,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "Route127_EventScript_1F6A63",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+ "x": 64,
+ "y": 19,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "Route127_EventScript_1F6A91",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+ "x": 54,
+ "y": 14,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_UP",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "Route127_EventScript_1F6A7A",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+ "x": 15,
+ "y": 23,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "2",
+ "script": "Route127_EventScript_1F6AA8",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+ "x": 63,
+ "y": 63,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "Route127_EventScript_1F6AD6",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+ "x": 12,
+ "y": 23,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "2",
+ "script": "Route127_EventScript_1F6ABF",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 13,
+ "y": 20,
+ "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": "Route127_EventScript_29104C",
+ "flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY"
+ }
+ ],
+ "warp_events": [],
+ "coord_events": [],
+ "bg_events": [
+ {
+ "type": "secret_base",
+ "x": 59,
+ "y": 67,
+ "elevation": 0,
+ "secret_base_id": "SECRET_BASE_RED_CAVE4_1"
+ },
+ {
+ "type": "secret_base",
+ "x": 59,
+ "y": 72,
+ "elevation": 0,
+ "secret_base_id": "SECRET_BASE_YELLOW_CAVE3_2"
+ },
+ {
+ "type": "secret_base",
+ "x": 67,
+ "y": 63,
+ "elevation": 0,
+ "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_1"
+ },
+ {
+ "type": "secret_base",
+ "x": 61,
+ "y": 21,
+ "elevation": 0,
+ "secret_base_id": "SECRET_BASE_YELLOW_CAVE3_3"
+ },
+ {
+ "type": "secret_base",
+ "x": 45,
+ "y": 24,
+ "elevation": 0,
+ "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_3"
+ }
+ ]
+} \ No newline at end of file
diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc
index 28f20bfb3..91fab2b61 100644
--- a/data/maps/Route127/scripts.inc
+++ b/data/maps/Route127/scripts.inc
@@ -1,28 +1,28 @@
Route127_MapScripts:: @ 81F69D9
- map_script 3, Route127_MapScript1_1F69E9
- map_script 1, Route127_MapScript1_1F6A14
- map_script 2, Route127_MapScript2_1F6A2B
+ map_script MAP_SCRIPT_ON_TRANSITION, Route127_MapScript1_1F69E9
+ map_script MAP_SCRIPT_ON_LOAD, Route127_MapScript1_1F6A14
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_MapScript2_1F6A2B
.byte 0
Route127_MapScript1_1F69E9: @ 81F69E9
- call_if_set FLAG_SYS_WEATHER_CTRL, Route127_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 Route127_EventScript_273D13
- compare VAR_0x4037, 13
- call_if_eq Route127_EventScript_273D17
- compare VAR_0x4037, 14
- call_if_eq Route127_EventScript_273D17
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH
+ call_if_eq UnusualWeather_StartKyogreWeather
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH
+ call_if_eq UnusualWeather_StartKyogreWeather
end
Route127_MapScript1_1F6A14: @ 81F6A14
- compare VAR_0x4037, 13
- call_if_eq Route127_EventScript_273B5F
- compare VAR_0x4037, 14
- call_if_eq Route127_EventScript_273BCC
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH
+ call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127North
+ compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH
+ call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127South
end
Route127_MapScript2_1F6A2B: @ 81F6A2B
- map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+ map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
Route127_EventScript_1F6A35:: @ 81F6A35