From e97513635748d3cec4de55449bb7614231cd6a06 Mon Sep 17 00:00:00 2001 From: Viperio <146665252+Viperio19@users.noreply.github.com> Date: Fri, 27 Feb 2026 16:52:49 +0100 Subject: [PATCH] Document oreburgh scripts (#974) --- generated/vars_flags.txt | 26 +- res/field/events/events_oreburgh_city.json | 54 +-- .../events_oreburgh_city_east_house_1f.json | 6 +- .../events_oreburgh_city_east_house_2f.json | 6 +- .../events_oreburgh_city_east_house_3f.json | 4 +- .../events/events_oreburgh_city_gym.json | 8 +- .../events_oreburgh_city_middle_house.json | 4 +- .../events_oreburgh_city_north_house_1f.json | 6 +- .../events_oreburgh_city_north_house_2f.json | 6 +- .../events_oreburgh_city_north_house_3f.json | 6 +- .../events_oreburgh_city_north_house_4f.json | 2 +- ...ents_oreburgh_city_northwest_house_1f.json | 6 +- ...ents_oreburgh_city_northwest_house_2f.json | 8 +- ...ents_oreburgh_city_northwest_house_3f.json | 4 +- ...ents_oreburgh_city_northwest_house_4f.json | 6 +- .../events_oreburgh_city_pokecenter_1f.json | 18 +- .../events_oreburgh_city_pokecenter_2f.json | 6 +- .../events_oreburgh_city_pokecenter_b1f.json | 8 +- .../events_oreburgh_city_south_house.json | 2 +- .../events_oreburgh_city_west_house.json | 6 +- .../events/events_oreburgh_mine_b1f.json | 8 +- .../events/events_oreburgh_mine_b2f.json | 20 +- res/field/scripts/scripts_common.s | 6 +- res/field/scripts/scripts_oreburgh_city.s | 428 +++++++++--------- .../scripts_oreburgh_city_east_house_1f.s | 18 +- .../scripts_oreburgh_city_east_house_2f.s | 36 +- .../scripts_oreburgh_city_east_house_3f.s | 12 +- .../scripts_oreburgh_city_middle_house.s | 12 +- .../scripts_oreburgh_city_north_house_1f.s | 46 +- .../scripts_oreburgh_city_north_house_2f.s | 36 +- .../scripts_oreburgh_city_north_house_3f.s | 18 +- .../scripts_oreburgh_city_north_house_4f.s | 4 +- ...scripts_oreburgh_city_northwest_house_1f.s | 18 +- ...scripts_oreburgh_city_northwest_house_2f.s | 36 +- ...scripts_oreburgh_city_northwest_house_3f.s | 24 +- ...scripts_oreburgh_city_northwest_house_4f.s | 18 +- .../scripts_oreburgh_city_pokecenter_1f.s | 96 ++-- .../scripts_oreburgh_city_pokecenter_b1f.s | 6 +- .../scripts_oreburgh_city_south_house.s | 6 +- .../scripts_oreburgh_city_west_house.s | 18 +- res/field/scripts/scripts_oreburgh_mine_b1f.s | 89 ++-- res/field/scripts/scripts_oreburgh_mine_b2f.s | 75 +-- res/text/common_strings.json | 2 +- res/text/menu_entries.json | 10 +- res/text/oreburgh_city.json | 62 +-- res/text/oreburgh_city_east_house_1f.json | 6 +- res/text/oreburgh_city_east_house_2f.json | 8 +- res/text/oreburgh_city_east_house_3f.json | 4 +- res/text/oreburgh_city_middle_house.json | 4 +- res/text/oreburgh_city_north_house_1f.json | 14 +- res/text/oreburgh_city_north_house_2f.json | 10 +- res/text/oreburgh_city_north_house_3f.json | 6 +- res/text/oreburgh_city_north_house_4f.json | 6 +- .../oreburgh_city_northwest_house_1f.json | 6 +- .../oreburgh_city_northwest_house_2f.json | 10 +- .../oreburgh_city_northwest_house_3f.json | 6 +- .../oreburgh_city_northwest_house_4f.json | 6 +- res/text/oreburgh_city_pokecenter_1f.json | 32 +- res/text/oreburgh_city_pokecenter_b1f.json | 2 +- res/text/oreburgh_city_south_house.json | 2 +- res/text/oreburgh_city_west_house.json | 6 +- res/text/oreburgh_mine_b1f.json | 12 +- res/text/oreburgh_mine_b2f.json | 12 +- 63 files changed, 726 insertions(+), 722 deletions(-) diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index 97f6a1aecf..ab0c069cc3 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -110,7 +110,7 @@ FLAG_GOT_POTION_FROM_ROUTE_201_CASHIER FLAG_UNK_0x006D FLAG_UNK_0x006E FLAG_UNK_0x006F -FLAG_UNK_0x0070 +FLAG_CHOSE_TRAINER_CLASS FLAG_UNK_0x0071 FLAG_UNK_0x0072 FLAG_UNK_0x0073 @@ -120,9 +120,9 @@ FLAG_UNK_0x0076 FLAG_UNK_0x0077 FLAG_UNK_0x0078 FLAG_EXPLORER_KIT_RECEIVED -FLAG_UNK_0x007A +FLAG_ROARK_RETURNED_TO_OREBURGH_GYM FLAG_UNK_0x007B -FLAG_UNK_0x007C +FLAG_RECEIVED_OREBURGH_CITY_NORTHWEST_HOUSE_3F_HARD_STONE FLAG_OBTAINED_FANTINA_TM65 FLAG_OBTAINED_FOCUS_BAND FLAG_UNK_0x007F @@ -131,12 +131,12 @@ FLAG_UNK_0x0081 FLAG_UNK_0x0082 FLAG_UNK_0x0083 FLAG_OLD_ROD_OBTAINED -FLAG_UNK_0x0085 +FLAG_TRADED_FOR_KAZZA_ABRA FLAG_UNK_0x0086 FLAG_TALKED_TO_MOM FLAG_ENTERED_DRESSING_ROOM FLAG_OBTAINED_ALL_BATTLE_FRONTIER_GOLD_PRINTS -FLAG_UNK_0x008A +FLAG_TALKED_TO_OREBURGH_CITY_RIVAL FLAG_UNK_0x008B FLAG_UNK_0x008C FLAG_UNK_0x008D @@ -163,7 +163,7 @@ FLAG_UNK_0x00A1 FLAG_GOOD_ROD_OBTAINED FLAG_UNK_0x00A3 FLAG_UNK_0x00A4 -FLAG_UNK_0x00A5 +FLAG_COULDNT_RECEIVE_OREBURGH_MINE_B1F_FLAME_PLATE FLAG_UNK_0x00A6 FLAG_UNK_0x00A7 FLAG_UNK_0x00A8 @@ -190,8 +190,8 @@ FLAG_UNK_0x00BC FLAG_UNK_0x00BD FLAG_SPOKEN_TO_BATTLE_HALL_RECORD_KEEPER FLAG_OBTAINED_QUICK_CLAW -FLAG_UNK_0x00C0 -FLAG_UNK_0x00C1 +FLAG_RECEIVED_OREBURGH_CITY_NORTHWEST_HOUSE_2F_DUSK_BALL +FLAG_RECEIVED_OREBURGH_CITY_NORTH_HOUSE_2F_HEAL_BALL FLAG_UNK_0x00C2 FLAG_GTS_INTRO_COMPLETED FLAG_UNK_0x00C4 @@ -263,8 +263,8 @@ FLAG_VEILSTONE_STORE_5F_RECEIVED_STICKY_BARB FLAG_UNK_0x0106 FLAG_UNK_0x0107 FLAG_UNK_0x0108 -FLAG_UNK_0x0109 -FLAG_UNK_0x010A +FLAG_RECEIVED_OREBURGH_CITY_SUPER_POTION +FLAG_RECEIVED_OREBURGH_CITY_EAST_HOUSE_2F_GREAT_BALL FLAG_UNK_0x010B FLAG_UNK_0x010C FLAG_UNK_0x010D @@ -378,7 +378,7 @@ FLAG_HIDE_ROUTE_201_PROF_ROWAN FLAG_HIDE_ROUTE_201_COUNTERPART FLAG_HIDE_JUBILIFE_CITY_COUNTERPART FLAG_HIDE_ROUTE_203_RIVAL -FLAG_UNK_0x017C +FLAG_HIDE_OREBURGH_CITY_RIVAL FLAG_HIDE_ROUTE_201_BRIEFCASE FLAG_UNK_0x017E FLAG_UNK_0x017F @@ -392,7 +392,7 @@ FLAG_HIDE_CANALAVE_LIBRARY_1F_LUCIAN FLAG_UNK_0x0187 FLAG_HIDE_ROUTE_202_COUNTERPART FLAG_UNK_0x0189 -FLAG_UNK_0x018A +FLAG_HIDE_OREBURGH_MINE_B2F_ROARK FLAG_HIDE_JUBILIFE_CITY_COLLECTOR FLAG_UNK_0x018C FLAG_UNK_0x018D @@ -710,7 +710,7 @@ FLAG_HIDE_SANDGEM_TOWN_PROF_ROWAN FLAG_UNK_0x02C5 FLAG_UNK_0x02C6 FLAG_UNK_0x02C7 -FLAG_UNK_0x02C8 +FLAG_HIDE_OREBURGH_MINE_B1F_HIKER FLAG_UNK_0x02C9 FLAG_UNK_0x02CA FLAG_HIDE_BATTLE_HALL_MAJOR_NPC diff --git a/res/field/events/events_oreburgh_city.json b/res/field/events/events_oreburgh_city.json index 8afa763f23..36bf8065c3 100644 --- a/res/field/events/events_oreburgh_city.json +++ b/res/field/events/events_oreburgh_city.json @@ -35,7 +35,7 @@ ], "object_events": [ { - "id": "OREBURGH_CITY_HIKER_0", + "id": "LOCALID_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -50,7 +50,7 @@ "y": 3 }, { - "id": "OREBURGH_CITY_SCHOOL_KID_F_1", + "id": "LOCALID_SCHOOL_KID_F", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -65,7 +65,7 @@ "y": 5 }, { - "id": "OREBURGH_CITY_POKEFAN_F_2", + "id": "LOCALID_POKEFAN_F", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -80,11 +80,11 @@ "y": 3 }, { - "id": "OREBURGH_CITY_RIVAL_3", + "id": "LOCALID_RIVAL", "graphics_id": "OBJ_EVENT_GFX_BARRY", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x017C", + "hidden_flag": "FLAG_HIDE_OREBURGH_CITY_RIVAL", "script": 1, "initial_dir": 1, "data": [], @@ -95,7 +95,7 @@ "y": 3 }, { - "id": "OREBURGH_CITY_YOUNGSTER_4", + "id": "LOCALID_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -110,7 +110,7 @@ "y": 3 }, { - "id": "OREBURGH_CITY_MAP_SIGNPOST_5", + "id": "LOCALID_MAP_SIGNPOST_WEST", "graphics_id": "OBJ_EVENT_GFX_MAP_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -127,7 +127,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_GYM_SIGNPOST_6", + "id": "LOCALID_GYM_SIGNPOST", "graphics_id": "OBJ_EVENT_GFX_GYM_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -142,7 +142,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_SIGNBOARD_7", + "id": "LOCALID_SIGNBOARD_OREBURGH_MINING_MUSEUM", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -157,7 +157,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_SIGNBOARD_8", + "id": "LOCALID_SIGNBOARD_OREBURGH_MINE", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -172,7 +172,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_MAP_SIGNPOST_9", + "id": "LOCALID_MAP_SIGNPOST_EAST", "graphics_id": "OBJ_EVENT_GFX_MAP_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -189,7 +189,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_VENT_10", + "id": "LOCALID_VENT_1", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -204,7 +204,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_VENT_11", + "id": "LOCALID_VENT_2", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -219,7 +219,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_VENT_12", + "id": "LOCALID_VENT_3", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -234,7 +234,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_VENT_13", + "id": "LOCALID_VENT_4", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -249,7 +249,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_VENT_14", + "id": "LOCALID_VENT_5", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -264,7 +264,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_WORKER_15", + "id": "LOCALID_WORKER_1", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -279,7 +279,7 @@ "y": 3 }, { - "id": "OREBURGH_CITY_WORKER_16", + "id": "LOCALID_WORKER_2", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -294,7 +294,7 @@ "y": 3 }, { - "id": "OREBURGH_CITY_CAMPER_17", + "id": "LOCALID_CAMPER", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "movement_type": "MOVEMENT_TYPE_WALK_BACK_AND_FORTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -309,7 +309,7 @@ "y": 5 }, { - "id": "OREBURGH_CITY_WORKER_18", + "id": "LOCALID_WORKER_3", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -324,7 +324,7 @@ "y": 3 }, { - "id": "OREBURGH_CITY_WORKER_19", + "id": "LOCALID_WORKER_4", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -339,7 +339,7 @@ "y": 3 }, { - "id": "OREBURGH_CITY_GUITARIST_20", + "id": "LOCALID_GUITARIST", "graphics_id": "OBJ_EVENT_GFX_GUITARIST", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -354,7 +354,7 @@ "y": 3 }, { - "id": "OREBURGH_CITY_BATTLE_GIRL_21", + "id": "LOCALID_BATTLE_GIRL_1", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -369,7 +369,7 @@ "y": 5 }, { - "id": "OREBURGH_CITY_MACHOP_22", + "id": "LOCALID_MACHOP_1", "graphics_id": "OBJ_EVENT_GFX_MACHOP", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -414,7 +414,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_MACHOP_25", + "id": "LOCALID_MACHOP_2", "graphics_id": "OBJ_EVENT_GFX_MACHOP", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -429,7 +429,7 @@ "y": 1 }, { - "id": "OREBURGH_CITY_MACHOP_26", + "id": "LOCALID_MACHOP_3", "graphics_id": "OBJ_EVENT_GFX_MACHOP", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -444,7 +444,7 @@ "y": 1 }, { - "id": "OREBURGH_CITY_BATTLE_GIRL_27", + "id": "LOCALID_BATTLE_GIRL_2", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_east_house_1f.json b/res/field/events/events_oreburgh_city_east_house_1f.json index 951df7784b..08b569818a 100644 --- a/res/field/events/events_oreburgh_city_east_house_1f.json +++ b/res/field/events/events_oreburgh_city_east_house_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_EAST_HOUSE_1F_POKEFAN_M_0", + "id": "LOCALID_POKEFAN_M", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 1 }, { - "id": "OREBURGH_CITY_EAST_HOUSE_1F_HIKER_1", + "id": "LOCALID_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 1 }, { - "id": "OREBURGH_CITY_EAST_HOUSE_1F_ACE_TRAINER_M_2", + "id": "LOCALID_ACE_TRAINER_M", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_east_house_2f.json b/res/field/events/events_oreburgh_city_east_house_2f.json index 7f9a7ca6b8..e8ecb68785 100644 --- a/res/field/events/events_oreburgh_city_east_house_2f.json +++ b/res/field/events/events_oreburgh_city_east_house_2f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_EAST_HOUSE_2F_YOUNGSTER_0", + "id": "LOCALID_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 1 }, { - "id": "OREBURGH_CITY_EAST_HOUSE_2F_GENTLEMAN_1", + "id": "LOCALID_GENTLEMAN", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 1 }, { - "id": "OREBURGH_CITY_EAST_HOUSE_2F_SCIENTIST_M_2", + "id": "LOCALID_SCIENTIST_M", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_east_house_3f.json b/res/field/events/events_oreburgh_city_east_house_3f.json index a29a53338c..e0f4a76be9 100644 --- a/res/field/events/events_oreburgh_city_east_house_3f.json +++ b/res/field/events/events_oreburgh_city_east_house_3f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_EAST_HOUSE_3F_SCIENTIST_M_0", + "id": "LOCALID_SCIENTIST_M", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 1 }, { - "id": "OREBURGH_CITY_EAST_HOUSE_3F_ACE_TRAINER_M_1", + "id": "LOCALID_ACE_TRAINER_M", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_gym.json b/res/field/events/events_oreburgh_city_gym.json index e725f56ab5..6d86b66202 100644 --- a/res/field/events/events_oreburgh_city_gym.json +++ b/res/field/events/events_oreburgh_city_gym.json @@ -19,7 +19,7 @@ ], "object_events": [ { - "id": "OREBURGH_CITY_GYM_ROARK_0", + "id": "LOCALID_ROARK", "graphics_id": "OBJ_EVENT_GFX_ROARK", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -34,7 +34,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_GYM_GYM_GUIDE_1", + "id": "LOCALID_GYM_GUIDE", "graphics_id": "OBJ_EVENT_GFX_GYM_GUIDE", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -49,7 +49,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_GYM_YOUNGSTER_JONATHON", + "id": "LOCALID_YOUNGSTER_JONATHON", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -66,7 +66,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_GYM_YOUNGSTER_DARIUS", + "id": "LOCALID_YOUNGSTER_DARIUS", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", diff --git a/res/field/events/events_oreburgh_city_middle_house.json b/res/field/events/events_oreburgh_city_middle_house.json index 6bb226cd1c..bc982ed2f2 100644 --- a/res/field/events/events_oreburgh_city_middle_house.json +++ b/res/field/events/events_oreburgh_city_middle_house.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_MIDDLE_HOUSE_SCHOOL_KID_F_0", + "id": "LOCALID_SCHOOL_KID_F", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_MIDDLE_HOUSE_HIKER_1", + "id": "LOCALID_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_north_house_1f.json b/res/field/events/events_oreburgh_city_north_house_1f.json index 82e9aec807..f73599acec 100644 --- a/res/field/events/events_oreburgh_city_north_house_1f.json +++ b/res/field/events/events_oreburgh_city_north_house_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_NORTH_HOUSE_1F_EXPERT_F_0", + "id": "LOCALID_EXPERT_F", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_NORTH_HOUSE_1F_SCHOOL_KID_F_1", + "id": "LOCALID_SCHOOL_KID_F", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_NORTH_HOUSE_1F_POKEMON_BREEDER_M_2", + "id": "LOCALID_POKEMON_BREEDER_M", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_north_house_2f.json b/res/field/events/events_oreburgh_city_north_house_2f.json index f00b2729bc..28305a5982 100644 --- a/res/field/events/events_oreburgh_city_north_house_2f.json +++ b/res/field/events/events_oreburgh_city_north_house_2f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_NORTH_HOUSE_2F_GUITARIST_0", + "id": "LOCALID_GUITARIST", "graphics_id": "OBJ_EVENT_GFX_GUITARIST", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_NORTH_HOUSE_2F_POKEMON_BREEDER_F_1", + "id": "LOCALID_POKEMON_BREEDER_F", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_NORTH_HOUSE_2F_COLLECTOR_2", + "id": "LOCALID_COLLECTOR", "graphics_id": "OBJ_EVENT_GFX_COLLECTOR", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_north_house_3f.json b/res/field/events/events_oreburgh_city_north_house_3f.json index 6bc3fa807d..de3bcbebc1 100644 --- a/res/field/events/events_oreburgh_city_north_house_3f.json +++ b/res/field/events/events_oreburgh_city_north_house_3f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_NORTH_HOUSE_3F_WORKER_0", + "id": "LOCALID_WORKER", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 1 }, { - "id": "OREBURGH_CITY_NORTH_HOUSE_3F_POKEFAN_F_1", + "id": "LOCALID_POKEFAN_F", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 1 }, { - "id": "OREBURGH_CITY_NORTH_HOUSE_3F_TWIN_2", + "id": "LOCALID_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_north_house_4f.json b/res/field/events/events_oreburgh_city_north_house_4f.json index 4591a1f25a..40f0bfabab 100644 --- a/res/field/events/events_oreburgh_city_north_house_4f.json +++ b/res/field/events/events_oreburgh_city_north_house_4f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_NORTH_HOUSE_4F_COLLECTOR_0", + "id": "LOCALID_COLLECTOR", "graphics_id": "OBJ_EVENT_GFX_COLLECTOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_northwest_house_1f.json b/res/field/events/events_oreburgh_city_northwest_house_1f.json index 05cef056d0..b492a85385 100644 --- a/res/field/events/events_oreburgh_city_northwest_house_1f.json +++ b/res/field/events/events_oreburgh_city_northwest_house_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_NORTHWEST_HOUSE_1F_POKEMON_BREEDER_M_0", + "id": "LOCALID_POKEMON_BREEDER_M", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_M", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_NORTHWEST_HOUSE_1F_YOUNGSTER_1", + "id": "LOCALID_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_NORTHWEST_HOUSE_1F_POKEFAN_F_2", + "id": "LOCALID_POKEFAN_F", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_northwest_house_2f.json b/res/field/events/events_oreburgh_city_northwest_house_2f.json index 548c5b5753..6a32a300d6 100644 --- a/res/field/events/events_oreburgh_city_northwest_house_2f.json +++ b/res/field/events/events_oreburgh_city_northwest_house_2f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_NORTHWEST_HOUSE_2F_WORKER_0", + "id": "LOCALID_WORKER", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 1 }, { - "id": "OREBURGH_CITY_NORTHWEST_HOUSE_2F_SCHOOL_KID_F_1", + "id": "LOCALID_SCHOOL_KID_F", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_F", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 1 }, { - "id": "OREBURGH_CITY_NORTHWEST_HOUSE_2F_LASS_2", + "id": "LOCALID_LASS", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 1 }, { - "id": "OREBURGH_CITY_NORTHWEST_HOUSE_2F_PSYDUCK_3", + "id": "LOCALID_PSYDUCK", "graphics_id": "OBJ_EVENT_GFX_PSYDUCK", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_northwest_house_3f.json b/res/field/events/events_oreburgh_city_northwest_house_3f.json index b24c8471d8..474829d336 100644 --- a/res/field/events/events_oreburgh_city_northwest_house_3f.json +++ b/res/field/events/events_oreburgh_city_northwest_house_3f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_NORTHWEST_HOUSE_3F_PSYDUCK_0", + "id": "LOCALID_PSYDUCK", "graphics_id": "OBJ_EVENT_GFX_PSYDUCK", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 1 }, { - "id": "OREBURGH_CITY_NORTHWEST_HOUSE_3F_LASS_1", + "id": "LOCALID_LASS", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_northwest_house_4f.json b/res/field/events/events_oreburgh_city_northwest_house_4f.json index 4961eba281..70f7084f76 100644 --- a/res/field/events/events_oreburgh_city_northwest_house_4f.json +++ b/res/field/events/events_oreburgh_city_northwest_house_4f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_NORTHWEST_HOUSE_4F_NINJA_BOY_0", + "id": "LOCALID_NINJA_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 1 }, { - "id": "OREBURGH_CITY_NORTHWEST_HOUSE_4F_SCHOOL_KID_M_1", + "id": "LOCALID_SCHOOL_KID_M", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 1 }, { - "id": "OREBURGH_CITY_NORTHWEST_HOUSE_4F_POKEFAN_F_2", + "id": "LOCALID_POKEFAN_F", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_pokecenter_1f.json b/res/field/events/events_oreburgh_city_pokecenter_1f.json index 0e03ed24e8..c003313305 100644 --- a/res/field/events/events_oreburgh_city_pokecenter_1f.json +++ b/res/field/events/events_oreburgh_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_POKECENTER_1F_PSYCHIC_0", + "id": "LOCALID_PSYCHIC", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_POKECENTER_1F_ACE_TRAINER_F_1", + "id": "LOCALID_ACE_TRAINER_F", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_POKECENTER_1F_NINJA_BOY_2", + "id": "LOCALID_NINJA_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_POKECENTER_1F_POKECENTER_NURSE_3", + "id": "LOCALID_POKECENTER_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_POKECENTER_1F_GENTLEMAN_4", + "id": "LOCALID_GENTLEMAN", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_POKECENTER_1F_UNK_111_5", + "id": "LOCALID_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -92,7 +92,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_POKECENTER_1F_UNK_112_6", + "id": "LOCALID_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -107,7 +107,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_POKECENTER_1F_KID_WITH_NDS_7", + "id": "LOCALID_KID_WITH_NDS_WEST", "graphics_id": "OBJ_EVENT_GFX_KID_WITH_NDS", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -122,7 +122,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_POKECENTER_1F_KID_WITH_NDS_8", + "id": "LOCALID_KID_WITH_NDS_EAST", "graphics_id": "OBJ_EVENT_GFX_KID_WITH_NDS", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_pokecenter_2f.json b/res/field/events/events_oreburgh_city_pokecenter_2f.json index d17356dce2..a1ba87815c 100644 --- a/res/field/events/events_oreburgh_city_pokecenter_2f.json +++ b/res/field/events/events_oreburgh_city_pokecenter_2f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_POKECENTER_2F_TEALA_0", + "id": "LOCALID_TEALA_WEST", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_POKECENTER_2F_TEALA_1", + "id": "LOCALID_TEALA_MIDDLE", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_POKECENTER_2F_TEALA_2", + "id": "LOCALID_TEALA_EAST", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_pokecenter_b1f.json b/res/field/events/events_oreburgh_city_pokecenter_b1f.json index b6791a9c62..ac8c6bb4d3 100644 --- a/res/field/events/events_oreburgh_city_pokecenter_b1f.json +++ b/res/field/events/events_oreburgh_city_pokecenter_b1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_POKECENTER_B1FWIFI_PLAZA_ATTENDANT_F_0", + "id": "LOCALID_WIFI_PLAZA_ATTENDANT_F", "graphics_id": "OBJ_EVENT_GFX_WIFI_PLAZA_ATTENDANT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_POKECENTER_B1F_TEALA_1", + "id": "LOCALID_TEALA_MIDDLE", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_POKECENTER_B1F_TEALA_2", + "id": "LOCALID_TEALA_EAST", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_POKECENTER_B1F_BATTLE_GIRL_3", + "id": "LOCALID_BATTLE_GIRL", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_south_house.json b/res/field/events/events_oreburgh_city_south_house.json index 3524982c94..3f7ed3ed3c 100644 --- a/res/field/events/events_oreburgh_city_south_house.json +++ b/res/field/events/events_oreburgh_city_south_house.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_SOUTH_HOUSE_WORKER_0", + "id": "LOCALID_WORKER", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_west_house.json b/res/field/events/events_oreburgh_city_west_house.json index e1aa49ce9c..62db1b4856 100644 --- a/res/field/events/events_oreburgh_city_west_house.json +++ b/res/field/events/events_oreburgh_city_west_house.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_CITY_WEST_HOUSE_YOUNGSTER_0", + "id": "LOCALID_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_WEST_HOUSE_POKEFAN_F_1", + "id": "LOCALID_POKEFAN_F", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "OREBURGH_CITY_WEST_HOUSE_PIKACHU_2", + "id": "LOCALID_PIKACHU", "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_mine_b1f.json b/res/field/events/events_oreburgh_mine_b1f.json index dcaf8cddb4..403f952528 100644 --- a/res/field/events/events_oreburgh_mine_b1f.json +++ b/res/field/events/events_oreburgh_mine_b1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_MINE_B1F_WORKER_0", + "id": "LOCALID_WORKER", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "OREBURGH_MINE_B1F_TWIN_2", + "id": "LOCALID_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,11 +47,11 @@ "y": 0 }, { - "id": "OREBURGH_MINE_B1F_HIKER_3", + "id": "LOCALID_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02C8", + "hidden_flag": "FLAG_HIDE_OREBURGH_MINE_B1F_HIKER", "script": 4, "initial_dir": 3, "data": [], diff --git a/res/field/events/events_oreburgh_mine_b2f.json b/res/field/events/events_oreburgh_mine_b2f.json index e061adff3c..521b9042e3 100644 --- a/res/field/events/events_oreburgh_mine_b2f.json +++ b/res/field/events/events_oreburgh_mine_b2f.json @@ -2,11 +2,11 @@ "bg_events": [], "object_events": [ { - "id": "OREBURGH_MINE_B2F_ROARK_0", + "id": "LOCALID_ROARK", "graphics_id": "OBJ_EVENT_GFX_ROARK", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x018A", + "hidden_flag": "FLAG_HIDE_OREBURGH_MINE_B2F_ROARK", "script": 1, "initial_dir": 3, "data": [], @@ -17,7 +17,7 @@ "y": 1 }, { - "id": "OREBURGH_MINE_B2F_ROCK_SMASH_1", + "id": "LOCALID_ROCK_SMASH_1", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "OREBURGH_MINE_B2F_ROCK_SMASH_2", + "id": "LOCALID_ROCK_SMASH_2", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "OREBURGH_MINE_B2F_WORKER_COLIN", + "id": "LOCALID_WORKER_COLIN", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -92,7 +92,7 @@ "y": 1 }, { - "id": "OREBURGH_MINE_B2F_WORKER_MASON", + "id": "LOCALID_WORKER_MASON", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -107,7 +107,7 @@ "y": 1 }, { - "id": "OREBURGH_MINE_B2F_WORKER_7", + "id": "LOCALID_WORKER", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -122,7 +122,7 @@ "y": 1 }, { - "id": "OREBURGH_MINE_B2F_MACHOP_8", + "id": "LOCALID_MACHOP_1", "graphics_id": "OBJ_EVENT_GFX_MACHOP", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -137,7 +137,7 @@ "y": 1 }, { - "id": "OREBURGH_MINE_B2F_MACHOP_9", + "id": "LOCALID_MACHOP_2", "graphics_id": "OBJ_EVENT_GFX_MACHOP", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -152,7 +152,7 @@ "y": 1 }, { - "id": "OREBURGH_MINE_B2F_MACHOP_10", + "id": "LOCALID_MACHOP_3", "graphics_id": "OBJ_EVENT_GFX_MACHOP", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/scripts/scripts_common.s b/res/field/scripts/scripts_common.s index 0d3483ce93..95e6aaa21c 100644 --- a/res/field/scripts/scripts_common.s +++ b/res/field/scripts/scripts_common.s @@ -34,7 +34,7 @@ ScriptEntry CommonScript_EmptyScript5 @ 0x7E8 ScriptEntry _1282 @ 0x7E9 ScriptEntry _12A8 @ 0x7EA - ScriptEntry _12BA @ 0x7EB + ScriptEntry CommonScript_Vent @ 0x7EB ScriptEntry _12CD @ 0x7EC ScriptEntry _12E0 @ 0x7ED ScriptEntry _12F3 @ 0x7EE @@ -1363,11 +1363,11 @@ _12A8: ReleaseAll End -_12BA: +CommonScript_Vent: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message pl_msg_00000213_00067 + Message CommonStrings_Text_ItsAnAirVentThatExchangesTheUndergroundTunnelsAir WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city.s b/res/field/scripts/scripts_oreburgh_city.s index 0356eae34f..ca8601c6f2 100644 --- a/res/field/scripts/scripts_oreburgh_city.s +++ b/res/field/scripts/scripts_oreburgh_city.s @@ -1,188 +1,188 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city.h" +#include "res/field/events/events_oreburgh_city.h" - - ScriptEntry _005A - ScriptEntry _0090 - ScriptEntry _03F8 - ScriptEntry _00D7 - ScriptEntry _0350 - ScriptEntry _0363 - ScriptEntry _0376 - ScriptEntry _03D2 - ScriptEntry _03E5 - ScriptEntry _0634 - ScriptEntry _0647 - ScriptEntry _0670 - ScriptEntry _0683 - ScriptEntry _0696 - ScriptEntry _06A9 - ScriptEntry _06C0 - ScriptEntry _06D5 - ScriptEntry _06EC - ScriptEntry _0703 - ScriptEntry _0722 - ScriptEntry _0735 - ScriptEntry _0754 + ScriptEntry OreburghCity_Rival + ScriptEntry OreburghCity_Youngster + ScriptEntry OreburghCity_TriggerYoungster + ScriptEntry OreburghCity_TriggerRival + ScriptEntry OreburghCity_Hiker + ScriptEntry OreburghCity_Worker1 + ScriptEntry OreburghCity_Worker2 + ScriptEntry OreburghCity_Worker3 + ScriptEntry OreburghCity_Worker4 + ScriptEntry OreburghCity_BattleGirl1 + ScriptEntry OreburghCity_SchoolKidF + ScriptEntry OreburghCity_Guitarist + ScriptEntry OreburghCity_PokefanF + ScriptEntry OreburghCity_Camper + ScriptEntry OreburghCity_MapSign + ScriptEntry OreburghCity_GymSignpost + ScriptEntry OreburghCity_ScrollingSignOreburghMiningMuseum + ScriptEntry OreburghCity_ScrollingSignOreburghMine + ScriptEntry OreburghCity_Machop1 + ScriptEntry OreburghCity_BattleGirl2 + ScriptEntry OreburghCity_Machop3 + ScriptEntry OreburghCity_Machop2 ScriptEntryEnd -_005A: +OreburghCity_Rival: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x008A, _0082 + GoToIfSet FLAG_TALKED_TO_OREBURGH_CITY_RIVAL, OreburghCity_IToldYouTheGymLeaderWentDownToTheOreburghMine BufferRivalName 0 BufferPlayerName 1 - Message 0 + Message OreburghCity_Text_TheGymLeadersGoneOffToTheCoalMine WaitABXPadPress - SetFlag FLAG_UNK_0x008A + SetFlag FLAG_TALKED_TO_OREBURGH_CITY_RIVAL CloseMessage ReleaseAll End -_0082: +OreburghCity_IToldYouTheGymLeaderWentDownToTheOreburghMine: BufferRivalName 0 - Message 1 + Message OreburghCity_Text_IToldYouTheGymLeaderWentDownToTheOreburghMine WaitABXPadPress CloseMessage ReleaseAll End -_0090: +OreburghCity_Youngster: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfBadgeAcquired BADGE_ID_COAL, _00C1 - GoToIfSet FLAG_UNK_0x007A, _00CC - Message 8 + GoToIfBadgeAcquired BADGE_ID_COAL, OreburghCity_CanISeeYourTrainerCase + GoToIfSet FLAG_ROARK_RETURNED_TO_OREBURGH_GYM, OreburghCity_TheGymLeadersWaitingForYou + Message OreburghCity_Text_IsThatGuyInFrontOfTheGymYourFriend WaitABXPadPress CloseMessage ReleaseAll End -_00C1: - Message 10 +OreburghCity_CanISeeYourTrainerCase: + Message OreburghCity_Text_CanISeeYourTrainerCase WaitABXPadPress CloseMessage ReleaseAll End -_00CC: - Message 9 +OreburghCity_TheGymLeadersWaitingForYou: + Message OreburghCity_Text_TheGymLeadersWaitingForYou WaitABXPadPress CloseMessage ReleaseAll End -_00D7: +OreburghCity_TriggerRival: LockAll - ClearFlag FLAG_UNK_0x017C - SetObjectEventMovementType 3, MOVEMENT_TYPE_LOOK_WEST - SetObjectEventDir 3, DIR_WEST + ClearFlag FLAG_HIDE_OREBURGH_CITY_RIVAL + SetObjectEventMovementType LOCALID_RIVAL, MOVEMENT_TYPE_LOOK_WEST + SetObjectEventDir LOCALID_RIVAL, DIR_WEST GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 0x2EC, _011E - GoToIfEq VAR_0x8005, 0x2ED, _0144 - GoToIfEq VAR_0x8005, 0x2EE, _016A - GoTo _0190 + GoToIfEq VAR_0x8005, 748, OreburghCity_RivalRunIntoPlayerZ748 + GoToIfEq VAR_0x8005, 749, OreburghCity_RivalRunIntoPlayerZ749 + GoToIfEq VAR_0x8005, 750, OreburghCity_RivalRunIntoPlayerZ750 + GoTo OreburghCity_RivalRunIntoPlayerZ751 End -_011E: - SetObjectEventPos 3, 0x10F, 0x2EC - AddObject 3 - ApplyMovement LOCALID_PLAYER, _02A0 - ApplyMovement 3, _02B8 +OreburghCity_RivalRunIntoPlayerZ748: + SetObjectEventPos LOCALID_RIVAL, 271, 748 + AddObject LOCALID_RIVAL + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerGetPushedByRival + ApplyMovement LOCALID_RIVAL, OreburghCity_Movement_RivalRunIntoPlayer WaitMovement - GoTo _01B6 + GoTo OreburghCity_NextStopTheEternaGymBadge End -_0144: - SetObjectEventPos 3, 0x10F, 0x2ED - AddObject 3 - ApplyMovement LOCALID_PLAYER, _02A0 - ApplyMovement 3, _02B8 +OreburghCity_RivalRunIntoPlayerZ749: + SetObjectEventPos LOCALID_RIVAL, 271, 749 + AddObject LOCALID_RIVAL + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerGetPushedByRival + ApplyMovement LOCALID_RIVAL, OreburghCity_Movement_RivalRunIntoPlayer WaitMovement - GoTo _01B6 + GoTo OreburghCity_NextStopTheEternaGymBadge End -_016A: - SetObjectEventPos 3, 0x10F, 0x2EE - AddObject 3 - ApplyMovement LOCALID_PLAYER, _02A0 - ApplyMovement 3, _02B8 +OreburghCity_RivalRunIntoPlayerZ750: + SetObjectEventPos LOCALID_RIVAL, 271, 750 + AddObject LOCALID_RIVAL + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerGetPushedByRival + ApplyMovement LOCALID_RIVAL, OreburghCity_Movement_RivalRunIntoPlayer WaitMovement - GoTo _01B6 + GoTo OreburghCity_NextStopTheEternaGymBadge End -_0190: - SetObjectEventPos 3, 0x10F, 0x2EF - AddObject 3 - ApplyMovement LOCALID_PLAYER, _02A0 - ApplyMovement 3, _02B8 +OreburghCity_RivalRunIntoPlayerZ751: + SetObjectEventPos LOCALID_RIVAL, 271, 751 + AddObject LOCALID_RIVAL + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerGetPushedByRival + ApplyMovement LOCALID_RIVAL, OreburghCity_Movement_RivalRunIntoPlayer WaitMovement - GoTo _01B6 + GoTo OreburghCity_NextStopTheEternaGymBadge End -_01B6: +OreburghCity_NextStopTheEternaGymBadge: PlayFanfare SEQ_SE_DP_WALL_HIT2 - Message 2 + Message OreburghCity_Text_BigThud CloseMessage Common_SetRivalBGM BufferRivalName 0 BufferPlayerName 1 - Message 3 + Message OreburghCity_Text_EternaCityIsTheNextPlaceWithAGymThatGivesAwayBadgesRight CloseMessage - ApplyMovement 3, _0340 + ApplyMovement LOCALID_RIVAL, OreburghCity_Movement_RivalWalkOnSpotEast WaitMovement - Message 4 - ApplyMovement 3, _0348 + Message OreburghCity_Text_IWentToRoute207ButYouCantGoThereWithoutABicycle + ApplyMovement LOCALID_RIVAL, OreburghCity_Movement_RivalWalkOnSpotWest WaitMovement - Message 5 + Message OreburghCity_Text_NextStopTheEternaGymBadge CloseMessage GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 0x2EC, _021F - GoToIfEq VAR_0x8005, 0x2ED, _0239 - GoToIfEq VAR_0x8005, 0x2EE, _0253 - GoTo _026D + GoToIfEq VAR_0x8005, 748, OreburghCity_RivalLeaveZ748 + GoToIfEq VAR_0x8005, 749, OreburghCity_RivalLeaveZ749 + GoToIfEq VAR_0x8005, 750, OreburghCity_RivalLeaveZ750 + GoTo OreburghCity_RivalLeaveZ751 End -_021F: - ApplyMovement LOCALID_PLAYER, _0310 - ApplyMovement 3, _02C0 +OreburghCity_RivalLeaveZ748: + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWatchRivalLeaveZ748 + ApplyMovement LOCALID_RIVAL, OreburghCity_Movement_RivalLeaveZ748 WaitMovement - GoTo _0287 + GoTo OreburghCity_RemoveRival End -_0239: - ApplyMovement LOCALID_PLAYER, _031C - ApplyMovement 3, _02D0 +OreburghCity_RivalLeaveZ749: + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWatchRivalLeaveZ749 + ApplyMovement LOCALID_RIVAL, OreburghCity_Movement_RivalLeaveZ749 WaitMovement - GoTo _0287 + GoTo OreburghCity_RemoveRival End -_0253: - ApplyMovement LOCALID_PLAYER, _0328 - ApplyMovement 3, _02E8 +OreburghCity_RivalLeaveZ750: + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWatchRivalLeaveZ750 + ApplyMovement LOCALID_RIVAL, OreburghCity_Movement_RivalLeaveZ750 WaitMovement - GoTo _0287 + GoTo OreburghCity_RemoveRival End -_026D: - ApplyMovement LOCALID_PLAYER, _0334 - ApplyMovement 3, _02F8 +OreburghCity_RivalLeaveZ751: + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWatchRivalLeaveZ751 + ApplyMovement LOCALID_RIVAL, OreburghCity_Movement_RivalLeaveZ751 WaitMovement - GoTo _0287 + GoTo OreburghCity_RemoveRival End -_0287: +OreburghCity_RemoveRival: PlayFanfare SEQ_SE_DP_KAIDAN2 - RemoveObject 3 + RemoveObject LOCALID_RIVAL Common_FadeToDefaultMusic2 SetVar VAR_OREBURGH_STATE, 3 ReleaseAll End .balign 4, 0 -_02A0: +OreburghCity_Movement_PlayerGetPushedByRival: Delay4 7 LockDir WalkFastWest @@ -191,19 +191,19 @@ _02A0: EndMovement .balign 4, 0 -_02B8: +OreburghCity_Movement_RivalRunIntoPlayer: WalkFastWest 9 EndMovement .balign 4, 0 -_02C0: +OreburghCity_Movement_RivalLeaveZ748: WalkFastSouth WalkFastWest 4 WalkOnSpotFastWest EndMovement .balign 4, 0 -_02D0: +OreburghCity_Movement_RivalLeaveZ749: WalkFastSouth WalkFastWest 3 WalkFastNorth @@ -212,14 +212,14 @@ _02D0: EndMovement .balign 4, 0 -_02E8: +OreburghCity_Movement_RivalLeaveZ750: WalkFastNorth WalkFastWest 4 WalkOnSpotFastWest EndMovement .balign 4, 0 -_02F8: +OreburghCity_Movement_RivalLeaveZ751: WalkFastNorth WalkFastWest 3 WalkFastNorth @@ -228,184 +228,184 @@ _02F8: EndMovement .balign 4, 0 -_0310: +OreburghCity_Movement_PlayerWatchRivalLeaveZ748: WalkOnSpotNormalSouth WalkOnSpotNormalWest EndMovement .balign 4, 0 -_031C: +OreburghCity_Movement_PlayerWatchRivalLeaveZ749: WalkOnSpotNormalSouth WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0328: +OreburghCity_Movement_PlayerWatchRivalLeaveZ750: WalkOnSpotNormalNorth WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0334: +OreburghCity_Movement_PlayerWatchRivalLeaveZ751: WalkOnSpotNormalNorth WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0340: +OreburghCity_Movement_RivalWalkOnSpotEast: WalkOnSpotNormalEast EndMovement .balign 4, 0 -_0348: +OreburghCity_Movement_RivalWalkOnSpotWest: WalkOnSpotNormalWest EndMovement -_0350: +OreburghCity_Hiker: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 14 + Message OreburghCity_Text_UpAheadTheresAHugeMountainThatTowersAboveEverything WaitABXPadPress CloseMessage ReleaseAll End -_0363: +OreburghCity_Worker1: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 16 + Message OreburghCity_Text_TheseVentsExchangeTheHotAirDownBelowWithTheFreshAirOutside WaitABXPadPress CloseMessage ReleaseAll End -_0376: +OreburghCity_Worker2: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x0109, _03BD - Message 17 + GoToIfSet FLAG_RECEIVED_OREBURGH_CITY_SUPER_POTION, OreburghCity_FeelingHaleAndHeartyPutsASmileOnMyFace + Message OreburghCity_Text_HereTakeOneOfThese SetVar VAR_0x8004, ITEM_SUPER_POTION SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _03C8 + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, OreburghCity_BagIsFull Common_GiveItemQuantity - SetFlag FLAG_UNK_0x0109 - GoTo _03BD + SetFlag FLAG_RECEIVED_OREBURGH_CITY_SUPER_POTION + GoTo OreburghCity_FeelingHaleAndHeartyPutsASmileOnMyFace End -_03BD: - Message 18 +OreburghCity_FeelingHaleAndHeartyPutsASmileOnMyFace: + Message OreburghCity_Text_FeelingHaleAndHeartyPutsASmileOnMyFace WaitABXPadPress CloseMessage ReleaseAll End -_03C8: +OreburghCity_BagIsFull: Common_MessageBagIsFull CloseMessage ReleaseAll End -_03D2: +OreburghCity_Worker3: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 19 + Message OreburghCity_Text_ThisPileOfDirtySandIsCalledASlagHeap WaitABXPadPress CloseMessage ReleaseAll End -_03E5: +OreburghCity_Worker4: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 20 + Message OreburghCity_Text_ChopChopMachopChopChopAwayOnRocks WaitABXPadPress CloseMessage ReleaseAll End -_03F8: +OreburghCity_TriggerYoungster: LockAll GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 0x2EC, _042F - GoToIfEq VAR_0x8005, 0x2ED, _0449 - GoToIfEq VAR_0x8005, 0x2EE, _0463 - GoTo _047D + GoToIfEq VAR_0x8005, 748, OreburghCity_YoungsterWalkToPlayerZ748 + GoToIfEq VAR_0x8005, 749, OreburghCity_YoungsterWalkToPlayerZ749 + GoToIfEq VAR_0x8005, 750, OreburghCity_YoungsterWalkToPlayerZ750 + GoTo OreburghCity_YoungsterWalkToPlayerZ751 End -_042F: - ApplyMovement LOCALID_PLAYER, _055C - ApplyMovement 4, _0604 +OreburghCity_YoungsterWalkToPlayerZ748: + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWalkOnSpotSouth + ApplyMovement LOCALID_YOUNGSTER, OreburghCity_Movement_YoungsterWalkToPlayerZ748 WaitMovement - GoTo _0497 + GoTo OreburghCity_IllTakeYouToThePokemonGym End -_0449: - ApplyMovement LOCALID_PLAYER, _055C - ApplyMovement 4, _0610 +OreburghCity_YoungsterWalkToPlayerZ749: + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWalkOnSpotSouth + ApplyMovement LOCALID_YOUNGSTER, OreburghCity_Movement_YoungsterWalkToPlayerZ749 WaitMovement - GoTo _0497 + GoTo OreburghCity_IllTakeYouToThePokemonGym End -_0463: - ApplyMovement LOCALID_PLAYER, _055C - ApplyMovement 4, _061C +OreburghCity_YoungsterWalkToPlayerZ750: + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWalkOnSpotSouth + ApplyMovement LOCALID_YOUNGSTER, OreburghCity_Movement_YoungsterWalkToPlayerZ750 WaitMovement - GoTo _0497 + GoTo OreburghCity_IllTakeYouToThePokemonGym End -_047D: - ApplyMovement LOCALID_PLAYER, _055C - ApplyMovement 4, _0628 +OreburghCity_YoungsterWalkToPlayerZ751: + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWalkOnSpotSouth + ApplyMovement LOCALID_YOUNGSTER, OreburghCity_Movement_YoungsterWalkToPlayerZ751 WaitMovement - GoTo _0497 + GoTo OreburghCity_IllTakeYouToThePokemonGym End -_0497: - Message 6 +OreburghCity_IllTakeYouToThePokemonGym: + Message OreburghCity_Text_IllTakeYouToThePokemonGym CloseMessage Common_SetFollowMeBGM GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 0x2EC, _04DC - GoToIfEq VAR_0x8005, 0x2ED, _04F6 - GoToIfEq VAR_0x8005, 0x2EE, _0510 - GoToIfEq VAR_0x8005, 0x2EF, _052A + GoToIfEq VAR_0x8005, 748, OreburghCity_WalkWithYoungsterToTheGymZ748 + GoToIfEq VAR_0x8005, 749, OreburghCity_WalkWithYoungsterToTheGymZ749 + GoToIfEq VAR_0x8005, 750, OreburghCity_WalkWithYoungsterToTheGymZ750 + GoToIfEq VAR_0x8005, 751, OreburghCity_WalkWithYoungsterToTheGymZ751 End -_04DC: - ApplyMovement LOCALID_PLAYER, _0564 - ApplyMovement 4, _05B4 +OreburghCity_WalkWithYoungsterToTheGymZ748: + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWalkToTheGymZ748 + ApplyMovement LOCALID_YOUNGSTER, OreburghCity_Movement_YoungsterWalkToTheGymZ748 WaitMovement - GoTo _0544 + GoTo OreburghCity_HuhTheresSomeoneThere End -_04F6: - ApplyMovement LOCALID_PLAYER, _0578 - ApplyMovement 4, _05C8 +OreburghCity_WalkWithYoungsterToTheGymZ749: + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWalkToTheGymZ749 + ApplyMovement LOCALID_YOUNGSTER, OreburghCity_Movement_YoungsterWalkToTheGymZ749 WaitMovement - GoTo _0544 + GoTo OreburghCity_HuhTheresSomeoneThere End -_0510: - ApplyMovement LOCALID_PLAYER, _058C - ApplyMovement 4, _05DC +OreburghCity_WalkWithYoungsterToTheGymZ750: + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWalkToTheGymZ750 + ApplyMovement LOCALID_YOUNGSTER, OreburghCity_Movement_YoungsterWalkToTheGymZ750 WaitMovement - GoTo _0544 + GoTo OreburghCity_HuhTheresSomeoneThere End -_052A: - ApplyMovement LOCALID_PLAYER, _05A0 - ApplyMovement 4, _05F0 +OreburghCity_WalkWithYoungsterToTheGymZ751: + ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWalkToTheGymZ751 + ApplyMovement LOCALID_YOUNGSTER, OreburghCity_Movement_YoungsterWalkToTheGymZ751 WaitMovement - GoTo _0544 + GoTo OreburghCity_HuhTheresSomeoneThere End -_0544: - Message 7 +OreburghCity_HuhTheresSomeoneThere: + Message OreburghCity_Text_HuhTheresSomeoneThere WaitABXPadPress CloseMessage Common_FadeToDefaultMusic3 @@ -414,12 +414,12 @@ _0544: End .balign 4, 0 -_055C: +OreburghCity_Movement_PlayerWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0564: +OreburghCity_Movement_PlayerWalkToTheGymZ748: WalkNormalSouth WalkNormalEast WalkNormalSouth 10 @@ -427,7 +427,7 @@ _0564: EndMovement .balign 4, 0 -_0578: +OreburghCity_Movement_PlayerWalkToTheGymZ749: WalkNormalSouth WalkNormalEast WalkNormalSouth 9 @@ -435,7 +435,7 @@ _0578: EndMovement .balign 4, 0 -_058C: +OreburghCity_Movement_PlayerWalkToTheGymZ750: WalkNormalSouth WalkNormalEast WalkNormalSouth 8 @@ -443,7 +443,7 @@ _058C: EndMovement .balign 4, 0 -_05A0: +OreburghCity_Movement_PlayerWalkToTheGymZ751: WalkNormalSouth WalkNormalEast WalkNormalSouth 7 @@ -451,7 +451,7 @@ _05A0: EndMovement .balign 4, 0 -_05B4: +OreburghCity_Movement_YoungsterWalkToTheGymZ748: WalkNormalEast WalkNormalSouth 10 WalkNormalEast 13 @@ -459,7 +459,7 @@ _05B4: EndMovement .balign 4, 0 -_05C8: +OreburghCity_Movement_YoungsterWalkToTheGymZ749: WalkNormalEast WalkNormalSouth 9 WalkNormalEast 13 @@ -467,7 +467,7 @@ _05C8: EndMovement .balign 4, 0 -_05DC: +OreburghCity_Movement_YoungsterWalkToTheGymZ750: WalkNormalEast WalkNormalSouth 8 WalkNormalEast 13 @@ -475,7 +475,7 @@ _05DC: EndMovement .balign 4, 0 -_05F0: +OreburghCity_Movement_YoungsterWalkToTheGymZ751: WalkNormalEast WalkNormalSouth 7 WalkNormalEast 13 @@ -483,146 +483,146 @@ _05F0: EndMovement .balign 4, 0 -_0604: +OreburghCity_Movement_YoungsterWalkToPlayerZ748: EmoteExclamationMark WalkNormalNorth 3 EndMovement .balign 4, 0 -_0610: +OreburghCity_Movement_YoungsterWalkToPlayerZ749: EmoteExclamationMark WalkNormalNorth 2 EndMovement .balign 4, 0 -_061C: +OreburghCity_Movement_YoungsterWalkToPlayerZ750: EmoteExclamationMark WalkNormalNorth EndMovement .balign 4, 0 -_0628: +OreburghCity_Movement_YoungsterWalkToPlayerZ751: EmoteExclamationMark WalkOnSpotNormalNorth EndMovement -_0634: +OreburghCity_BattleGirl1: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 21 + Message OreburghCity_Text_TMsAreSingleUseOnlyButHMsCanBeUsedOverAndOver WaitABXPadPress CloseMessage ReleaseAll End -_0647: +OreburghCity_SchoolKidF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x007A, _0665 - Message 11 + GoToIfSet FLAG_ROARK_RETURNED_TO_OREBURGH_GYM, OreburghCity_TheGymLeaderIsYoungButHesTheMinesSafetySupervisor + Message OreburghCity_Text_TheGymLeaderWentOffToWorkInTheMine WaitABXPadPress CloseMessage ReleaseAll End -_0665: - Message 12 +OreburghCity_TheGymLeaderIsYoungButHesTheMinesSafetySupervisor: + Message OreburghCity_Text_TheGymLeaderIsYoungButHesTheMinesSafetySupervisor WaitABXPadPress CloseMessage ReleaseAll End -_0670: +OreburghCity_Guitarist: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 15 + Message OreburghCity_Text_HaveYouSeenTheVents WaitABXPadPress CloseMessage ReleaseAll End -_0683: +OreburghCity_PokefanF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 13 + Message OreburghCity_Text_EveryonesProudOfTheMine WaitABXPadPress CloseMessage ReleaseAll End -_0696: +OreburghCity_Camper: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 22 + Message OreburghCity_Text_WhenIRunAroundWithMyRunningShoesOnImTheCenterOfAttention WaitABXPadPress CloseMessage ReleaseAll End -_06A9: - ShowMapSign 27 +OreburghCity_MapSign: + ShowMapSign OreburghCity_Text_MapSign End -_06C0: - ShowScrollingSign 28 +OreburghCity_GymSignpost: + ShowScrollingSign OreburghCity_Text_OreburgCityPokemonGymCallMeRoarkTheRock End -_06D5: - ShowLandmarkSign 29 +OreburghCity_ScrollingSignOreburghMiningMuseum: + ShowLandmarkSign OreburghCity_Text_OreburghMiningMuseumCoalMiningAndYou End -_06EC: - ShowLandmarkSign 30 +OreburghCity_ScrollingSignOreburghMine: + ShowLandmarkSign OreburghCity_Text_OreburghMineBewareOfBusyPokemon End -_0703: +OreburghCity_Machop1: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer WaitFanfare SEQ_SE_CONFIRM PlayCry SPECIES_MACHOP - Message 24 + Message OreburghCity_Text_MachopMachoChopo WaitCry WaitABXPadPress CloseMessage ReleaseAll End -_0722: +OreburghCity_BattleGirl2: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 23 + Message OreburghCity_Text_ThatsWhatFossilsAre WaitABXPadPress CloseMessage ReleaseAll End -_0735: +OreburghCity_Machop3: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer WaitFanfare SEQ_SE_CONFIRM PlayCry SPECIES_MACHOP - Message 25 + Message OreburghCity_Text_MachopPigyooh WaitCry WaitABXPadPress CloseMessage ReleaseAll End -_0754: +OreburghCity_Machop2: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer WaitFanfare SEQ_SE_CONFIRM PlayCry SPECIES_MACHOP - Message 26 + Message OreburghCity_Text_MachopGwoohGogogooh WaitCry WaitABXPadPress CloseMessage diff --git a/res/field/scripts/scripts_oreburgh_city_east_house_1f.s b/res/field/scripts/scripts_oreburgh_city_east_house_1f.s index 14579ce87b..5310525cf7 100644 --- a/res/field/scripts/scripts_oreburgh_city_east_house_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_east_house_1f.s @@ -2,36 +2,36 @@ #include "res/text/bank/oreburgh_city_east_house_1f.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _0034 + ScriptEntry OreburghCityEastHouse1F_PokefanM + ScriptEntry OreburghCityEastHouse1F_Hiker + ScriptEntry OreburghCityEastHouse1F_AceTrainerM ScriptEntryEnd -_000E: +OreburghCityEastHouse1F_PokefanM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message OreburghCityEastHouse1F_Text_WhyNotTryTrainingInTheOreburghMine WaitABXPadPress CloseMessage ReleaseAll End -_0021: +OreburghCityEastHouse1F_Hiker: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message OreburghCityEastHouse1F_Text_IAlwaysHaveARottenTimeTryingToDecideWhichMovesMyPokemonShouldLearn WaitABXPadPress CloseMessage ReleaseAll End -_0034: +OreburghCityEastHouse1F_AceTrainerM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 2 + Message OreburghCityEastHouse1F_Text_YouRemindMeSoMuchOfTheTimeIGotMyFirstPokemon WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city_east_house_2f.s b/res/field/scripts/scripts_oreburgh_city_east_house_2f.s index 79cbf8b689..b07aba2ef0 100644 --- a/res/field/scripts/scripts_oreburgh_city_east_house_2f.s +++ b/res/field/scripts/scripts_oreburgh_city_east_house_2f.s @@ -2,57 +2,57 @@ #include "res/text/bank/oreburgh_city_east_house_2f.h" - ScriptEntry _0012 - ScriptEntry _0025 - ScriptEntry _0081 - ScriptEntry _0083 + ScriptEntry OreburghCityEastHouse2F_Gentleman + ScriptEntry OreburghCityEastHouse2F_Youngster + ScriptEntry OreburghCityEastHouse2F_Unused + ScriptEntry OreburghCityEastHouse2F_ScientistM ScriptEntryEnd -_0012: +OreburghCityEastHouse2F_Gentleman: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message OreburghCityEastHouse2F_Text_TheOreburghMineIsOperatedWithTheUtmostCare WaitABXPadPress CloseMessage ReleaseAll End -_0025: +OreburghCityEastHouse2F_Youngster: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x010A, _006C - Message 1 + GoToIfSet FLAG_RECEIVED_OREBURGH_CITY_EAST_HOUSE_2F_GREAT_BALL, OreburghCityEastHouse2F_YouKnowHowPokemonStayInsideTheirPokeBalls + Message OreburghCityEastHouse2F_Text_HereIWantYouToHaveThis SetVar VAR_0x8004, ITEM_GREAT_BALL SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _0077 + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, OreburghCityEastHouse2F_BagIsFull Common_GiveItemQuantity - SetFlag FLAG_UNK_0x010A - GoTo _006C + SetFlag FLAG_RECEIVED_OREBURGH_CITY_EAST_HOUSE_2F_GREAT_BALL + GoTo OreburghCityEastHouse2F_YouKnowHowPokemonStayInsideTheirPokeBalls End -_006C: - Message 2 +OreburghCityEastHouse2F_YouKnowHowPokemonStayInsideTheirPokeBalls: + Message OreburghCityEastHouse2F_Text_YouKnowHowPokemonStayInsideTheirPokeBalls WaitABXPadPress CloseMessage ReleaseAll End -_0077: +OreburghCityEastHouse2F_BagIsFull: Common_MessageBagIsFull CloseMessage ReleaseAll End -_0081: +OreburghCityEastHouse2F_Unused: End -_0083: +OreburghCityEastHouse2F_ScientistM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 3 + Message OreburghCityEastHouse2F_Text_CoalIsCarriedOutOfTheOreburghMineOnAFullyAutomatedSystem WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city_east_house_3f.s b/res/field/scripts/scripts_oreburgh_city_east_house_3f.s index 0c28e15246..45c782b10a 100644 --- a/res/field/scripts/scripts_oreburgh_city_east_house_3f.s +++ b/res/field/scripts/scripts_oreburgh_city_east_house_3f.s @@ -2,25 +2,25 @@ #include "res/text/bank/oreburgh_city_east_house_3f.h" - ScriptEntry _000A - ScriptEntry _001D + ScriptEntry OreburghCityEastHouse3F_ScientistM + ScriptEntry OreburghCityEastHouse3F_AceTrainerM ScriptEntryEnd -_000A: +OreburghCityEastHouse3F_ScientistM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message OreburghCityEastHouse3F_Text_TheCoalMineHeresFullyAutomated WaitABXPadPress CloseMessage ReleaseAll End -_001D: +OreburghCityEastHouse3F_AceTrainerM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message OreburghCityEastHouse3F_Text_YouRemindMeSoMuchOfTheTimeIGotMyFirstPokemon WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city_middle_house.s b/res/field/scripts/scripts_oreburgh_city_middle_house.s index 04deee23ea..01eece0c89 100644 --- a/res/field/scripts/scripts_oreburgh_city_middle_house.s +++ b/res/field/scripts/scripts_oreburgh_city_middle_house.s @@ -2,25 +2,25 @@ #include "res/text/bank/oreburgh_city_middle_house.h" - ScriptEntry _000A - ScriptEntry _001D + ScriptEntry OreburghCityMiddleHouse_SchoolKidF + ScriptEntry OreburghCityMiddleHouse_Hiker ScriptEntryEnd -_000A: +OreburghCityMiddleHouse_SchoolKidF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message OreburghCityMiddleHouse_Text_RoarkIsAUserOfRockTypePokemon WaitABXPadPress CloseMessage ReleaseAll End -_001D: +OreburghCityMiddleHouse_Hiker: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message OreburghCityMiddleHouse_Text_RoarkIsOurTownsGymLeader WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city_north_house_1f.s b/res/field/scripts/scripts_oreburgh_city_north_house_1f.s index 047c2851b3..ae85e30442 100644 --- a/res/field/scripts/scripts_oreburgh_city_north_house_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_north_house_1f.s @@ -2,80 +2,80 @@ #include "res/text/bank/oreburgh_city_north_house_1f.h" - ScriptEntry _000E - ScriptEntry _00C2 - ScriptEntry _00D5 + ScriptEntry OreburghCityNorthHouse1F_SchoolKidF + ScriptEntry OreburghCityNorthHouse1F_ExpertF + ScriptEntry OreburghCityNorthHouse1F_PokemonBreederM ScriptEntryEnd -_000E: +OreburghCityNorthHouse1F_SchoolKidF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x0085, _00B7 - Message 0 + GoToIfSet FLAG_TRADED_FOR_KAZZA_ABRA, OreburghCityNorthHouse1F_ThanksToPokemonIGotToBeFriendsWithYou + Message OreburghCityNorthHouse1F_Text_WouldYouBeWillingToTradeYourMachopForMyAbra ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _003B - GoTo _00AC + GoToIfEq VAR_RESULT, MENU_YES, OreburghCityNorthHouse1F_TryTrade + GoTo OreburghCityNorthHouse1F_IfYouChangeYourMindIllBeRightHereWaiting -_003B: +OreburghCityNorthHouse1F_TryTrade: CloseMessage FadeScreenOut WaitFadeScreen SelectPokemonToTrade FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, 0xFF, _00AC + GoToIfEq VAR_RESULT, 0xFF, OreburghCityNorthHouse1F_IfYouChangeYourMindIllBeRightHereWaiting StartNpcTrade NPC_TRADE_KAZZA_ABRA SetVar VAR_0x8004, VAR_RESULT GetPartyMonSpecies VAR_0x8004, VAR_0x8005 GetNpcTradeRequestedSpecies VAR_RESULT - GoToIfNe VAR_0x8005, VAR_RESULT, _009F + GoToIfNe VAR_0x8005, VAR_RESULT, OreburghCityNorthHouse1F_WhatIAskedForWasAMachop ScrCmd_229 VAR_0x8004 FinishNpcTrade - SetFlag FLAG_UNK_0x0085 - Message 1 + SetFlag FLAG_TRADED_FOR_KAZZA_ABRA + Message OreburghCityNorthHouse1F_Text_BeNiceToMyAbra WaitABXPadPress CloseMessage ReleaseAll End -_009F: +OreburghCityNorthHouse1F_WhatIAskedForWasAMachop: FinishNpcTrade - Message 2 + Message OreburghCityNorthHouse1F_Text_WhatIAskedForWasAMachop WaitABXPadPress CloseMessage ReleaseAll End -_00AC: - Message 3 +OreburghCityNorthHouse1F_IfYouChangeYourMindIllBeRightHereWaiting: + Message OreburghCityNorthHouse1F_Text_IfYouChangeYourMindIllBeRightHereWaiting WaitABXPadPress CloseMessage ReleaseAll End -_00B7: - Message 4 +OreburghCityNorthHouse1F_ThanksToPokemonIGotToBeFriendsWithYou: + Message OreburghCityNorthHouse1F_Text_ThanksToPokemonIGotToBeFriendsWithYou WaitABXPadPress CloseMessage ReleaseAll End -_00C2: +OreburghCityNorthHouse1F_ExpertF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 5 + Message OreburghCityNorthHouse1F_Text_APokemonObtainedInATradeGrowsQuickly WaitABXPadPress CloseMessage ReleaseAll End -_00D5: +OreburghCityNorthHouse1F_PokemonBreederM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 6 + Message OreburghCityNorthHouse1F_Text_WhenYouTradeAPokemonTheItemItsHoldingIsTradedAsWell WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city_north_house_2f.s b/res/field/scripts/scripts_oreburgh_city_north_house_2f.s index 8eb1a82f5a..ce0d12d27e 100644 --- a/res/field/scripts/scripts_oreburgh_city_north_house_2f.s +++ b/res/field/scripts/scripts_oreburgh_city_north_house_2f.s @@ -2,63 +2,63 @@ #include "res/text/bank/oreburgh_city_north_house_2f.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _0034 + ScriptEntry OreburghCityNorthHouse2F_Guitarist + ScriptEntry OreburghCityNorthHouse2F_PokemonBreederF + ScriptEntry OreburghCityNorthHouse2F_Collector ScriptEntryEnd -_000E: +OreburghCityNorthHouse2F_Guitarist: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message OreburghCityNorthHouse2F_Text_AllPokemonHaveASpecialPowerCalledAnAbility WaitABXPadPress CloseMessage ReleaseAll End -_0021: +OreburghCityNorthHouse2F_PokemonBreederF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message OreburghCityNorthHouse2F_Text_MyFavoritePokemonAbilityIsMyPachirisusPickup WaitABXPadPress CloseMessage ReleaseAll End -_0034: +OreburghCityNorthHouse2F_Collector: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x00C1, _00A1 + GoToIfSet FLAG_RECEIVED_OREBURGH_CITY_NORTH_HOUSE_2F_HEAL_BALL, OreburghCityNorthHouse2F_YeahThereAreSoManyKindsOfPokemonOutInTheWorld CheckPartyHasSpecies VAR_RESULT, SPECIES_GEODUDE - GoToIfEq VAR_RESULT, 0, _0096 - Message 3 + GoToIfEq VAR_RESULT, FALSE, OreburghCityNorthHouse2F_HowAboutShowingMeAPokemonCalledGeodude + Message OreburghCityNorthHouse2F_Text_ThatsAGeodudeThisIsATokenOfMyThanks SetVar VAR_0x8004, ITEM_HEAL_BALL SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _008C - SetFlag FLAG_UNK_0x00C1 + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, OreburghCityNorthHouse2F_BagIsFull + SetFlag FLAG_RECEIVED_OREBURGH_CITY_NORTH_HOUSE_2F_HEAL_BALL Common_GiveItemQuantityNoLineFeed CloseMessage ReleaseAll End -_008C: +OreburghCityNorthHouse2F_BagIsFull: Common_MessageBagIsFull CloseMessage ReleaseAll End -_0096: - Message 2 +OreburghCityNorthHouse2F_HowAboutShowingMeAPokemonCalledGeodude: + Message OreburghCityNorthHouse2F_Text_HowAboutShowingMeAPokemonCalledGeodude WaitABXPadPress CloseMessage ReleaseAll End -_00A1: - Message 4 +OreburghCityNorthHouse2F_YeahThereAreSoManyKindsOfPokemonOutInTheWorld: + Message OreburghCityNorthHouse2F_Text_YeahThereAreSoManyKindsOfPokemonOutInTheWorld WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city_north_house_3f.s b/res/field/scripts/scripts_oreburgh_city_north_house_3f.s index 3b3abd35ef..c309718887 100644 --- a/res/field/scripts/scripts_oreburgh_city_north_house_3f.s +++ b/res/field/scripts/scripts_oreburgh_city_north_house_3f.s @@ -2,36 +2,36 @@ #include "res/text/bank/oreburgh_city_north_house_3f.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _0034 + ScriptEntry OreburghCityNorthHouse3F_PokefanF + ScriptEntry OreburghCityNorthHouse3F_Worker + ScriptEntry OreburghCityNorthHouse3F_Twin ScriptEntryEnd -_000E: +OreburghCityNorthHouse3F_PokefanF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message OreburghCityNorthHouse3F_Text_DuringTheDaytimeEveryoneGoesOffToTheMine WaitABXPadPress CloseMessage ReleaseAll End -_0021: +OreburghCityNorthHouse3F_Worker: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message OreburghCityNorthHouse3F_Text_WellKeepDiggingCoal WaitABXPadPress CloseMessage ReleaseAll End -_0034: +OreburghCityNorthHouse3F_Twin: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 2 + Message OreburghCityNorthHouse3F_Text_EveryoneIncludingLotsOfPokemonDugTheBigUndergroundMaze WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city_north_house_4f.s b/res/field/scripts/scripts_oreburgh_city_north_house_4f.s index ac162a2b65..674d41bb74 100644 --- a/res/field/scripts/scripts_oreburgh_city_north_house_4f.s +++ b/res/field/scripts/scripts_oreburgh_city_north_house_4f.s @@ -1,8 +1,8 @@ #include "macros/scrcmd.inc" - ScriptEntry _0006 + ScriptEntry OreburghCityNorthHouse4F_Collector ScriptEntryEnd -_0006: +OreburghCityNorthHouse4F_Collector: End diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s index 2720b3c34b..bf73609ec8 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s @@ -2,36 +2,36 @@ #include "res/text/bank/oreburgh_city_northwest_house_1f.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _0034 + ScriptEntry OreburghCityNorthwestHouse1F_BreederM + ScriptEntry OreburghCityNorthwestHouse1F_Youngster + ScriptEntry OreburghCityNorthwestHouse1F_PokefanF ScriptEntryEnd -_000E: +OreburghCityNorthwestHouse1F_BreederM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message OreburghCityNorthwestHouse1F_Text_ThereAreEightGymLeadersInTheSinnohRegion WaitABXPadPress CloseMessage ReleaseAll End -_0021: +OreburghCityNorthwestHouse1F_Youngster: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message OreburghCityNorthwestHouse1F_Text_AGymLeaderIsntLikeJustAnyTrainerYouMeet WaitABXPadPress CloseMessage ReleaseAll End -_0034: +OreburghCityNorthwestHouse1F_PokefanF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 2 + Message OreburghCityNorthwestHouse1F_Text_RoarkLetsUsTrainOurPokemonInTheMine WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s index d9d1ebf6d7..590760b02c 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s @@ -2,68 +2,68 @@ #include "res/text/bank/oreburgh_city_northwest_house_2f.h" - ScriptEntry _0012 - ScriptEntry _0025 - ScriptEntry _0038 - ScriptEntry _0097 + ScriptEntry OreburghCityNorthwestHouse2F_Worker + ScriptEntry OreburghCityNorthwestHouse2F_SchoolKidF + ScriptEntry OreburghCityNorthwestHouse2F_Lass + ScriptEntry OreburghCityNorthwestHouse2F_Psyduck ScriptEntryEnd -_0012: +OreburghCityNorthwestHouse2F_Worker: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message OreburghCityNorthwestHouse2F_Text_GivingNicknamesToPokemonIsTheWayToGo WaitABXPadPress CloseMessage ReleaseAll End -_0025: +OreburghCityNorthwestHouse2F_SchoolKidF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message OreburghCityNorthwestHouse2F_Text_ButHeNamedOurPsyduckYellowJustBecauseOfItsColor WaitABXPadPress CloseMessage ReleaseAll End -_0038: +OreburghCityNorthwestHouse2F_Lass: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x00C0, _008C + GoToIfSet FLAG_RECEIVED_OREBURGH_CITY_NORTHWEST_HOUSE_2F_DUSK_BALL, OreburghCityNorthwestHouse2F_TheDuskBallIsAPokeBallDesignedForUseInDarkness BufferItemName 0, ITEM_DUSK_BALL - Message 2 + Message OreburghCityNorthwestHouse2F_Text_HereTakeThisIfYoudLike SetVar VAR_0x8004, ITEM_DUSK_BALL SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _0082 - SetFlag FLAG_UNK_0x00C0 + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, OreburghCityNorthwestHouse2F_BagIsFull + SetFlag FLAG_RECEIVED_OREBURGH_CITY_NORTHWEST_HOUSE_2F_DUSK_BALL Common_GiveItemQuantityNoLineFeed CloseMessage ReleaseAll End -_0082: +OreburghCityNorthwestHouse2F_BagIsFull: Common_MessageBagIsFull CloseMessage ReleaseAll End -_008C: - Message 3 +OreburghCityNorthwestHouse2F_TheDuskBallIsAPokeBallDesignedForUseInDarkness: + Message OreburghCityNorthwestHouse2F_Text_TheDuskBallIsAPokeBallDesignedForUseInDarkness WaitABXPadPress CloseMessage ReleaseAll End -_0097: +OreburghCityNorthwestHouse2F_Psyduck: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer WaitFanfare SEQ_SE_CONFIRM PlayCry SPECIES_PSYDUCK - Message 4 + Message OreburghCityNorthwestHouse2F_Text_YellowDuuuck WaitCry WaitABXPadPress CloseMessage diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s index e2d54d4e95..a3b912ace5 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s @@ -2,47 +2,47 @@ #include "res/text/bank/oreburgh_city_northwest_house_3f.h" - ScriptEntry _000A - ScriptEntry _006E + ScriptEntry OreburghCityNorthwestHouse3F_Lass + ScriptEntry OreburghCityNorthwestHouse3F_Psyduck ScriptEntryEnd -_000A: +OreburghCityNorthwestHouse3F_Lass: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x007C, _0054 + GoToIfSet FLAG_RECEIVED_OREBURGH_CITY_NORTHWEST_HOUSE_3F_HARD_STONE, OreburghCityNorthwestHouse3F_ThatItemIntensifiesThePowerOfRockTypeMoves BufferItemName 0, ITEM_HARD_STONE - Message 0 + Message OreburghCityNorthwestHouse3F_Text_IfYoudLikeLetOneHoldThisItem SetVar VAR_0x8004, ITEM_HARD_STONE SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _0064 - SetFlag FLAG_UNK_0x007C + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, OreburghCityNorthwestHouse3F_BagIsFull + SetFlag FLAG_RECEIVED_OREBURGH_CITY_NORTHWEST_HOUSE_3F_HARD_STONE Common_GiveItemQuantityNoLineFeed CloseMessage ReleaseAll End -_0054: +OreburghCityNorthwestHouse3F_ThatItemIntensifiesThePowerOfRockTypeMoves: BufferItemName 0, ITEM_HARD_STONE - Message 1 + Message OreburghCityNorthwestHouse3F_Text_ThatItemIntensifiesThePowerOfRockTypeMoves WaitABXPadPress CloseMessage ReleaseAll End -_0064: +OreburghCityNorthwestHouse3F_BagIsFull: Common_MessageBagIsFull CloseMessage ReleaseAll End -_006E: +OreburghCityNorthwestHouse3F_Psyduck: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer WaitFanfare SEQ_SE_CONFIRM PlayCry SPECIES_PSYDUCK - Message 2 + Message OreburghCityNorthwestHouse3F_Text_PsyduckDuuuck WaitCry WaitABXPadPress CloseMessage diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s index 2919bc76fc..b864dbd060 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s @@ -2,36 +2,36 @@ #include "res/text/bank/oreburgh_city_northwest_house_4f.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _0034 + ScriptEntry OreburghCityNorthwestHouse4F_SchoolKidM + ScriptEntry OreburghCityNorthwestHouse4F_NinjaBoy + ScriptEntry OreburghCityNorthwestHouse4F_PokefanF ScriptEntryEnd -_000E: +OreburghCityNorthwestHouse4F_SchoolKidM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message OreburghCityNorthwestHouse4F_Text_HahahaImGonnaSwipeYourFlag WaitABXPadPress CloseMessage ReleaseAll End -_0021: +OreburghCityNorthwestHouse4F_NinjaBoy: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message OreburghCityNorthwestHouse4F_Text_ISetSomeNastyTrapsCatchMeIfYouCan WaitABXPadPress CloseMessage ReleaseAll End -_0034: +OreburghCityNorthwestHouse4F_PokefanF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 2 + Message OreburghCityNorthwestHouse4F_Text_ThanksToTheGymLeaderWeCanPlayUnderground WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s b/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s index c1af4db9e0..11e9e9fdd5 100644 --- a/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s @@ -1,123 +1,125 @@ #include "macros/scrcmd.inc" +#include "res/text/bank/menu_entries.h" #include "res/text/bank/oreburgh_city_pokecenter_1f.h" +#include "res/field/events/events_oreburgh_city_pokecenter_1f.h" - ScriptEntry _001E - ScriptEntry _002A - ScriptEntry _003D - ScriptEntry _0050 - ScriptEntry _0110 - ScriptEntry _0139 - ScriptEntry _014C + ScriptEntry OreburghCityPokecenter1F_Nurse + ScriptEntry OreburghCityPokecenter1F_NinjaBoy + ScriptEntry OreburghCityPokecenter1F_AceTrainerF + ScriptEntry OreburghCityPokecenter1F_Psychic + ScriptEntry OreburghCityPokecenter1F_Gentleman + ScriptEntry OreburghCityPokecenter1F_KidWithNDSWest + ScriptEntry OreburghCityPokecenter1F_KidWithNDSEast ScriptEntryEnd -_001E: - Common_CallPokecenterNurse 3 +OreburghCityPokecenter1F_Nurse: + Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE End -_002A: +OreburghCityPokecenter1F_NinjaBoy: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message OreburghCityPokecenter1F_Text_YayIGotAPalPadAtThePokemonWiFiClubDownstairs WaitABXPadPress CloseMessage ReleaseAll End -_003D: +OreburghCityPokecenter1F_AceTrainerF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message OreburghCityPokecenter1F_Text_SwitchOnThePCAtAnyPokemonCenter WaitABXPadPress CloseMessage ReleaseAll End -_0050: +OreburghCityPokecenter1F_Psychic: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x0070, _006C - Message 2 - GoTo _0078 + GoToIfSet FLAG_CHOSE_TRAINER_CLASS, OreburghCityPokecenter1F_HowAboutTellingMeWhatKindOfTrainerYouLike + Message OreburghCityPokecenter1F_Text_WhatIsYourFavoriteKindOfTrainerCanYouTellMe + GoTo OreburghCityPokecenter1F_WhichKindOfTrainerWouldYouLikeToBe -_006C: +OreburghCityPokecenter1F_HowAboutTellingMeWhatKindOfTrainerYouLike: BufferTrainerClassFromAppearance 0 - Message 7 - GoTo _0078 + Message OreburghCityPokecenter1F_Text_HowAboutTellingMeWhatKindOfTrainerYouLike + GoTo OreburghCityPokecenter1F_WhichKindOfTrainerWouldYouLikeToBe -_0078: - Message 3 +OreburghCityPokecenter1F_WhichKindOfTrainerWouldYouLikeToBe: + Message OreburghCityPokecenter1F_Text_WhichKindOfTrainerWouldYouLikeToBe LoadTrainerAppearances InitGlobalTextMenu 1, 1, 0, VAR_RESULT - AddMenuEntryImm 50, 0 - AddMenuEntryImm 51, 1 - AddMenuEntryImm 52, 2 - AddMenuEntryImm 53, 3 - AddMenuEntryImm 43, 4 + AddMenuEntryImm MenuEntries_Text_TrainerAppearanceVariant1, 0 + AddMenuEntryImm MenuEntries_Text_TrainerAppearanceVariant2, 1 + AddMenuEntryImm MenuEntries_Text_TrainerAppearanceVariant3, 2 + AddMenuEntryImm MenuEntries_Text_TrainerAppearanceVariant4, 3 + AddMenuEntryImm MenuEntries_Text_TrainerAppearancesExit, 4 ShowMenu SetVar VAR_0x8004, VAR_RESULT SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 4, _00E9 - GoToIfEq VAR_0x8008, -2, _00E9 + GoToIfEq VAR_0x8008, 4, OreburghCityPokecenter1F_OKThenIllJustTalkToYouLater + GoToIfEq VAR_0x8008, -2, OreburghCityPokecenter1F_OKThenIllJustTalkToYouLater ScrCmd_155 VAR_0x8004, VAR_0x8005 BufferTrainerClassNameWithArticle 0, VAR_0x8005 CapitalizeFirstLetter 0 - Message 4 + Message OreburghCityPokecenter1F_Text_AskThisIsTheKindOfTrainerYouWantToBe ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _00F4 - GoTo _0078 + GoToIfEq VAR_RESULT, MENU_YES, OreburghCityPokecenter1F_SetTrainerClass + GoTo OreburghCityPokecenter1F_WhichKindOfTrainerWouldYouLikeToBe -_00E9: - Message 6 +OreburghCityPokecenter1F_OKThenIllJustTalkToYouLater: + Message OreburghCityPokecenter1F_Text_OKThenIllJustTalkToYouLater WaitABXPadPress CloseMessage ReleaseAll End -_00F4: +OreburghCityPokecenter1F_SetTrainerClass: BufferTrainerClassNameWithArticle 0, VAR_0x8005 - Message 5 - SetFlag FLAG_UNK_0x0070 + Message OreburghCityPokecenter1F_Text_ISeeSoThisIsTheKindOfTrainerYouLike + SetFlag FLAG_CHOSE_TRAINER_CLASS ScrCmd_29C VAR_0x8004, VAR_0x8005 ScrCmd_156 VAR_0x8005 - GoTo _00E9 + GoTo OreburghCityPokecenter1F_OKThenIllJustTalkToYouLater -_0110: +OreburghCityPokecenter1F_Gentleman: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_GAME_COMPLETED, _012E - Message 8 + GoToIfSet FLAG_GAME_COMPLETED, OreburghCityPokecenter1F_WhatOrWhoIsThisTeamGalactic + Message OreburghCityPokecenter1F_Text_WhatOrWhoIsThisTeamGalacticItsAMystery WaitABXPadPress CloseMessage ReleaseAll End -_012E: - Message 9 +OreburghCityPokecenter1F_WhatOrWhoIsThisTeamGalactic: + Message OreburghCityPokecenter1F_Text_WhatOrWhoIsThisTeamGalactic WaitABXPadPress CloseMessage ReleaseAll End -_0139: +OreburghCityPokecenter1F_KidWithNDSWest: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 10 + Message OreburghCityPokecenter1F_Text_NowYouCanCaptureItAsABattleVideoUsingAVsRecorder WaitABXPadPress CloseMessage ReleaseAll End -_014C: +OreburghCityPokecenter1F_KidWithNDSEast: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 11 + Message OreburghCityPokecenter1F_Text_CoolYouHaveAVsRecorder WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s b/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s index 51674bc7b6..3b2394bb64 100644 --- a/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s @@ -2,14 +2,14 @@ #include "res/text/bank/oreburgh_city_pokecenter_b1f.h" - ScriptEntry _0006 + ScriptEntry OreburghCityPokecenterB1F_BattleGirl ScriptEntryEnd -_0006: +OreburghCityPokecenterB1F_BattleGirl: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message OreburghCityPokecenterB1F_Text_IWantToBecomeFriendsWithAnExperiencedTrainerIReallyAdmire WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city_south_house.s b/res/field/scripts/scripts_oreburgh_city_south_house.s index 71406d83d5..06582f58ff 100644 --- a/res/field/scripts/scripts_oreburgh_city_south_house.s +++ b/res/field/scripts/scripts_oreburgh_city_south_house.s @@ -2,14 +2,14 @@ #include "res/text/bank/oreburgh_city_south_house.h" - ScriptEntry _0006 + ScriptEntry OreburghCitySouthHouse_Worker ScriptEntryEnd -_0006: +OreburghCitySouthHouse_Worker: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message OreburghCitySouthHouse_Text_YoureTakingATourOfOurCoalMine WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city_west_house.s b/res/field/scripts/scripts_oreburgh_city_west_house.s index 83cbdfa958..2fd238a582 100644 --- a/res/field/scripts/scripts_oreburgh_city_west_house.s +++ b/res/field/scripts/scripts_oreburgh_city_west_house.s @@ -2,38 +2,38 @@ #include "res/text/bank/oreburgh_city_west_house.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _0034 + ScriptEntry OreburghCityWestHouse_Youngster + ScriptEntry OreburghCityWestHouse_PokefanF + ScriptEntry OreburghCityWestHouse_Pikachu ScriptEntryEnd -_000E: +OreburghCityWestHouse_Youngster: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message OreburghCityWestHouse_Text_HaveYouEverSeenOrHeardAboutDifferentlyColoredPokemon WaitABXPadPress CloseMessage ReleaseAll End -_0021: +OreburghCityWestHouse_PokefanF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message OreburghCityWestHouse_Text_YouKnowHowPokemonHaveDifferentNaturesLikeWeHavePersonalities WaitABXPadPress CloseMessage ReleaseAll End -_0034: +OreburghCityWestHouse_Pikachu: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer WaitFanfare SEQ_SE_CONFIRM PlayCry SPECIES_PIKACHU - Message 2 + Message OreburghCityWestHouse_Text_PikachuPikaaah WaitCry WaitABXPadPress CloseMessage diff --git a/res/field/scripts/scripts_oreburgh_mine_b1f.s b/res/field/scripts/scripts_oreburgh_mine_b1f.s index 217e2b45da..a0d8e63534 100644 --- a/res/field/scripts/scripts_oreburgh_mine_b1f.s +++ b/res/field/scripts/scripts_oreburgh_mine_b1f.s @@ -1,114 +1,115 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_mine_b1f.h" +#include "res/field/events/events_oreburgh_mine_b1f.h" - ScriptEntry _0012 - ScriptEntry _002F - ScriptEntry _0042 - ScriptEntry _0055 + ScriptEntry OreburghMineB1F_OnTransition + ScriptEntry OreburghMineB1F_Worker + ScriptEntry OreburghMineB1F_Twin + ScriptEntry OreburghMineB1F_Hiker ScriptEntryEnd -_0012: +OreburghMineB1F_OnTransition: SetFlag FLAG_FIRST_ARRIVAL_OREBURGH_MINE - SetFlag FLAG_UNK_0x02C8 - CallIfEq VAR_ARCEUS_EVENT_STATE, 1, _0029 + SetFlag FLAG_HIDE_OREBURGH_MINE_B1F_HIKER + CallIfEq VAR_ARCEUS_EVENT_STATE, 1, OreburghMineB1F_ShowHiker End -_0029: - ClearFlag FLAG_UNK_0x02C8 +OreburghMineB1F_ShowHiker: + ClearFlag FLAG_HIDE_OREBURGH_MINE_B1F_HIKER Return -_002F: +OreburghMineB1F_Worker: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message OreburghMineB1F_Text_EveryoneThatWorksInTheCoalMineKeepsTheirOwnPokemonWithThem WaitABXPadPress CloseMessage ReleaseAll End -_0042: +OreburghMineB1F_Twin: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message OreburghMineB1F_Text_IFoundWhatIThoughtWereSomeRocksThenTheyStartedMoving WaitABXPadPress CloseMessage ReleaseAll End -_0055: +OreburghMineB1F_Hiker: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x00A5, _012B - Message 2 - GoTo _0073 + GoToIfSet FLAG_COULDNT_RECEIVE_OREBURGH_MINE_B1F_FLAME_PLATE, OreburghMineB1F_TryGiveFlamePlateAgain + Message OreburghMineB1F_Text_IFoundSomethingVeryInterestingSoonAfterArrivalYouMayHaveItIfYoudLike + GoTo OreburghMineB1F_TryGiveFlamePlate End -_0073: +OreburghMineB1F_TryGiveFlamePlate: SetVar VAR_0x8004, ITEM_FLAME_PLATE SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _0114 + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, OreburghMineB1F_OhYouHaveAnOveradundanceOfThings Common_GiveItemQuantity - Message 5 + Message OreburghMineB1F_Text_ImToldThatPlateWasCreatedAtTheSameTimeAsSinnoh CloseMessage GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 3, _00CC - GoToIfEq VAR_0x8005, 4, _00DE - GoToIfEq VAR_0x8005, 5, _00F0 + GoToIfEq VAR_0x8005, 3, OreburghMineB1F_HikerLeaveZ3 + GoToIfEq VAR_0x8005, 4, OreburghMineB1F_HikerLeaveZ4 + GoToIfEq VAR_0x8005, 5, OreburghMineB1F_HikerLeaveZ5 End -_00CC: - ApplyMovement 3, _0138 +OreburghMineB1F_HikerLeaveZ3: + ApplyMovement LOCALID_HIKER, OreburghMineB1F_Movement_HikerLeaveZ3 WaitMovement - GoTo _0102 + GoTo OreburghMineB1F_RemoveHiker End -_00DE: - ApplyMovement 3, _0144 +OreburghMineB1F_HikerLeaveZ4: + ApplyMovement LOCALID_HIKER, OreburghMineB1F_Movement_HikerLeaveZ4Or5 WaitMovement - GoTo _0102 + GoTo OreburghMineB1F_RemoveHiker End -_00F0: - ApplyMovement 3, _0144 +OreburghMineB1F_HikerLeaveZ5: + ApplyMovement LOCALID_HIKER, OreburghMineB1F_Movement_HikerLeaveZ4Or5 WaitMovement - GoTo _0102 + GoTo OreburghMineB1F_RemoveHiker End -_0102: +OreburghMineB1F_RemoveHiker: PlayFanfare SEQ_SE_DP_KAIDAN2 - RemoveObject 3 + RemoveObject LOCALID_HIKER SetVar VAR_ARCEUS_EVENT_STATE, 2 ReleaseAll End -_0114: - SetFlag FLAG_UNK_0x00A5 - Message 3 - GoTo _0123 +OreburghMineB1F_OhYouHaveAnOveradundanceOfThings: + SetFlag FLAG_COULDNT_RECEIVE_OREBURGH_MINE_B1F_FLAME_PLATE + Message OreburghMineB1F_Text_OhYouHaveAnOveradundanceOfThings + GoTo OreburghMineB1F_HikerEnd End -_0123: +OreburghMineB1F_HikerEnd: WaitABXPadPress CloseMessage ReleaseAll End -_012B: - Message 4 - GoTo _0073 +OreburghMineB1F_TryGiveFlamePlateAgain: + Message OreburghMineB1F_Text_AboutThatVeryInterestingThingIFoundYouMayHaveItIfYoudLike + GoTo OreburghMineB1F_TryGiveFlamePlate End .balign 4, 0 -_0138: +OreburghMineB1F_Movement_HikerLeaveZ3: WalkNormalWest WalkNormalNorth 3 EndMovement .balign 4, 0 -_0144: +OreburghMineB1F_Movement_HikerLeaveZ4Or5: WalkNormalNorth 3 EndMovement diff --git a/res/field/scripts/scripts_oreburgh_mine_b2f.s b/res/field/scripts/scripts_oreburgh_mine_b2f.s index 047d83455f..43b3719391 100644 --- a/res/field/scripts/scripts_oreburgh_mine_b2f.s +++ b/res/field/scripts/scripts_oreburgh_mine_b2f.s @@ -1,59 +1,60 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_mine_b2f.h" +#include "res/field/events/events_oreburgh_mine_b2f.h" - ScriptEntry _0016 - ScriptEntry _00FC - ScriptEntry _011B - ScriptEntry _013A - ScriptEntry _0159 + ScriptEntry OreburghMineB2F_Roark + ScriptEntry OreburghMineB2F_Machop1 + ScriptEntry OreburghMineB2F_Machop3 + ScriptEntry OreburghMineB2F_Machop2 + ScriptEntry OreburghMineB2F_Worker ScriptEntryEnd -_0016: +OreburghMineB2F_Roark: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoTo _0034 + GoTo OreburghMineB2F_RoarkTurnBackEast OreburghMineB2F_Unused: - ApplyMovement 0, OreburghMineB2F_UnusedMovement2 + ApplyMovement LOCALID_ROARK, OreburghMineB2F_UnusedMovement2 WaitMovement - GoTo _0044 + GoTo OreburghMineB2F_RoarkUseRockSmash -_0034: - ApplyMovement 0, _00D8 +OreburghMineB2F_RoarkTurnBackEast: + ApplyMovement LOCALID_ROARK, OreburghMineB2F_Movement_RoarkTurnBackEast WaitMovement - GoTo _0044 + GoTo OreburghMineB2F_RoarkUseRockSmash -_0044: - Message 0 +OreburghMineB2F_RoarkUseRockSmash: + Message OreburghMineB2F_Text_OKStandBackAndWatchThis CloseMessage ScrCmd_29E 2, VAR_0x8005 WaitTime 10, VAR_RESULT - RemoveObject 1 -_0059: + RemoveObject LOCALID_ROCK_SMASH_1 +OreburghMineB2F_WaitRockSmash: WaitTime 1, VAR_RESULT - GoToIfEq VAR_0x8005, 0, _0059 + GoToIfEq VAR_0x8005, 0, OreburghMineB2F_WaitRockSmash FacePlayer - Message 1 + Message OreburghMineB2F_Text_FallenBouldersNeedToBeSmashedSoTheyreOutOfTheWay CloseMessage - GoTo _0091 + GoTo OreburghMineB2F_RoarkLeave OreburghMineB2F_Unused2: ApplyMovement 0, OreburghMineB2F_UnusedMovement ApplyMovement LOCALID_PLAYER, OreburghMineB2F_UnusedMovement3 WaitMovement - GoTo _00A1 + GoTo OreburghMineB2F_RemoveRoark -_0091: - ApplyMovement 0, _00C0 +OreburghMineB2F_RoarkLeave: + ApplyMovement LOCALID_ROARK, OreburghMineB2F_Movement_RoarkLeave WaitMovement - GoTo _00A1 + GoTo OreburghMineB2F_RemoveRoark -_00A1: - RemoveObject 0 - SetFlag FLAG_UNK_0x007A - SetFlag FLAG_UNK_0x017C +OreburghMineB2F_RemoveRoark: + RemoveObject LOCALID_ROARK + SetFlag FLAG_ROARK_RETURNED_TO_OREBURGH_GYM + SetFlag FLAG_HIDE_OREBURGH_CITY_RIVAL ReleaseAll End @@ -64,7 +65,7 @@ OreburghMineB2F_UnusedMovement: EndMovement .balign 4, 0 -_00C0: +OreburghMineB2F_Movement_RoarkLeave: WalkNormalEast 10 EndMovement @@ -75,7 +76,7 @@ OreburghMineB2F_UnusedMovement2: EndMovement .balign 4, 0 -_00D8: +OreburghMineB2F_Movement_RoarkTurnBackEast: Delay8 2 WalkOnSpotNormalEast Delay8 4 @@ -88,50 +89,50 @@ OreburghMineB2F_UnusedMovement3: WalkOnSpotNormalEast EndMovement -_00FC: +OreburghMineB2F_Machop1: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer WaitFanfare SEQ_SE_CONFIRM PlayCry SPECIES_MACHOP - Message 2 + Message OreburghMineB2F_Text_MachopMaaacho WaitCry WaitABXPadPress CloseMessage ReleaseAll End -_011B: +OreburghMineB2F_Machop3: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer WaitFanfare SEQ_SE_CONFIRM PlayCry SPECIES_MACHOP - Message 3 + Message OreburghMineB2F_Text_MachopChopChop WaitCry WaitABXPadPress CloseMessage ReleaseAll End -_013A: +OreburghMineB2F_Machop2: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer WaitFanfare SEQ_SE_CONFIRM PlayCry SPECIES_MACHOP - Message 4 + Message OreburghMineB2F_Text_MachopChopmacho WaitCry WaitABXPadPress CloseMessage ReleaseAll End -_0159: +OreburghMineB2F_Worker: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 5 + Message OreburghMineB2F_Text_IMetTheseMachopOnRoute207 WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/text/common_strings.json b/res/text/common_strings.json index 2162f0e359..42e1e962d8 100644 --- a/res/text/common_strings.json +++ b/res/text/common_strings.json @@ -436,7 +436,7 @@ ] }, { - "id": "pl_msg_00000213_00067", + "id": "CommonStrings_Text_ItsAnAirVentThatExchangesTheUndergroundTunnelsAir", "en_US": [ "It’s an air vent that exchanges\n", "the underground tunnels’ air." diff --git a/res/text/menu_entries.json b/res/text/menu_entries.json index 195745dd32..e8e0031c37 100644 --- a/res/text/menu_entries.json +++ b/res/text/menu_entries.json @@ -174,7 +174,7 @@ "en_US": "NO" }, { - "id": "pl_msg_00000361_00043", + "id": "MenuEntries_Text_TrainerAppearancesExit", "en_US": "EXIT" }, { @@ -202,19 +202,19 @@ "en_US": "BATTLE" }, { - "id": "pl_msg_00000361_00050", + "id": "MenuEntries_Text_TrainerAppearanceVariant1", "en_US": "{STRVAR_1 3, 0, 0}" }, { - "id": "pl_msg_00000361_00051", + "id": "MenuEntries_Text_TrainerAppearanceVariant2", "en_US": "{STRVAR_1 3, 1, 0}" }, { - "id": "pl_msg_00000361_00052", + "id": "MenuEntries_Text_TrainerAppearanceVariant3", "en_US": "{STRVAR_1 3, 2, 0}" }, { - "id": "pl_msg_00000361_00053", + "id": "MenuEntries_Text_TrainerAppearanceVariant4", "en_US": "{STRVAR_1 3, 3, 0}" }, { diff --git a/res/text/oreburgh_city.json b/res/text/oreburgh_city.json index 5bd4ed8c34..52ad41fe78 100644 --- a/res/text/oreburgh_city.json +++ b/res/text/oreburgh_city.json @@ -2,7 +2,7 @@ "key": 18331, "messages": [ { - "id": "pl_msg_00000065_00000", + "id": "OreburghCity_Text_TheGymLeadersGoneOffToTheCoalMine", "en_US": [ "{STRVAR_1 3, 0, 0}: Hunh?\r", "Oh, it’s you, {STRVAR_1 3, 1, 0}!\n", @@ -21,7 +21,7 @@ ] }, { - "id": "pl_msg_00000065_00001", + "id": "OreburghCity_Text_IToldYouTheGymLeaderWentDownToTheOreburghMine", "en_US": [ "{STRVAR_1 3, 0, 0}: I told you, the Gym\n", "Leader went down to the Oreburgh Mine.\r", @@ -30,11 +30,11 @@ ] }, { - "id": "pl_msg_00000065_00002", + "id": "OreburghCity_Text_BigThud", "en_US": "{SIZE 200}Thud!!{SIZE 100}\r" }, { - "id": "pl_msg_00000065_00003", + "id": "OreburghCity_Text_EternaCityIsTheNextPlaceWithAGymThatGivesAwayBadgesRight", "en_US": [ "{STRVAR_1 3, 0, 0}: Whoops! {STRVAR_1 3, 1, 0}!\n", "You got the Gym Badge, huh?\r", @@ -43,7 +43,7 @@ ] }, { - "id": "pl_msg_00000065_00004", + "id": "OreburghCity_Text_IWentToRoute207ButYouCantGoThereWithoutABicycle", "en_US": [ "So, yeah, I went to Route 207, but\n", "you can’t go there without a Bicycle.\r", @@ -52,7 +52,7 @@ ] }, { - "id": "pl_msg_00000065_00005", + "id": "OreburghCity_Text_NextStopTheEternaGymBadge", "en_US": [ "So, I’m going back to Jubilife City.\n", "Next stop, the Eterna Gym Badge!\r", @@ -62,7 +62,7 @@ ] }, { - "id": "pl_msg_00000065_00006", + "id": "OreburghCity_Text_IllTakeYouToThePokemonGym", "en_US": [ "Howdy, Trainer!\r", "Huh? Uh-oh!\n", @@ -72,14 +72,14 @@ ] }, { - "id": "pl_msg_00000065_00007", + "id": "OreburghCity_Text_HuhTheresSomeoneThere", "en_US": [ "Huh?\n", "There’s someone there." ] }, { - "id": "pl_msg_00000065_00008", + "id": "OreburghCity_Text_IsThatGuyInFrontOfTheGymYourFriend", "en_US": [ "Is that guy in front of the Gym\n", "your friend?\r", @@ -87,14 +87,14 @@ ] }, { - "id": "pl_msg_00000065_00009", + "id": "OreburghCity_Text_TheGymLeadersWaitingForYou", "en_US": [ "Oh, hi, you’re back!\n", "The Gym Leader’s waiting for you." ] }, { - "id": "pl_msg_00000065_00010", + "id": "OreburghCity_Text_CanISeeYourTrainerCase", "en_US": [ "Can I see your Trainer Case?\r", "It’s got the Gym Badge you just\n", @@ -102,14 +102,14 @@ ] }, { - "id": "pl_msg_00000065_00011", + "id": "OreburghCity_Text_TheGymLeaderWentOffToWorkInTheMine", "en_US": [ "The Gym Leader went off to work in\n", "the mine." ] }, { - "id": "pl_msg_00000065_00012", + "id": "OreburghCity_Text_TheGymLeaderIsYoungButHesTheMinesSafetySupervisor", "en_US": [ "The Gym Leader is young, but he’s\n", "the mine’s safety supervisor.\r", @@ -118,7 +118,7 @@ ] }, { - "id": "pl_msg_00000065_00013", + "id": "OreburghCity_Text_EveryonesProudOfTheMine", "en_US": [ "Everyone’s proud of the mine.\r", "They’re digging for coal under the\n", @@ -127,7 +127,7 @@ ] }, { - "id": "pl_msg_00000065_00014", + "id": "OreburghCity_Text_UpAheadTheresAHugeMountainThatTowersAboveEverything", "en_US": [ "Up ahead there’s a huge mountain\n", "that towers above everything.\r", @@ -136,14 +136,14 @@ ] }, { - "id": "pl_msg_00000065_00015", + "id": "OreburghCity_Text_HaveYouSeenTheVents", "en_US": [ "Have you seen the vents?\n", "They release steam from down below." ] }, { - "id": "pl_msg_00000065_00016", + "id": "OreburghCity_Text_TheseVentsExchangeTheHotAirDownBelowWithTheFreshAirOutside", "en_US": [ "These vents exchange the hot air\n", "down below with the fresh air outside.\r", @@ -152,7 +152,7 @@ ] }, { - "id": "pl_msg_00000065_00017", + "id": "OreburghCity_Text_HereTakeOneOfThese", "en_US": [ "There’s no question. This is hard,\n", "hard work.\r", @@ -162,14 +162,14 @@ ] }, { - "id": "pl_msg_00000065_00018", + "id": "OreburghCity_Text_FeelingHaleAndHeartyPutsASmileOnMyFace", "en_US": [ "Feeling hale and hearty puts a smile\n", "on my face. And that makes me happy." ] }, { - "id": "pl_msg_00000065_00019", + "id": "OreburghCity_Text_ThisPileOfDirtySandIsCalledASlagHeap", "en_US": [ "This pile of dirty sand is called\n", "a slag heap.\r", @@ -177,14 +177,14 @@ ] }, { - "id": "pl_msg_00000065_00020", + "id": "OreburghCity_Text_ChopChopMachopChopChopAwayOnRocks", "en_US": [ "Chop, chop, MACHOP!\n", "Chop, chop away on rocks! ~♫" ] }, { - "id": "pl_msg_00000065_00021", + "id": "OreburghCity_Text_TMsAreSingleUseOnlyButHMsCanBeUsedOverAndOver", "en_US": [ "TMs are single use only, but HMs\n", "can be used over and over.\r", @@ -193,7 +193,7 @@ ] }, { - "id": "pl_msg_00000065_00022", + "id": "OreburghCity_Text_WhenIRunAroundWithMyRunningShoesOnImTheCenterOfAttention", "en_US": [ "When I run around with my Running\n", "Shoes on, I’m the center of attention!\r", @@ -202,7 +202,7 @@ ] }, { - "id": "pl_msg_00000065_00023", + "id": "OreburghCity_Text_ThatsWhatFossilsAre", "en_US": [ "Natural time capsules buried many,\n", "many years ago...\r", @@ -210,26 +210,26 @@ ] }, { - "id": "pl_msg_00000065_00024", + "id": "OreburghCity_Text_MachopMachoChopo", "en_US": "MACHOP: Macho! Chopo!" }, { - "id": "pl_msg_00000065_00025", + "id": "OreburghCity_Text_MachopPigyooh", "en_US": "MACHOP: Pigyooh!" }, { - "id": "pl_msg_00000065_00026", + "id": "OreburghCity_Text_MachopGwoohGogogooh", "en_US": "MACHOP: Gwooh! Gogogooh!" }, { - "id": "pl_msg_00000065_00027", + "id": "OreburghCity_Text_MapSign", "en_US": [ "Oreburgh City\n", "City of Energy" ] }, { - "id": "pl_msg_00000065_00028", + "id": "OreburghCity_Text_OreburgCityPokemonGymCallMeRoarkTheRock", "en_US": [ "Oreburgh City Pokémon Gym\n", "Leader: Roark\f", @@ -237,14 +237,14 @@ ] }, { - "id": "pl_msg_00000065_00029", + "id": "OreburghCity_Text_OreburghMiningMuseumCoalMiningAndYou", "en_US": [ "Oreburgh Mining Museum\n", "“Coal Mining and You!”" ] }, { - "id": "pl_msg_00000065_00030", + "id": "OreburghCity_Text_OreburghMineBewareOfBusyPokemon", "en_US": [ "Oreburgh Mine\n", "Beware of Busy Pokémon!" diff --git a/res/text/oreburgh_city_east_house_1f.json b/res/text/oreburgh_city_east_house_1f.json index 4b494e993b..b7564c5eda 100644 --- a/res/text/oreburgh_city_east_house_1f.json +++ b/res/text/oreburgh_city_east_house_1f.json @@ -2,7 +2,7 @@ "key": 58426, "messages": [ { - "id": "pl_msg_00000081_00000", + "id": "OreburghCityEastHouse1F_Text_WhyNotTryTrainingInTheOreburghMine", "en_US": [ "Hiya! Your Pokémon could use some\n", "toughening up.\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000081_00001", + "id": "OreburghCityEastHouse1F_Text_IAlwaysHaveARottenTimeTryingToDecideWhichMovesMyPokemonShouldLearn", "en_US": [ "I always have a rotten time trying\n", "to decide which moves my Pokémon\f", @@ -19,7 +19,7 @@ ] }, { - "id": "pl_msg_00000081_00002", + "id": "OreburghCityEastHouse1F_Text_YouRemindMeSoMuchOfTheTimeIGotMyFirstPokemon", "en_US": [ "You remind me so much of the time\n", "I got my first Pokémon." diff --git a/res/text/oreburgh_city_east_house_2f.json b/res/text/oreburgh_city_east_house_2f.json index 13a4ea3b90..68a94c55c6 100644 --- a/res/text/oreburgh_city_east_house_2f.json +++ b/res/text/oreburgh_city_east_house_2f.json @@ -2,7 +2,7 @@ "key": 58422, "messages": [ { - "id": "pl_msg_00000082_00000", + "id": "OreburghCityEastHouse2F_Text_TheOreburghMineIsOperatedWithTheUtmostCare", "en_US": [ "The Oreburgh Mine is operated\n", "with the utmost care.\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000082_00001", + "id": "OreburghCityEastHouse2F_Text_HereIWantYouToHaveThis", "en_US": [ "Wow... Your Pokémon’s eyes are\n", "twinkling brightly!\r", @@ -20,7 +20,7 @@ ] }, { - "id": "pl_msg_00000082_00002", + "id": "OreburghCityEastHouse2F_Text_YouKnowHowPokemonStayInsideTheirPokeBalls", "en_US": [ "You know how Pokémon stay inside\n", "their Poké Balls?\r", @@ -29,7 +29,7 @@ ] }, { - "id": "pl_msg_00000082_00003", + "id": "OreburghCityEastHouse2F_Text_CoalIsCarriedOutOfTheOreburghMineOnAFullyAutomatedSystem", "en_US": [ "Coal is carried out of Oreburgh Mine on\n", "a fully automated system.\r", diff --git a/res/text/oreburgh_city_east_house_3f.json b/res/text/oreburgh_city_east_house_3f.json index efaea29d2e..e8d7d46dcb 100644 --- a/res/text/oreburgh_city_east_house_3f.json +++ b/res/text/oreburgh_city_east_house_3f.json @@ -2,7 +2,7 @@ "key": 58418, "messages": [ { - "id": "pl_msg_00000083_00000", + "id": "OreburghCityEastHouse3F_Text_TheCoalMineHeresFullyAutomated", "en_US": [ "The coal mine here’s fully automated.\r", "Coal mining was brutally hard in the\n", @@ -10,7 +10,7 @@ ] }, { - "id": "pl_msg_00000083_00001", + "id": "OreburghCityEastHouse3F_Text_YouRemindMeSoMuchOfTheTimeIGotMyFirstPokemon", "en_US": [ "You remind me so much of the time\n", "I got my first Pokémon." diff --git a/res/text/oreburgh_city_middle_house.json b/res/text/oreburgh_city_middle_house.json index b5b6c43efc..bbbc01dd28 100644 --- a/res/text/oreburgh_city_middle_house.json +++ b/res/text/oreburgh_city_middle_house.json @@ -2,7 +2,7 @@ "key": 58386, "messages": [ { - "id": "pl_msg_00000078_00000", + "id": "OreburghCityMiddleHouse_Text_RoarkIsAUserOfRockTypePokemon", "en_US": [ "Roark is a user of Rock-type Pokémon.\r", "Don’t you think Rock-type Pokémon are\n", @@ -10,7 +10,7 @@ ] }, { - "id": "pl_msg_00000078_00001", + "id": "OreburghCityMiddleHouse_Text_RoarkIsOurTownsGymLeader", "en_US": [ "Roark is our town’s Gym Leader.\r", "He may be young, but he keeps the\n", diff --git a/res/text/oreburgh_city_north_house_1f.json b/res/text/oreburgh_city_north_house_1f.json index 1af07bcb2e..2e1212135b 100644 --- a/res/text/oreburgh_city_north_house_1f.json +++ b/res/text/oreburgh_city_north_house_1f.json @@ -2,7 +2,7 @@ "key": 25627, "messages": [ { - "id": "pl_msg_00000074_00000", + "id": "OreburghCityNorthHouse1F_Text_WouldYouBeWillingToTradeYourMachopForMyAbra", "en_US": [ "Listen, listen. Do you have a Pokémon\n", "called MACHOP?\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000074_00001", + "id": "OreburghCityNorthHouse1F_Text_BeNiceToMyAbra", "en_US": [ "Be nice to my ABRA!\r", "I’ll be sure to look after your MACHOP\n", @@ -19,11 +19,11 @@ ] }, { - "id": "pl_msg_00000074_00002", + "id": "OreburghCityNorthHouse1F_Text_WhatIAskedForWasAMachop", "en_US": "What I asked for was a MACHOP..." }, { - "id": "pl_msg_00000074_00003", + "id": "OreburghCityNorthHouse1F_Text_IfYouChangeYourMindIllBeRightHereWaiting", "en_US": [ "Oh, OK...\n", "Well, I can’t make you trade me.\r", @@ -32,14 +32,14 @@ ] }, { - "id": "pl_msg_00000074_00004", + "id": "OreburghCityNorthHouse1F_Text_ThanksToPokemonIGotToBeFriendsWithYou", "en_US": [ "Thanks to Pokémon, I got to be\n", "friends with you!" ] }, { - "id": "pl_msg_00000074_00005", + "id": "OreburghCityNorthHouse1F_Text_APokemonObtainedInATradeGrowsQuickly", "en_US": [ "A Pokémon obtained in a trade grows\n", "quickly.\r", @@ -50,7 +50,7 @@ ] }, { - "id": "pl_msg_00000074_00006", + "id": "OreburghCityNorthHouse1F_Text_WhenYouTradeAPokemonTheItemItsHoldingIsTradedAsWell", "en_US": [ "When you trade a Pokémon, the item it’s\n", "holding is traded as well.\r", diff --git a/res/text/oreburgh_city_north_house_2f.json b/res/text/oreburgh_city_north_house_2f.json index 052f2584f1..8f840424f0 100644 --- a/res/text/oreburgh_city_north_house_2f.json +++ b/res/text/oreburgh_city_north_house_2f.json @@ -2,14 +2,14 @@ "key": 25623, "messages": [ { - "id": "pl_msg_00000075_00000", + "id": "OreburghCityNorthHouse2F_Text_AllPokemonHaveASpecialPowerCalledAnAbility", "en_US": [ "All Pokémon have a special power\n", "called an ability." ] }, { - "id": "pl_msg_00000075_00001", + "id": "OreburghCityNorthHouse2F_Text_MyFavoritePokemonAbilityIsMyPachirisusPickup", "en_US": [ "My favorite Pokémon ability is my\n", "PACHIRISU’s Pickup.\r", @@ -18,7 +18,7 @@ ] }, { - "id": "pl_msg_00000075_00002", + "id": "OreburghCityNorthHouse2F_Text_HowAboutShowingMeAPokemonCalledGeodude", "en_US": [ "The view is good from the second floor,\n", "but it’s a pain going outside.\r", @@ -27,7 +27,7 @@ ] }, { - "id": "pl_msg_00000075_00003", + "id": "OreburghCityNorthHouse2F_Text_ThatsAGeodudeThisIsATokenOfMyThanks", "en_US": [ "The view is good from the second floor,\n", "but it’s a pain going outside.\r", @@ -44,7 +44,7 @@ ] }, { - "id": "pl_msg_00000075_00004", + "id": "OreburghCityNorthHouse2F_Text_YeahThereAreSoManyKindsOfPokemonOutInTheWorld", "en_US": [ "Yeah, there are so many kinds of\n", "Pokémon out in the world.\r", diff --git a/res/text/oreburgh_city_north_house_3f.json b/res/text/oreburgh_city_north_house_3f.json index 6f8cfa6714..d6ee22adf5 100644 --- a/res/text/oreburgh_city_north_house_3f.json +++ b/res/text/oreburgh_city_north_house_3f.json @@ -2,7 +2,7 @@ "key": 25619, "messages": [ { - "id": "pl_msg_00000076_00000", + "id": "OreburghCityNorthHouse3F_Text_DuringTheDaytimeEveryoneGoesOffToTheMine", "en_US": [ "During the daytime, everyone goes off\n", "to the mine.\r", @@ -11,14 +11,14 @@ ] }, { - "id": "pl_msg_00000076_00001", + "id": "OreburghCityNorthHouse3F_Text_WellKeepDiggingCoal", "en_US": [ "We’ll keep digging coal.\n", "The world needs energy!" ] }, { - "id": "pl_msg_00000076_00002", + "id": "OreburghCityNorthHouse3F_Text_EveryoneIncludingLotsOfPokemonDugTheBigUndergroundMaze", "en_US": [ "Everyone, including lots of Pokémon,\n", "dug the big underground maze!" diff --git a/res/text/oreburgh_city_north_house_4f.json b/res/text/oreburgh_city_north_house_4f.json index d6c2755af1..f679c71d77 100644 --- a/res/text/oreburgh_city_north_house_4f.json +++ b/res/text/oreburgh_city_north_house_4f.json @@ -2,15 +2,15 @@ "key": 25615, "messages": [ { - "id": "pl_msg_00000077_00000", + "id": "OreburghCityNorthHouse4F_Dummy0", "garbage": 73 }, { - "id": "pl_msg_00000077_00001", + "id": "OreburghCityNorthHouse4F_Dummy1", "garbage": 87 }, { - "id": "pl_msg_00000077_00002", + "id": "OreburghCityNorthHouse4F_Dummy2", "garbage": 39 } ] diff --git a/res/text/oreburgh_city_northwest_house_1f.json b/res/text/oreburgh_city_northwest_house_1f.json index ebe531406b..cb34115a26 100644 --- a/res/text/oreburgh_city_northwest_house_1f.json +++ b/res/text/oreburgh_city_northwest_house_1f.json @@ -2,7 +2,7 @@ "key": 25603, "messages": [ { - "id": "pl_msg_00000070_00000", + "id": "OreburghCityNorthwestHouse1F_Text_ThereAreEightGymLeadersInTheSinnohRegion", "en_US": [ "There are eight Gym Leaders in the\n", "Sinnoh region.\r", @@ -13,7 +13,7 @@ ] }, { - "id": "pl_msg_00000070_00001", + "id": "OreburghCityNorthwestHouse1F_Text_AGymLeaderIsntLikeJustAnyTrainerYouMeet", "en_US": [ "A Gym Leader isn’t like just any Trainer\n", "you meet.\r", @@ -24,7 +24,7 @@ ] }, { - "id": "pl_msg_00000070_00002", + "id": "OreburghCityNorthwestHouse1F_Text_RoarkLetsUsTrainOurPokemonInTheMine", "en_US": [ "Roark lets us train our Pokémon in\n", "the mine." diff --git a/res/text/oreburgh_city_northwest_house_2f.json b/res/text/oreburgh_city_northwest_house_2f.json index ed335821bf..5d17b5eab9 100644 --- a/res/text/oreburgh_city_northwest_house_2f.json +++ b/res/text/oreburgh_city_northwest_house_2f.json @@ -2,7 +2,7 @@ "key": 25615, "messages": [ { - "id": "pl_msg_00000071_00000", + "id": "OreburghCityNorthwestHouse2F_Text_GivingNicknamesToPokemonIsTheWayToGo", "en_US": [ "Giving nicknames to Pokémon is\n", "the way to go.\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000071_00001", + "id": "OreburghCityNorthwestHouse2F_Text_ButHeNamedOurPsyduckYellowJustBecauseOfItsColor", "en_US": [ "But he named our PSYDUCK “Yellow”\n", "just because of its color...\r", @@ -20,14 +20,14 @@ ] }, { - "id": "pl_msg_00000071_00002", + "id": "OreburghCityNorthwestHouse2F_Text_HereTakeThisIfYoudLike", "en_US": [ "Are you catching Pokémon?\n", "Here, take this if you’d like.\r" ] }, { - "id": "pl_msg_00000071_00003", + "id": "OreburghCityNorthwestHouse2F_Text_TheDuskBallIsAPokeBallDesignedForUseInDarkness", "en_US": [ "The Dusk Ball is a Poké Ball designed\n", "for use in darkness.\r", @@ -36,7 +36,7 @@ ] }, { - "id": "pl_msg_00000071_00004", + "id": "OreburghCityNorthwestHouse2F_Text_YellowDuuuck", "en_US": "Yellow: Duuuck?" } ] diff --git a/res/text/oreburgh_city_northwest_house_3f.json b/res/text/oreburgh_city_northwest_house_3f.json index 76d27783da..82b16b6651 100644 --- a/res/text/oreburgh_city_northwest_house_3f.json +++ b/res/text/oreburgh_city_northwest_house_3f.json @@ -2,7 +2,7 @@ "key": 25611, "messages": [ { - "id": "pl_msg_00000072_00000", + "id": "OreburghCityNorthwestHouse3F_Text_IfYoudLikeLetOneHoldThisItem", "en_US": [ "Do you make your Pokémon hold items?\r", "If you’d like, let one hold this\n", @@ -10,7 +10,7 @@ ] }, { - "id": "pl_msg_00000072_00001", + "id": "OreburghCityNorthwestHouse3F_Text_ThatItemIntensifiesThePowerOfRockTypeMoves", "en_US": [ "That {STRVAR_1 8, 0, 0} intensifies the\n", "power of Rock-type moves.\r", @@ -19,7 +19,7 @@ ] }, { - "id": "pl_msg_00000072_00002", + "id": "OreburghCityNorthwestHouse3F_Text_PsyduckDuuuck", "en_US": "PSYDUCK: Duuuck?" } ] diff --git a/res/text/oreburgh_city_northwest_house_4f.json b/res/text/oreburgh_city_northwest_house_4f.json index 6e06018409..1e9965e1f9 100644 --- a/res/text/oreburgh_city_northwest_house_4f.json +++ b/res/text/oreburgh_city_northwest_house_4f.json @@ -2,21 +2,21 @@ "key": 25623, "messages": [ { - "id": "pl_msg_00000073_00000", + "id": "OreburghCityNorthwestHouse4F_Text_HahahaImGonnaSwipeYourFlag", "en_US": [ "Hahaha!\n", "I’m gonna swipe your Flag!" ] }, { - "id": "pl_msg_00000073_00001", + "id": "OreburghCityNorthwestHouse4F_Text_ISetSomeNastyTrapsCatchMeIfYouCan", "en_US": [ "I set some nasty Traps!\n", "Catch me if you can!" ] }, { - "id": "pl_msg_00000073_00002", + "id": "OreburghCityNorthwestHouse4F_Text_ThanksToTheGymLeaderWeCanPlayUnderground", "en_US": [ "Thanks to the Gym Leader, we can\n", "play underground." diff --git a/res/text/oreburgh_city_pokecenter_1f.json b/res/text/oreburgh_city_pokecenter_1f.json index 22634885c2..4c9a41a899 100644 --- a/res/text/oreburgh_city_pokecenter_1f.json +++ b/res/text/oreburgh_city_pokecenter_1f.json @@ -2,14 +2,14 @@ "key": 44018, "messages": [ { - "id": "pl_msg_00000068_00000", + "id": "OreburghCityPokecenter1F_Text_YayIGotAPalPadAtThePokemonWiFiClubDownstairs", "en_US": [ "Yay! I got a Pal Pad at the\n", "Pokémon Wi-Fi Club downstairs!" ] }, { - "id": "pl_msg_00000068_00001", + "id": "OreburghCityPokecenter1F_Text_SwitchOnThePCAtAnyPokemonCenter", "en_US": [ "Switch on the PC at any Pokémon\n", "Center.\r", @@ -20,7 +20,7 @@ ] }, { - "id": "pl_msg_00000068_00002", + "id": "OreburghCityPokecenter1F_Text_WhatIsYourFavoriteKindOfTrainerCanYouTellMe", "en_US": [ "Hmmm...!\r", "What is your favorite kind of Trainer?\n", @@ -28,21 +28,21 @@ ] }, { - "id": "pl_msg_00000068_00003", + "id": "OreburghCityPokecenter1F_Text_WhichKindOfTrainerWouldYouLikeToBe", "en_US": [ "Which kind of Trainer would you like\n", "to be?" ] }, { - "id": "pl_msg_00000068_00004", + "id": "OreburghCityPokecenter1F_Text_AskThisIsTheKindOfTrainerYouWantToBe", "en_US": [ "{STRVAR_1 14, 0, 0} is the kind of Trainer\n", "you want to be?" ] }, { - "id": "pl_msg_00000068_00005", + "id": "OreburghCityPokecenter1F_Text_ISeeSoThisIsTheKindOfTrainerYouLike", "en_US": [ "I see! So {STRVAR_1 14, 0, 0} is the kind\n", "of Trainer you like.\r", @@ -51,11 +51,11 @@ ] }, { - "id": "pl_msg_00000068_00006", + "id": "OreburghCityPokecenter1F_Text_OKThenIllJustTalkToYouLater", "en_US": "OK, then I’ll just talk to you later!" }, { - "id": "pl_msg_00000068_00007", + "id": "OreburghCityPokecenter1F_Text_HowAboutTellingMeWhatKindOfTrainerYouLike", "en_US": [ "Hello! You’ve been mistaken for\n", "{STRVAR_1 14, 0, 0}, haven’t you?\r", @@ -66,7 +66,7 @@ ] }, { - "id": "pl_msg_00000068_00008", + "id": "OreburghCityPokecenter1F_Text_WhatOrWhoIsThisTeamGalacticItsAMystery", "en_US": [ "Hmmm!\n", "What, or who, is this Team Galactic?!\r", @@ -79,7 +79,7 @@ ] }, { - "id": "pl_msg_00000068_00009", + "id": "OreburghCityPokecenter1F_Text_WhatOrWhoIsThisTeamGalactic", "en_US": [ "Hmmm!\n", "What, or who, is this Team Galactic?!\r", @@ -90,7 +90,7 @@ ] }, { - "id": "pl_msg_00000068_00010", + "id": "OreburghCityPokecenter1F_Text_NowYouCanCaptureItAsABattleVideoUsingAVsRecorder", "en_US": [ "You know how you can battle a friend\n", "using wireless communications?\r", @@ -99,7 +99,7 @@ ] }, { - "id": "pl_msg_00000068_00011", + "id": "OreburghCityPokecenter1F_Text_CoolYouHaveAVsRecorder", "en_US": [ "Cool!\n", "You have a Vs. Recorder!\r", @@ -108,7 +108,7 @@ ] }, { - "id": "pl_msg_00000068_00012", + "id": "OreburghCityPokecenter1F_Text_HiImGraceTheIdolSoShallWeBattle", "en_US": [ "Hi, I’m Grace, the Idol! I’m just back\n", "from a show in Oreburgh Mine!\r", @@ -116,21 +116,21 @@ ] }, { - "id": "pl_msg_00000068_00013", + "id": "OreburghCityPokecenter1F_Text_IllLetYouJoinMyFanClubIfYouCanBeatMe", "en_US": [ "I’ll let you join my fan club if you can\n", "beat me!\r" ] }, { - "id": "pl_msg_00000068_00014", + "id": "OreburghCityPokecenter1F_Text_YouWontAcceptMyChallengeButImAnIdol", "en_US": [ "You won’t accept my challenge?!\n", "But I’m an Idol..." ] }, { - "id": "pl_msg_00000068_00015", + "id": "OreburghCityPokecenter1F_Text_WellThatsMeAndMyPokemon", "en_US": [ "Well, that’s me and my Pokémon!\n", "I hope you’ll support us!\r", diff --git a/res/text/oreburgh_city_pokecenter_b1f.json b/res/text/oreburgh_city_pokecenter_b1f.json index 7997e333ff..cfd865d715 100644 --- a/res/text/oreburgh_city_pokecenter_b1f.json +++ b/res/text/oreburgh_city_pokecenter_b1f.json @@ -2,7 +2,7 @@ "key": 44026, "messages": [ { - "id": "pl_msg_00000069_00000", + "id": "OreburghCityPokecenterB1F_Text_IWantToBecomeFriendsWithAnExperiencedTrainerIReallyAdmire", "en_US": [ "I want to become friends with an\n", "experienced Trainer I really admire.\r", diff --git a/res/text/oreburgh_city_south_house.json b/res/text/oreburgh_city_south_house.json index 1cd8457a85..23b6c892e0 100644 --- a/res/text/oreburgh_city_south_house.json +++ b/res/text/oreburgh_city_south_house.json @@ -2,7 +2,7 @@ "key": 25651, "messages": [ { - "id": "pl_msg_00000084_00000", + "id": "OreburghCitySouthHouse_Text_YoureTakingATourOfOurCoalMine", "en_US": [ "You’re taking a tour of our coal mine?\r", "Wonderful!\n", diff --git a/res/text/oreburgh_city_west_house.json b/res/text/oreburgh_city_west_house.json index ce01858fa7..6985e28e79 100644 --- a/res/text/oreburgh_city_west_house.json +++ b/res/text/oreburgh_city_west_house.json @@ -2,7 +2,7 @@ "key": 58402, "messages": [ { - "id": "pl_msg_00000080_00000", + "id": "OreburghCityWestHouse_Text_HaveYouEverSeenOrHeardAboutDifferentlyColoredPokemon", "en_US": [ "Have you ever seen or heard about\n", "differently colored Pokémon?\r", @@ -13,7 +13,7 @@ ] }, { - "id": "pl_msg_00000080_00001", + "id": "OreburghCityWestHouse_Text_YouKnowHowPokemonHaveDifferentNaturesLikeWeHavePersonalities", "en_US": [ "You know how Pokémon have different\n", "natures like we have personalities?\r", @@ -22,7 +22,7 @@ ] }, { - "id": "pl_msg_00000080_00002", + "id": "OreburghCityWestHouse_Text_PikachuPikaaah", "en_US": "PIKACHU: Pikaaah!" } ] diff --git a/res/text/oreburgh_mine_b1f.json b/res/text/oreburgh_mine_b1f.json index b13bd463cd..6cfeec2b01 100644 --- a/res/text/oreburgh_mine_b1f.json +++ b/res/text/oreburgh_mine_b1f.json @@ -2,7 +2,7 @@ "key": 9218, "messages": [ { - "id": "pl_msg_00000222_00000", + "id": "OreburghMineB1F_Text_EveryoneThatWorksInTheCoalMineKeepsTheirOwnPokemonWithThem", "en_US": [ "Everyone that works in the coal mine\n", "keeps their own Pokémon with them.\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000222_00001", + "id": "OreburghMineB1F_Text_IFoundWhatIThoughtWereSomeRocksThenTheyStartedMoving", "en_US": [ "I found what I thought were some\n", "rocks, then they started moving!\r", @@ -20,7 +20,7 @@ ] }, { - "id": "pl_msg_00000222_00002", + "id": "OreburghMineB1F_Text_IFoundSomethingVeryInterestingSoonAfterArrivalYouMayHaveItIfYoudLike", "en_US": [ "Hello! How do you do!\n", "I’m a student of philosophy.\r", @@ -38,7 +38,7 @@ ] }, { - "id": "pl_msg_00000222_00003", + "id": "OreburghMineB1F_Text_OhYouHaveAnOveradundanceOfThings", "en_US": [ "Oh?\n", "You have an overabundance of things!\f", @@ -46,7 +46,7 @@ ] }, { - "id": "pl_msg_00000222_00004", + "id": "OreburghMineB1F_Text_AboutThatVeryInterestingThingIFoundYouMayHaveItIfYoudLike", "en_US": [ "Well, hello!\r", "About that very interesting thing\n", @@ -55,7 +55,7 @@ ] }, { - "id": "pl_msg_00000222_00005", + "id": "OreburghMineB1F_Text_ImToldThatPlateWasCreatedAtTheSameTimeAsSinnoh", "en_US": [ "I’m told that Plate was created at the\n", "same time as Sinnoh.\r", diff --git a/res/text/oreburgh_mine_b2f.json b/res/text/oreburgh_mine_b2f.json index 06d5316af1..1540a102ae 100644 --- a/res/text/oreburgh_mine_b2f.json +++ b/res/text/oreburgh_mine_b2f.json @@ -2,7 +2,7 @@ "key": 9230, "messages": [ { - "id": "pl_msg_00000223_00000", + "id": "OreburghMineB2F_Text_OKStandBackAndWatchThis", "en_US": [ "OK, stand back and watch this.\r", "Using the hidden move Rock Smash,\n", @@ -10,7 +10,7 @@ ] }, { - "id": "pl_msg_00000223_00001", + "id": "OreburghMineB2F_Text_FallenBouldersNeedToBeSmashedSoTheyreOutOfTheWay", "en_US": [ "Fallen boulders need to be smashed\n", "so they’re out of the way.\r", @@ -22,19 +22,19 @@ ] }, { - "id": "pl_msg_00000223_00002", + "id": "OreburghMineB2F_Text_MachopMaaacho", "en_US": "MACHOP: Maaacho!" }, { - "id": "pl_msg_00000223_00003", + "id": "OreburghMineB2F_Text_MachopChopChop", "en_US": "MACHOP: Chopchop!" }, { - "id": "pl_msg_00000223_00004", + "id": "OreburghMineB2F_Text_MachopChopmacho", "en_US": "MACHOP: Chopmacho!" }, { - "id": "pl_msg_00000223_00005", + "id": "OreburghMineB2F_Text_IMetTheseMachopOnRoute207", "en_US": [ "I met these MACHOP on Route 207.\r", "They’ve now become my most trusted\n",