summaryrefslogtreecommitdiff
path: root/data/maps/Route103
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route103')
-rw-r--r--data/maps/Route103/connections.inc8
-rw-r--r--data/maps/Route103/events.inc31
-rw-r--r--data/maps/Route103/header.inc15
-rw-r--r--data/maps/Route103/map.json309
-rw-r--r--data/maps/Route103/scripts.inc22
5 files changed, 320 insertions, 65 deletions
diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc
deleted file mode 100644
index 0759d872f..000000000
--- a/data/maps/Route103/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route103_MapConnectionsList: @ 848684C
- connection down, 0, MAP_OLDALE_TOWN
- connection right, -60, MAP_ROUTE110
-
-Route103_MapConnections: @ 8486864
- .4byte 0x2
- .4byte Route103_MapConnectionsList
-
diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc
deleted file mode 100644
index 5a6cc8866..000000000
--- a/data/maps/Route103/events.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-Route103_EventObjects: @ 85280DC
- object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0
- object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, FLAG_HIDE_ROUTE_103_RIVAL
- object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0
- object_event 4, EVENT_OBJ_GFX_TWIN, 0, 65, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0
- object_event 5, EVENT_OBJ_GFX_TWIN, 0, 64, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0
- object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 1, 1, 3, Route103_EventScript_1EC6D1, 0
- object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 5, BerryTreeScript, 0
- object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 6, BerryTreeScript, 0
- object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 7, BerryTreeScript, 0
- object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0
- object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_272141, FLAG_HIDE_ROUTE_103_BIRCH
- object_event 12, EVENT_OBJ_GFX_POKEFAN_M, 0, 56, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0
- object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CE5, FLAG_ITEM_ROUTE_103_GUARD_SPEC
- object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_12
- object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_13
- object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route103_EventScript_1EC761, 0
- object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 67, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0
- object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0
- object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0
- object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, FLAG_ITEM_ROUTE_103_PP_UP
-
-Route103_MapWarps: @ 85282BC
- warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE
-
-Route103_MapBGEvents: @ 85282C4
- bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route103_EventScript_1EC5EB
-
-Route103_MapEvents:: @ 85282D0
- map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents
-
diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc
deleted file mode 100644
index b614f32eb..000000000
--- a/data/maps/Route103/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route103: @ 84826B0
- .4byte Route103_Layout
- .4byte Route103_MapEvents
- .4byte Route103_MapScripts
- .4byte Route103_MapConnections
- .2byte MUS_DOORO1
- .2byte 19
- .byte MAPSEC_ROUTE_103
- .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/Route103/map.json b/data/maps/Route103/map.json
new file mode 100644
index 000000000..6516e99dc
--- /dev/null
+++ b/data/maps/Route103/map.json
@@ -0,0 +1,309 @@
+{
+ "id": "MAP_ROUTE103",
+ "name": "Route103",
+ "layout": "LAYOUT_ROUTE103",
+ "music": "MUS_DOORO1",
+ "region_map_section": "MAPSEC_ROUTE_103",
+ "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": "down",
+ "offset": 0,
+ "map": "MAP_OLDALE_TOWN"
+ },
+ {
+ "direction": "right",
+ "offset": -60,
+ "map": "MAP_ROUTE110"
+ }
+ ],
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+ "x": 49,
+ "y": 12,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "Route103_EventScript_1EC5E2",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+ "x": 10,
+ "y": 3,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "Route103_EventScript_1EC3C1",
+ "flag": "FLAG_HIDE_ROUTE_103_RIVAL"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+ "x": 71,
+ "y": 11,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "Route103_EventScript_1EC5F4",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_TWIN",
+ "x": 65,
+ "y": 12,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "1",
+ "script": "Route103_EventScript_1EC66E",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_TWIN",
+ "x": 64,
+ "y": 12,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "1",
+ "script": "Route103_EventScript_1EC60B",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
+ "x": 50,
+ "y": 8,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+ "movement_range_x": 0,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "Route103_EventScript_1EC6D1",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "x": 58,
+ "y": 5,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "5",
+ "script": "BerryTreeScript",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "x": 59,
+ "y": 5,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "6",
+ "script": "BerryTreeScript",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "x": 60,
+ "y": 5,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "7",
+ "script": "BerryTreeScript",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+ "x": 20,
+ "y": 10,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 2,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "Route103_EventScript_1EC5D9",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH",
+ "x": 7,
+ "y": 3,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "Route103_EventScript_272141",
+ "flag": "FLAG_HIDE_ROUTE_103_BIRCH"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
+ "x": 56,
+ "y": 13,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "5",
+ "script": "Route103_EventScript_1EC6E8",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 50,
+ "y": 5,
+ "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": "Route103_EventScript_290CE5",
+ "flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+ "x": 67,
+ "y": 7,
+ "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": "Route103_EventScript_2906BB",
+ "flag": "FLAG_TEMP_12"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+ "x": 72,
+ "y": 8,
+ "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": "Route103_EventScript_2906BB",
+ "flag": "FLAG_TEMP_13"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+ "x": 67,
+ "y": 5,
+ "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": "2",
+ "script": "Route103_EventScript_1EC761",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+ "x": 67,
+ "y": 9,
+ "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": "2",
+ "script": "Route103_EventScript_1EC74A",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+ "x": 36,
+ "y": 6,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+ "movement_range_x": 1,
+ "movement_range_y": 3,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "5",
+ "script": "Route103_EventScript_1EC78F",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+ "x": 36,
+ "y": 13,
+ "elevation": 1,
+ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN",
+ "movement_range_x": 1,
+ "movement_range_y": 3,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "5",
+ "script": "Route103_EventScript_1EC778",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 64,
+ "y": 7,
+ "elevation": 0,
+ "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": "Route103_EventScript_290CF2",
+ "flag": "FLAG_ITEM_ROUTE_103_PP_UP"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 45,
+ "y": 6,
+ "elevation": 0,
+ "dest_map": "MAP_ALTERING_CAVE",
+ "dest_warp_id": 0
+ }
+ ],
+ "coord_events": [],
+ "bg_events": [
+ {
+ "type": "sign",
+ "x": 11,
+ "y": 9,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "Route103_EventScript_1EC5EB"
+ }
+ ]
+} \ No newline at end of file
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index e13bad76d..f711416fd 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -1,10 +1,10 @@
Route103_MapScripts:: @ 81EC38E
- map_script 3, Route103_MapScript1_1EC399
- map_script 1, Route103_MapScript1_1EC3A4
+ map_script MAP_SCRIPT_ON_TRANSITION, Route103_MapScript1_1EC399
+ map_script MAP_SCRIPT_ON_LOAD, Route103_MapScript1_1EC3A4
.byte 0
Route103_MapScript1_1EC399: @ 81EC399
- call Route103_EventScript_271ED7
+ call Common_EventScript_SetupRivalGender
call Route103_EventScript_2720AD
end
@@ -30,11 +30,11 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA
msgbox Route103_Text_1EC7A6, MSGBOX_DEFAULT
closemessage
playbgm MUS_GIRL_SUP, 1
- applymovement 2, Route103_Movement_27259E
+ applymovement 2, Common_Movement_FacePlayer
waitmovement 0
- applymovement 2, Route103_Movement_272598
+ applymovement 2, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 2, Route103_Movement_27259A
+ applymovement 2, Common_Movement_Delay48
waitmovement 0
msgbox Route103_Text_1EC7DE, MSGBOX_DEFAULT
switch VAR_STARTER_MON
@@ -47,11 +47,11 @@ Route103_EventScript_1EC434:: @ 81EC434
msgbox Route103_Text_1EC989, MSGBOX_DEFAULT
closemessage
playbgm MUS_BOY_SUP, 1
- applymovement 2, Route103_Movement_27259E
+ applymovement 2, Common_Movement_FacePlayer
waitmovement 0
- applymovement 2, Route103_Movement_272598
+ applymovement 2, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 2, Route103_Movement_27259A
+ applymovement 2, Common_Movement_Delay48
waitmovement 0
msgbox Route103_Text_1EC9CE, MSGBOX_DEFAULT
switch VAR_STARTER_MON
@@ -140,10 +140,10 @@ Route103_EventScript_1EC585:: @ 81EC585
Route103_EventScript_1EC5A2:: @ 81EC5A2
removeobject 2
- setvar VAR_0x4084, 4
+ setvar VAR_BIRCH_LAB_STATE, 4
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
setflag FLAG_DEFEATED_RIVAL_ROUTE103
- setvar VAR_0x40C7, 1
+ setvar VAR_OLDALE_STATE, 1
clearflag FLAG_HIDE_OLDALE_TOWN_RIVAL
savebgm MUS_DUMMY
fadedefaultbgm
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 12:59:37 +0000