summaryrefslogtreecommitdiff
path: root/data/maps/Route101
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route101')
-rw-r--r--data/maps/Route101/connections.inc8
-rw-r--r--data/maps/Route101/events.inc25
-rw-r--r--data/maps/Route101/header.inc15
-rw-r--r--data/maps/Route101/map.json201
-rw-r--r--data/maps/Route101/scripts.inc22
5 files changed, 212 insertions, 59 deletions
diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc
deleted file mode 100644
index f5f35e974..000000000
--- a/data/maps/Route101/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route101_MapConnectionsList: @ 848680C
- connection up, 0, MAP_OLDALE_TOWN
- connection down, 0, MAP_LITTLEROOT_TOWN
-
-Route101_MapConnections: @ 8486824
- .4byte 0x2
- .4byte Route101_MapConnectionsList
-
diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc
deleted file mode 100644
index 77ee2848f..000000000
--- a/data/maps/Route101/events.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-Route101_EventObjects: @ 8527E98
- object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0
- object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE
- object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG
- object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_ZIGZAGOON
- object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, FLAG_HIDE_ROUTE_101_BIRCH
- object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, FLAG_HIDE_ROUTE_101_BOY
-
-Route101_MapCoordEvents: @ 8527F28
- coord_event 10, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE
- coord_event 11, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE
- coord_event 10, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E
- coord_event 11, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E
- coord_event 6, 16, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64
- coord_event 6, 15, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64
- coord_event 6, 17, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64
- coord_event 6, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64
- coord_event 7, 13, 3, VAR_0x4060, 2, Route101_EventScript_1EBD7A
-
-Route101_MapBGEvents: @ 8527FB8
- bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_1EBE0D
-
-Route101_MapEvents:: @ 8527FC4
- map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents
-
diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc
deleted file mode 100644
index 5a98f7e22..000000000
--- a/data/maps/Route101/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route101: @ 8482678
- .4byte Route101_Layout
- .4byte Route101_MapEvents
- .4byte Route101_MapScripts
- .4byte Route101_MapConnections
- .2byte MUS_DOORO1
- .2byte 17
- .byte MAPSEC_ROUTE_101
- .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/Route101/map.json b/data/maps/Route101/map.json
new file mode 100644
index 000000000..44d8b2137
--- /dev/null
+++ b/data/maps/Route101/map.json
@@ -0,0 +1,201 @@
+{
+ "id": "MAP_ROUTE101",
+ "name": "Route101",
+ "layout": "LAYOUT_ROUTE101",
+ "music": "MUS_DOORO1",
+ "region_map_section": "MAPSEC_ROUTE_101",
+ "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_OLDALE_TOWN"
+ },
+ {
+ "direction": "down",
+ "offset": 0,
+ "map": "MAP_LITTLEROOT_TOWN"
+ }
+ ],
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+ "x": 16,
+ "y": 8,
+ "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": "Route101_EventScript_1EBDFB",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH",
+ "x": 9,
+ "y": 13,
+ "elevation": 0,
+ "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "0x0",
+ "flag": "FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_BIRCHS_BAG",
+ "x": 7,
+ "y": 14,
+ "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": "Route101_EventScript_1EBE16",
+ "flag": "FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_1",
+ "x": 10,
+ "y": 13,
+ "elevation": 0,
+ "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_LEFT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "0x0",
+ "flag": "FLAG_HIDE_ROUTE_101_ZIGZAGOON"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH",
+ "x": 5,
+ "y": 11,
+ "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": "Route101_EventScript_272141",
+ "flag": "FLAG_HIDE_ROUTE_101_BIRCH"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+ "x": 2,
+ "y": 13,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "Route101_EventScript_1EBE04",
+ "flag": "FLAG_HIDE_ROUTE_101_BOY"
+ }
+ ],
+ "warp_events": [],
+ "coord_events": [
+ {
+ "type": "trigger",
+ "x": 10,
+ "y": 19,
+ "elevation": 3,
+ "var": "VAR_ROUTE101_STATE",
+ "var_value": "1",
+ "script": "Route101_EventScript_1EBCDE"
+ },
+ {
+ "type": "trigger",
+ "x": 11,
+ "y": 19,
+ "elevation": 3,
+ "var": "VAR_ROUTE101_STATE",
+ "var_value": "1",
+ "script": "Route101_EventScript_1EBCDE"
+ },
+ {
+ "type": "trigger",
+ "x": 10,
+ "y": 18,
+ "elevation": 3,
+ "var": "VAR_ROUTE101_STATE",
+ "var_value": "2",
+ "script": "Route101_EventScript_1EBD4E"
+ },
+ {
+ "type": "trigger",
+ "x": 11,
+ "y": 18,
+ "elevation": 3,
+ "var": "VAR_ROUTE101_STATE",
+ "var_value": "2",
+ "script": "Route101_EventScript_1EBD4E"
+ },
+ {
+ "type": "trigger",
+ "x": 6,
+ "y": 16,
+ "elevation": 3,
+ "var": "VAR_ROUTE101_STATE",
+ "var_value": "2",
+ "script": "Route101_EventScript_1EBD64"
+ },
+ {
+ "type": "trigger",
+ "x": 6,
+ "y": 15,
+ "elevation": 3,
+ "var": "VAR_ROUTE101_STATE",
+ "var_value": "2",
+ "script": "Route101_EventScript_1EBD64"
+ },
+ {
+ "type": "trigger",
+ "x": 6,
+ "y": 17,
+ "elevation": 3,
+ "var": "VAR_ROUTE101_STATE",
+ "var_value": "2",
+ "script": "Route101_EventScript_1EBD64"
+ },
+ {
+ "type": "trigger",
+ "x": 6,
+ "y": 18,
+ "elevation": 3,
+ "var": "VAR_ROUTE101_STATE",
+ "var_value": "2",
+ "script": "Route101_EventScript_1EBD64"
+ },
+ {
+ "type": "trigger",
+ "x": 7,
+ "y": 13,
+ "elevation": 3,
+ "var": "VAR_ROUTE101_STATE",
+ "var_value": "2",
+ "script": "Route101_EventScript_1EBD7A"
+ }
+ ],
+ "bg_events": [
+ {
+ "type": "sign",
+ "x": 5,
+ "y": 9,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "Route101_EventScript_1EBE0D"
+ }
+ ]
+} \ No newline at end of file
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index 15722a3f3..47663e1dd 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -1,6 +1,6 @@
Route101_MapScripts:: @ 81EBCBA
- map_script 3, Route101_MapScript1_1EBCC5
- map_script 2, Route101_MapScript2_1EBCCB
+ map_script MAP_SCRIPT_ON_TRANSITION, Route101_MapScript1_1EBCC5
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_1EBCCB
.byte 0
Route101_MapScript1_1EBCC5: @ 81EBCC5
@@ -8,12 +8,12 @@ Route101_MapScript1_1EBCC5: @ 81EBCC5
end
Route101_MapScript2_1EBCCB: @ 81EBCCB
- map_script_2 VAR_0x4060, 0, Route101_EventScript_1EBCD5
+ map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_1EBCD5
.2byte 0
Route101_EventScript_1EBCD5:: @ 81EBCD5
- setflag FLAG_SPECIAL_FLAG_0x4000
- setvar VAR_0x4060, 1
+ setflag FLAG_HIDE_MAP_NAME_POPUP
+ setvar VAR_ROUTE101_STATE, 1
end
Route101_EventScript_1EBCDE:: @ 81EBCDE
@@ -30,14 +30,14 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE
applymovement 4, Route101_Movement_1EBD96
applymovement 2, Route101_Movement_1EBDC8
waitmovement 0
- applymovement 2, Route101_Movement_2725A8
+ applymovement 2, Common_Movement_WalkInPlaceRight
waitmovement 0
applymovement 4, Route101_Movement_1EBDBD
applymovement 2, Route101_Movement_1EBDEF
waitmovement 0
msgbox Route101_Text_1EBE9A, MSGBOX_DEFAULT
closemessage
- setvar VAR_0x4060, 2
+ setvar VAR_ROUTE101_STATE, 2
releaseall
end
@@ -223,7 +223,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16
fadescreen 1
removeobject 4
setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13
- applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_2725A4
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
waitmovement 0
special ChooseStarter
waitstate
@@ -234,9 +234,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16
setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG
- setvar VAR_0x4084, 2
- setvar VAR_0x4060, 3
- clearflag FLAG_SPECIAL_FLAG_0x4000
+ setvar VAR_BIRCH_LAB_STATE, 2
+ setvar VAR_ROUTE101_STATE, 3
+ clearflag FLAG_HIDE_MAP_NAME_POPUP
checkplayergender
compare VAR_RESULT, MALE
call_if_eq Route101_EventScript_1EBE85
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 22:44:27 +0000