From e32a6d71ec75d1df693a77a0c5b07584755c74f5 Mon Sep 17 00:00:00 2001 From: Viperio <146665252+Viperio19@users.noreply.github.com> Date: Tue, 17 Mar 2026 18:09:02 +0100 Subject: [PATCH] Document routes 206, 207 and 211 and wayward cave (#1007) --- asm/macros/scrcmd.inc | 6 +- generated/vars_flags.txt | 18 +-- include/player_avatar.h | 6 +- res/field/events/events_route_206.json | 42 ++--- ...nts_route_206_cycling_road_north_gate.json | 8 +- ...nts_route_206_cycling_road_south_gate.json | 6 +- res/field/events/events_route_207.json | 52 +++---- res/field/events/events_route_211_west.json | 14 +- res/field/events/events_wayward_cave_1f.json | 48 +++--- res/field/scripts/scripts_cycle_shop.s | 4 +- res/field/scripts/scripts_eterna_city.s | 4 +- res/field/scripts/scripts_init_new_game.s | 2 +- res/field/scripts/scripts_route_206.s | 56 +++---- ...cripts_route_206_cycling_road_north_gate.s | 89 +++++------ ...cripts_route_206_cycling_road_south_gate.s | 55 +++---- res/field/scripts/scripts_route_207.s | 144 +++++++++--------- res/field/scripts/scripts_route_211_west.s | 18 +-- res/field/scripts/scripts_wayward_cave_1f.s | 137 ++++++++--------- res/text/menu_entries.json | 4 +- res/text/route_206.json | 6 +- .../route_206_cycling_road_north_gate.json | 16 +- .../route_206_cycling_road_south_gate.json | 10 +- res/text/route_207.json | 28 ++-- res/text/route_211_west.json | 6 +- res/text/wayward_cave_1f.json | 24 +-- src/item_use_functions.c | 4 +- src/player_avatar.c | 10 +- src/scrcmd.c | 14 +- src/unk_0205F180.c | 2 +- 29 files changed, 419 insertions(+), 414 deletions(-) diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 98dfb0f8fd..bcd1550a30 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -1255,9 +1255,9 @@ .byte \rideBike .endm - .macro ScrCmd_0C9 arg0 + .macro ForceBicycling flag .short 201 - .byte \arg0 + .byte \flag .endm .macro GetPlayerState destVarID @@ -4193,7 +4193,7 @@ .short \destVar .endm - .macro ScrCmd_2BF + .macro SetCyclingBGM .short 703 .endm diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index 96ee4fc57e..8e2533d306 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -128,7 +128,7 @@ FLAG_OBTAINED_FOCUS_BAND FLAG_UNK_0x007F FLAG_RECEIVED_FLOWER_SHOP_SPRAYDUCK FLAG_UNK_0x0081 -FLAG_UNK_0x0082 +FLAG_RECEIVED_BICYCLE FLAG_RECEIVED_FLOAROMA_TOWN_MIDDLE_HOUSE_TM88 FLAG_OLD_ROD_OBTAINED FLAG_TRADED_FOR_KAZZA_ABRA @@ -222,7 +222,7 @@ FLAG_UNK_0x00DC FLAG_UNK_0x00DD FLAG_UNK_0x00DE FLAG_UNK_0x00DF -FLAG_UNK_0x00E0 +FLAG_TALKED_TO_WAYWARD_CAVE_1F_MIRA FLAG_UNK_0x00E1 FLAG_UNK_0x00E2 FLAG_TRAVELED_WITH_CHERYL @@ -265,7 +265,7 @@ FLAG_UNK_0x0107 FLAG_UNK_0x0108 FLAG_RECEIVED_OREBURGH_CITY_SUPER_POTION FLAG_RECEIVED_OREBURGH_CITY_EAST_HOUSE_2F_GREAT_BALL -FLAG_UNK_0x010B +FLAG_RECEIVED_ROUTE_206_CYCLING_ROAD_NORTH_GATE_EXP_SHARE FLAG_UNK_0x010C FLAG_UNK_0x010D FLAG_UNK_0x010E @@ -297,7 +297,7 @@ FLAG_CAUGHT_UXIE FLAG_UNK_0x0128 FLAG_VEILSTONE_STORE_1F_RECEIVED_MASK FLAG_OBTAINED_ETERNA_FOREST_OUTSIDE_ACCESSORY_BIG_TREE -FLAG_UNK_0x012B +FLAG_RECEIVED_ROUTE_206_CYCLING_ROAD_SOUTH_GATE_ACCESSORY_FLAG FLAG_UNK_0x012C FLAG_UNK_0x012D FLAG_GAME_CORNER_RECEIVED_20_COINS_OLD_MAN @@ -458,7 +458,7 @@ FLAG_UNK_0x01C8 FLAG_UNK_0x01C9 FLAG_UNK_0x01CA FLAG_UNK_0x01CB -FLAG_UNK_0x01CC +FLAG_HIDE_ROUTE_207_COUNTERPART FLAG_UNK_0x01CD FLAG_UNK_0x01CE FLAG_UNK_0x01CF @@ -482,7 +482,7 @@ FLAG_AZELF_DISAPPEARED FLAG_UXIE_DISAPPEARED FLAG_UNK_0x01E2 FLAG_UNK_0x01E3 -FLAG_UNK_0x01E4 +FLAG_HIDE_WAYWARD_CAVE_1F_MIRA FLAG_UNK_0x01E5 FLAG_UNK_0x01E6 FLAG_UNK_0x01E7 @@ -544,7 +544,7 @@ FLAG_UNK_0x021E FLAG_UNK_0x021F FLAG_UNK_0x0220 FLAG_UNK_0x0221 -FLAG_UNK_0x0222 +FLAG_HIDE_ROUTE_206_CYCLING_ROAD_NORTH_GATE_SCIENTIST_M FLAG_UNK_0x0223 FLAG_UNK_0x0224 FLAG_UNK_0x0225 @@ -4239,12 +4239,12 @@ VAR_ROUTE_203_RIVAL_STATE VAR_VALLEY_WINDWORKS_STATE VAR_UNK_0x408A VAR_UNK_0x408B -VAR_UNK_0x408C +VAR_ROUTE_207_COUNTERPART_TRIGGER_STATE VAR_UNK_0x408D VAR_UNK_0x408E VAR_UNK_0x408F VAR_UNK_0x4090 -VAR_UNK_0x4091 +VAR_WAYWARD_CAVE_1F_FOLLOWER_MIRA_STATE VAR_UNK_0x4092 VAR_OREBURGH_GATE_1F_HIKER_STATE VAR_UNK_0x4094 diff --git a/include/player_avatar.h b/include/player_avatar.h index a7ae2b16d3..a9a395b96c 100644 --- a/include/player_avatar.h +++ b/include/player_avatar.h @@ -24,7 +24,7 @@ enum PlayerAvatarFlagUnk00 { UNK_00_0 = (1 << 0), UNK_00_1 = (1 << 1), UNK_00_2 = (1 << 2), - UNK_00_3 = (1 << 3), + UNK_00_IS_ON_CYCLING_ROAD = (1 << 3), UNK_00_ESCAPED_FROM_DEEP_MUD = (1 << 4), UNK_00_5 = (1 << 5), UNK_00_6 = (1 << 6), @@ -124,8 +124,8 @@ void sub_0205EF6C(PlayerAvatar *playerAvatar, int param1); BOOL sub_0205EF84(PlayerAvatar *playerAvatar); void sub_0205EF98(PlayerAvatar *playerAvatar, int param1); BOOL sub_0205EFB0(PlayerAvatar *playerAvatar); -void sub_0205EFC4(PlayerAvatar *playerAvatar, int param1); -BOOL sub_0205EFDC(PlayerAvatar *playerAvatar); +void PlayerAvatar_SetFlagIsOnCyclingRoad(PlayerAvatar *playerAvatar, int param1); +BOOL PlayerAvatar_GetFlagIsOnCyclingRoad(PlayerAvatar *playerAvatar); void PlayerAvatar_SetEscapedFromDeepMud(PlayerAvatar *playerAvatar, BOOL flag); BOOL PlayerAvatar_CheckEscapedFromDeepMud(PlayerAvatar *playerAvatar); void sub_0205F01C(PlayerAvatar *playerAvatar, BOOL param1); diff --git a/res/field/events/events_route_206.json b/res/field/events/events_route_206.json index 856c3341ba..c7eb542d3e 100644 --- a/res/field/events/events_route_206.json +++ b/res/field/events/events_route_206.json @@ -19,7 +19,7 @@ ], "object_events": [ { - "id": "ROUTE_206_CYCLIST_AXEL", + "id": "LOCALID_CYCLIST_AXEL", "graphics_id": "OBJ_EVENT_GFX_CYCLIST_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -36,7 +36,7 @@ "y": 9 }, { - "id": "ROUTE_206_CYCLIST_MEGAN", + "id": "LOCALID_CYCLIST_MEGAN", "graphics_id": "OBJ_EVENT_GFX_CYCLIST_F", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -53,7 +53,7 @@ "y": 8 }, { - "id": "ROUTE_206_CYCLIST_JAMES", + "id": "LOCALID_CYCLIST_JAMES", "graphics_id": "OBJ_EVENT_GFX_CYCLIST_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -70,7 +70,7 @@ "y": 7 }, { - "id": "ROUTE_206_CYCLIST_NICOLE", + "id": "LOCALID_CYCLIST_NICOLE", "graphics_id": "OBJ_EVENT_GFX_CYCLIST_F", "movement_type": "MOVEMENT_TYPE_WALK_BACK_AND_FORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -87,7 +87,7 @@ "y": 7 }, { - "id": "ROUTE_206_CYCLIST_JOHN", + "id": "LOCALID_CYCLIST_JOHN", "graphics_id": "OBJ_EVENT_GFX_CYCLIST_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -104,7 +104,7 @@ "y": 6 }, { - "id": "ROUTE_206_CYCLIST_KAYLA", + "id": "LOCALID_CYCLIST_KAYLA", "graphics_id": "OBJ_EVENT_GFX_CYCLIST_F", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -121,7 +121,7 @@ "y": 3 }, { - "id": "ROUTE_206_CYCLIST_RYAN", + "id": "LOCALID_CYCLIST_RYAN", "graphics_id": "OBJ_EVENT_GFX_CYCLIST_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -138,7 +138,7 @@ "y": 4 }, { - "id": "ROUTE_206_CYCLIST_RACHEL", + "id": "LOCALID_CYCLIST_RACHEL", "graphics_id": "OBJ_EVENT_GFX_CYCLIST_F", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -155,7 +155,7 @@ "y": 4 }, { - "id": "ROUTE_206_ARROW_SIGNPOST_8", + "id": "LOCALID_ARROW_SIGNPOST_OREBURGH_CITY", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -172,7 +172,7 @@ "y": 0 }, { - "id": "ROUTE_206_ARROW_SIGNPOST_9", + "id": "LOCALID_ARROW_SIGNPOST_ETERNA_CITY", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -189,7 +189,7 @@ "y": 0 }, { - "id": "ROUTE_206_CUT_TREE_10", + "id": "LOCALID_CUT_TREE_1", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -204,7 +204,7 @@ "y": 0 }, { - "id": "ROUTE_206_CUT_TREE_11", + "id": "LOCALID_CUT_TREE_2", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -219,7 +219,7 @@ "y": 0 }, { - "id": "ROUTE_206_CUT_TREE_12", + "id": "LOCALID_CUT_TREE_3", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -264,7 +264,7 @@ "y": 0 }, { - "id": "ROUTE_206_BERRY_SOIL_15", + "id": "LOCALID_BERRY_SOIL_1", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -281,7 +281,7 @@ "y": 0 }, { - "id": "ROUTE_206_BERRY_SOIL_16", + "id": "LOCALID_BERRY_SOIL_2", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -298,7 +298,7 @@ "y": 0 }, { - "id": "ROUTE_206_BERRY_SOIL_17", + "id": "LOCALID_BERRY_SOIL_3", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -315,7 +315,7 @@ "y": 0 }, { - "id": "ROUTE_206_BERRY_SOIL_18", + "id": "LOCALID_BERRY_SOIL_4", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -332,12 +332,12 @@ "y": 0 }, { - "id": "ROUTE_206_TRAINER_TIPS_SIGNPOST_19", + "id": "LOCALID_TRAINER_TIPS_SIGNPOST", "clone_id": 8, "graphics_id": "OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0161", + "hidden_flag": "MAP_HEADER_ROUTE_207", "script": 65535, "initial_dir": 0, "data": [], @@ -378,7 +378,7 @@ "y": 0 }, { - "id": "ROUTE_206_HIKER_THEODORE", + "id": "LOCALID_HIKER_THEODORE", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -395,7 +395,7 @@ "y": 0 }, { - "id": "ROUTE_206_HIKER_23", + "id": "LOCALID_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_route_206_cycling_road_north_gate.json b/res/field/events/events_route_206_cycling_road_north_gate.json index d775d8f418..8665fc9534 100644 --- a/res/field/events/events_route_206_cycling_road_north_gate.json +++ b/res/field/events/events_route_206_cycling_road_north_gate.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "ROUTE_206_CYCLING_ROAD_NORTH_GATE_CASHIER_M_0", + "id": "LOCALID_CASHIER_M_EAST", "graphics_id": "OBJ_EVENT_GFX_CASHIER_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "ROUTE_206_CYCLING_ROAD_NORTH_GATE_CASHIER_M_1", + "id": "LOCALID_CASHIER_M_WEST", "graphics_id": "OBJ_EVENT_GFX_CASHIER_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,11 +32,11 @@ "y": 0 }, { - "id": "ROUTE_206_CYCLING_ROAD_NORTH_GATE_SCIENTIST_M_2", + "id": "LOCALID_SCIENTIST_M", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0222", + "hidden_flag": "FLAG_HIDE_ROUTE_206_CYCLING_ROAD_NORTH_GATE_SCIENTIST_M", "script": 5, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_route_206_cycling_road_south_gate.json b/res/field/events/events_route_206_cycling_road_south_gate.json index 1b74eaac3a..748bce119f 100644 --- a/res/field/events/events_route_206_cycling_road_south_gate.json +++ b/res/field/events/events_route_206_cycling_road_south_gate.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "ROUTE_206_CYCLING_ROAD_SOUTH_GATE_CASHIER_M_0", + "id": "LOCALID_CASHIER_M_WEST", "graphics_id": "OBJ_EVENT_GFX_CASHIER_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "ROUTE_206_CYCLING_ROAD_SOUTH_GATE_CASHIER_M_1", + "id": "LOCALID_CASHIER_M_EAST", "graphics_id": "OBJ_EVENT_GFX_CASHIER_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "ROUTE_206_CYCLING_ROAD_SOUTH_GATE_BATTLE_GIRL_2", + "id": "LOCALID_BATTLE_GIRL", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_route_207.json b/res/field/events/events_route_207.json index e8aa796c09..c67cd07214 100644 --- a/res/field/events/events_route_207.json +++ b/res/field/events/events_route_207.json @@ -43,7 +43,7 @@ ], "object_events": [ { - "id": "ROUTE_207_CAMPER_ANTHONY", + "id": "LOCALID_CAMPER_ANTHONY", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -60,7 +60,7 @@ "y": 5 }, { - "id": "ROUTE_207_PICNICKER_LAUREN", + "id": "LOCALID_PICNICKER_LAUREN", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -77,7 +77,7 @@ "y": 5 }, { - "id": "ROUTE_207_YOUNGSTER_AUSTIN", + "id": "LOCALID_YOUNGSTER_AUSTIN", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_WALK_EAST_SOUTH_WEST_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -94,7 +94,7 @@ "y": 5 }, { - "id": "ROUTE_207_HIKER_JUSTIN", + "id": "LOCALID_HIKER_JUSTIN", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -111,7 +111,7 @@ "y": 0 }, { - "id": "ROUTE_207_HIKER_KEVIN", + "id": "LOCALID_HIKER_KEVIN", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -128,7 +128,7 @@ "y": 7 }, { - "id": "ROUTE_207_BATTLE_GIRL_HELEN", + "id": "LOCALID_BATTLE_GIRL_HELEN", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "movement_type": "MOVEMENT_TYPE_WALK_BACK_AND_FORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -145,7 +145,7 @@ "y": 6 }, { - "id": "ROUTE_207_ARROW_SIGNPOST_6", + "id": "LOCALID_ARROW_SIGNPOST_OREBURGH_CITY", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -162,7 +162,7 @@ "y": 0 }, { - "id": "ROUTE_207_ARROW_SIGNPOST_7", + "id": "LOCALID_ARROW_SIGNPOST_MT_CORONET", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -179,7 +179,7 @@ "y": 0 }, { - "id": "ROUTE_207_TRAINER_TIPS_SIGNPOST_8", + "id": "LOCALID_TRAINER_TIPS_SIGNPOST", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -239,7 +239,7 @@ "y": 0 }, { - "id": "ROUTE_207_BERRY_SOIL_12", + "id": "LOCALID_BERRY_SOIL_1", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -256,7 +256,7 @@ "y": 0 }, { - "id": "ROUTE_207_BERRY_SOIL_13", + "id": "LOCALID_BERRY_SOIL_2", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -273,7 +273,7 @@ "y": 0 }, { - "id": "ROUTE_207_BERRY_SOIL_14", + "id": "LOCALID_BERRY_SOIL_3", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -290,7 +290,7 @@ "y": 0 }, { - "id": "ROUTE_207_BERRY_SOIL_15", + "id": "LOCALID_BERRY_SOIL_4", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -307,12 +307,12 @@ "y": 0 }, { - "id": "ROUTE_207_ARROW_SIGNPOST_16", + "id": "LOCALID_ARROW_SIGNPOST_ROUTE_206_OREBURGH_CITY", "clone_id": 8, "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_GALACTIC_LEFT_LAKE_VALOR", + "hidden_flag": "MAP_HEADER_ROUTE_206", "script": 65535, "initial_dir": 0, "data": [ @@ -325,12 +325,12 @@ "y": 0 }, { - "id": "ROUTE_207_MAP_SIGNPOST_17", + "id": "LOCALID_MAP_SIGNPOST", "clone_id": 9, "graphics_id": "OBJ_EVENT_GFX_MAP_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_HIDE_OBSTACLE_14", + "hidden_flag": "MAP_HEADER_OREBURGH_CITY", "script": 65535, "initial_dir": 0, "data": [ @@ -343,11 +343,11 @@ "y": 0 }, { - "id": "ROUTE_207_COUNTERPART_18", + "id": "LOCALID_COUNTERPART", "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01CC", + "hidden_flag": "FLAG_HIDE_ROUTE_207_COUNTERPART", "script": 0, "initial_dir": 0, "data": [], @@ -358,7 +358,7 @@ "y": 0 }, { - "id": "ROUTE_207_VENT_19", + "id": "LOCALID_VENT_1", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -373,7 +373,7 @@ "y": 0 }, { - "id": "ROUTE_207_VENT_20", + "id": "LOCALID_VENT_2", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -388,7 +388,7 @@ "y": 0 }, { - "id": "ROUTE_207_VENT_21", + "id": "LOCALID_VENT_3", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -403,7 +403,7 @@ "y": 0 }, { - "id": "ROUTE_207_VENT_22", + "id": "LOCALID_VENT_4", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -418,7 +418,7 @@ "y": 0 }, { - "id": "ROUTE_207_VENT_23", + "id": "LOCALID_VENT_5", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -433,7 +433,7 @@ "y": 0 }, { - "id": "ROUTE_207_CYCLIST_M_24", + "id": "LOCALID_CYCLIST_M", "graphics_id": "OBJ_EVENT_GFX_CYCLIST_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -500,7 +500,7 @@ "y": 0, "width": 1, "length": 3, - "var": "VAR_UNK_0x408C", + "var": "VAR_ROUTE_207_COUNTERPART_TRIGGER_STATE", "value": 0 } ] diff --git a/res/field/events/events_route_211_west.json b/res/field/events/events_route_211_west.json index de93b784e9..a499089637 100644 --- a/res/field/events/events_route_211_west.json +++ b/res/field/events/events_route_211_west.json @@ -19,7 +19,7 @@ ], "object_events": [ { - "id": "ROUTE_211_WEST_BIRD_KEEPER_ALEXANDRA", + "id": "LOCALID_BIRD_KEEPER_ALEXANDRA", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -36,7 +36,7 @@ "y": 0 }, { - "id": "ROUTE_211_WEST_HIKER_LOUIS", + "id": "LOCALID_HIKER_LOUIS", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -53,7 +53,7 @@ "y": 0 }, { - "id": "ROUTE_211_WEST_NINJA_BOY_ZACH", + "id": "LOCALID_NINJA_BOY_ZACH", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "movement_type": "MOVEMENT_TYPE_DISGUISE_ROCK", "trainer_type": "TRAINER_TYPE_VIEW_ALL_DIRECTIONS", @@ -70,7 +70,7 @@ "y": 0 }, { - "id": "ROUTE_211_WEST_ARROW_SIGNPOST_3", + "id": "LOCALID_ARROW_SIGNPOST_MT_CORONET", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -87,7 +87,7 @@ "y": 0 }, { - "id": "ROUTE_211_WEST_ROCK_SMASH_4", + "id": "LOCALID_ROCK_SMASH_1", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -117,7 +117,7 @@ "y": 0 }, { - "id": "ROUTE_211_WEST_MAP_SIGNPOST_6", + "id": "LOCALID_MAP_SIGNPOST", "clone_id": 9, "graphics_id": "OBJ_EVENT_GFX_MAP_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", @@ -135,7 +135,7 @@ "y": 0 }, { - "id": "ROUTE_211_WEST_ARROW_SIGNPOST_7", + "id": "LOCALID_ARROW_SIGNPOST_ETERNA_CITY", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_wayward_cave_1f.json b/res/field/events/events_wayward_cave_1f.json index 679fd80987..9652ecd66c 100644 --- a/res/field/events/events_wayward_cave_1f.json +++ b/res/field/events/events_wayward_cave_1f.json @@ -111,11 +111,11 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_MIRA_4", + "id": "LOCALID_MIRA", "graphics_id": "OBJ_EVENT_GFX_MIRA", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01E4", + "hidden_flag": "FLAG_HIDE_WAYWARD_CAVE_1F_MIRA", "script": 2, "initial_dir": 0, "data": [], @@ -126,7 +126,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_CAMPER_DIEGO", + "id": "LOCALID_CAMPER_DIEGO", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -143,7 +143,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_PICNICKER_TORI", + "id": "LOCALID_PICNICKER_TORI", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -160,7 +160,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_LASS_CASSIDY", + "id": "LOCALID_LASS_CASSIDY", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -177,7 +177,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_YOUNGSTER_WAYNE", + "id": "LOCALID_YOUNGSTER_WAYNE", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -194,7 +194,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_HIKER_REGINALD", + "id": "LOCALID_HIKER_REGINALD", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -211,7 +211,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_COLLECTOR_TERRY", + "id": "LOCALID_COLLECTOR_TERRY", "graphics_id": "OBJ_EVENT_GFX_COLLECTOR", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -228,7 +228,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_PICNICKER_ANA", + "id": "LOCALID_PICNICKER_ANA", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -245,7 +245,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_CAMPER_PARKER", + "id": "LOCALID_CAMPER_PARKER", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -262,7 +262,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_RUIN_MANIAC_GERALD", + "id": "LOCALID_RUIN_MANIAC_GERALD", "graphics_id": "OBJ_EVENT_GFX_RUIN_MANIAC", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -279,7 +279,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_HIKER_LORENZO", + "id": "LOCALID_HIKER_LORENZO", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -296,7 +296,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_ROCK_SMASH_15", + "id": "LOCALID_ROCK_SMASH_1", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -311,7 +311,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_ROCK_SMASH_16", + "id": "LOCALID_ROCK_SMASH_2", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -326,7 +326,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_ROCK_SMASH_17", + "id": "LOCALID_ROCK_SMASH_3", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -341,7 +341,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_ROCK_SMASH_18", + "id": "LOCALID_ROCK_SMASH_4", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -356,7 +356,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_ROCK_SMASH_19", + "id": "LOCALID_ROCK_SMASH_5", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -371,7 +371,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_ROCK_SMASH_20", + "id": "LOCALID_ROCK_SMASH_6", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -386,7 +386,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_ROCK_SMASH_21", + "id": "LOCALID_ROCK_SMASH_7", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -401,7 +401,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_ROCK_SMASH_22", + "id": "LOCALID_ROCK_SMASH_8", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -416,7 +416,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_ROCK_SMASH_23", + "id": "LOCALID_ROCK_SMASH_9", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -431,7 +431,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_ROCK_SMASH_24", + "id": "LOCALID_ROCK_SMASH_10", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -446,7 +446,7 @@ "y": 0 }, { - "id": "WAYWARD_CAVE_1F_ROCK_SMASH_25", + "id": "LOCALID_ROCK_SMASH_11", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -495,7 +495,7 @@ "y": 0, "width": 1, "length": 1, - "var": "VAR_UNK_0x4091", + "var": "VAR_WAYWARD_CAVE_1F_FOLLOWER_MIRA_STATE", "value": 1 } ] diff --git a/res/field/scripts/scripts_cycle_shop.s b/res/field/scripts/scripts_cycle_shop.s index a69c7fa65c..1671205b44 100644 --- a/res/field/scripts/scripts_cycle_shop.s +++ b/res/field/scripts/scripts_cycle_shop.s @@ -13,12 +13,12 @@ _0016: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x0082, _0052 + GoToIfSet FLAG_RECEIVED_BICYCLE, _0052 Message 0 SetVar VAR_0x8004, ITEM_BICYCLE SetVar VAR_0x8005, 1 Common_GiveItemQuantity - SetFlag FLAG_UNK_0x0082 + SetFlag FLAG_RECEIVED_BICYCLE SetVar VAR_UNK_0x4114, 1 ScrCmd_14C 9 GoTo _0052 diff --git a/res/field/scripts/scripts_eterna_city.s b/res/field/scripts/scripts_eterna_city.s index 4e7da8c53f..9578114930 100644 --- a/res/field/scripts/scripts_eterna_city.s +++ b/res/field/scripts/scripts_eterna_city.s @@ -545,8 +545,8 @@ _0770: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfUnset FLAG_UNK_0x0082, _07A5 - GoToIfGe VAR_UNK_0x408C, 1, _07A5 + GoToIfUnset FLAG_RECEIVED_BICYCLE, _07A5 + GoToIfGe VAR_ROUTE_207_COUNTERPART_TRIGGER_STATE, 1, _07A5 Message 34 WaitABXPadPress CloseMessage diff --git a/res/field/scripts/scripts_init_new_game.s b/res/field/scripts/scripts_init_new_game.s index 0aaf5686d9..096e04da53 100644 --- a/res/field/scripts/scripts_init_new_game.s +++ b/res/field/scripts/scripts_init_new_game.s @@ -75,7 +75,7 @@ _0006: SetFlag FLAG_UNK_0x028A SetFlag FLAG_UNK_0x020D SetFlag FLAG_VEILSTONE_STORE_B1F_HIDE_PROF_ROWAN - SetFlag FLAG_UNK_0x01CC + SetFlag FLAG_HIDE_ROUTE_207_COUNTERPART SetFlag FLAG_HIDE_POKEMON_LEAGUE_NORTH_POKECENTER_1F_RIVAL SetFlag FLAG_HIDE_FLOAROMA_MEADOW_WORKS_KEY SetFlag FLAG_UNK_0x01CB diff --git a/res/field/scripts/scripts_route_206.s b/res/field/scripts/scripts_route_206.s index d89fb2e8f4..abb9efbcde 100644 --- a/res/field/scripts/scripts_route_206.s +++ b/res/field/scripts/scripts_route_206.s @@ -2,57 +2,57 @@ #include "res/text/bank/route_206.h" - ScriptEntry _0016 - ScriptEntry _001C - ScriptEntry _00A4 - ScriptEntry _00B7 - ScriptEntry _00CE + ScriptEntry Route206_OnTransition + ScriptEntry Route206_OnResume + ScriptEntry Route206_Hiker + ScriptEntry Route206_ArrowSignpostEternaCity + ScriptEntry Route206_ArrowSignpostOreburghCity ScriptEntryEnd -_0016: +Route206_OnTransition: SetFlag FLAG_FIRST_ARRIVAL_CYCLING_ROAD_UNUSED End -_001C: - CallIfSet FLAG_ON_CYCLING_ROAD, _009F +Route206_OnResume: + CallIfSet FLAG_ON_CYCLING_ROAD, Route206_ForceBicycling GetPreviousMapID VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, MAP_HEADER_ROUTE_206_CYCLING_ROAD_NORTH_GATE, _0047 - GoToIfEq VAR_MAP_LOCAL_0, MAP_HEADER_ROUTE_206_CYCLING_ROAD_SOUTH_GATE, _0047 + GoToIfEq VAR_MAP_LOCAL_0, MAP_HEADER_ROUTE_206_CYCLING_ROAD_NORTH_GATE, Route206_TrySetFlagsCyclingRoad + GoToIfEq VAR_MAP_LOCAL_0, MAP_HEADER_ROUTE_206_CYCLING_ROAD_SOUTH_GATE, Route206_TrySetFlagsCyclingRoad End -_0047: - GoToIfSet FLAG_UNK_0x0003, _009D +Route206_TrySetFlagsCyclingRoad: + GoToIfSet FLAG_UNK_0x0003, Route206_OnResumeEnd GetPlayerMapPos VAR_MAP_LOCAL_0, VAR_MAP_LOCAL_1 - GoToIfLt VAR_MAP_LOCAL_0, 0x12B, _009D - GoToIfGt VAR_MAP_LOCAL_0, 0x132, _009D - GoToIfEq VAR_MAP_LOCAL_1, 0x240, _008E - GoToIfEq VAR_MAP_LOCAL_1, 0x2A9, _008E + GoToIfLt VAR_MAP_LOCAL_0, 299, Route206_OnResumeEnd + GoToIfGt VAR_MAP_LOCAL_0, 306, Route206_OnResumeEnd + GoToIfEq VAR_MAP_LOCAL_1, 576, Route206_SetFlagsCyclingRoad + GoToIfEq VAR_MAP_LOCAL_1, 681, Route206_SetFlagsCyclingRoad End -_008E: +Route206_SetFlagsCyclingRoad: SetFlag FLAG_UNK_0x0003 SetFlag FLAG_ON_CYCLING_ROAD - ScrCmd_2BF - ScrCmd_0C9 1 + SetCyclingBGM + ForceBicycling TRUE End -_009D: +Route206_OnResumeEnd: End -_009F: - ScrCmd_0C9 1 +Route206_ForceBicycling: + ForceBicycling TRUE Return -_00A4: - NPCMessage 0 +Route206_Hiker: + NPCMessage Route206_Text_IHeardThereWereTwoCavesOnRoute206 End -_00B7: - ShowArrowSign 1 +Route206_ArrowSignpostEternaCity: + ShowArrowSign Route206_Text_Rt206EternaCity End -_00CE: - ShowArrowSign 2 +Route206_ArrowSignpostOreburghCity: + ShowArrowSign Route206_Text_Rt206OreburghCity End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_206_cycling_road_north_gate.s b/res/field/scripts/scripts_route_206_cycling_road_north_gate.s index e399cefebe..408d856a04 100644 --- a/res/field/scripts/scripts_route_206_cycling_road_north_gate.s +++ b/res/field/scripts/scripts_route_206_cycling_road_north_gate.s @@ -1,121 +1,122 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_206_cycling_road_north_gate.h" +#include "res/field/events/events_route_206_cycling_road_north_gate.h" - ScriptEntry _003B - ScriptEntry _004E - ScriptEntry _0061 - ScriptEntry _00B0 - ScriptEntry _00C0 - ScriptEntry _001A + ScriptEntry Route206CyclingRoadNorthGate_OnTransition + ScriptEntry Route206CyclingRoadNorthGate_CashierM + ScriptEntry Route206CyclingRoadNorthGate_TriggerOnlyBicycles + ScriptEntry Route206CyclingRoadNorthGate_TriggerClearFlagForceBikingInGate + ScriptEntry Route206CyclingRoadNorthGate_ScientistM + ScriptEntry Route206CyclingRoadNorthGate_OnFrame ScriptEntryEnd -_001A: +Route206CyclingRoadNorthGate_OnFrame: GetPlayerMapPos VAR_MAP_LOCAL_4, VAR_MAP_LOCAL_5 - CallIfGe VAR_MAP_LOCAL_5, 12, _0035 + CallIfGe VAR_MAP_LOCAL_5, 12, Route206CyclingRoadNorthGate_OnFrameForceBikingInGate SetVar VAR_MAP_LOCAL_3, 1 End -_0035: +Route206CyclingRoadNorthGate_OnFrameForceBikingInGate: SetFlag FLAG_FORCE_BIKING_IN_GATE Return -_003B: - CallIfSet FLAG_UNK_0x010B, _0048 +Route206CyclingRoadNorthGate_OnTransition: + CallIfSet FLAG_RECEIVED_ROUTE_206_CYCLING_ROAD_NORTH_GATE_EXP_SHARE, Route206CyclingRoadNorthGate_HideScientistM End -_0048: - SetFlag FLAG_UNK_0x0222 +Route206CyclingRoadNorthGate_HideScientistM: + SetFlag FLAG_HIDE_ROUTE_206_CYCLING_ROAD_NORTH_GATE_SCIENTIST_M Return -_004E: - NPCMessage 2 +Route206CyclingRoadNorthGate_CashierM: + NPCMessage Route206CyclingRoadNorthGate_Text_LearnHowToShiftGearsAndYoullBeAbleToRideAnywhere End -_0061: +Route206CyclingRoadNorthGate_TriggerOnlyBicycles: LockAll CheckPlayerOnBike VAR_RESULT - GoToIfEq VAR_RESULT, TRUE, _0091 - ApplyMovement 1, _00A0 + GoToIfEq VAR_RESULT, TRUE, Route206CyclingRoadNorthGate_TriggerForceBikingInGate + ApplyMovement LOCALID_CASHIER_M_WEST, Route206CyclingRoadNorthGate_Movement_CashierMExclamationMark WaitMovement - Message 1 + Message Route206CyclingRoadNorthGate_Text_CyclingRoadIsOnlyForBicycles CloseMessage - ApplyMovement LOCALID_PLAYER, _00A8 + ApplyMovement LOCALID_PLAYER, Route206CyclingRoadNorthGate_Movement_PlayerWalkNorth WaitMovement ReleaseAll End -_0091: +Route206CyclingRoadNorthGate_TriggerForceBikingInGate: SetFlag FLAG_FORCE_BIKING_IN_GATE SetVar VAR_MAP_LOCAL_2, 1 ReleaseAll End .balign 4, 0 -_00A0: +Route206CyclingRoadNorthGate_Movement_CashierMExclamationMark: EmoteExclamationMark EndMovement .balign 4, 0 -_00A8: +Route206CyclingRoadNorthGate_Movement_PlayerWalkNorth: WalkNormalNorth EndMovement -_00B0: +Route206CyclingRoadNorthGate_TriggerClearFlagForceBikingInGate: LockAll ClearFlag FLAG_FORCE_BIKING_IN_GATE SetVar VAR_MAP_LOCAL_2, 0 ReleaseAll End -_00C0: +Route206CyclingRoadNorthGate_ScientistM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x010B, _0154 + GoToIfSet FLAG_RECEIVED_ROUTE_206_CYCLING_ROAD_NORTH_GATE_EXP_SHARE, Route206CyclingRoadNorthGate_APokemonHoldingAnExpShareWillGetSomeOfTheExpPointsFromBattle BufferPlayerName 0 BufferCounterpartName 1 GetPlayerGender VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, GENDER_MALE, _00F0 - GoTo _00F9 + GoToIfEq VAR_MAP_LOCAL_0, GENDER_MALE, Route206CyclingRoadNorthGate_PlayerMaleLetMeAskYouHowManyPokemonHaveYouMet + GoTo Route206CyclingRoadNorthGate_PlayerFemaleLetMeAskYouHowManyPokemonHaveYouMet -_00F0: - Message 3 - GoTo _0102 +Route206CyclingRoadNorthGate_PlayerMaleLetMeAskYouHowManyPokemonHaveYouMet: + Message Route206CyclingRoadNorthGate_Text_PlayerLetMeAskYouHowManyPokemonHaveYouMet + GoTo Route206CyclingRoadNorthGate_CheckAmountPokemonSeen -_00F9: - Message 4 - GoTo _0102 +Route206CyclingRoadNorthGate_PlayerFemaleLetMeAskYouHowManyPokemonHaveYouMet: + Message Route206CyclingRoadNorthGate_Text_PlayerLetMeAskYouHowManyPokemonHaveYouMet2 + GoTo Route206CyclingRoadNorthGate_CheckAmountPokemonSeen -_0102: +Route206CyclingRoadNorthGate_CheckAmountPokemonSeen: GetNationalDexSeenCount VAR_0x8004 BufferNumber 1, VAR_0x8004 - GoToIfLt VAR_0x8004, 35, _015F - Message 5 + GoToIfLt VAR_0x8004, 35, Route206CyclingRoadNorthGate_YouveGotToFindAtLeast35 + Message Route206CyclingRoadNorthGate_Text_ProfessorRowanShouldBeDelightedHereIsSomethingForYou SetVar VAR_0x8004, ITEM_EXP_SHARE SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _014A - SetFlag FLAG_UNK_0x010B + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, Route206CyclingRoadNorthGate_BagIsFull + SetFlag FLAG_RECEIVED_ROUTE_206_CYCLING_ROAD_NORTH_GATE_EXP_SHARE Common_GiveItemQuantityNoLineFeed CloseMessage ReleaseAll End -_014A: +Route206CyclingRoadNorthGate_BagIsFull: Common_MessageBagIsFull CloseMessage ReleaseAll End -_0154: - Message 6 +Route206CyclingRoadNorthGate_APokemonHoldingAnExpShareWillGetSomeOfTheExpPointsFromBattle: + Message Route206CyclingRoadNorthGate_Text_APokemonHoldingAnExpShareWillGetSomeOfTheExpPointsFromBattle WaitABXPadPress CloseMessage ReleaseAll End -_015F: - Message 7 +Route206CyclingRoadNorthGate_YouveGotToFindAtLeast35: + Message Route206CyclingRoadNorthGate_Text_YouveGotToFindAtLeast35 WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_route_206_cycling_road_south_gate.s b/res/field/scripts/scripts_route_206_cycling_road_south_gate.s index 60727a89ef..eae2656fd3 100644 --- a/res/field/scripts/scripts_route_206_cycling_road_south_gate.s +++ b/res/field/scripts/scripts_route_206_cycling_road_south_gate.s @@ -1,85 +1,86 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_206_cycling_road_south_gate.h" +#include "res/field/events/events_route_206_cycling_road_south_gate.h" - ScriptEntry _001A - ScriptEntry _003D - ScriptEntry _0050 - ScriptEntry _00A0 - ScriptEntry _00B0 - ScriptEntry _001C + ScriptEntry Route206CyclingRoadSouthGate_OnTransition + ScriptEntry Route206CyclingRoadSouthGate_CashierM + ScriptEntry Route206CyclingRoadSouthGate_TriggerOnlyCyclists + ScriptEntry Route206CyclingRoadSouthGate_TriggerClearFlagForceBikingInGate + ScriptEntry Route206CyclingRoadSouthGate_BattleGirl + ScriptEntry Route206CyclingRoadSouthGate_OnFrame ScriptEntryEnd -_001A: +Route206CyclingRoadSouthGate_OnTransition: End -_001C: +Route206CyclingRoadSouthGate_OnFrame: GetPlayerMapPos VAR_MAP_LOCAL_4, VAR_MAP_LOCAL_5 - CallIfLe VAR_MAP_LOCAL_5, 3, _0037 + CallIfLe VAR_MAP_LOCAL_5, 3, Route206CyclingRoadSouthGate_OnFrameForceBikingInGate SetVar VAR_MAP_LOCAL_3, 1 End -_0037: +Route206CyclingRoadSouthGate_OnFrameForceBikingInGate: SetFlag FLAG_FORCE_BIKING_IN_GATE Return -_003D: - NPCMessage 2 +Route206CyclingRoadSouthGate_CashierM: + NPCMessage Route206CyclingRoadSouthGate_Text_LearnHowToShiftGearsAndYoullBeAbleToRideAnywhere End -_0050: +Route206CyclingRoadSouthGate_TriggerOnlyCyclists: LockAll CheckPlayerOnBike VAR_RESULT - GoToIfEq VAR_RESULT, TRUE, _0080 - ApplyMovement 0, _0090 + GoToIfEq VAR_RESULT, TRUE, Route206CyclingRoadSouthGate_TriggerForceBikingInGate + ApplyMovement LOCALID_CASHIER_M_WEST, Route206CyclingRoadSouthGate_Movement_CashierMExclamationMark WaitMovement - Message 1 + Message Route206CyclingRoadSouthGate_Text_CyclingRoadIsOpenOnlyToCyclists CloseMessage - ApplyMovement LOCALID_PLAYER, _0098 + ApplyMovement LOCALID_PLAYER, Route206CyclingRoadSouthGate_Movement_PlayerWalkSouth WaitMovement ReleaseAll End -_0080: +Route206CyclingRoadSouthGate_TriggerForceBikingInGate: SetFlag FLAG_FORCE_BIKING_IN_GATE SetVar VAR_MAP_LOCAL_2, 1 ReleaseAll End .balign 4, 0 -_0090: +Route206CyclingRoadSouthGate_Movement_CashierMExclamationMark: EmoteExclamationMark EndMovement .balign 4, 0 -_0098: +Route206CyclingRoadSouthGate_Movement_PlayerWalkSouth: WalkNormalSouth EndMovement -_00A0: +Route206CyclingRoadSouthGate_TriggerClearFlagForceBikingInGate: LockAll ClearFlag FLAG_FORCE_BIKING_IN_GATE SetVar VAR_MAP_LOCAL_2, 0 ReleaseAll End -_00B0: +Route206CyclingRoadSouthGate_BattleGirl: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x012B, _00E5 + GoToIfSet FLAG_RECEIVED_ROUTE_206_CYCLING_ROAD_SOUTH_GATE_ACCESSORY_FLAG, Route206CyclingRoadSouthGate_GoThroughMtCoronetFromHereAndYouCanGetToHearthomeCity SetVar VAR_0x8004, ACCESSORY_FLAG BufferAccessoryName 0, VAR_0x8004 - Message 3 + Message Route206CyclingRoadSouthGate_Text_WhatsABicycleWithoutThisYouveGotToHaveAFlag SetVar VAR_0x8005, 1 Common_GiveAccessoryWaitForConfirm - SetFlag FLAG_UNK_0x012B + SetFlag FLAG_RECEIVED_ROUTE_206_CYCLING_ROAD_SOUTH_GATE_ACCESSORY_FLAG CloseMessage ReleaseAll End -_00E5: - Message 4 +Route206CyclingRoadSouthGate_GoThroughMtCoronetFromHereAndYouCanGetToHearthomeCity: + Message Route206CyclingRoadSouthGate_Text_GoThroughMtCoronetFromHereAndYouCanGetToHearthomeCity WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_route_207.s b/res/field/scripts/scripts_route_207.s index 9e0254ec87..995d42d4c7 100644 --- a/res/field/scripts/scripts_route_207.s +++ b/res/field/scripts/scripts_route_207.s @@ -1,111 +1,113 @@ #include "macros/scrcmd.inc" +#include "res/text/bank/menu_entries.h" #include "res/text/bank/route_207.h" +#include "res/field/events/events_route_207.h" - ScriptEntry _001E - ScriptEntry _004E - ScriptEntry _01B0 - ScriptEntry _01C3 - ScriptEntry _01EC - ScriptEntry _0203 - ScriptEntry _021A + ScriptEntry Route207_OnTransition + ScriptEntry Route207_TriggerCounterpart + ScriptEntry Route207_Unused + ScriptEntry Route207_CyclistM + ScriptEntry Route207_ArrowSignpostMtCoronet + ScriptEntry Route207_ArrowSignpostOreburghCity + ScriptEntry Route207_TrainerTips ScriptEntryEnd -_001E: +Route207_OnTransition: GetPlayerGender VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, GENDER_MALE, _003E - GoToIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, _0046 + GoToIfEq VAR_MAP_LOCAL_0, GENDER_MALE, Route207_SetCounterpartGraphicsDawn + GoToIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, Route207_SetCounterpartGraphicsLucas End -_003E: - SetVar VAR_OBJ_GFX_ID_0, 97 +Route207_SetCounterpartGraphicsDawn: + SetVar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_PLAYER_F End -_0046: - SetVar VAR_OBJ_GFX_ID_0, 0 +Route207_SetCounterpartGraphicsLucas: + SetVar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_PLAYER_M End -_004E: +Route207_TriggerCounterpart: LockAll GetPlayerMapPos VAR_0x8004, VAR_0x8005 - SetObjectEventPos 18, 0x14B, VAR_0x8005 - Call _008E - ApplyMovement 18, _0194 + SetObjectEventPos LOCALID_COUNTERPART, 331, VAR_0x8005 + Call Route207_ShowCounterpart + ApplyMovement LOCALID_COUNTERPART, Route207_Movement_CounterpartNoticePlayer WaitMovement Common_SetCounterpartBGM - ApplyMovement 18, _01A0 + ApplyMovement LOCALID_COUNTERPART, Route207_Movement_CounterpartWalkToPlayer WaitMovement - ApplyMovement LOCALID_PLAYER, _0174 + ApplyMovement LOCALID_PLAYER, Route207_Movement_PlayerFaceCounterpart WaitMovement - GoTo _009C + GoTo Route207_Counterpart End -_008E: - ClearFlag FLAG_UNK_0x01CC - AddObject 18 - LockObject 18 +Route207_ShowCounterpart: + ClearFlag FLAG_HIDE_ROUTE_207_COUNTERPART + AddObject LOCALID_COUNTERPART + LockObject LOCALID_COUNTERPART Return -_009C: +Route207_Counterpart: GetPlayerGender VAR_RESULT - GoToIfEq VAR_RESULT, GENDER_MALE, _00B3 - GoTo _00F1 + GoToIfEq VAR_RESULT, GENDER_MALE, Route207_Dawn + GoTo Route207_Lucas -_00B3: +Route207_Dawn: BufferPlayerName 0 - Message 0 + Message Route207_Text_DawnPlayerChooseWhichHandYouWant InitGlobalTextListMenu 30, 13, 0, VAR_RESULT, NO_EXIT_ON_B SetMenuXOriginToRight - AddListMenuEntry 137, 0 - AddListMenuEntry 138, 1 + AddListMenuEntry MenuEntries_Text_CounterpartHand_Right, 0 + AddListMenuEntry MenuEntries_Text_CounterpartHand_Left, 1 ShowListMenu - Message 1 - Call _012F - Message 2 - Call _0145 - Message 3 - GoTo _0156 + Message Route207_Text_DawnISeeYouWantTheVsSeeker + Call Route207_GiveVsSeeker + Message Route207_Text_DawnYouCanHaveThisTooThen + Call Route207_GivePoketchAppDowsingMachine + Message Route207_Text_DawnTheDowsingMachineIsSomethingYouShouldTouchOften + GoTo Route207_CounterpartLeave -_00F1: +Route207_Lucas: BufferPlayerName 0 - Message 4 + Message Route207_Text_LucasPlayerIllShareWithYouChooseAHand InitGlobalTextListMenu 30, 13, 0, VAR_RESULT, NO_EXIT_ON_B SetMenuXOriginToRight - AddListMenuEntry 137, 0 - AddListMenuEntry 138, 1 + AddListMenuEntry MenuEntries_Text_CounterpartHand_Right, 0 + AddListMenuEntry MenuEntries_Text_CounterpartHand_Left, 1 ShowListMenu - Message 5 - Call _012F - Message 6 - Call _0145 - Message 7 - GoTo _0156 + Message Route207_Text_LucasOhYeahYouWantTheVsSeeker + Call Route207_GiveVsSeeker + Message Route207_Text_LucasYouCanHaveThisTooThen + Call Route207_GivePoketchAppDowsingMachine + Message Route207_Text_LucasTheDowsingMachineIsJustTryTouchingIt + GoTo Route207_CounterpartLeave -_012F: +Route207_GiveVsSeeker: SetFlag FLAG_UNLOCKED_VS_SEEKER_LVL_1 SetVar VAR_0x8004, ITEM_VS_SEEKER SetVar VAR_0x8005, 1 Common_GiveItemQuantity Return -_0145: +Route207_GivePoketchAppDowsingMachine: SetVar VAR_0x8004, POKETCH_APPID_DOWSINGMACHINE Common_GivePoketchApp BufferPoketchAppName 1, POKETCH_APPID_DOWSINGMACHINE Return -_0156: +Route207_CounterpartLeave: CloseMessage - ApplyMovement 18, _01A8 + ApplyMovement LOCALID_COUNTERPART, Route207_Movement_CounterpartLeave WaitMovement - RemoveObject 18 + RemoveObject LOCALID_COUNTERPART Common_FadeToDefaultMusic - SetVar VAR_UNK_0x408C, 1 + SetVar VAR_ROUTE_207_COUNTERPART_TRIGGER_STATE, 1 ReleaseAll End .balign 4, 0 -_0174: +Route207_Movement_PlayerFaceCounterpart: WalkOnSpotNormalWest EndMovement @@ -120,53 +122,53 @@ Route207_UnusedMovement2: EndMovement .balign 4, 0 -_0194: +Route207_Movement_CounterpartNoticePlayer: WalkNormalEast 3 EmoteExclamationMark EndMovement .balign 4, 0 -_01A0: +Route207_Movement_CounterpartWalkToPlayer: WalkNormalEast 5 EndMovement .balign 4, 0 -_01A8: +Route207_Movement_CounterpartLeave: WalkNormalWest 8 EndMovement -_01B0: - NPCMessage 8 +Route207_Unused: + NPCMessage Route207_Text_Dummy8 End -_01C3: +Route207_CyclistM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x0082, _01E1 - Message 9 + GoToIfSet FLAG_RECEIVED_BICYCLE, Route207_ChangeToThe4thGearAndTakeARun + Message Route207_Text_ThatSlopesTooSlippery WaitABXPadPress CloseMessage ReleaseAll End -_01E1: - Message 10 +Route207_ChangeToThe4thGearAndTakeARun: + Message Route207_Text_ChangeToThe4thGearAndTakeARun WaitABXPadPress CloseMessage ReleaseAll End -_01EC: - ShowArrowSign 11 +Route207_ArrowSignpostMtCoronet: + ShowArrowSign Route207_Text_Rt207MtCoronet End -_0203: - ShowArrowSign 12 +Route207_ArrowSignpostOreburghCity: + ShowArrowSign Route207_Text_Rt207OreburghCity End -_021A: - ShowScrollingSign 13 +Route207_TrainerTips: + ShowScrollingSign Route207_Text_TrainerTipsPokemonMayBecomeImmobilizedIfTheyAreAsleepOrParalyzed End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_211_west.s b/res/field/scripts/scripts_route_211_west.s index 0240137bc7..f6ceaf16b0 100644 --- a/res/field/scripts/scripts_route_211_west.s +++ b/res/field/scripts/scripts_route_211_west.s @@ -2,21 +2,21 @@ #include "res/text/bank/route_211_west.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _0038 + ScriptEntry Route211West_Unused + ScriptEntry Route211West_ArrowSignpostMtCoronet + ScriptEntry Route211West_ArrowSignpostEternaCity ScriptEntryEnd -_000E: - NPCMessage 0 +Route211West_Unused: + NPCMessage Route211West_Text_Dummy0 End -_0021: - ShowArrowSign 1 +Route211West_ArrowSignpostMtCoronet: + ShowArrowSign Route211West_Text_Rt211MtCoronet End -_0038: - ShowArrowSign 2 +Route211West_ArrowSignpostEternaCity: + ShowArrowSign Route211West_Text_Rt211EternaCity End .balign 4, 0 diff --git a/res/field/scripts/scripts_wayward_cave_1f.s b/res/field/scripts/scripts_wayward_cave_1f.s index 220a8b3050..194b2a8ee0 100644 --- a/res/field/scripts/scripts_wayward_cave_1f.s +++ b/res/field/scripts/scripts_wayward_cave_1f.s @@ -1,148 +1,149 @@ #include "macros/scrcmd.inc" #include "res/text/bank/wayward_cave_1f.h" +#include "res/field/events/events_wayward_cave_1f.h" - ScriptEntry _0012 - ScriptEntry _002B - ScriptEntry _00E0 - ScriptEntry _00E2 + ScriptEntry WaywardCave1F_OnTransition + ScriptEntry WaywardCave1F_Mira + ScriptEntry WaywardCave1F_Unused + ScriptEntry WaywardCave1F_TriggerExit ScriptEntryEnd -_0012: +WaywardCave1F_OnTransition: SetFlag FLAG_FIRST_ARRIVAL_WAYWARD_CAVE - GoToIfUnset FLAG_TRAVELED_WITH_MIRA, _0023 + GoToIfUnset FLAG_TRAVELED_WITH_MIRA, WaywardCave1F_ResetFollowerMiraState End -_0023: - SetVar VAR_UNK_0x4091, 0 +WaywardCave1F_ResetFollowerMiraState: + SetVar VAR_WAYWARD_CAVE_1F_FOLLOWER_MIRA_STATE, 0 End -_002B: +WaywardCave1F_Mira: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer SetPlayerBike FALSE - GoToIfGe VAR_UNK_0x4091, 1, _0095 + GoToIfGe VAR_WAYWARD_CAVE_1F_FOLLOWER_MIRA_STATE, 1, WaywardCave1F_MiraMessage BufferPlayerName 0 - CallIfUnset FLAG_UNK_0x00E0, _008B - CallIfSet FLAG_UNK_0x00E0, _0090 + CallIfUnset FLAG_TALKED_TO_WAYWARD_CAVE_1F_MIRA, WaywardCave1F_ImMiraPleaseTakeMeToTheExit + CallIfSet FLAG_TALKED_TO_WAYWARD_CAVE_1F_MIRA, WaywardCave1F_MyNameIsMiraILikeYourName BufferPlayerName 0 PlaySound SEQ_GONIN - Message 1 + Message WaywardCave1F_Text_PlayerDecidedToGoWithMira WaitSound - SetFlag FLAG_UNK_0x00E0 - SetVar VAR_UNK_0x4091, 1 - Message 2 + SetFlag FLAG_TALKED_TO_WAYWARD_CAVE_1F_MIRA + SetVar VAR_WAYWARD_CAVE_1F_FOLLOWER_MIRA_STATE, 1 + Message WaywardCave1F_Text_IllKeepYourPokemonHealthyAllTheTime WaitABXPadPress CloseMessage SetVar VAR_PARTNER_TRAINER_ID, TRAINER_MIRA_WAYWARD_CAVE SetHasPartner - SetMovementType 4, 48 + SetMovementType LOCALID_MIRA, MOVEMENT_TYPE_FOLLOW_PLAYER ReleaseAll End -_008B: - Message 0 +WaywardCave1F_ImMiraPleaseTakeMeToTheExit: + Message WaywardCave1F_Text_ImMiraPleaseTakeMeToTheExit Return -_0090: - Message 3 +WaywardCave1F_MyNameIsMiraILikeYourName: + Message WaywardCave1F_Text_MyNameIsMiraILikeYourName Return -_0095: - GoToIfGe VAR_FOLLOWER_MIRA_TIMES_TALKED, 2, _00C4 - GoToIfEq VAR_FOLLOWER_MIRA_TIMES_TALKED, 1, _00BB +WaywardCave1F_MiraMessage: + GoToIfGe VAR_FOLLOWER_MIRA_TIMES_TALKED, 2, WaywardCave1F_PlayerDidYouGetToBeSoGoodBecauseYoureAlwaysWithPokemon + GoToIfEq VAR_FOLLOWER_MIRA_TIMES_TALKED, 1, WaywardCave1F_ThisCaveItsSoEasyToGetConfused BufferPlayerName 0 - Message 9 - GoTo _00D2 + Message WaywardCave1F_Text_ILikeHelpfulPokemonMovesLikeGrowlAndMinimize + GoTo WaywardCave1F_IncreaseFollowerMiraTimesTalked -_00BB: - Message 10 - GoTo _00D2 +WaywardCave1F_ThisCaveItsSoEasyToGetConfused: + Message WaywardCave1F_Text_ThisCaveItsSoEasyToGetConfused + GoTo WaywardCave1F_IncreaseFollowerMiraTimesTalked -_00C4: +WaywardCave1F_PlayerDidYouGetToBeSoGoodBecauseYoureAlwaysWithPokemon: BufferPlayerName 0 - Message 11 + Message WaywardCave1F_Text_PlayerDidYouGetToBeSoGoodBecauseYoureAlwaysWithPokemon WaitABXPadPress CloseMessage ReleaseAll End -_00D2: +WaywardCave1F_IncreaseFollowerMiraTimesTalked: AddVar VAR_FOLLOWER_MIRA_TIMES_TALKED, 1 WaitABXPadPress CloseMessage ReleaseAll End -_00E0: +WaywardCave1F_Unused: End -_00E2: +WaywardCave1F_TriggerExit: LockAll ClearHasPartner - SetMovementType 4, 16 + SetMovementType LOCALID_MIRA, MOVEMENT_TYPE_LOOK_WEST GetPlayerDir VAR_RESULT - GoToIfEq VAR_RESULT, 2, _0103 - GoTo _011B + GoToIfEq VAR_RESULT, DIR_WEST, WaywardCave1F_NoticeExitWest + GoTo WaywardCave1F_NoticeExitSouth -_0103: - ApplyMovement LOCALID_PLAYER, _0194 - ApplyMovement 4, _01D8 +WaywardCave1F_NoticeExitWest: + ApplyMovement LOCALID_PLAYER, WaywardCave1F_Movement_PlayerWalkOnSpotEast + ApplyMovement LOCALID_MIRA, WaywardCave1F_Movement_MiraWalkOnSpotWestExclamationMark WaitMovement - GoTo _0133 + GoTo WaywardCave1F_OhTheresTheExitThankYou -_011B: - ApplyMovement LOCALID_PLAYER, _019C - ApplyMovement 4, _01E4 +WaywardCave1F_NoticeExitSouth: + ApplyMovement LOCALID_PLAYER, WaywardCave1F_Movement_PlayerWalkOnSpotNorth + ApplyMovement LOCALID_MIRA, WaywardCave1F_Movement_MiraWalkOnSpotSouthExclamationMark WaitMovement - GoTo _0133 + GoTo WaywardCave1F_OhTheresTheExitThankYou -_0133: +WaywardCave1F_OhTheresTheExitThankYou: BufferPlayerName 0 - Message 5 + Message WaywardCave1F_Text_OhTheresTheExitThankYou CloseMessage GetPlayerDir VAR_RESULT - GoToIfEq VAR_RESULT, 3, _0152 - GoTo _016A + GoToIfEq VAR_RESULT, DIR_EAST, WaywardCave1F_MiraWalkWestLeave + GoTo WaywardCave1F_MiraWalkSouthLeave -_0152: - ApplyMovement LOCALID_PLAYER, _01A4 - ApplyMovement 4, _01F0 +WaywardCave1F_MiraWalkWestLeave: + ApplyMovement LOCALID_PLAYER, WaywardCave1F_Movement_PlayerWalkNorthOnSpotSouth + ApplyMovement LOCALID_MIRA, WaywardCave1F_Movement_MiraWalkWestLeave WaitMovement - GoTo _0182 + GoTo WaywardCave1F_RemoveMira -_016A: - ApplyMovement LOCALID_PLAYER, _01B0 - ApplyMovement 4, _0200 +WaywardCave1F_MiraWalkSouthLeave: + ApplyMovement LOCALID_PLAYER, WaywardCave1F_Movement_PlayerWalkEastOnSpotWest + ApplyMovement LOCALID_MIRA, WaywardCave1F_Movement_MiraWalkSouthLeave WaitMovement - GoTo _0182 + GoTo WaywardCave1F_RemoveMira -_0182: - RemoveObject 4 +WaywardCave1F_RemoveMira: + RemoveObject LOCALID_MIRA SetFlag FLAG_TRAVELED_WITH_MIRA - SetVar VAR_UNK_0x4091, 2 + SetVar VAR_WAYWARD_CAVE_1F_FOLLOWER_MIRA_STATE, 2 ReleaseAll End .balign 4, 0 -_0194: +WaywardCave1F_Movement_PlayerWalkOnSpotEast: WalkOnSpotNormalEast EndMovement .balign 4, 0 -_019C: +WaywardCave1F_Movement_PlayerWalkOnSpotNorth: WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_01A4: +WaywardCave1F_Movement_PlayerWalkNorthOnSpotSouth: WalkNormalNorth WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_01B0: +WaywardCave1F_Movement_PlayerWalkEastOnSpotWest: WalkNormalEast WalkOnSpotNormalWest EndMovement @@ -159,26 +160,26 @@ WaywardCave1F_UnusedMovement2: EndMovement .balign 4, 0 -_01D8: +WaywardCave1F_Movement_MiraWalkOnSpotWestExclamationMark: WalkOnSpotNormalWest EmoteExclamationMark EndMovement .balign 4, 0 -_01E4: +WaywardCave1F_Movement_MiraWalkOnSpotSouthExclamationMark: WalkOnSpotNormalSouth EmoteExclamationMark EndMovement .balign 4, 0 -_01F0: +WaywardCave1F_Movement_MiraWalkWestLeave: Delay8 3 WalkNormalWest WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0200: +WaywardCave1F_Movement_MiraWalkSouthLeave: Delay8 3 WalkNormalSouth WalkOnSpotNormalSouth diff --git a/res/text/menu_entries.json b/res/text/menu_entries.json index 5723ea49d6..ae828a11aa 100644 --- a/res/text/menu_entries.json +++ b/res/text/menu_entries.json @@ -574,11 +574,11 @@ "en_US": "CANCEL" }, { - "id": "pl_msg_00000361_00137", + "id": "MenuEntries_Text_CounterpartHand_Right", "en_US": "RIGHT" }, { - "id": "pl_msg_00000361_00138", + "id": "MenuEntries_Text_CounterpartHand_Left", "en_US": "LEFT" }, { diff --git a/res/text/route_206.json b/res/text/route_206.json index 30de969fa1..6da1106013 100644 --- a/res/text/route_206.json +++ b/res/text/route_206.json @@ -2,7 +2,7 @@ "key": 40576, "messages": [ { - "id": "pl_msg_00000474_00000", + "id": "Route206_Text_IHeardThereWereTwoCavesOnRoute206", "en_US": [ "This is odd... I heard there were two\n", "caves on Route 206.\r", @@ -10,14 +10,14 @@ ] }, { - "id": "pl_msg_00000474_00001", + "id": "Route206_Text_Rt206EternaCity", "en_US": [ "Rt. 206\n", "Eterna City" ] }, { - "id": "pl_msg_00000474_00002", + "id": "Route206_Text_Rt206OreburghCity", "en_US": [ "Rt. 206\n", "Oreburgh City" diff --git a/res/text/route_206_cycling_road_north_gate.json b/res/text/route_206_cycling_road_north_gate.json index db21d39a5b..c54f549bd9 100644 --- a/res/text/route_206_cycling_road_north_gate.json +++ b/res/text/route_206_cycling_road_north_gate.json @@ -2,25 +2,25 @@ "key": 5163, "messages": [ { - "id": "pl_msg_00000101_00000", + "id": "Route206CyclingRoadNorthGate_Text_Dummy0", "garbage": 46 }, { - "id": "pl_msg_00000101_00001", + "id": "Route206CyclingRoadNorthGate_Text_CyclingRoadIsOnlyForBicycles", "en_US": [ "Cycling Road is only for Bicycles!\r", "Please get on your Bicycle!\r" ] }, { - "id": "pl_msg_00000101_00002", + "id": "Route206CyclingRoadNorthGate_Text_LearnHowToShiftGearsAndYoullBeAbleToRideAnywhere", "en_US": [ "Learn how to shift gears, and you’ll\n", "be able to ride anywhere." ] }, { - "id": "pl_msg_00000101_00003", + "id": "Route206CyclingRoadNorthGate_Text_PlayerLetMeAskYouHowManyPokemonHaveYouMet", "en_US": [ "{STRVAR_1 3, 0, 0}, long time, no see!\r", "Oh? You look puzzled.\n", @@ -35,7 +35,7 @@ ] }, { - "id": "pl_msg_00000101_00004", + "id": "Route206CyclingRoadNorthGate_Text_PlayerLetMeAskYouHowManyPokemonHaveYouMet2", "en_US": [ "{STRVAR_1 3, 0, 0}, long time, no see!\r", "Oh? You look puzzled.\n", @@ -50,7 +50,7 @@ ] }, { - "id": "pl_msg_00000101_00005", + "id": "Route206CyclingRoadNorthGate_Text_ProfessorRowanShouldBeDelightedHereIsSomethingForYou", "en_US": [ "Oh, my!\n", "You’ve met {STRVAR_1 52, 1, 0} Pokémon!\r", @@ -60,7 +60,7 @@ ] }, { - "id": "pl_msg_00000101_00006", + "id": "Route206CyclingRoadNorthGate_Text_APokemonHoldingAnExpShareWillGetSomeOfTheExpPointsFromBattle", "en_US": [ "A Pokémon holding an Exp. Share will get\n", "some of the Exp. Points from battle.\r", @@ -75,7 +75,7 @@ ] }, { - "id": "pl_msg_00000101_00007", + "id": "Route206CyclingRoadNorthGate_Text_YouveGotToFindAtLeast35", "en_US": [ "You’ve met only {STRVAR_1 52, 1, 0} Pokémon?\r", "Hmm...\n", diff --git a/res/text/route_206_cycling_road_south_gate.json b/res/text/route_206_cycling_road_south_gate.json index 3149f4ec9d..4219d30496 100644 --- a/res/text/route_206_cycling_road_south_gate.json +++ b/res/text/route_206_cycling_road_south_gate.json @@ -2,25 +2,25 @@ "key": 36554, "messages": [ { - "id": "pl_msg_00000475_00000", + "id": "Route206CyclingRoadSouthGate_Text_Dummy0", "garbage": 46 }, { - "id": "pl_msg_00000475_00001", + "id": "Route206CyclingRoadSouthGate_Text_CyclingRoadIsOpenOnlyToCyclists", "en_US": [ "Cycling Road is open only to cyclists.\n", "You must be on a Bicycle.\r" ] }, { - "id": "pl_msg_00000475_00002", + "id": "Route206CyclingRoadSouthGate_Text_LearnHowToShiftGearsAndYoullBeAbleToRideAnywhere", "en_US": [ "Learn how to shift gears, and you’ll\n", "be able to ride anywhere." ] }, { - "id": "pl_msg_00000475_00003", + "id": "Route206CyclingRoadSouthGate_Text_WhatsABicycleWithoutThisYouveGotToHaveAFlag", "en_US": [ "What’s a Bicycle without this?\r", "You’ve got to have a Flag!\n", @@ -28,7 +28,7 @@ ] }, { - "id": "pl_msg_00000475_00004", + "id": "Route206CyclingRoadSouthGate_Text_GoThroughMtCoronetFromHereAndYouCanGetToHearthomeCity", "en_US": [ "Go through Mt. Coronet from here,\n", "and you can get to Hearthome City.\r", diff --git a/res/text/route_207.json b/res/text/route_207.json index ac61a6c462..973f044309 100644 --- a/res/text/route_207.json +++ b/res/text/route_207.json @@ -2,7 +2,7 @@ "key": 40580, "messages": [ { - "id": "pl_msg_00000477_00000", + "id": "Route207_Text_DawnPlayerChooseWhichHandYouWant", "en_US": [ "Dawn: Hi, {STRVAR_1 3, 0, 0}!\n", "How’s your Pokédex coming along?\r", @@ -15,7 +15,7 @@ ] }, { - "id": "pl_msg_00000477_00001", + "id": "Route207_Text_DawnISeeYouWantTheVsSeeker", "en_US": [ "Dawn: I see...\n", "You want the Vs. Seeker.\r", @@ -24,7 +24,7 @@ ] }, { - "id": "pl_msg_00000477_00002", + "id": "Route207_Text_DawnYouCanHaveThisTooThen", "en_US": [ "Dawn: Using that Vs. Seeker, you can\n", "find Trainers who want a rematch\f", @@ -38,7 +38,7 @@ ] }, { - "id": "pl_msg_00000477_00003", + "id": "Route207_Text_DawnTheDowsingMachineIsSomethingYouShouldTouchOften", "en_US": [ "Dawn: The {STRVAR_1 24, 1, 0} is\n", "something you should touch often.\r", @@ -52,7 +52,7 @@ ] }, { - "id": "pl_msg_00000477_00004", + "id": "Route207_Text_LucasPlayerIllShareWithYouChooseAHand", "en_US": [ "Lucas: Hey, {STRVAR_1 3, 0, 0}!\n", "How’s your Pokédex coming along?\r", @@ -66,7 +66,7 @@ ] }, { - "id": "pl_msg_00000477_00005", + "id": "Route207_Text_LucasOhYeahYouWantTheVsSeeker", "en_US": [ "Lucas: Oh yeah.\n", "You want the Vs. Seeker.\r", @@ -75,7 +75,7 @@ ] }, { - "id": "pl_msg_00000477_00006", + "id": "Route207_Text_LucasYouCanHaveThisTooThen", "en_US": [ "Lucas: Using that Vs. Seeker, you can\n", "find Trainers who want to battle with\f", @@ -89,7 +89,7 @@ ] }, { - "id": "pl_msg_00000477_00007", + "id": "Route207_Text_LucasTheDowsingMachineIsJustTryTouchingIt", "en_US": [ "Lucas: The {STRVAR_1 24, 1, 0} is...\n", "Just try touching it.\r", @@ -102,11 +102,11 @@ ] }, { - "id": "pl_msg_00000477_00008", + "id": "Route207_Text_Dummy8", "garbage": 59 }, { - "id": "pl_msg_00000477_00009", + "id": "Route207_Text_ThatSlopesTooSlippery", "en_US": [ "That slope’s too slippery.\n", "You’ll need a Bike to get up.\r", @@ -115,28 +115,28 @@ ] }, { - "id": "pl_msg_00000477_00010", + "id": "Route207_Text_ChangeToThe4thGearAndTakeARun", "en_US": [ "Change to the 4th gear and take a run.\n", "That’ll shoot you right up that slope." ] }, { - "id": "pl_msg_00000477_00011", + "id": "Route207_Text_Rt207MtCoronet", "en_US": [ "Rt. 207\n", "Mt. Coronet" ] }, { - "id": "pl_msg_00000477_00012", + "id": "Route207_Text_Rt207OreburghCity", "en_US": [ "Rt. 207\n", "Oreburgh City" ] }, { - "id": "pl_msg_00000477_00013", + "id": "Route207_Text_TrainerTipsPokemonMayBecomeImmobilizedIfTheyAreAsleepOrParalyzed", "en_US": [ "Trainer Tips\r", "Pokémon may become immobilized if\n", diff --git a/res/text/route_211_west.json b/res/text/route_211_west.json index 242e8388ee..2783e47089 100644 --- a/res/text/route_211_west.json +++ b/res/text/route_211_west.json @@ -2,18 +2,18 @@ "key": 40311, "messages": [ { - "id": "pl_msg_00000487_00000", + "id": "Route211West_Text_Dummy0", "garbage": 78 }, { - "id": "pl_msg_00000487_00001", + "id": "Route211West_Text_Rt211MtCoronet", "en_US": [ "Rt. 211\n", "Mt. Coronet" ] }, { - "id": "pl_msg_00000487_00002", + "id": "Route211West_Text_Rt211EternaCity", "en_US": [ "Rt. 211\n", "Eterna City" diff --git a/res/text/wayward_cave_1f.json b/res/text/wayward_cave_1f.json index 4202a3d97f..70dc8f8f46 100644 --- a/res/text/wayward_cave_1f.json +++ b/res/text/wayward_cave_1f.json @@ -2,7 +2,7 @@ "key": 42051, "messages": [ { - "id": "pl_msg_00000272_00000", + "id": "WaywardCave1F_Text_ImMiraPleaseTakeMeToTheExit", "en_US": [ "I’m Mira...\r", "I was catching Pokémon, and then\n", @@ -13,21 +13,21 @@ ] }, { - "id": "pl_msg_00000272_00001", + "id": "WaywardCave1F_Text_PlayerDecidedToGoWithMira", "en_US": [ "{STRVAR_1 3, 0, 0} decided to go with\n", "Mira!" ] }, { - "id": "pl_msg_00000272_00002", + "id": "WaywardCave1F_Text_IllKeepYourPokemonHealthyAllTheTime", "en_US": [ "Mira: I’ll keep your Pokémon healthy\n", "all the time!" ] }, { - "id": "pl_msg_00000272_00003", + "id": "WaywardCave1F_Text_MyNameIsMiraILikeYourName", "en_US": [ "Trainer, your name is {STRVAR_1 3, 0, 0}?\r", "My name is Mira.\n", @@ -35,14 +35,14 @@ ] }, { - "id": "pl_msg_00000272_00004", + "id": "WaywardCave1F_Text_OhPlayerIWaitedALongTime", "en_US": [ "Mira: Oh! {STRVAR_1 3, 0, 0}...\n", "I waited... A long time...\r" ] }, { - "id": "pl_msg_00000272_00005", + "id": "WaywardCave1F_Text_OhTheresTheExitThankYou", "en_US": [ "Mira: Oh! There’s the exit!\r", "I want to get tougher so I\n", @@ -52,19 +52,19 @@ ] }, { - "id": "pl_msg_00000272_00006", + "id": "WaywardCave1F_Text_Dummy6", "garbage": 29 }, { - "id": "pl_msg_00000272_00007", + "id": "WaywardCave1F_Text_Dummy7", "garbage": 29 }, { - "id": "pl_msg_00000272_00008", + "id": "WaywardCave1F_Text_Dummy8", "garbage": 26 }, { - "id": "pl_msg_00000272_00009", + "id": "WaywardCave1F_Text_ILikeHelpfulPokemonMovesLikeGrowlAndMinimize", "en_US": [ "Mira: I like helpful Pokémon moves\n", "like Growl and Minimize.\r", @@ -73,7 +73,7 @@ ] }, { - "id": "pl_msg_00000272_00010", + "id": "WaywardCave1F_Text_ThisCaveItsSoEasyToGetConfused", "en_US": [ "Mira: This cave...\n", "It’s so easy to get confused.\r", @@ -81,7 +81,7 @@ ] }, { - "id": "pl_msg_00000272_00011", + "id": "WaywardCave1F_Text_PlayerDidYouGetToBeSoGoodBecauseYoureAlwaysWithPokemon", "en_US": [ "Mira: {STRVAR_1 3, 0, 0}, did you get to be\n", "so good because you’re always with\f", diff --git a/src/item_use_functions.c b/src/item_use_functions.c index 84abb8485b..8bca191462 100644 --- a/src/item_use_functions.c +++ b/src/item_use_functions.c @@ -371,7 +371,7 @@ static enum ItemUseCheckResult CanUseExplorerKit(const ItemUseContext *usageCont return ITEM_USE_CANNOT_USE_GENERIC; } - if (sub_0205EFDC(usageContext->playerAvatar) == TRUE) { + if (PlayerAvatar_GetFlagIsOnCyclingRoad(usageContext->playerAvatar) == TRUE) { return ITEM_USE_CANNOT_USE_GENERIC; } @@ -477,7 +477,7 @@ static enum ItemUseCheckResult CanUseBicycle(const ItemUseContext *usageContext) return ITEM_USE_CANNOT_DISMOUNT; } - if (sub_0205EFDC(usageContext->playerAvatar) == TRUE) { + if (PlayerAvatar_GetFlagIsOnCyclingRoad(usageContext->playerAvatar) == TRUE) { return ITEM_USE_CANNOT_DISMOUNT; } diff --git a/src/player_avatar.c b/src/player_avatar.c index 520f822470..ca16977c23 100644 --- a/src/player_avatar.c +++ b/src/player_avatar.c @@ -732,18 +732,18 @@ BOOL sub_0205EFB0(PlayerAvatar *playerAvatar) return FALSE; } -void sub_0205EFC4(PlayerAvatar *playerAvatar, int flag) +void PlayerAvatar_SetFlagIsOnCyclingRoad(PlayerAvatar *playerAvatar, int flag) { if (flag == TRUE) { - PlayerAvatar_SetFlagUnk_00(playerAvatar, UNK_00_3); + PlayerAvatar_SetFlagUnk_00(playerAvatar, UNK_00_IS_ON_CYCLING_ROAD); } else { - PlayerAvatar_ClearFlagUnk_00(playerAvatar, UNK_00_3); + PlayerAvatar_ClearFlagUnk_00(playerAvatar, UNK_00_IS_ON_CYCLING_ROAD); } } -BOOL sub_0205EFDC(PlayerAvatar *playerAvatar) +BOOL PlayerAvatar_GetFlagIsOnCyclingRoad(PlayerAvatar *playerAvatar) { - if (PlayerAvatar_GetFlagUnk_00(playerAvatar, UNK_00_3)) { + if (PlayerAvatar_GetFlagUnk_00(playerAvatar, UNK_00_IS_ON_CYCLING_ROAD)) { return TRUE; } diff --git a/src/scrcmd.c b/src/scrcmd.c index 52790f181f..c9846a6f74 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -415,7 +415,7 @@ static BOOL sub_02042C80(ScriptContext *ctx); static BOOL ScrCmd_ChangeIntoContestAttire(ScriptContext *ctx); static BOOL ScrCmd_CheckPlayerOnBike(ScriptContext *ctx); static BOOL ScrCmd_SetPlayerBike(ScriptContext *ctx); -static BOOL ScrCmd_0C9(ScriptContext *ctx); +static BOOL ScrCmd_ForceBicycling(ScriptContext *ctx); static BOOL ScrCmd_GetPlayerState(ScriptContext *ctx); static BOOL ScrCmd_SetPlayerState(ScriptContext *ctx); static BOOL ScrCmd_ChangePlayerState(ScriptContext *ctx); @@ -698,7 +698,7 @@ static BOOL ResumeOnSelectionOrDisconnect(ScriptContext *ctx); static BOOL ScrCmd_ShowUnionRoomMenu(ScriptContext *ctx); static BOOL ScrCmd_2BB(ScriptContext *ctx); static BOOL ScrCmd_GetTrainerCardLevel(ScriptContext *ctx); -static BOOL ScrCmd_2BF(ScriptContext *ctx); +static BOOL ScrCmd_SetCyclingBGM(ScriptContext *ctx); static BOOL ScrCmd_OpenSaveInfo(ScriptContext *ctx); static BOOL ScrCmd_CloseSaveInfo(ScriptContext *ctx); static BOOL ScrCmd_Unused_2C3(ScriptContext *ctx); @@ -965,7 +965,7 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_ChangeIntoContestAttire, ScrCmd_CheckPlayerOnBike, ScrCmd_SetPlayerBike, - ScrCmd_0C9, + ScrCmd_ForceBicycling, ScrCmd_GetPlayerState, ScrCmd_SetPlayerState, ScrCmd_ChangePlayerState, @@ -1467,7 +1467,7 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_CheckDidNotCapture, ScrCmd_StartLegendaryBattle, ScrCmd_GetTrainerCardLevel, - ScrCmd_2BF, + ScrCmd_SetCyclingBGM, ScrCmd_MessageAutoScroll, ScrCmd_OpenSaveInfo, ScrCmd_CloseSaveInfo, @@ -4573,15 +4573,15 @@ static BOOL ScrCmd_SetPlayerBike(ScriptContext *ctx) return FALSE; } -static BOOL ScrCmd_2BF(ScriptContext *ctx) +static BOOL ScrCmd_SetCyclingBGM(ScriptContext *ctx) { Sound_SetSpecialBGM(ctx->fieldSystem, SEQ_PL_BICYCLE); return FALSE; } -static BOOL ScrCmd_0C9(ScriptContext *ctx) +static BOOL ScrCmd_ForceBicycling(ScriptContext *ctx) { - sub_0205EFC4(ctx->fieldSystem->playerAvatar, ScriptContext_ReadByte(ctx)); + PlayerAvatar_SetFlagIsOnCyclingRoad(ctx->fieldSystem->playerAvatar, ScriptContext_ReadByte(ctx)); return FALSE; } diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c index 416bf4b540..663c785971 100644 --- a/src/unk_0205F180.c +++ b/src/unk_0205F180.c @@ -2383,7 +2383,7 @@ static int PlayerAvatar_IsUnderCyclingRoad(PlayerAvatar *playerAvatar, u32 param return FALSE; } - if (sub_0205EFDC(playerAvatar) == 0) { + if (PlayerAvatar_GetFlagIsOnCyclingRoad(playerAvatar) == 0) { return FALSE; }