From e9ee028a3174f088fa5bb30339e12e832807ef5c Mon Sep 17 00:00:00 2001 From: Viperio <146665252+Viperio19@users.noreply.github.com> Date: Fri, 3 Apr 2026 19:54:41 +0200 Subject: [PATCH] Document routes 216-217 and lake acuity scripts, polish lake cavern scripts (#1054) --- generated/vars_flags.txt | 28 ++--- res/field/events/events_acuity_cavern.json | 4 +- res/field/events/events_acuity_lakefront.json | 8 +- res/field/events/events_lake_acuity.json | 6 +- .../events/events_lake_acuity_low_water.json | 2 +- res/field/events/events_route_216.json | 22 ++-- res/field/events/events_route_216_house.json | 4 +- res/field/events/events_route_217.json | 30 ++--- .../events_route_217_northeast_house.json | 4 +- .../events/events_route_217_west_house.json | 2 +- .../events_snowpoint_city_pokecenter_1f.json | 2 +- res/field/events/events_valor_cavern.json | 2 +- res/field/events/events_verity_cavern.json | 8 +- res/field/scripts/scripts_acuity_cavern.s | 13 +-- res/field/scripts/scripts_acuity_lakefront.s | 43 +++---- res/field/scripts/scripts_init_new_game.s | 10 +- res/field/scripts/scripts_lake_acuity.s | 109 +++++++++--------- .../scripts/scripts_lake_acuity_low_water.s | 14 +-- .../scripts_pokemon_league_hall_of_fame.s | 14 +-- res/field/scripts/scripts_route_216.s | 18 +-- res/field/scripts/scripts_route_216_house.s | 42 +++---- res/field/scripts/scripts_route_217.s | 81 ++++++------- .../scripts_route_217_northeast_house.s | 20 ++-- .../scripts/scripts_route_217_west_house.s | 26 ++--- ...cripts_sandgem_town_pokemon_research_lab.s | 6 +- res/field/scripts/scripts_valor_cavern.s | 2 +- res/field/scripts/scripts_verity_cavern.s | 82 +++++++------ res/text/acuity_lakefront.json | 12 +- res/text/lake_acuity.json | 12 +- res/text/lake_acuity_low_water.json | 4 +- res/text/route_216.json | 6 +- res/text/route_216_house.json | 14 +-- res/text/route_217.json | 10 +- res/text/route_217_northeast_house.json | 4 +- res/text/route_217_west_house.json | 6 +- 35 files changed, 335 insertions(+), 335 deletions(-) diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index 0e356bbb1b..1cb378d157 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -167,7 +167,7 @@ FLAG_COULDNT_RECEIVE_OREBURGH_MINE_B1F_FLAME_PLATE FLAG_UNK_0x00A6 FLAG_UNK_0x00A7 FLAG_LAKE_VALOR_EXPLODED -FLAG_UNK_0x00A9 +FLAG_TALKED_TO_LAKE_ACUITY_LOW_WATER_RIVAL FLAG_UNK_0x00AA FLAG_LOCAL_DEX_DIPLOMA_RECEIVED FLAG_NATIONAL_DEX_DIPLOMA_RECEIVED @@ -220,7 +220,7 @@ FLAG_UNK_0x00DA FLAG_MR_FUEGO_ASKED_FOR_TRADE FLAG_COULD_NOT_RECEIVE_POKEMON_NEWS_PRESS_REWARD FLAG_UNK_0x00DD -FLAG_UNK_0x00DE +FLAG_RECEIVED_ROUTE_217_WEST_HOUSE_ICICLE_PLATE FLAG_UNK_0x00DF FLAG_TALKED_TO_WAYWARD_CAVE_1F_MIRA FLAG_UNK_0x00E1 @@ -313,7 +313,7 @@ FLAG_COULD_NOT_RECEIVE_ROUTE_221_HOUSE_REWARD FLAG_RECEIVED_FUEGO_IRONWORKS_BUILDING_STAR_PIECE FLAG_RECEIVED_POKEMON_MANSION_MAIDS_ROOM_SOOTHE_BELL FLAG_RECEIVED_GRAND_LAKE_VALOR_LAKEFRONT_EAST_HOUSE_WHITE_FLUTE -FLAG_UNK_0x013B +FLAG_RECEIVED_ROUTE_217_NORTHEAST_HOUSE_SPELL_TAG FLAG_TRAVELED_TO_NEWMOON_ISLAND VAR_OBTAINED_ACCESSORY_STARTER_MASK FLAG_DEFEATED_COMMANDER_SATURN_VALOR_CAVERN @@ -424,7 +424,7 @@ FLAG_UNK_0x01A6 FLAG_HIDE_ROARK_UNDERGROUND FLAG_HIDE_VEILSTONE_COUNTERPART FLAG_HIDE_PASTORIA_CITY_RIVAL -FLAG_UNK_0x01AA +FLAG_HIDE_ACUITY_LAKEFRONT_RIVAL FLAG_HIDE_MT_CORONET_1F_SOUTH_CYRUS FLAG_UNK_0x01AC FLAG_HIDE_VALOR_LAKEFRONT_CYNTHIA @@ -439,7 +439,7 @@ FLAG_HIDE_CANALAVE_CITY_COUNTERPART FLAG_HIDE_CANALAVE_LIBRARY_COUNTERPART FLAG_HIDE_CANALAVE_LIBRARY_ROWAN FLAG_HIDE_CANALAVE_LIBRARY_RIVAL -FLAG_UNK_0x01B9 +FLAG_HIDE_LAKE_ACUITY_RIVAL FLAG_HIDE_LAKE_ACUITY_JUPITER FLAG_HIDE_TEAM_GALACTIC_ETERNA_BUILDING_1F_LOOKER FLAG_HIDE_LAKE_VALOR_GALACTIC @@ -477,9 +477,9 @@ FLAG_HIDE_STARK_MOUNTAIN_ROOM_3_BUCK FLAG_UNK_0x01DC FLAG_HIDE_STARK_MOUNTAIN_ROOM_3_HEATRAN FLAG_UNK_0x01DE -FLAG_MESPRIT_DISAPPEARED -FLAG_AZELF_DISAPPEARED -FLAG_UXIE_DISAPPEARED +FLAG_HIDE_VERITY_CAVERN_MESPRIT +FLAG_HIDE_VALOR_CAVERN_AZELF +FLAG_HIDE_ACUITY_CAVERN_UXIE FLAG_UNK_0x01E2 FLAG_UNK_0x01E3 FLAG_HIDE_WAYWARD_CAVE_1F_MIRA @@ -562,7 +562,7 @@ FLAG_UNK_0x0230 FLAG_UNK_0x0231 FLAG_UNK_0x0232 FLAG_UNK_0x0233 -FLAG_UNK_0x0234 +FLAG_HIDE_SNOWPOINT_CITY_POKECENTER_1F_MAYLENE FLAG_HIDE_MT_CORONET_2F_CAVE_PAINTING FLAG_UNK_0x0236 FLAG_UNK_0x0237 @@ -605,7 +605,7 @@ FLAG_HIDE_CANALAVE_CITY_SAILOR_ELDRITCH_HOUSE_SAILOR_ELDRITCH FLAG_UNK_0x025C FLAG_HIDE_VALOR_LAKEFRONT_BEAUTY FLAG_HIDE_GRAND_LAKE_VALOR_LAKEFRONT_EAST_HOUSE_BEAUTY -FLAG_UNK_0x025F +FLAG_HIDE_ROUTE_217_NORTHEAST_HOUSE_POKEMON_BREEDER_F FLAG_HIDE_ROUTE_212_NORTH_POLICEMAN_BOBBY_NO_BATTLE FLAG_HIDE_ROUTE_212_NORTH_POLICEMAN_BOBBY FLAG_HIDE_ROUTE_212_NORTH_POLICEMAN_ALEX_NO_BATTLE @@ -660,8 +660,8 @@ FLAG_UNK_0x0292 FLAG_HIDE_LAKE_ACUITY_LOW_WATER_RIVAL FLAG_UNK_0x0294 FLAG_HIDE_MT_CORONET_1F_NORTH_ROOM_1_GRUNT_F -FLAG_UNK_0x0296 -FLAG_UNK_0x0297 +FLAG_HIDE_VERITY_CAVERN_PROF_OAK +FLAG_HIDE_ROUTE_217_MAYLENE FLAG_HIDE_VEILSTONE_CITY_GYM_MAYLENE FLAG_UNK_0x0299 FLAG_HIDE_MT_CORONET_1F_NORTH_ROOM_1_GRUNTS_M @@ -4231,7 +4231,7 @@ VAR_UNK_0x4080 VAR_UNK_0x4081 VAR_UNK_0x4082 VAR_UNK_0x4083 -VAR_UNK_0x4084 +VAR_ACUITY_LAKEFRONT_STATE VAR_UNK_0x4085 VAR_FOLLOWER_RIVAL_STATE VAR_ROUTE_202_STATE @@ -4267,7 +4267,7 @@ VAR_PLAYER_HOUSE_STATE VAR_PLAYER_HOUSE_RIVAL_TRIGGER_STATE VAR_SANDGEM_TOWN_LAB_STATE VAR_UNK_0x40A7 -VAR_UNK_0x40A8 +VAR_ROUTE_217_STATE VAR_MT_CORONET_2F_STATE VAR_EXITED_DISTORTION_WORLD_STATE VAR_AMITY_SQUARE_GIFT_ID diff --git a/res/field/events/events_acuity_cavern.json b/res/field/events/events_acuity_cavern.json index c90165f9d4..5112569804 100644 --- a/res/field/events/events_acuity_cavern.json +++ b/res/field/events/events_acuity_cavern.json @@ -2,11 +2,11 @@ "bg_events": [], "object_events": [ { - "id": "ACUITY_CAVERN_UXIE_0", + "id": "LOCALID_UXIE", "graphics_id": "OBJ_EVENT_GFX_UXIE", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UXIE_DISAPPEARED", + "hidden_flag": "FLAG_HIDE_ACUITY_CAVERN_UXIE", "script": 3, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_acuity_lakefront.json b/res/field/events/events_acuity_lakefront.json index 5a88ab3031..b0f9a2076a 100644 --- a/res/field/events/events_acuity_lakefront.json +++ b/res/field/events/events_acuity_lakefront.json @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "ACUITY_LAKEFRONT_ARROW_SIGNPOST_1", + "id": "LOCALID_ARROW_SIGNPOST", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -34,11 +34,11 @@ "y": 0 }, { - "id": "ACUITY_LAKEFRONT_RIVAL_2", + "id": "LOCALID_RIVAL", "graphics_id": "OBJ_EVENT_GFX_BARRY", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01AA", + "hidden_flag": "FLAG_HIDE_ACUITY_LAKEFRONT_RIVAL", "script": 0, "initial_dir": 1, "data": [], @@ -98,7 +98,7 @@ "y": 0, "width": 2, "length": 1, - "var": "VAR_UNK_0x4084", + "var": "VAR_ACUITY_LAKEFRONT_STATE", "value": 0 } ] diff --git a/res/field/events/events_lake_acuity.json b/res/field/events/events_lake_acuity.json index e66560a35e..75e3beab4a 100644 --- a/res/field/events/events_lake_acuity.json +++ b/res/field/events/events_lake_acuity.json @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "LAKE_ACUITY_JUPITER_1", + "id": "LOCALID_JUPITER", "graphics_id": "OBJ_EVENT_GFX_JUPITER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,11 +32,11 @@ "y": 0 }, { - "id": "LAKE_ACUITY_RIVAL_2", + "id": "LOCALID_RIVAL", "graphics_id": "OBJ_EVENT_GFX_BARRY", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01B9", + "hidden_flag": "FLAG_HIDE_LAKE_ACUITY_RIVAL", "script": 0, "initial_dir": 0, "data": [], diff --git a/res/field/events/events_lake_acuity_low_water.json b/res/field/events/events_lake_acuity_low_water.json index e7e361c3bb..d2bd3d6186 100644 --- a/res/field/events/events_lake_acuity_low_water.json +++ b/res/field/events/events_lake_acuity_low_water.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "LAKE_ACUITY_LOW_WATER_RIVAL_0", + "id": "LOCALID_RIVAL", "graphics_id": "OBJ_EVENT_GFX_BARRY", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_route_216.json b/res/field/events/events_route_216.json index 0a147ec610..b5c51fbf3f 100644 --- a/res/field/events/events_route_216.json +++ b/res/field/events/events_route_216.json @@ -11,7 +11,7 @@ ], "object_events": [ { - "id": "ROUTE_216_ACE_TRAINER_BLAKE", + "id": "LOCALID_ACE_TRAINER_BLAKE", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_SNOW_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -28,7 +28,7 @@ "y": 0 }, { - "id": "ROUTE_216_ACE_TRAINER_LAURA", + "id": "LOCALID_ACE_TRAINER_LAURA", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_SNOW_F", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -45,7 +45,7 @@ "y": 0 }, { - "id": "ROUTE_216_BLACK_BELT_PHILIP", + "id": "LOCALID_BLACK_BELT_PHILIP", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "ROUTE_216_SKIER_BRADLEY", + "id": "LOCALID_SKIER_BRADLEY", "graphics_id": "OBJ_EVENT_GFX_SKIER_M", "movement_type": "MOVEMENT_TYPE_WALK_BACK_AND_FORTH", "trainer_type": "TRAINER_TYPE_SPIN_COUNTERCLOCKWISE", @@ -79,7 +79,7 @@ "y": 0 }, { - "id": "ROUTE_216_ACE_TRAINER_GARRETT", + "id": "LOCALID_ACE_TRAINER_GARRETT", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_SNOW_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -96,7 +96,7 @@ "y": 0 }, { - "id": "ROUTE_216_ACE_TRAINER_MARIA", + "id": "LOCALID_ACE_TRAINER_MARIA", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_SNOW_F", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -113,7 +113,7 @@ "y": 0 }, { - "id": "ROUTE_216_SKIER_KAITLYN", + "id": "LOCALID_SKIER_KAITLYN", "graphics_id": "OBJ_EVENT_GFX_SKIER_F", "movement_type": "MOVEMENT_TYPE_WALK_SOUTH_EAST_NORTH_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -130,7 +130,7 @@ "y": 0 }, { - "id": "ROUTE_216_SKIER_EDWARD", + "id": "LOCALID_SKIER_EDWARD", "graphics_id": "OBJ_EVENT_GFX_SKIER_M", "movement_type": "MOVEMENT_TYPE_WALK_SOUTH_EAST_NORTH_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -147,7 +147,7 @@ "y": 0 }, { - "id": "ROUTE_216_SKIER_ANDREA", + "id": "LOCALID_SKIER_ANDREA", "graphics_id": "OBJ_EVENT_GFX_SKIER_F", "movement_type": "MOVEMENT_TYPE_WALK_EAST_SOUTH_WEST_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -164,7 +164,7 @@ "y": 0 }, { - "id": "ROUTE_216_ARROW_SIGNPOST_9", + "id": "LOCALID_ARROW_SIGNPOST", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -181,7 +181,7 @@ "y": 0 }, { - "id": "ROUTE_216_SIGNBOARD_10", + "id": "LOCALID_SIGNBOARD_SNOWBOUND_LODGE", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_route_216_house.json b/res/field/events/events_route_216_house.json index f37aa19f06..00a1ae2d65 100644 --- a/res/field/events/events_route_216_house.json +++ b/res/field/events/events_route_216_house.json @@ -19,7 +19,7 @@ ], "object_events": [ { - "id": "ROUTE_216_HOUSE_HIKER_0", + "id": "LOCALID_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -34,7 +34,7 @@ "y": 0 }, { - "id": "ROUTE_216_HOUSE_SNOWPOINT_NPC_F_1", + "id": "LOCALID_SNOWPOINT_NPC_F", "graphics_id": "OBJ_EVENT_GFX_SNOWPOINT_NPC_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_route_217.json b/res/field/events/events_route_217.json index 31b6d766b3..db3a309496 100644 --- a/res/field/events/events_route_217.json +++ b/res/field/events/events_route_217.json @@ -83,7 +83,7 @@ ], "object_events": [ { - "id": "ROUTE_217_SKIER_SHAWN", + "id": "LOCALID_SKIER_SHAWN", "graphics_id": "OBJ_EVENT_GFX_SKIER_M", "movement_type": "MOVEMENT_TYPE_WALK_WEST_SOUTH_EAST_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -100,7 +100,7 @@ "y": 0 }, { - "id": "ROUTE_217_SKIER_LEXIE", + "id": "LOCALID_SKIER_LEXIE", "graphics_id": "OBJ_EVENT_GFX_SKIER_F", "movement_type": "MOVEMENT_TYPE_WALK_NORTH_WEST_SOUTH_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -117,7 +117,7 @@ "y": 0 }, { - "id": "ROUTE_217_SKIER_BJORN", + "id": "LOCALID_SKIER_BJORN", "graphics_id": "OBJ_EVENT_GFX_SKIER_M", "movement_type": "MOVEMENT_TYPE_WALK_EAST_SOUTH_WEST_NORTH", "trainer_type": "TRAINER_TYPE_SPIN_COUNTERCLOCKWISE", @@ -134,7 +134,7 @@ "y": 0 }, { - "id": "ROUTE_217_SKIER_MADISON", + "id": "LOCALID_SKIER_MADISON", "graphics_id": "OBJ_EVENT_GFX_SKIER_F", "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -151,7 +151,7 @@ "y": 0 }, { - "id": "ROUTE_217_NINJA_BOY_MATTHEW", + "id": "LOCALID_NINJA_BOY_MATTHEW", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "movement_type": "MOVEMENT_TYPE_DISGUISE_SNOW", "trainer_type": "TRAINER_TYPE_VIEW_ALL_DIRECTIONS", @@ -168,7 +168,7 @@ "y": 0 }, { - "id": "ROUTE_217_NINJA_BOY_ETHAN", + "id": "LOCALID_NINJA_BOY_ETHAN", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "movement_type": "MOVEMENT_TYPE_DISGUISE_SNOW", "trainer_type": "TRAINER_TYPE_VIEW_ALL_DIRECTIONS", @@ -185,7 +185,7 @@ "y": 0 }, { - "id": "ROUTE_217_BLACK_BELT_LUKE", + "id": "LOCALID_BLACK_BELT_LUKE", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "movement_type": "MOVEMENT_TYPE_WALK_BACK_AND_FORTH", "trainer_type": "TRAINER_TYPE_FACE_COUNTERCLOCKWISE", @@ -202,7 +202,7 @@ "y": 0 }, { - "id": "ROUTE_217_ACE_TRAINER_DALTON", + "id": "LOCALID_ACE_TRAINER_DALTON", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_SNOW_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -219,7 +219,7 @@ "y": 0 }, { - "id": "ROUTE_217_ACE_TRAINER_OLIVIA", + "id": "LOCALID_ACE_TRAINER_OLIVIA", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_SNOW_F", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -236,7 +236,7 @@ "y": 0 }, { - "id": "ROUTE_217_ARROW_SIGNPOST_9", + "id": "LOCALID_ARROW_SIGNPOST", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -298,7 +298,7 @@ "y": 0 }, { - "id": "ROUTE_217_ICE_ROCK_13", + "id": "LOCALID_ICE_ROCK", "graphics_id": "OBJ_EVENT_GFX_ICE_ROCK", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -313,7 +313,7 @@ "y": 0 }, { - "id": "ROUTE_217_SNOWPOINT_NPC_F_14", + "id": "LOCALID_SNOWPOINT_NPC_F", "graphics_id": "OBJ_EVENT_GFX_SNOWPOINT_NPC_F", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -328,11 +328,11 @@ "y": 0 }, { - "id": "ROUTE_217_MAYLENE_15", + "id": "LOCALID_MAYLENE", "graphics_id": "OBJ_EVENT_GFX_MAYLENE", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0297", + "hidden_flag": "FLAG_HIDE_ROUTE_217_MAYLENE", "script": 0, "initial_dir": 0, "data": [], @@ -410,7 +410,7 @@ "y": 0, "width": 2, "length": 1, - "var": "VAR_UNK_0x40A8", + "var": "VAR_ROUTE_217_STATE", "value": 0 } ] diff --git a/res/field/events/events_route_217_northeast_house.json b/res/field/events/events_route_217_northeast_house.json index a7617c30dc..d28ceb2a73 100644 --- a/res/field/events/events_route_217_northeast_house.json +++ b/res/field/events/events_route_217_northeast_house.json @@ -2,11 +2,11 @@ "bg_events": [], "object_events": [ { - "id": "ROUTE_217_NORTHEAST_HOUSE_POKEMON_BREEDER_F_0", + "id": "LOCALID_POKEMON_BREEDER_F", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x025F", + "hidden_flag": "FLAG_HIDE_ROUTE_217_NORTHEAST_HOUSE_POKEMON_BREEDER_F", "script": 1, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_route_217_west_house.json b/res/field/events/events_route_217_west_house.json index 3cf5fd4e59..066fbf9120 100644 --- a/res/field/events/events_route_217_west_house.json +++ b/res/field/events/events_route_217_west_house.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "ROUTE_217_WEST_HOUSE_HIKER_0", + "id": "LOCALID_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_snowpoint_city_pokecenter_1f.json b/res/field/events/events_snowpoint_city_pokecenter_1f.json index d88ca3d273..1ae06f53d8 100644 --- a/res/field/events/events_snowpoint_city_pokecenter_1f.json +++ b/res/field/events/events_snowpoint_city_pokecenter_1f.json @@ -66,7 +66,7 @@ "graphics_id": "OBJ_EVENT_GFX_MAYLENE", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0234", + "hidden_flag": "FLAG_HIDE_SNOWPOINT_CITY_POKECENTER_1F_MAYLENE", "script": 5, "initial_dir": 0, "data": [], diff --git a/res/field/events/events_valor_cavern.json b/res/field/events/events_valor_cavern.json index 7150d78a6c..1ca6bed214 100644 --- a/res/field/events/events_valor_cavern.json +++ b/res/field/events/events_valor_cavern.json @@ -6,7 +6,7 @@ "graphics_id": "OBJ_EVENT_GFX_AZELF", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_AZELF_DISAPPEARED", + "hidden_flag": "FLAG_HIDE_VALOR_CAVERN_AZELF", "script": 3, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_verity_cavern.json b/res/field/events/events_verity_cavern.json index acc03d048a..87a5a1cc97 100644 --- a/res/field/events/events_verity_cavern.json +++ b/res/field/events/events_verity_cavern.json @@ -2,11 +2,11 @@ "bg_events": [], "object_events": [ { - "id": "VERITY_CAVERN_MESPRIT_0", + "id": "LOCALID_MESPRIT", "graphics_id": "OBJ_EVENT_GFX_MESPRIT", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_MESPRIT_DISAPPEARED", + "hidden_flag": "FLAG_HIDE_VERITY_CAVERN_MESPRIT", "script": 2, "initial_dir": 1, "data": [], @@ -17,11 +17,11 @@ "y": 0 }, { - "id": "VERITY_CAVERN_PROF_ROWAN_1", + "id": "LOCALID_PROF_ROWAN", "graphics_id": "OBJ_EVENT_GFX_PROF_ROWAN", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0296", + "hidden_flag": "FLAG_HIDE_VERITY_CAVERN_PROF_OAK", "script": 0, "initial_dir": 0, "data": [], diff --git a/res/field/scripts/scripts_acuity_cavern.s b/res/field/scripts/scripts_acuity_cavern.s index 1b13f90e10..5297d7b913 100644 --- a/res/field/scripts/scripts_acuity_cavern.s +++ b/res/field/scripts/scripts_acuity_cavern.s @@ -1,24 +1,23 @@ #include "macros/scrcmd.inc" #include "res/text/bank/acuity_cavern.h" - -#define LOCALID_UXIE 0 +#include "res/field/events/events_acuity_cavern.h" - ScriptEntry _000E - ScriptEntry AcuityCavern_CheckShouldUxieBeRemoved + ScriptEntry AcuityCavern_OnTransition + ScriptEntry AcuityCavern_OnLoad ScriptEntry AcuityCavern_Uxie ScriptEntryEnd -_000E: +AcuityCavern_OnTransition: SetFlag FLAG_FIRST_ARRIVAL_ACUITY_CAVERN End -AcuityCavern_CheckShouldUxieBeRemoved: +AcuityCavern_OnLoad: GoToIfSet FLAG_MAP_LOCAL, AcuityCavern_RemoveUxie End AcuityCavern_RemoveUxie: - SetFlag FLAG_UXIE_DISAPPEARED + SetFlag FLAG_HIDE_ACUITY_CAVERN_UXIE RemoveObject LOCALID_UXIE ClearFlag FLAG_MAP_LOCAL End diff --git a/res/field/scripts/scripts_acuity_lakefront.s b/res/field/scripts/scripts_acuity_lakefront.s index f1d1d33716..fc8f4a1190 100644 --- a/res/field/scripts/scripts_acuity_lakefront.s +++ b/res/field/scripts/scripts_acuity_lakefront.s @@ -1,14 +1,15 @@ #include "macros/scrcmd.inc" #include "res/text/bank/acuity_lakefront.h" +#include "res/field/events/events_acuity_lakefront.h" - ScriptEntry _004E - ScriptEntry _0012 - ScriptEntry _0083 - ScriptEntry _009A + ScriptEntry AcuityLakefront_OnTransition + ScriptEntry AcuityLakefront_OnLoad + ScriptEntry AcuityLakefront_ArrowSignpostLakeAcuity + ScriptEntry AcuityLakefront_TriggerRival ScriptEntryEnd -_0012: +AcuityLakefront_OnLoad: GoToIfUnset FLAG_TEAM_GALACTIC_LEFT_LAKE_VERITY, AcuityLakefront_RemoveWarpsLakeAcuityNormal GoToIfSet FLAG_TEAM_GALACTIC_LEFT_LAKE_VERITY, AcuityLakefront_RemoveWarpsLakeAcuityLowWater End @@ -23,55 +24,55 @@ AcuityLakefront_RemoveWarpsLakeAcuityLowWater: SetWarpEventPos 1, 306, 229 End -_004E: +AcuityLakefront_OnTransition: CheckBadgeAcquired BADGE_ID_ICICLE, VAR_MAP_LOCAL_0 - CallIfEq VAR_MAP_LOCAL_0, TRUE, _0079 + CallIfEq VAR_MAP_LOCAL_0, TRUE, AcuityLakefront_SetVeilstoneGymMaylene GoToIfUnset FLAG_TEAM_GALACTIC_LEFT_LAKE_VERITY, AcuityLakefront_RemoveWarpsLakeAcuityNormal GoToIfSet FLAG_TEAM_GALACTIC_LEFT_LAKE_VERITY, AcuityLakefront_RemoveWarpsLakeAcuityLowWater End -_0079: - SetFlag FLAG_UNK_0x0234 +AcuityLakefront_SetVeilstoneGymMaylene: + SetFlag FLAG_HIDE_SNOWPOINT_CITY_POKECENTER_1F_MAYLENE ClearFlag FLAG_HIDE_VEILSTONE_CITY_GYM_MAYLENE Return -_0083: - ShowArrowSign 5 +AcuityLakefront_ArrowSignpostLakeAcuity: + ShowArrowSign AcuityLakefront_Text_SignLakeAcuityAhead End -_009A: +AcuityLakefront_TriggerRival: LockAll GetPlayerMapPos VAR_0x8004, VAR_0x8005 AddFreeCamera VAR_0x8004, VAR_0x8005 - ApplyFreeCameraMovement _00E8 + ApplyFreeCameraMovement AcuityLakefront_Movement_CameraMoveNorth WaitMovement WaitTime 15, VAR_RESULT BufferRivalName 0 BufferPlayerName 1 - Message 0 + Message AcuityLakefront_Text_CantClimbWithoutBadge CloseMessage - ApplyMovement 2, _00F8 + ApplyMovement LOCALID_RIVAL, AcuityLakefront_Movement_RivalLeave WaitMovement - RemoveObject 2 - ApplyFreeCameraMovement _00F0 + RemoveObject LOCALID_RIVAL + ApplyFreeCameraMovement AcuityLakefront_Movement_CameraMoveSouth WaitMovement RestoreCamera - SetVar VAR_UNK_0x4084, 1 + SetVar VAR_ACUITY_LAKEFRONT_STATE, 1 ReleaseAll End .balign 4, 0 -_00E8: +AcuityLakefront_Movement_CameraMoveNorth: WalkNormalNorth 6 EndMovement .balign 4, 0 -_00F0: +AcuityLakefront_Movement_CameraMoveSouth: WalkNormalSouth 6 EndMovement .balign 4, 0 -_00F8: +AcuityLakefront_Movement_RivalLeave: WalkNormalNorth 3 WalkNormalWest WalkNormalNorth 4 diff --git a/res/field/scripts/scripts_init_new_game.s b/res/field/scripts/scripts_init_new_game.s index b2f63b7cb6..eaebb4be88 100644 --- a/res/field/scripts/scripts_init_new_game.s +++ b/res/field/scripts/scripts_init_new_game.s @@ -13,10 +13,10 @@ _0006: SetFlag FLAG_HIDE_LAKE_VERITY_LOW_WATER_PROF_ROWAN SetFlag FLAG_HIDE_LAKE_VERITY_LOW_WATER_COUNTERPART SetFlag FLAG_UNK_0x0195 - SetFlag FLAG_MESPRIT_DISAPPEARED - SetFlag FLAG_AZELF_DISAPPEARED - SetFlag FLAG_UXIE_DISAPPEARED - SetFlag FLAG_UNK_0x0296 + SetFlag FLAG_HIDE_VERITY_CAVERN_MESPRIT + SetFlag FLAG_HIDE_VALOR_CAVERN_AZELF + SetFlag FLAG_HIDE_ACUITY_CAVERN_UXIE + SetFlag FLAG_HIDE_VERITY_CAVERN_PROF_OAK SetFlag FLAG_HIDE_LAKE_ACUITY_LOW_WATER_RIVAL SetFlag FLAG_HIDE_LAKE_ACUITY_JUPITER SetFlag FLAG_HIDE_TWINLEAF_TOWN_RIVAL @@ -118,7 +118,7 @@ _0006: SetFlag FLAG_UNK_0x01CD SetFlag FLAG_UNK_0x02BA SetFlag FLAG_HIDE_ROUTE_205_SOUTH_YOUNGSTER - SetFlag FLAG_UNK_0x0297 + SetFlag FLAG_HIDE_ROUTE_217_MAYLENE SetFlag FLAG_UNK_0x0255 SetFlag FLAG_UNK_0x01E3 SetFlag FLAG_UNK_0x02C5 diff --git a/res/field/scripts/scripts_lake_acuity.s b/res/field/scripts/scripts_lake_acuity.s index 09e70ac21f..d50f47151b 100644 --- a/res/field/scripts/scripts_lake_acuity.s +++ b/res/field/scripts/scripts_lake_acuity.s @@ -1,60 +1,61 @@ #include "macros/scrcmd.inc" #include "res/text/bank/lake_acuity.h" +#include "res/field/events/events_lake_acuity.h" - ScriptEntry _0006 + ScriptEntry LakeAcuity_TriggerJupiterRival ScriptEntryEnd -_0006: +LakeAcuity_TriggerJupiterRival: LockAll GetPlayerMapPos VAR_0x8004, VAR_0x8005 AddFreeCamera VAR_0x8004, VAR_0x8005 - ApplyFreeCameraMovement _0228 + ApplyFreeCameraMovement LakeAcuity_Movement_CameraMoveNorth WaitMovement WaitTime 15, VAR_RESULT - ApplyMovement 2, _01C4 + ApplyMovement LOCALID_RIVAL, LakeAcuity_Movement_RivalWalkOnSpotNorth WaitMovement BufferRivalName 0 - Message 0 + Message LakeAcuity_Text_YoureNotGettingAway CloseMessage - ApplyMovement 1, _01EC + ApplyMovement LOCALID_JUPITER, LakeAcuity_Movement_JupiterWalkOnSpotSouth WaitMovement - Message 1 + Message LakeAcuity_Text_BackToVeilstoneCity CloseMessage GetPlayerMapPos VAR_0x8004, VAR_0x8005 - CallIfEq VAR_0x8004, 14, _0136 - CallIfEq VAR_0x8004, 15, _0154 + CallIfEq VAR_0x8004, 14, LakeAcuity_JupiterWalkToPlayerX14 + CallIfEq VAR_0x8004, 15, LakeAcuity_JupiterWalkToPlayerX15 RestoreCamera - Message 2 + Message LakeAcuity_Text_DontWasteYourTime CloseMessage GetPlayerMapPos VAR_0x8004, VAR_0x8005 - CallIfEq VAR_0x8004, 14, _0168 - CallIfEq VAR_0x8004, 15, _0174 + CallIfEq VAR_0x8004, 14, LakeAcuity_JupiterLeaveX14 + CallIfEq VAR_0x8004, 15, LakeAcuity_JupiterLeaveX15 PlaySE SEQ_SE_DP_KAIDAN2 - RemoveObject 1 + RemoveObject LOCALID_JUPITER WaitSE SEQ_SE_DP_KAIDAN2 GetPlayerMapPos VAR_0x8004, VAR_0x8005 - CallIfEq VAR_0x8004, 14, _0180 - CallIfEq VAR_0x8004, 15, _018C - ApplyMovement 2, _01CC + CallIfEq VAR_0x8004, 14, LakeAcuity_PlayerWalkToRivalX14 + CallIfEq VAR_0x8004, 15, LakeAcuity_PlayerWalkToRivalX15 + ApplyMovement LOCALID_RIVAL, LakeAcuity_Movement_RivalWalkOnSpotWest WaitMovement BufferRivalName 0 - Message 3 + Message LakeAcuity_Text_ICouldntDoAnything CloseMessage - ApplyMovement 2, _01D4 + ApplyMovement LOCALID_RIVAL, LakeAcuity_Movement_RivalWalkOnSpotNorth2 WaitMovement - Message 4 + Message LakeAcuity_Text_UxieWasSuffering CloseMessage WaitTime 30, VAR_RESULT - ApplyMovement 2, _01CC + ApplyMovement LOCALID_RIVAL, LakeAcuity_Movement_RivalWalkOnSpotWest WaitMovement - Message 5 + Message LakeAcuity_Text_IHaveToBeStronger CloseMessage - ApplyMovement 2, _01DC - ApplyMovement LOCALID_PLAYER, _01B8 + ApplyMovement LOCALID_RIVAL, LakeAcuity_Movement_RivalLeave + ApplyMovement LOCALID_PLAYER, LakeAcuity_Movement_PlayerWatchRivalLeave WaitMovement PlaySE SEQ_SE_DP_KAIDAN2 - RemoveObject 2 + RemoveObject LOCALID_RIVAL WaitSE SEQ_SE_DP_KAIDAN2 SetFlag FLAG_ALT_MUSIC_LAKE_ACUITY ClearFlag FLAG_HIDE_VEILSTONE_CITY_GRUNT_M_STORAGE_KEY @@ -68,121 +69,121 @@ _0006: ReleaseAll End -_0136: - ApplyMovement 1, _01F4 - ApplyFreeCameraMovement _0230 +LakeAcuity_JupiterWalkToPlayerX14: + ApplyMovement LOCALID_JUPITER, LakeAcuity_Movement_JupiterWalkToPlayerX14 + ApplyFreeCameraMovement LakeAcuity_Movement_CameraMoveSouth WaitMovement - ApplyMovement LOCALID_PLAYER, _01B0 + ApplyMovement LOCALID_PLAYER, LakeAcuity_Movement_PlayerWalkOnSpotEast WaitMovement Return -_0154: - ApplyMovement 1, _0204 - ApplyFreeCameraMovement _0230 +LakeAcuity_JupiterWalkToPlayerX15: + ApplyMovement LOCALID_JUPITER, LakeAcuity_Movement_JupiterWalkToPlayerX15 + ApplyFreeCameraMovement LakeAcuity_Movement_CameraMoveSouth WaitMovement Return -_0168: - ApplyMovement 1, _0210 +LakeAcuity_JupiterLeaveX14: + ApplyMovement LOCALID_JUPITER, LakeAcuity_Movement_JupiterLeaveX14 WaitMovement Return -_0174: - ApplyMovement 1, _0218 +LakeAcuity_JupiterLeaveX15: + ApplyMovement LOCALID_JUPITER, LakeAcuity_Movement_JupiterLeaveX15 WaitMovement Return -_0180: - ApplyMovement LOCALID_PLAYER, _0198 +LakeAcuity_PlayerWalkToRivalX14: + ApplyMovement LOCALID_PLAYER, LakeAcuity_Movement_PlayerWalkToRivalX14 WaitMovement Return -_018C: - ApplyMovement LOCALID_PLAYER, _01A4 +LakeAcuity_PlayerWalkToRivalX15: + ApplyMovement LOCALID_PLAYER, LakeAcuity_Movement_PlayerWalkToRivalX15 WaitMovement Return .balign 4, 0 -_0198: +LakeAcuity_Movement_PlayerWalkToRivalX14: WalkNormalNorth 5 WalkNormalEast 2 EndMovement .balign 4, 0 -_01A4: +LakeAcuity_Movement_PlayerWalkToRivalX15: WalkNormalNorth 5 WalkNormalEast EndMovement .balign 4, 0 -_01B0: +LakeAcuity_Movement_PlayerWalkOnSpotEast: WalkOnSpotNormalEast EndMovement .balign 4, 0 -_01B8: +LakeAcuity_Movement_PlayerWatchRivalLeave: Delay8 WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_01C4: +LakeAcuity_Movement_RivalWalkOnSpotNorth: WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_01CC: +LakeAcuity_Movement_RivalWalkOnSpotWest: WalkOnSpotNormalWest EndMovement .balign 4, 0 -_01D4: +LakeAcuity_Movement_RivalWalkOnSpotNorth2: WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_01DC: +LakeAcuity_Movement_RivalLeave: WalkNormalSouth 2 WalkNormalWest 2 WalkNormalSouth 3 EndMovement .balign 4, 0 -_01EC: +LakeAcuity_Movement_JupiterWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_01F4: +LakeAcuity_Movement_JupiterWalkToPlayerX14: WalkNormalWest 2 WalkNormalSouth 6 WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0204: +LakeAcuity_Movement_JupiterWalkToPlayerX15: WalkNormalWest 2 WalkNormalSouth 5 EndMovement .balign 4, 0 -_0210: +LakeAcuity_Movement_JupiterLeaveX14: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0218: +LakeAcuity_Movement_JupiterLeaveX15: WalkNormalWest WalkNormalSouth WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0228: +LakeAcuity_Movement_CameraMoveNorth: WalkNormalNorth 5 EndMovement .balign 4, 0 -_0230: +LakeAcuity_Movement_CameraMoveSouth: WalkNormalSouth 5 EndMovement diff --git a/res/field/scripts/scripts_lake_acuity_low_water.s b/res/field/scripts/scripts_lake_acuity_low_water.s index b05125a728..53a355cf8e 100644 --- a/res/field/scripts/scripts_lake_acuity_low_water.s +++ b/res/field/scripts/scripts_lake_acuity_low_water.s @@ -2,25 +2,25 @@ #include "res/text/bank/lake_acuity_low_water.h" - ScriptEntry _0006 + ScriptEntry LakeAcuityLowWater_Rival ScriptEntryEnd -_0006: +LakeAcuityLowWater_Rival: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x00A9, _002B - SetFlag FLAG_UNK_0x00A9 + GoToIfSet FLAG_TALKED_TO_LAKE_ACUITY_LOW_WATER_RIVAL, LakeAcuityLowWater_ChallengeSunyshoreGym + SetFlag FLAG_TALKED_TO_LAKE_ACUITY_LOW_WATER_RIVAL BufferRivalName 0 - Message 0 + Message LakeAcuityLowWater_Text_NotSupposedToBeHere WaitButton CloseMessage ReleaseAll End -_002B: +LakeAcuityLowWater_ChallengeSunyshoreGym: BufferRivalName 0 - Message 1 + Message LakeAcuityLowWater_Text_ChallengeSunyshoreGym WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_pokemon_league_hall_of_fame.s b/res/field/scripts/scripts_pokemon_league_hall_of_fame.s index f02ae35884..b7698a89ba 100644 --- a/res/field/scripts/scripts_pokemon_league_hall_of_fame.s +++ b/res/field/scripts/scripts_pokemon_league_hall_of_fame.s @@ -127,8 +127,8 @@ PokemonLeagueHallOfFame_SetHallOfFameVictoryFlagsAndVars: CallIfUnset FLAG_CAUGHT_PALKIA, PokemonLeagueHallOfFame_ResetSpearPillarPalkiaState CallIfUnset FLAG_CAUGHT_HEATRAN, PokemonLeagueHallOfFame_TryShowStarkMountainHeatran CallIfUnset FLAG_CAUGHT_REGIGIGAS, PokemonLeagueHallOfFame_TryShowSnowpointTempleRegigigas - CallIfUnset FLAG_CAUGHT_AZELF, PokemonLeagueHallOfFame_ClearFlagAzelfDisappeared - CallIfUnset FLAG_CAUGHT_UXIE, PokemonLeagueHallOfFame_ClearFlagUxieDisappeared + CallIfUnset FLAG_CAUGHT_AZELF, PokemonLeagueHallOfFame_ShowValorCavernAzelf + CallIfUnset FLAG_CAUGHT_UXIE, PokemonLeagueHallOfFame_ShowAcuityCavernUxie CallIfUnset FLAG_CAUGHT_GIRATINA, PokemonLeagueHallOfFame_ShowTurnbackCaveGiratina CallIfEq VAR_ROAMING_MESPRIT_STATE, ROAMER_STATE_DEFEATED, PokemonLeagueHallOfFame_ResetRoamingMesprit CallIfEq VAR_ROAMING_CRESSELIA_STATE, ROAMER_STATE_DEFEATED, PokemonLeagueHallOfFame_ResetRoamingCresselia @@ -169,12 +169,12 @@ PokemonLeagueHallOfFame_TryShowSnowpointTempleRegigigas: PokemonLeagueHallOfFame_DontShowSnowpointTempleRegigigas: Return -PokemonLeagueHallOfFame_ClearFlagAzelfDisappeared: - ClearFlag FLAG_AZELF_DISAPPEARED +PokemonLeagueHallOfFame_ShowValorCavernAzelf: + ClearFlag FLAG_HIDE_VALOR_CAVERN_AZELF Return -PokemonLeagueHallOfFame_ClearFlagUxieDisappeared: - ClearFlag FLAG_UXIE_DISAPPEARED +PokemonLeagueHallOfFame_ShowAcuityCavernUxie: + ClearFlag FLAG_HIDE_ACUITY_CAVERN_UXIE Return PokemonLeagueHallOfFame_ShowTurnbackCaveGiratina: @@ -182,7 +182,7 @@ PokemonLeagueHallOfFame_ShowTurnbackCaveGiratina: Return PokemonLeagueHallOfFame_ResetRoamingMesprit: - ClearFlag FLAG_MESPRIT_DISAPPEARED + ClearFlag FLAG_HIDE_VERITY_CAVERN_MESPRIT SetVar VAR_ROAMING_MESPRIT_STATE, ROAMER_STATE_RESET Return diff --git a/res/field/scripts/scripts_route_216.s b/res/field/scripts/scripts_route_216.s index b6e72e1617..2ea420c40b 100644 --- a/res/field/scripts/scripts_route_216.s +++ b/res/field/scripts/scripts_route_216.s @@ -2,21 +2,21 @@ #include "res/text/bank/route_216.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _0038 + ScriptEntry Route216_Unused + ScriptEntry Route216_ArrowSignpostMtCoronet + ScriptEntry Route216_SignSnowboundLodge ScriptEntryEnd -_000E: - NPCMessage 0 +Route216_Unused: + NPCMessage Route216_Text_CantRideBikeOnSnow End -_0021: - ShowArrowSign 1 +Route216_ArrowSignpostMtCoronet: + ShowArrowSign Route216_Text_SignRt216MtCoronet End -_0038: - ShowLandmarkSign 2 +Route216_SignSnowboundLodge: + ShowLandmarkSign Route216_Text_SignSnowboundLodge End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_216_house.s b/res/field/scripts/scripts_route_216_house.s index 6c6121e8a1..fb085bbbff 100644 --- a/res/field/scripts/scripts_route_216_house.s +++ b/res/field/scripts/scripts_route_216_house.s @@ -2,22 +2,22 @@ #include "res/text/bank/route_216_house.h" - ScriptEntry _000E - ScriptEntry _0071 - ScriptEntry _0084 + ScriptEntry Route216House_Hiker + ScriptEntry Route216House_SnowpointNPCF + ScriptEntry Route216House_Bed ScriptEntryEnd -_000E: +Route216House_Hiker: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message Route216House_Text_MakeYourselfAtHome ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _0039 - GoToIfEq VAR_RESULT, MENU_NO, _0066 + GoToIfEq VAR_RESULT, MENU_YES, Route216House_HikerRest + GoToIfEq VAR_RESULT, MENU_NO, Route216House_YouCanNapInBed End -_0039: +Route216House_HikerRest: CloseMessage FadeScreenOut WaitFadeScreen @@ -26,35 +26,35 @@ _0039: HealParty FadeScreenIn WaitFadeScreen - Message 1 + Message Route216House_Text_YourPokemonAreHealthy WaitButton CloseMessage ReleaseAll End -_0066: - Message 2 +Route216House_YouCanNapInBed: + Message Route216House_Text_YouCanNapInBed WaitButton CloseMessage ReleaseAll End -_0071: - NPCMessage 3 +Route216House_SnowpointNPCF: + NPCMessage Route216House_Text_IDontHaveThickFat End -_0084: +Route216House_Bed: PlaySE SEQ_SE_CONFIRM LockAll - Message 4 + Message Route216House_Text_WantToRest ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _00AD - GoToIfEq VAR_RESULT, MENU_NO, _00E3 + GoToIfEq VAR_RESULT, MENU_YES, Route216House_RestInBed + GoToIfEq VAR_RESULT, MENU_NO, Route216House_DontRestInBed End -_00AD: +Route216House_RestInBed: BufferPlayerName 0 - Message 5 + Message Route216House_Text_FellAsleepInBed CloseMessage FadeScreenOut WaitFadeScreen @@ -64,13 +64,13 @@ _00AD: FadeScreenIn WaitFadeScreen BufferPlayerName 0 - Message 6 + Message Route216House_Text_BecameFullyHealed WaitButton CloseMessage ReleaseAll End -_00E3: +Route216House_DontRestInBed: CloseMessage ReleaseAll End diff --git a/res/field/scripts/scripts_route_217.s b/res/field/scripts/scripts_route_217.s index 9a789c9b8d..b67ce3bcfb 100644 --- a/res/field/scripts/scripts_route_217.s +++ b/res/field/scripts/scripts_route_217.s @@ -1,86 +1,87 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_217.h" +#include "res/field/events/events_route_217.h" - ScriptEntry _0012 - ScriptEntry _0023 - ScriptEntry _003A - ScriptEntry _004D + ScriptEntry Route217_IceRock + ScriptEntry Route217_ArrowSignpostLakeAcuity + ScriptEntry Route217_SnowpointNPCF + ScriptEntry Route217_TriggerMaylene ScriptEntryEnd -_0012: - EventMessage 3 +Route217_IceRock: + EventMessage Route217_Text_BoulderEncrustedWithIce End -_0023: - ShowArrowSign 4 +Route217_ArrowSignpostLakeAcuity: + ShowArrowSign Route217_Text_SignRt217LakeAcuity End -_003A: - NPCMessage 2 +Route217_SnowpointNPCF: + NPCMessage Route217_Text_ImUsingDowsingMachine End -_004D: +Route217_TriggerMaylene: LockAll - ClearFlag FLAG_UNK_0x0297 - AddObject 15 + ClearFlag FLAG_HIDE_ROUTE_217_MAYLENE + AddObject LOCALID_MAYLENE GetPlayerMapPos VAR_0x8004, VAR_0x8005 - CallIfEq VAR_0x8004, 0x12E, _00CA - CallIfEq VAR_0x8004, 0x12F, _00D6 + CallIfEq VAR_0x8004, 302, Route217_MayleneEnterX302 + CallIfEq VAR_0x8004, 303, Route217_MayleneEnterX303 BufferPlayerName 0 - Message 0 + Message Route217_Text_OhPlayer CloseMessage - ApplyMovement LOCALID_PLAYER, _010C + ApplyMovement LOCALID_PLAYER, Route217_Movement_PlayerWalkOnSpotSouth WaitMovement - ApplyMovement 15, _014C + ApplyMovement LOCALID_MAYLENE, Route217_Movement_MayleneWalkNorth WaitMovement - Message 1 + Message Route217_Text_GoingToSnowpointCity CloseMessage GetPlayerMapPos VAR_0x8004, VAR_0x8005 - CallIfEq VAR_0x8004, 0x12E, _00E2 - CallIfEq VAR_0x8004, 0x12F, _00F6 - RemoveObject 15 - SetVar VAR_UNK_0x40A8, 1 + CallIfEq VAR_0x8004, 302, Route217_MayleneLeaveX302 + CallIfEq VAR_0x8004, 303, Route217_MayleneLeaveX303 + RemoveObject LOCALID_MAYLENE + SetVar VAR_ROUTE_217_STATE, 1 SetFlag FLAG_HIDE_VEILSTONE_CITY_GYM_MAYLENE ReleaseAll End -_00CA: - ApplyMovement 15, _0124 +Route217_MayleneEnterX302: + ApplyMovement LOCALID_MAYLENE, Route217_Movement_MayleneEnterX302 WaitMovement Return -_00D6: - ApplyMovement 15, _0138 +Route217_MayleneEnterX303: + ApplyMovement LOCALID_MAYLENE, Route217_Movement_MayleneEnterX303 WaitMovement Return -_00E2: - ApplyMovement LOCALID_PLAYER, _0114 - ApplyMovement 15, _0154 +Route217_MayleneLeaveX302: + ApplyMovement LOCALID_PLAYER, Route217_Movement_PlayerWatchMayleneLeave + ApplyMovement LOCALID_MAYLENE, Route217_Movement_MayleneLeaveX302 WaitMovement Return -_00F6: - ApplyMovement LOCALID_PLAYER, _0114 - ApplyMovement 15, _0168 +Route217_MayleneLeaveX303: + ApplyMovement LOCALID_PLAYER, Route217_Movement_PlayerWatchMayleneLeave + ApplyMovement LOCALID_MAYLENE, Route217_Movement_MayleneLeaveX303 WaitMovement Return .balign 4, 0 -_010C: +Route217_Movement_PlayerWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0114: +Route217_Movement_PlayerWatchMayleneLeave: Delay8 2 Delay4 WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_0124: +Route217_Movement_MayleneEnterX302: WalkNormalNorth 4 WalkNormalWest 3 WalkNormalNorth @@ -88,7 +89,7 @@ _0124: EndMovement .balign 4, 0 -_0138: +Route217_Movement_MayleneEnterX303: WalkNormalNorth 4 WalkNormalWest 2 WalkNormalNorth @@ -96,12 +97,12 @@ _0138: EndMovement .balign 4, 0 -_014C: +Route217_Movement_MayleneWalkNorth: WalkNormalNorth EndMovement .balign 4, 0 -_0154: +Route217_Movement_MayleneLeaveX302: WalkNormalEast WalkNormalNorth 3 WalkNormalEast 2 @@ -109,7 +110,7 @@ _0154: EndMovement .balign 4, 0 -_0168: +Route217_Movement_MayleneLeaveX303: WalkNormalWest WalkNormalNorth 3 WalkNormalEast 3 diff --git a/res/field/scripts/scripts_route_217_northeast_house.s b/res/field/scripts/scripts_route_217_northeast_house.s index 3a42286c67..fb2261d262 100644 --- a/res/field/scripts/scripts_route_217_northeast_house.s +++ b/res/field/scripts/scripts_route_217_northeast_house.s @@ -2,33 +2,33 @@ #include "res/text/bank/route_217_northeast_house.h" - ScriptEntry _0006 + ScriptEntry Route217NortheastHouse_PokemonBreederF ScriptEntryEnd -_0006: +Route217NortheastHouse_PokemonBreederF: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x013B, _0059 - Message 0 + GoToIfSet FLAG_RECEIVED_ROUTE_217_NORTHEAST_HOUSE_SPELL_TAG, Route217NortheastHouse_ExplainSpellTag + Message Route217NortheastHouse_Text_PersonRareSight SetVar VAR_0x8004, ITEM_SPELL_TAG SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _004F - SetFlag FLAG_UNK_0x013B - SetFlag FLAG_UNK_0x025F + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, Route217NortheastHouse_BagIsFull + SetFlag FLAG_RECEIVED_ROUTE_217_NORTHEAST_HOUSE_SPELL_TAG + SetFlag FLAG_HIDE_ROUTE_217_NORTHEAST_HOUSE_POKEMON_BREEDER_F Common_GiveItemQuantityNoLineFeed CloseMessage ReleaseAll End -_004F: +Route217NortheastHouse_BagIsFull: Common_MessageBagIsFull CloseMessage ReleaseAll End -_0059: - Message 1 +Route217NortheastHouse_ExplainSpellTag: + Message Route217NortheastHouse_Text_ExplainSpellTag WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_route_217_west_house.s b/res/field/scripts/scripts_route_217_west_house.s index a300caac73..152a9c1df8 100644 --- a/res/field/scripts/scripts_route_217_west_house.s +++ b/res/field/scripts/scripts_route_217_west_house.s @@ -2,39 +2,39 @@ #include "res/text/bank/route_217_west_house.h" - ScriptEntry _0006 + ScriptEntry Route217WestHouse_Hiker ScriptEntryEnd -_0006: +Route217WestHouse_Hiker: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x00DE, _0039 + GoToIfSet FLAG_RECEIVED_ROUTE_217_WEST_HOUSE_ICICLE_PLATE, Route217WestHouse_IFoundIciclePlate CheckItem ITEM_HM08, 1, VAR_RESULT - GoToIfEq VAR_RESULT, 1, _0044 - Message 0 + GoToIfEq VAR_RESULT, TRUE, Route217WestHouse_TryGiveIciclePlate + Message Route217WestHouse_Text_IDroppedHM WaitButton CloseMessage ReleaseAll End -_0039: - Message 2 +Route217WestHouse_IFoundIciclePlate: + Message Route217WestHouse_Text_IFoundIciclePlate WaitButton CloseMessage ReleaseAll End -_0044: - Message 1 +Route217WestHouse_TryGiveIciclePlate: + Message Route217WestHouse_Text_YouFoundHM SetVar VAR_0x8004, ITEM_ICICLE_PLATE SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _0076 + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, Route217WestHouse_BagIsFull Common_GiveItemQuantity - SetFlag FLAG_UNK_0x00DE - GoTo _0039 + SetFlag FLAG_RECEIVED_ROUTE_217_WEST_HOUSE_ICICLE_PLATE + GoTo Route217WestHouse_IFoundIciclePlate -_0076: +Route217WestHouse_BagIsFull: Common_MessageBagIsFull CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s b/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s index c779f8efa4..f2952d2eaf 100644 --- a/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s +++ b/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s @@ -109,9 +109,9 @@ SandgemTownLab_WhyNotObtainSunyshoresBadge: CloseMessage SetFlag FLAG_HIDE_VALOR_LAKEFRONT_COLLECTOR SetVar VAR_UNK_0x4112, 1 - ClearFlag FLAG_MESPRIT_DISAPPEARED - ClearFlag FLAG_AZELF_DISAPPEARED - ClearFlag FLAG_UXIE_DISAPPEARED + ClearFlag FLAG_HIDE_VERITY_CAVERN_MESPRIT + ClearFlag FLAG_HIDE_VALOR_CAVERN_AZELF + ClearFlag FLAG_HIDE_ACUITY_CAVERN_UXIE SetVar VAR_SANDGEM_TOWN_LAB_STATE, 3 ReleaseAll End diff --git a/res/field/scripts/scripts_valor_cavern.s b/res/field/scripts/scripts_valor_cavern.s index e5208e0f87..58ee930d05 100644 --- a/res/field/scripts/scripts_valor_cavern.s +++ b/res/field/scripts/scripts_valor_cavern.s @@ -31,7 +31,7 @@ ValorCavern_OnLoad: End ValorCavern_RemoveAzelf: - SetFlag FLAG_AZELF_DISAPPEARED + SetFlag FLAG_HIDE_VALOR_CAVERN_AZELF RemoveObject LOCALID_AZELF ClearFlag FLAG_MAP_LOCAL Return diff --git a/res/field/scripts/scripts_verity_cavern.s b/res/field/scripts/scripts_verity_cavern.s index 2b1d1c5178..e755882b2d 100644 --- a/res/field/scripts/scripts_verity_cavern.s +++ b/res/field/scripts/scripts_verity_cavern.s @@ -1,15 +1,13 @@ #include "macros/scrcmd.inc" #include "res/text/bank/verity_cavern.h" - -#define LOCALID_MESPRIT 0 -#define LOCALID_ROWAN 1 +#include "res/field/events/events_verity_cavern.h" - ScriptEntry _000A + ScriptEntry VerityCavern_OnTransition ScriptEntry VerityCavern_Mesprit ScriptEntryEnd -_000A: +VerityCavern_OnTransition: SetFlag FLAG_FIRST_ARRIVAL_VERITY_CAVERN End @@ -23,25 +21,25 @@ VerityCavern_Mesprit: PlayCry SPECIES_MESPRIT Message VerityCavern_Text_MespritCry CloseMessage - SetFlag FLAG_MESPRIT_DISAPPEARED + SetFlag FLAG_HIDE_VERITY_CAVERN_MESPRIT RemoveObject LOCALID_MESPRIT WaitTime 8, VAR_RESULT - ClearFlag FLAG_MESPRIT_DISAPPEARED + ClearFlag FLAG_HIDE_VERITY_CAVERN_MESPRIT AddObject LOCALID_MESPRIT WaitTime 8, VAR_RESULT - SetFlag FLAG_MESPRIT_DISAPPEARED + SetFlag FLAG_HIDE_VERITY_CAVERN_MESPRIT RemoveObject LOCALID_MESPRIT WaitTime 8, VAR_RESULT - ClearFlag FLAG_MESPRIT_DISAPPEARED + ClearFlag FLAG_HIDE_VERITY_CAVERN_MESPRIT AddObject LOCALID_MESPRIT WaitTime 8, VAR_RESULT - SetFlag FLAG_MESPRIT_DISAPPEARED + SetFlag FLAG_HIDE_VERITY_CAVERN_MESPRIT RemoveObject LOCALID_MESPRIT WaitTime 8, VAR_RESULT - ClearFlag FLAG_MESPRIT_DISAPPEARED + ClearFlag FLAG_HIDE_VERITY_CAVERN_MESPRIT AddObject LOCALID_MESPRIT WaitTime 8, VAR_RESULT - SetFlag FLAG_MESPRIT_DISAPPEARED + SetFlag FLAG_HIDE_VERITY_CAVERN_MESPRIT RemoveObject LOCALID_MESPRIT ActivateRoamingPokemon ROAMING_SLOT_MESPRIT Message VerityCavern_Text_MespritFlewOff @@ -49,58 +47,58 @@ VerityCavern_Mesprit: GoToIfEq VAR_ROAMING_MESPRIT_STATE, ROAMER_STATE_RESET, VerityCavern_ResetRoamingMespritState WaitTime 30, VAR_RESULT GetPlayerDir VAR_RESULT - GoToIfEq VAR_RESULT, DIR_NORTH, VerityCavern_EnterProfessorRowanNorth - GoToIfEq VAR_RESULT, DIR_SOUTH, VerityCavern_EnterProfessorRowanSouth - GoToIfEq VAR_RESULT, DIR_WEST, VerityCavern_EnterProfessorRowanWest - GoToIfEq VAR_RESULT, DIR_EAST, VerityCavern_EnterProfessorRowanEast + GoToIfEq VAR_RESULT, DIR_NORTH, VerityCavern_EnterProfRowanNorth + GoToIfEq VAR_RESULT, DIR_SOUTH, VerityCavern_EnterProfRowanSouth + GoToIfEq VAR_RESULT, DIR_WEST, VerityCavern_EnterProfRowanWest + GoToIfEq VAR_RESULT, DIR_EAST, VerityCavern_EnterProfRowanEast End -VerityCavern_EnterProfessorRowanNorth: - SetObjectEventPos LOCALID_ROWAN, 12, 22 - GoTo VerityCavern_EnterProfessorRowan +VerityCavern_EnterProfRowanNorth: + SetObjectEventPos LOCALID_PROF_ROWAN, 12, 22 + GoTo VerityCavern_EnterProfRowan End -VerityCavern_EnterProfessorRowanSouth: - SetObjectEventPos LOCALID_ROWAN, 12, 20 - GoTo VerityCavern_EnterProfessorRowan +VerityCavern_EnterProfRowanSouth: + SetObjectEventPos LOCALID_PROF_ROWAN, 12, 20 + GoTo VerityCavern_EnterProfRowan End -VerityCavern_EnterProfessorRowanWest: - SetObjectEventPos LOCALID_ROWAN, 13, 21 - GoTo VerityCavern_EnterProfessorRowan +VerityCavern_EnterProfRowanWest: + SetObjectEventPos LOCALID_PROF_ROWAN, 13, 21 + GoTo VerityCavern_EnterProfRowan End -VerityCavern_EnterProfessorRowanEast: - SetObjectEventPos LOCALID_ROWAN, 11, 21 - GoTo VerityCavern_EnterProfessorRowan +VerityCavern_EnterProfRowanEast: + SetObjectEventPos LOCALID_PROF_ROWAN, 11, 21 + GoTo VerityCavern_EnterProfRowan End -VerityCavern_EnterProfessorRowan: - ClearFlag FLAG_UNK_0x0296 - AddObject LOCALID_ROWAN - ApplyMovement LOCALID_ROWAN, _0190 +VerityCavern_EnterProfRowan: + ClearFlag FLAG_HIDE_VERITY_CAVERN_PROF_OAK + AddObject LOCALID_PROF_ROWAN + ApplyMovement LOCALID_PROF_ROWAN, VerityCavern_Movement_ProfRowanEnter WaitMovement - ApplyMovement LOCALID_PLAYER, _01B0 + ApplyMovement LOCALID_PLAYER, VerityCavern_Movement_PlayerFaceSouth WaitMovement BufferPlayerName 0 Message VerityCavern_Text_RowanThatWasMesprit CloseMessage - ApplyMovement LOCALID_ROWAN, _0198 + ApplyMovement LOCALID_PROF_ROWAN, VerityCavern_Movement_ProfRowanWalkOnSpotSouthNorth WaitMovement BufferPlayerName 0 Message VerityCavern_Text_RowanChaseAfterMesprit CheckPoketchAppRegistered POKETCH_APPID_MARKINGMAP, VAR_RESULT - CallIfEq VAR_RESULT, 0, VerityCavern_ProfessorRowanNoMarkingMap + CallIfEq VAR_RESULT, FALSE, VerityCavern_ProfRowanNoMarkingMap BufferPlayerName 0 Message VerityCavern_Text_RowanGoOn CloseMessage - ApplyMovement LOCALID_ROWAN, _01A8 + ApplyMovement LOCALID_PROF_ROWAN, VerityCavern_Movement_ProfRowanLeave WaitMovement - RemoveObject LOCALID_ROWAN + RemoveObject LOCALID_PROF_ROWAN ReleaseAll End -VerityCavern_ProfessorRowanNoMarkingMap: +VerityCavern_ProfRowanNoMarkingMap: Message VerityCavern_Text_RowanNoMarkingMap Return @@ -110,23 +108,23 @@ VerityCavern_ResetRoamingMespritState: End .balign 4, 0 -_0190: +VerityCavern_Movement_ProfRowanEnter: WalkNormalNorth 7 EndMovement .balign 4, 0 -_0198: +VerityCavern_Movement_ProfRowanWalkOnSpotSouthNorth: WalkOnSpotNormalSouth Delay8 2 WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_01A8: +VerityCavern_Movement_ProfRowanLeave: WalkNormalSouth 9 EndMovement .balign 4, 0 -_01B0: +VerityCavern_Movement_PlayerFaceSouth: FaceSouth EndMovement diff --git a/res/text/acuity_lakefront.json b/res/text/acuity_lakefront.json index 9bcbc4b663..4423f58e12 100644 --- a/res/text/acuity_lakefront.json +++ b/res/text/acuity_lakefront.json @@ -2,7 +2,7 @@ "key": 18403, "messages": [ { - "id": "pl_msg_00000405_00000", + "id": "AcuityLakefront_Text_CantClimbWithoutBadge", "en_US": [ "{STRVAR_1 3, 0, 0}: Hey, {STRVAR_1 3, 1, 0}!\n", "What, you finally come along now?\f", @@ -16,14 +16,14 @@ ] }, { - "id": "pl_msg_00000405_00001", + "id": "AcuityLakefront_Text_MakeSureNoDisturbance", "en_US": [ "We’re here to make sure Snowpoint’s\n", "Gym Leader doesn’t disturb us!" ] }, { - "id": "pl_msg_00000405_00002", + "id": "AcuityLakefront_Text_YouMustBeBored", "en_US": [ "You’re here to see the lake Pokémon,\n", "too?\r", @@ -32,7 +32,7 @@ ] }, { - "id": "pl_msg_00000405_00003", + "id": "AcuityLakefront_Text_StandingGuardIsImportant", "en_US": [ "Standing guard is a very important\n", "assignment!\r", @@ -41,7 +41,7 @@ ] }, { - "id": "pl_msg_00000405_00004", + "id": "AcuityLakefront_Text_LakePokemonConnected", "en_US": [ "The Pokémon of the three lakes\n", "appear to be connected somehow.\r", @@ -50,7 +50,7 @@ ] }, { - "id": "pl_msg_00000405_00005", + "id": "AcuityLakefront_Text_SignLakeAcuityAhead", "en_US": "Lake Acuity ahead" } ] diff --git a/res/text/lake_acuity.json b/res/text/lake_acuity.json index 0b6a6a2741..780f392867 100644 --- a/res/text/lake_acuity.json +++ b/res/text/lake_acuity.json @@ -2,7 +2,7 @@ "key": 9295, "messages": [ { - "id": "pl_msg_00000298_00000", + "id": "LakeAcuity_Text_YoureNotGettingAway", "en_US": [ "{STRVAR_1 3, 0, 0}: !\r", "You’re not getting away with this,\n", @@ -10,7 +10,7 @@ ] }, { - "id": "pl_msg_00000298_00001", + "id": "LakeAcuity_Text_BackToVeilstoneCity", "en_US": [ "Jupiter: Oh?\n", "Are you finished already?\r", @@ -25,7 +25,7 @@ ] }, { - "id": "pl_msg_00000298_00002", + "id": "LakeAcuity_Text_DontWasteYourTime", "en_US": [ "Oh? Don’t I know you?\n", "We met in Eterna City.\r", @@ -41,7 +41,7 @@ ] }, { - "id": "pl_msg_00000298_00003", + "id": "LakeAcuity_Text_ICouldntDoAnything", "en_US": [ "{STRVAR_1 3, 0, 0}: ...\n", "...\r", @@ -51,14 +51,14 @@ ] }, { - "id": "pl_msg_00000298_00004", + "id": "LakeAcuity_Text_UxieWasSuffering", "en_US": [ "That Pokémon called UXIE...\n", "It was suffering...\r" ] }, { - "id": "pl_msg_00000298_00005", + "id": "LakeAcuity_Text_IHaveToBeStronger", "en_US": [ "I’m going to get tougher...\r", "It’s not about winning or losing...\n", diff --git a/res/text/lake_acuity_low_water.json b/res/text/lake_acuity_low_water.json index 5fcbd7c42b..2f351cb329 100644 --- a/res/text/lake_acuity_low_water.json +++ b/res/text/lake_acuity_low_water.json @@ -2,7 +2,7 @@ "key": 9283, "messages": [ { - "id": "pl_msg_00000297_00000", + "id": "LakeAcuityLowWater_Text_NotSupposedToBeHere", "en_US": [ "{STRVAR_1 3, 0, 0}: What are you doing?\n", "You’re not supposed to be here.\r", @@ -16,7 +16,7 @@ ] }, { - "id": "pl_msg_00000297_00001", + "id": "LakeAcuityLowWater_Text_ChallengeSunyshoreGym", "en_US": [ "{STRVAR_1 3, 0, 0}: What’d I say?\n", "I told you I’ll be OK by myself.\r", diff --git a/res/text/route_216.json b/res/text/route_216.json index 8848f9fa80..de03508713 100644 --- a/res/text/route_216.json +++ b/res/text/route_216.json @@ -2,21 +2,21 @@ "key": 39552, "messages": [ { - "id": "pl_msg_00000505_00000", + "id": "Route216_Text_CantRideBikeOnSnow", "en_US": [ "You can’t ride a Bike on snow.\n", "It’s too dangerous." ] }, { - "id": "pl_msg_00000505_00001", + "id": "Route216_Text_SignRt216MtCoronet", "en_US": [ "Rt. 216\n", "Mt. Coronet" ] }, { - "id": "pl_msg_00000505_00002", + "id": "Route216_Text_SignSnowboundLodge", "en_US": [ "Snowbound Lodge\n", "A Warm Bed and Little Else" diff --git a/res/text/route_216_house.json b/res/text/route_216_house.json index 45cc2f8437..7eb591b3c8 100644 --- a/res/text/route_216_house.json +++ b/res/text/route_216_house.json @@ -2,21 +2,21 @@ "key": 3819, "messages": [ { - "id": "pl_msg_00000506_00000", + "id": "Route216House_Text_MakeYourselfAtHome", "en_US": [ "Yahoo! This lodge’s seen better days,\n", "but relax, make yourself at home!" ] }, { - "id": "pl_msg_00000506_00001", + "id": "Route216House_Text_YourPokemonAreHealthy", "en_US": [ "OK! You and your Pokémon are healthy,\n", "chipper, and good to go!" ] }, { - "id": "pl_msg_00000506_00002", + "id": "Route216House_Text_YouCanNapInBed", "en_US": [ "As you can see, the lodge is beat up.\r", "You can do as you like--leave right \n", @@ -24,7 +24,7 @@ ] }, { - "id": "pl_msg_00000506_00003", + "id": "Route216House_Text_IDontHaveThickFat", "en_US": [ "I don’t have Thick Fat like some\n", "Pokémon.\r", @@ -37,21 +37,21 @@ ] }, { - "id": "pl_msg_00000506_00004", + "id": "Route216House_Text_WantToRest", "en_US": [ "It’s a bed...\n", "Want to take a rest?" ] }, { - "id": "pl_msg_00000506_00005", + "id": "Route216House_Text_FellAsleepInBed", "en_US": [ "{STRVAR_1 3, 0, 0} quickly fell asleep\n", "in the bed...\r" ] }, { - "id": "pl_msg_00000506_00006", + "id": "Route216House_Text_BecameFullyHealed", "en_US": [ "{STRVAR_1 3, 0, 0} and the Pokémon\n", "became fully healed from the rest!" diff --git a/res/text/route_217.json b/res/text/route_217.json index d77c498143..ac2fbb0ace 100644 --- a/res/text/route_217.json +++ b/res/text/route_217.json @@ -2,11 +2,11 @@ "key": 39556, "messages": [ { - "id": "pl_msg_00000507_00000", + "id": "Route217_Text_OhPlayer", "en_US": "Maylene: Oh, {STRVAR_1 3, 0, 0}!\r" }, { - "id": "pl_msg_00000507_00001", + "id": "Route217_Text_GoingToSnowpointCity", "en_US": [ "Um, are you maybe on your way to\n", "Snowpoint City?\r", @@ -24,7 +24,7 @@ ] }, { - "id": "pl_msg_00000507_00002", + "id": "Route217_Text_ImUsingDowsingMachine", "en_US": [ "I’m using the Dowsing Machine on\n", "my Pokétch.\r", @@ -33,14 +33,14 @@ ] }, { - "id": "pl_msg_00000507_00003", + "id": "Route217_Text_BoulderEncrustedWithIce", "en_US": [ "The boulder is encrusted with ice.\n", "It is bone chilling to touch." ] }, { - "id": "pl_msg_00000507_00004", + "id": "Route217_Text_SignRt217LakeAcuity", "en_US": [ "Rt. 217\n", "Lake Acuity" diff --git a/res/text/route_217_northeast_house.json b/res/text/route_217_northeast_house.json index 04b2dca1f8..e0d345c193 100644 --- a/res/text/route_217_northeast_house.json +++ b/res/text/route_217_northeast_house.json @@ -2,7 +2,7 @@ "key": 7923, "messages": [ { - "id": "pl_msg_00000509_00000", + "id": "Route217NortheastHouse_Text_PersonRareSight", "en_US": [ "...A person...?\n", "...A rare sight...\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000509_00001", + "id": "Route217NortheastHouse_Text_ExplainSpellTag", "en_US": [ "...The Spell Tag...\n", "It intensifies Ghost-type moves...\f", diff --git a/res/text/route_217_west_house.json b/res/text/route_217_west_house.json index 194c810691..762cb32775 100644 --- a/res/text/route_217_west_house.json +++ b/res/text/route_217_west_house.json @@ -2,7 +2,7 @@ "key": 7915, "messages": [ { - "id": "pl_msg_00000508_00000", + "id": "Route217WestHouse_Text_IDroppedHM", "en_US": [ "While I was fighting my way through\n", "the blizzard, I dropped an HM.\r", @@ -12,7 +12,7 @@ ] }, { - "id": "pl_msg_00000508_00001", + "id": "Route217WestHouse_Text_YouFoundHM", "en_US": [ "While I was fighting my way through\n", "the blizzard, I dropped an HM.\r", @@ -30,7 +30,7 @@ ] }, { - "id": "pl_msg_00000508_00002", + "id": "Route217WestHouse_Text_IFoundIciclePlate", "en_US": [ "That Icicle Plate, I found that under\n", "the snow as well.\r",