diff --git a/generated/text_banks.txt b/generated/text_banks.txt index 6fa86cfeb9..1ba1c9f29a 100644 --- a/generated/text_banks.txt +++ b/generated/text_banks.txt @@ -367,7 +367,7 @@ TEXT_BANK_BATTLE_FACTORY_SCENE TEXT_BANK_JOURNAL_ENTRIES TEXT_BANK_START_MENU TEXT_BANK_BATTLE_STRINGS -TEXT_BANK_UNK_0369 +TEXT_BANK_POKEBALL_ITEMS TEXT_BANK_NPC_TRADE_NAMES TEXT_BANK_FURNITURE_NAMES TEXT_BANK_UNK_0372 @@ -378,7 +378,7 @@ TEXT_BANK_SPIN_TRADE TEXT_BANK_UNK_0377 TEXT_BANK_GYM_NAMES TEXT_BANK_MYSTERY_GIFT_DELIVERYMAN -TEXT_BANK_UNK_0380 +TEXT_BANK_HIDDEN_ITEMS TEXT_BANK_FIELD_MOVES TEXT_BANK_WIFI_PLAZA_ENTRANCE TEXT_BANK_POKEDEX_RATINGS diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index a289706ff8..b5bf38f412 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -239,9 +239,9 @@ FLAG_OBTAINED_COUPON_1 FLAG_OBTAINED_COUPON_2 FLAG_OBTAINED_COUPON_3 FLAG_TALKED_TO_COUNTERPART_SISTER_WITH_NATIONAL_DEX -FLAG_UNK_0x00F1 -FLAG_UNK_0x00F2 -FLAG_UNK_0x00F3 +FLAG_TALKED_TO_TRAINERS_SCHOOL_RIVAL +FLAG_OBTAINED_FASHION_CASE +FLAG_OBTAINED_POKETCH FLAG_UNK_0x00F4 FLAG_UNK_0x00F5 FLAG_UNK_0x00F6 @@ -275,7 +275,7 @@ FLAG_UNK_0x0111 FLAG_UNK_0x0112 FLAG_UNK_0x0113 FLAG_UNK_0x0114 -FLAG_UNK_0x0115 +FLAG_TALKED_TO_ROUTE_202_COUNTERPART FLAG_UNK_0x0116 FLAG_UNK_0x0117 FLAG_UNK_0x0118 @@ -376,24 +376,24 @@ FLAG_HIDE_LAKE_VERITY_LOW_WATER_CYRUS FLAG_HIDE_SANDGEM_TOWN_COUNTERPART FLAG_HIDE_ROUTE_201_PROF_ROWAN FLAG_HIDE_ROUTE_201_COUNTERPART -FLAG_HIDE_JUBILIFE_COUNTERPART +FLAG_HIDE_JUBILIFE_CITY_COUNTERPART FLAG_UNK_0x017B FLAG_UNK_0x017C FLAG_HIDE_ROUTE_201_BRIEFCASE FLAG_UNK_0x017E FLAG_UNK_0x017F FLAG_UNK_0x0180 -FLAG_UNK_0x0181 +FLAG_HIDE_JUBILIFE_CITY_LOOKER FLAG_UNK_0x0182 FLAG_UNK_0x0183 FLAG_UNK_0x0184 FLAG_VEILSTONE_STORE_B1F_HIDE_PROF_ROWAN FLAG_HIDE_CANALAVE_LIBRARY_1F_LUCIAN FLAG_UNK_0x0187 -FLAG_UNK_0x0188 +FLAG_HIDE_ROUTE_202_COUNTERPART FLAG_UNK_0x0189 FLAG_UNK_0x018A -FLAG_UNK_0x018B +FLAG_HIDE_JUBILIFE_CITY_COLLECTOR FLAG_UNK_0x018C FLAG_UNK_0x018D FLAG_UNK_0x018E @@ -499,9 +499,9 @@ FLAG_HIDE_TWINLEAF_TOWN_PLAYER_HOUSE_1F_RIVAL_MOM FLAG_HIDE_TWINLEAF_TOWN_RIVAL_HOUSE_2F_RIVAL FLAG_UNK_0x01F3 FLAG_UNK_0x01F4 -FLAG_UNK_0x01F5 -FLAG_UNK_0x01F6 -FLAG_UNK_0x01F7 +FLAG_HIDE_JUBILIFE_CITY_CLOWNS_1_AND_2 +FLAG_HIDE_JUBILIFE_CITY_POKETCH_CO_PRESIDENT +FLAG_HIDE_POKETCH_CO_1F_POKETCH_CO_PRESIDENT FLAG_UNK_0x01F8 FLAG_UNK_0x01F9 FLAG_UNK_0x01FA @@ -566,7 +566,7 @@ FLAG_UNK_0x0234 FLAG_UNK_0x0235 FLAG_UNK_0x0236 FLAG_UNK_0x0237 -FLAG_UNK_0x0238 +FLAG_HIDE_JUBILIFE_CITY_CLOWN_3 FLAG_UNK_0x0239 FLAG_HIDE_POKEMON_LEAGUE_HALLWAY_TO_HALL_OF_FAME_CYNTHIA FLAG_HIDE_POKEMON_LEAGUE_HALLWAY_TO_HALL_OF_FAME_PROF_ROWAN @@ -1012,7 +1012,7 @@ FLAG_UNK_0x03F2 FLAG_UNK_0x03F3 FLAG_UNK_0x03F4 FLAG_UNK_0x03F5 -FLAG_UNK_0x03F6 +FLAG_OBTAINED_ROUTE_202_POTION FLAG_UNK_0x03F7 FLAG_UNK_0x03F8 FLAG_UNK_0x03F9 @@ -1251,7 +1251,7 @@ FLAG_UNK_0x04E1 FLAG_UNK_0x04E2 FLAG_UNK_0x04E3 FLAG_UNK_0x04E4 -FLAG_HIDE_LAKE_VERITY_POKEBALL +FLAG_OBTAINED_LAKE_VERITY_TM38 FLAG_UNK_0x04E6 FLAG_UNK_0x04E7 FLAG_UNK_0x04E8 @@ -1270,7 +1270,7 @@ FLAG_UNK_0x04F4 FLAG_UNK_0x04F5 FLAG_UNK_0x04F6 FLAG_UNK_0x04F7 -FLAG_UNK_0x04F8 +FLAG_OBTAINED_JUBILIFE_CITY_POTION FLAG_UNK_0x04F9 FLAG_UNK_0x04FA FLAG_UNK_0x04FB @@ -4217,8 +4217,8 @@ VAR_UNK_0x4072 VAR_UNK_0x4073 VAR_UNK_0x4074 VAR_UNK_0x4075 -VAR_JUBILIFE_LOOKER_PALPAD -VAR_JUBILIFE_STATE +VAR_JUBILIFE_LOOKER_PAL_PAD_STATE +VAR_JUBILIFE_CITY_STATE VAR_CANALAVE_STATE VAR_OREBURGH_STATE VAR_UNK_0x407A @@ -4234,7 +4234,7 @@ VAR_UNK_0x4083 VAR_UNK_0x4084 VAR_UNK_0x4085 VAR_FOLLOWER_RIVAL_STATE -VAR_UNK_0x4087 +VAR_ROUTE_202_STATE VAR_UNK_0x4088 VAR_UNK_0x4089 VAR_UNK_0x408A @@ -4330,7 +4330,7 @@ VAR_UNK_0x40E3 VAR_FOLLOWER_MARLEY_TIMES_TALKED VAR_UNK_0x40E5 VAR_TWINLEAF_TOWN_RIVAL_TRIGGER_STATE -VAR_UNK_0x40E7 +VAR_POKETCH_CAMPAIGN_STATE VAR_FOLLOWER_CHERYL_TIMES_TALKED VAR_UNK_0x40E9 VAR_UNK_0x40EA @@ -4339,7 +4339,7 @@ VAR_UNK_0x40EC VAR_UNK_0x40ED VAR_UNK_0x40EE VAR_RIVAL_BEAT_SUNYSHORE_GYM -VAR_GTS_HAS_BADGES_CHECK_TEST +VAR_GTS_ACCESS_STATE VAR_UNK_0x40F1 VAR_UNK_0x40F2 VAR_PAL_PARK_STATE diff --git a/include/script_manager.h b/include/script_manager.h index 25824ac59e..8a006908d1 100644 --- a/include/script_manager.h +++ b/include/script_manager.h @@ -89,6 +89,7 @@ enum ScriptContextType { #define SCRIPT_ID_OFFSET_COMMON_SCRIPTS 2000 #define SCRIPT_ID_OFFSET_SINGLE_BATTLES 3000 #define SCRIPT_ID_OFFSET_DOUBLE_BATTLES 5000 +#define SCRIPT_ID_OFFSET_POKEBALL_ITEMS 7000 #define SCRIPT_ID_OFFSET_HIDDEN_ITEMS 8000 #define SCRIPT_ID_OFFSET_SAFARI_GAME 8800 #define SCRIPT_ID_OFFSET_INIT_NEW_GAME 9600 diff --git a/res/field/events/events_jubilife_city.json b/res/field/events/events_jubilife_city.json index 7dea7ca571..ff8d4158a5 100644 --- a/res/field/events/events_jubilife_city.json +++ b/res/field/events/events_jubilife_city.json @@ -11,7 +11,7 @@ ], "object_events": [ { - "id": "JUBILIFE_CITY_ACE_TRAINER_F_0", + "id": "LOCALID_ACE_TRAINER_F", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -26,7 +26,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_ACE_TRAINER_M_1", + "id": "LOCALID_ACE_TRAINER_M_1", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -41,7 +41,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_SCHOOL_KID_M_2", + "id": "LOCALID_SCHOOL_KID_M_1", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -56,7 +56,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_TWIN_3", + "id": "LOCALID_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -71,7 +71,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_EXPERT_M_4", + "id": "LOCALID_EXPERT_M_1", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -86,7 +86,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_SCHOOL_KID_M_5", + "id": "LOCALID_SCHOOL_KID_M_2", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -101,7 +101,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_EXPERT_M_6", + "id": "LOCALID_EXPERT_M_2", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -116,11 +116,11 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_COUNTERPART", + "id": "LOCALID_COUNTERPART", "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_HIDE_JUBILIFE_COUNTERPART", + "hidden_flag": "FLAG_HIDE_JUBILIFE_CITY_COUNTERPART", "script": 0, "initial_dir": 1, "data": [], @@ -131,7 +131,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_MAP_SIGNPOST_8", + "id": "LOCALID_MAP_SIGNPOST_1", "graphics_id": "OBJ_EVENT_GFX_MAP_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -148,7 +148,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_MAP_SIGNPOST_9", + "id": "LOCALID_MAP_SIGNPOST_2", "graphics_id": "OBJ_EVENT_GFX_MAP_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -165,7 +165,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_MAP_SIGNPOST_10", + "id": "LOCALID_MAP_SIGNPOST_3", "graphics_id": "OBJ_EVENT_GFX_MAP_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -182,7 +182,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_MAP_SIGNPOST_11", + "id": "LOCALID_MAP_SIGNPOST_4", "graphics_id": "OBJ_EVENT_GFX_MAP_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -199,7 +199,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_SIGNBOARD_12", + "id": "LOCALID_SIGNBOARD_JUBILIFE_CONDOMINIUMS", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -214,7 +214,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_SIGNBOARD_13", + "id": "LOCALID_SIGNBOARD_POKETCH_COMPANY", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -229,7 +229,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_SIGNBOARD_14", + "id": "LOCALID_SIGNBOARD_JUBILIFE_TV", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -244,7 +244,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_SIGNBOARD_15", + "id": "LOCALID_SIGNBOARD_TRAINERS_SCHOOL", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -259,7 +259,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_PROF_ROWAN_16", + "id": "LOCALID_PROF_ROWAN", "graphics_id": "OBJ_EVENT_GFX_PROF_ROWAN", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -274,7 +274,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_GRUNT_M_17", + "id": "LOCALID_GRUNT_M_1", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -289,7 +289,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_GRUNT_M_18", + "id": "LOCALID_GRUNT_M_2", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -304,12 +304,12 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_ARROW_SIGNPOST_19", + "id": "LOCALID_ARROW_SIGNPOST_ROUTE_202", "clone_id": 5, "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0157", + "hidden_flag": "MAP_HEADER_ROUTE_202", "script": 65535, "initial_dir": 0, "data": [ @@ -322,12 +322,12 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_ARROW_SIGNPOST_20", + "id": "LOCALID_ARROW_SIGNPOST_ROUTE_203", "clone_id": 6, "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0158", + "hidden_flag": "MAP_HEADER_ROUTE_203", "script": 65535, "initial_dir": 0, "data": [ @@ -340,7 +340,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_ACE_TRAINER_M_21", + "id": "LOCALID_ACE_TRAINER_M_2", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -355,7 +355,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_SIGNBOARD_22", + "id": "LOCALID_SIGNBOARD_GLOBAL_TERMINAL", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -370,11 +370,11 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_MIDDLE_AGED_MAN_23", + "id": "LOCALID_POKETCH_CO_PRESIDENT", "graphics_id": "OBJ_EVENT_GFX_MIDDLE_AGED_MAN", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01F6", + "hidden_flag": "FLAG_HIDE_JUBILIFE_CITY_POKETCH_CO_PRESIDENT", "script": 18, "initial_dir": 2, "data": [], @@ -385,11 +385,11 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_CLOWN_24", + "id": "LOCALID_CLOWN_1", "graphics_id": "OBJ_EVENT_GFX_CLOWN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01F5", + "hidden_flag": "FLAG_HIDE_JUBILIFE_CITY_CLOWNS_1_AND_2", "script": 14, "initial_dir": 1, "data": [], @@ -400,11 +400,11 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_CLOWN_25", + "id": "LOCALID_CLOWN_2", "graphics_id": "OBJ_EVENT_GFX_CLOWN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01F5", + "hidden_flag": "FLAG_HIDE_JUBILIFE_CITY_CLOWNS_1_AND_2", "script": 15, "initial_dir": 1, "data": [], @@ -415,7 +415,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_ACE_TRAINER_M_26", + "id": "LOCALID_ACE_TRAINER_M_3", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -430,11 +430,11 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_CLOWN_27", + "id": "LOCALID_CLOWN_3", "graphics_id": "OBJ_EVENT_GFX_CLOWN", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0238", + "hidden_flag": "FLAG_HIDE_JUBILIFE_CITY_CLOWN_3", "script": 16, "initial_dir": 1, "data": [], @@ -445,7 +445,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_KID_WITH_NDS_28", + "id": "LOCALID_KID_WITH_NDS_1", "graphics_id": "OBJ_EVENT_GFX_KID_WITH_NDS", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -460,7 +460,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_KID_WITH_NDS_29", + "id": "LOCALID_KID_WITH_NDS_2", "graphics_id": "OBJ_EVENT_GFX_KID_WITH_NDS", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -475,11 +475,11 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_COLLECTOR_30", + "id": "LOCALID_COLLECTOR", "graphics_id": "OBJ_EVENT_GFX_COLLECTOR", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x018B", + "hidden_flag": "FLAG_HIDE_JUBILIFE_CITY_COLLECTOR", "script": 0, "initial_dir": 0, "data": [], @@ -490,11 +490,11 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_LOOKER_31", + "id": "LOCALID_LOOKER", "graphics_id": "OBJ_EVENT_GFX_LOOKER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0181", + "hidden_flag": "FLAG_HIDE_JUBILIFE_CITY_LOOKER", "script": 5, "initial_dir": 1, "data": [], @@ -505,11 +505,11 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_POKEBALL_32", + "id": "LOCALID_POKEBALL", "graphics_id": "OBJ_EVENT_GFX_POKEBALL", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x04F8", + "hidden_flag": "FLAG_OBTAINED_JUBILIFE_CITY_POTION", "script": 7257, "initial_dir": 0, "data": [], @@ -614,7 +614,7 @@ "y": 0, "width": 4, "length": 1, - "var": "VAR_JUBILIFE_STATE", + "var": "VAR_JUBILIFE_CITY_STATE", "value": 0 }, { @@ -624,7 +624,7 @@ "y": 0, "width": 3, "length": 1, - "var": "VAR_JUBILIFE_STATE", + "var": "VAR_JUBILIFE_CITY_STATE", "value": 3 }, { @@ -634,7 +634,7 @@ "y": 0, "width": 1, "length": 4, - "var": "VAR_JUBILIFE_STATE", + "var": "VAR_JUBILIFE_CITY_STATE", "value": 1 }, { @@ -644,8 +644,8 @@ "y": 0, "width": 1, "length": 3, - "var": "VAR_GTS_HAS_BADGES_CHECK_TEST", - "value": false + "var": "VAR_GTS_ACCESS_STATE", + "value": 0 }, { "script": 17, @@ -654,7 +654,7 @@ "y": 0, "width": 5, "length": 1, - "var": "VAR_UNK_0x40E7", + "var": "VAR_POKETCH_CAMPAIGN_STATE", "value": 1 }, { @@ -664,7 +664,7 @@ "y": 0, "width": 1, "length": 4, - "var": "VAR_JUBILIFE_LOOKER_PALPAD", + "var": "VAR_JUBILIFE_LOOKER_PAL_PAD_STATE", "value": 1 } ] diff --git a/res/field/events/events_lake_verity.json b/res/field/events/events_lake_verity.json index 81f272c328..f3086cbb85 100644 --- a/res/field/events/events_lake_verity.json +++ b/res/field/events/events_lake_verity.json @@ -74,7 +74,7 @@ "graphics_id": "OBJ_EVENT_GFX_POKEBALL", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_HIDE_LAKE_VERITY_POKEBALL", + "hidden_flag": "FLAG_OBTAINED_LAKE_VERITY_TM38", "script": 7239, "initial_dir": 0, "data": [], diff --git a/res/field/events/events_lake_verity_low_water.json b/res/field/events/events_lake_verity_low_water.json index dcaa709fb5..0f5779347c 100644 --- a/res/field/events/events_lake_verity_low_water.json +++ b/res/field/events/events_lake_verity_low_water.json @@ -96,7 +96,7 @@ "graphics_id": "OBJ_EVENT_GFX_POKEBALL", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_HIDE_LAKE_VERITY_POKEBALL", + "hidden_flag": "FLAG_OBTAINED_LAKE_VERITY_TM38", "script": 7239, "initial_dir": 0, "data": [], diff --git a/res/field/events/events_poketch_co_1f.json b/res/field/events/events_poketch_co_1f.json index 5c9b72a431..1b1134fa7b 100644 --- a/res/field/events/events_poketch_co_1f.json +++ b/res/field/events/events_poketch_co_1f.json @@ -51,7 +51,7 @@ "graphics_id": "OBJ_EVENT_GFX_MIDDLE_AGED_MAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01F7", + "hidden_flag": "FLAG_HIDE_POKETCH_CO_1F_POKETCH_CO_PRESIDENT", "script": 1, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_route_202.json b/res/field/events/events_route_202.json index 517fa86004..0b23043e98 100644 --- a/res/field/events/events_route_202.json +++ b/res/field/events/events_route_202.json @@ -11,7 +11,7 @@ ], "object_events": [ { - "id": "ROUTE_202_YOUNGSTER_TRISTAN", + "id": "LOCALID_YOUNGSTER_TRISTAN", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -28,7 +28,7 @@ "y": 1 }, { - "id": "ROUTE_202_LASS_NATALIE", + "id": "LOCALID_LASS_NATALIE", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -45,7 +45,7 @@ "y": 1 }, { - "id": "ROUTE_202_YOUNGSTER_LOGAN", + "id": "LOCALID_YOUNGSTER_LOGAN", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -62,11 +62,11 @@ "y": 1 }, { - "id": "ROUTE_202_COUNTERPART_3", + "id": "LOCALID_COUNTERPART", "graphics_id": "OBJ_EVENT_GFX_COUNTERPART", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0188", + "hidden_flag": "FLAG_HIDE_ROUTE_202_COUNTERPART", "script": 7, "initial_dir": 3, "data": [], @@ -77,7 +77,7 @@ "y": 1 }, { - "id": "ROUTE_202_ARROW_SIGNPOST_4", + "id": "LOCALID_ARROW_SIGNPOST_SANDGEM_TOWN", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -94,7 +94,7 @@ "y": 0 }, { - "id": "ROUTE_202_ARROW_SIGNPOST_5", + "id": "LOCALID_ARROW_SIGNPOST_JUBILIFE_CITY", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -111,7 +111,7 @@ "y": 0 }, { - "id": "ROUTE_202_TRAINER_TIPS_SIGNPOST_6", + "id": "LOCALID_TRAINER_TIPS_SIGNPOST", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -126,7 +126,7 @@ "y": 0 }, { - "id": "ROUTE_202_YOUNGSTER_7", + "id": "LOCALID_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -141,11 +141,11 @@ "y": 0 }, { - "id": "ROUTE_202_POKEBALL_8", + "id": "LOCALID_POKEBALL", "graphics_id": "OBJ_EVENT_GFX_POKEBALL", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x03F6", + "hidden_flag": "FLAG_OBTAINED_ROUTE_202_POTION", "script": 7000, "initial_dir": 0, "data": [], @@ -165,7 +165,7 @@ "y": 0, "width": 1, "length": 5, - "var": "VAR_UNK_0x4087", + "var": "VAR_ROUTE_202_STATE", "value": 0 } ] diff --git a/res/field/scripts/meson.build b/res/field/scripts/meson.build index 188070bf8b..1890c15f95 100644 --- a/res/field/scripts/meson.build +++ b/res/field/scripts/meson.build @@ -437,11 +437,11 @@ scr_seq_files = files( 'scripts_empty.s', 'scripts_unk_0402.s', 'scripts_unk_0403.s', - 'scripts_unk_0404.s', + 'scripts_pokeball_items.s', 'scripts_unk_0405.s', 'scripts_unk_0406.s', 'scripts_unk_0407.s', - 'scripts_unk_0408.s', + 'scripts_hidden_items.s', 'scripts_field_moves.s', 'scripts_wifi_plaza_entrance.s', 'scripts_pokedex_ratings.s', diff --git a/res/field/scripts/scripts.order b/res/field/scripts/scripts.order index 51315e372c..36fecc00e9 100644 --- a/res/field/scripts/scripts.order +++ b/res/field/scripts/scripts.order @@ -402,11 +402,11 @@ scripts_pokemon_center_daily_trainers scripts_empty scripts_unk_0402 scripts_unk_0403 -scripts_unk_0404 +scripts_pokeball_items scripts_unk_0405 scripts_unk_0406 scripts_unk_0407 -scripts_unk_0408 +scripts_hidden_items scripts_field_moves scripts_wifi_plaza_entrance scripts_pokedex_ratings diff --git a/res/field/scripts/scripts_unk_0408.s b/res/field/scripts/scripts_hidden_items.s similarity index 99% rename from res/field/scripts/scripts_unk_0408.s rename to res/field/scripts/scripts_hidden_items.s index 59ec601098..ed3bea1c48 100644 --- a/res/field/scripts/scripts_unk_0408.s +++ b/res/field/scripts/scripts_hidden_items.s @@ -1,5 +1,5 @@ #include "macros/scrcmd.inc" -#include "res/text/bank/unk_0380.h" +#include "res/text/bank/hidden_items.h" ScriptEntry _0472 diff --git a/res/field/scripts/scripts_init_new_game.s b/res/field/scripts/scripts_init_new_game.s index 18a481763c..b68c310755 100644 --- a/res/field/scripts/scripts_init_new_game.s +++ b/res/field/scripts/scripts_init_new_game.s @@ -33,13 +33,13 @@ _0006: SetFlag FLAG_UNK_0x0229 SetFlag FLAG_UNK_0x01A6 SetFlag FLAG_UNK_0x01C3 - SetFlag FLAG_HIDE_JUBILIFE_COUNTERPART + SetFlag FLAG_HIDE_JUBILIFE_CITY_COUNTERPART SetFlag FLAG_HIDE_JUBILIFE_ROWAN SetFlag FLAG_HIDE_JUBILIFE_GALACTIC_GRUNTS - SetFlag FLAG_UNK_0x01F6 - SetFlag FLAG_UNK_0x01F7 - SetFlag FLAG_UNK_0x01F5 - SetFlag FLAG_UNK_0x018B + SetFlag FLAG_HIDE_JUBILIFE_CITY_POKETCH_CO_PRESIDENT + SetFlag FLAG_HIDE_POKETCH_CO_1F_POKETCH_CO_PRESIDENT + SetFlag FLAG_HIDE_JUBILIFE_CITY_CLOWNS_1_AND_2 + SetFlag FLAG_HIDE_JUBILIFE_CITY_COLLECTOR SetFlag FLAG_UNK_0x01B5 SetFlag FLAG_UNK_0x01B3 SetFlag FLAG_HIDE_CANALAVE_RIVAL diff --git a/res/field/scripts/scripts_jubilife_city.s b/res/field/scripts/scripts_jubilife_city.s index 5d0dcc587d..9d8054d24a 100644 --- a/res/field/scripts/scripts_jubilife_city.s +++ b/res/field/scripts/scripts_jubilife_city.s @@ -1,392 +1,393 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city.h" +#include "res/text/bank/menu_entries.h" #include "res/field/events/events_jubilife_city.h" - ScriptEntry _0072 - ScriptEntry JubilifeCity_Counterpart - ScriptEntry _0700 - ScriptEntry _09DC - ScriptEntry _0954 - ScriptEntry _0F3C - ScriptEntry _0FAD - ScriptEntry _0FD3 - ScriptEntry _1027 - ScriptEntry _0FC0 - ScriptEntry _0FE6 - ScriptEntry _058C - ScriptEntry _05BD - ScriptEntry _1320 - ScriptEntry _1397 - ScriptEntry _140E - ScriptEntry _10C4 - ScriptEntry _11CC - ScriptEntry JubilifeCity_GTSGreeter_HasNoBadges - ScriptEntry _14A9 - ScriptEntry _14BC - ScriptEntry _103A - ScriptEntry _1051 - ScriptEntry _1068 - ScriptEntry _107F - ScriptEntry _1096 - ScriptEntry _10AD - ScriptEntry JubilifeCity_Looker_AfterOneBadgeObtained + ScriptEntry JubilifeCity_OnTransition + ScriptEntry JubilifeCity_TriggerFirstArrival + ScriptEntry JubilifeCity_TriggerLookerBlockRoute203 + ScriptEntry JubilifeCity_TriggerTeamGalactic + ScriptEntry JubilifeCity_Looker + ScriptEntry JubilifeCity_SchoolKidM1 + ScriptEntry JubilifeCity_Twin + ScriptEntry JubilifeCity_AceTrainerF + ScriptEntry JubilifeCity_SchoolKidM2 + ScriptEntry JubilifeCity_AceTrainerM1 + ScriptEntry JubilifeCity_ExpertM1 + ScriptEntry JubilifeCity_ExpertM2 + ScriptEntry JubilifeCity_AceTrainerM3 + ScriptEntry JubilifeCity_Clown1 + ScriptEntry JubilifeCity_Clown2 + ScriptEntry JubilifeCity_Clown3 + ScriptEntry JubilifeCity_TriggerPoketchCampaign + ScriptEntry JubilifeCity_PoketchCoPresident + ScriptEntry JubilifeCity_TriggerGTSGreeterBlockPlayer + ScriptEntry JubilifeCity_KidWithNDS1 + ScriptEntry JubilifeCity_KidWithNDS2 + ScriptEntry JubilifeCity_MapSign + ScriptEntry JubilifeCity_LandmarkSignJubilifeCondominiums + ScriptEntry JubilifeCity_LandmarkSignPoketchCompany + ScriptEntry JubilifeCity_LandmarkSignTrainersSchool + ScriptEntry JubilifeCity_LandmarkSignJubilifeTV + ScriptEntry JubilifeCity_LandmarkSignGlobalTerminal + ScriptEntry JubilifeCity_TriggerLookerPalPad ScriptEntryEnd -_0072: - CallIfEq VAR_JUBILIFE_STATE, 0, _00AC - CallIfGe VAR_JUBILIFE_STATE, 3, _00C2 +JubilifeCity_OnTransition: + CallIfEq VAR_JUBILIFE_CITY_STATE, 0, JubilifeCity_SetLookerPositionFirstArrival + CallIfGe VAR_JUBILIFE_CITY_STATE, 3, JubilifeCity_SetCounterpartPositionTeamGalactic GetPlayerGender VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, GENDER_MALE, _00D8 - GoToIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, _00E0 + GoToIfEq VAR_MAP_LOCAL_0, GENDER_MALE, JubilifeCity_SetCounterpartGraphicsDawn + GoToIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, JubilifeCity_SetCounterpartGraphicsLucas End -_00AC: - SetObjectEventPos 31, 177, 0x306 - SetObjectEventDir 31, DIR_SOUTH - SetObjectEventMovementType 31, MOVEMENT_TYPE_LOOK_SOUTH +JubilifeCity_SetLookerPositionFirstArrival: + SetObjectEventPos LOCALID_LOOKER, 177, 774 + SetObjectEventDir LOCALID_LOOKER, DIR_SOUTH + SetObjectEventMovementType LOCALID_LOOKER, MOVEMENT_TYPE_LOOK_SOUTH Return -_00C2: - SetObjectEventPos 7, 176, 0x2E3 - SetObjectEventDir 7, DIR_WEST - SetObjectEventMovementType 7, MOVEMENT_TYPE_LOOK_WEST +JubilifeCity_SetCounterpartPositionTeamGalactic: + SetObjectEventPos LOCALID_COUNTERPART, 176, 739 + SetObjectEventDir LOCALID_COUNTERPART, DIR_WEST + SetObjectEventMovementType LOCALID_COUNTERPART, MOVEMENT_TYPE_LOOK_WEST Return -_00D8: - SetVar VAR_OBJ_GFX_ID_0, 97 +JubilifeCity_SetCounterpartGraphicsDawn: + SetVar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_PLAYER_F End -_00E0: - SetVar VAR_OBJ_GFX_ID_0, 0 +JubilifeCity_SetCounterpartGraphicsLucas: + SetVar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_PLAYER_M End -JubilifeCity_Counterpart: +JubilifeCity_TriggerFirstArrival: LockAll GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8004, 173, JubilifeCity_Counterpart_Left - GoToIfEq VAR_0x8004, 174, JubilifeCity_Counterpart_Middle - GoToIfEq VAR_0x8004, 175, JubilifeCity_Counterpart_Right + GoToIfEq VAR_0x8004, 173, JubilifeCity_FirstArrivalX173 + GoToIfEq VAR_0x8004, 174, JubilifeCity_FirstArrivalX174 + GoToIfEq VAR_0x8004, 175, JubilifeCity_FirstArrivalX175 End -JubilifeCity_Counterpart_Left: - SetObjectEventPos JUBILIFE_CITY_COUNTERPART, 173, 0x314 - GoTo JubilifeCity_Counterpart_Init +JubilifeCity_FirstArrivalX173: + SetObjectEventPos LOCALID_COUNTERPART, 173, 788 + GoTo JubilifeCity_CounterpartWalkToPlayerFirstArrival End -JubilifeCity_Counterpart_Middle: - SetObjectEventPos JUBILIFE_CITY_COUNTERPART, 174, 0x314 - GoTo JubilifeCity_Counterpart_Init +JubilifeCity_FirstArrivalX174: + SetObjectEventPos LOCALID_COUNTERPART, 174, 788 + GoTo JubilifeCity_CounterpartWalkToPlayerFirstArrival End -JubilifeCity_Counterpart_Right: - SetObjectEventPos JUBILIFE_CITY_COUNTERPART, 175, 0x314 - GoTo JubilifeCity_Counterpart_Init +JubilifeCity_FirstArrivalX175: + SetObjectEventPos LOCALID_COUNTERPART, 175, 788 + GoTo JubilifeCity_CounterpartWalkToPlayerFirstArrival End -JubilifeCity_Counterpart_Init: - ClearFlag FLAG_HIDE_JUBILIFE_COUNTERPART - AddObject JUBILIFE_CITY_COUNTERPART - LockObject JUBILIFE_CITY_COUNTERPART - ApplyMovement JUBILIFE_CITY_COUNTERPART, _043C +JubilifeCity_CounterpartWalkToPlayerFirstArrival: + ClearFlag FLAG_HIDE_JUBILIFE_CITY_COUNTERPART + AddObject LOCALID_COUNTERPART + LockObject LOCALID_COUNTERPART + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartNoticePlayer WaitMovement - ApplyMovement JUBILIFE_CITY_COUNTERPART, _044C + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWalkToPlayerFirstArrival WaitMovement Common_SetCounterpartBGM GetPlayerGender VAR_RESULT - GoToIfEq VAR_RESULT, GENDER_MALE, JubilifeCity_Dawn - GoToIfEq VAR_RESULT, GENDER_FEMALE, JubilifeCity_Lucas + GoToIfEq VAR_RESULT, GENDER_MALE, JubilifeCity_MeetLookerWithDawn + GoToIfEq VAR_RESULT, GENDER_FEMALE, JubilifeCity_MeetLookerWithLucas End -JubilifeCity_Dawn: +JubilifeCity_MeetLookerWithDawn: BufferCounterpartName 0 BufferPlayerName 1 - Message 0 + Message JubilifeCity_Text_DawnAreYouCatchingPokemon GetPartyCount VAR_RESULT BufferNumber 0, VAR_RESULT - CallIfGe VAR_RESULT, 4, JubilifeCity_Dawn_AtLeast4Mon - CallIfLe VAR_RESULT, 3, JubilifeCity_Dawn_LessThan4Mon + CallIfGe VAR_RESULT, 4, JubilifeCity_DawnAtLeastFourPokemon + CallIfLe VAR_RESULT, 3, JubilifeCity_DawnLessThanFourPokemon BufferPlayerName 0 BufferRivalName 1 - Message 3 - Call _02DB - Message 8 + Message JubilifeCity_Text_DawnFollowMe + Call JubilifeCity_PlayerAndCounterpartWalkNorth + Message JubilifeCity_Text_DawnThatManWhatIsHeDoing CloseMessage - Call _0348 - Message 9 - Call _036E - Message 14 - Call _0390 - Call _03C0 - Message 23 + Call JubilifeCity_LookerWalkAround + Message JubilifeCity_Text_DawnUm + Call JubilifeCity_LookerNoticePlayerAndCounterpart + Message JubilifeCity_Text_DawnIWasJustMakingConversation + Call JubilifeCity_IsTheSayingDontBeAThiefFamiliarToYou + Call JubilifeCity_LookerGiveVSRecorderAndLeave + Message JubilifeCity_Text_DawnWorkingForTheInternationPoliceMustBeHard CloseMessage WaitTime 30, VAR_RESULT BufferPlayerName 0 - Call _041B - Message 24 + Call JubilifeCity_CounterpartWalkToTrainersSchool + Message JubilifeCity_Text_DawnHereItIsItsTheTrainersSchool CloseMessage BufferRivalName 1 - Call _042F - Message 25 + Call JubilifeCity_CounterpartWalkBackFromTrainersSchool + Message JubilifeCity_Text_DawnISawYourFriendRivalGoInEarlier CloseMessage - GoTo _02BB + GoTo JubilifeCity_CounterpartLeave End -JubilifeCity_Dawn_AtLeast4Mon: - Message 1 +JubilifeCity_DawnAtLeastFourPokemon: + Message JubilifeCity_Text_DawnWowYouveAlreadyGotNumPokemonWithYou Return -JubilifeCity_Dawn_LessThan4Mon: - Message 2 +JubilifeCity_DawnLessThanFourPokemon: + Message JubilifeCity_Text_DawnIThinkYoudFeelALotSaferIfYouWereToCatchSomeMore Return -JubilifeCity_Lucas: +JubilifeCity_MeetLookerWithLucas: BufferCounterpartName 0 BufferPlayerName 1 - Message 4 + Message JubilifeCity_Text_LucasHowManyPokemonhaveYouCaught GetPartyCount VAR_RESULT BufferNumber 0, VAR_RESULT - CallIfGe VAR_RESULT, 4, JubilifeCity_Lucas_AtLeast4Mon - CallIfLe VAR_RESULT, 3, JubilifeCity_Lucas_LessThan4Mon + CallIfGe VAR_RESULT, 4, JubilifeCity_LucasAtLeastFourPokemon + CallIfLe VAR_RESULT, 3, JubilifeCity_LucasLessThanFourPokemon BufferPlayerName 0 BufferRivalName 1 - Message 7 - Call _02DB - Message 10 + Message JubilifeCity_Text_LucasFollowMe + Call JubilifeCity_PlayerAndCounterpartWalkNorth + Message JubilifeCity_Text_LucasThatGuyWhatsHeDoing CloseMessage - Call _0348 - Message 11 - Call _036E - Message 15 - Call _0390 - Call _03C0 - Message 26 + Call JubilifeCity_LookerWalkAround + Message JubilifeCity_Text_LucasUhExcuse + Call JubilifeCity_LookerNoticePlayerAndCounterpart + Message JubilifeCity_Text_LucasIWasJustMakingSmallTalk + Call JubilifeCity_IsTheSayingDontBeAThiefFamiliarToYou + Call JubilifeCity_LookerGiveVSRecorderAndLeave + Message JubilifeCity_Text_LucasWorkingForTheInternationPoliceSoundsHard CloseMessage WaitTime 15, VAR_RESULT BufferPlayerName 0 - Call _041B - Message 27 + Call JubilifeCity_CounterpartWalkToTrainersSchool + Message JubilifeCity_Text_LucasHereWeAreThisIsTheTrainersSchool CloseMessage BufferRivalName 1 - Call _042F - Message 28 + Call JubilifeCity_CounterpartWalkBackFromTrainersSchool + Message JubilifeCity_Text_LucasYourPalRivalWentInEarier CloseMessage - GoTo _02BB + GoTo JubilifeCity_CounterpartLeave End -JubilifeCity_Lucas_AtLeast4Mon: - Message 5 +JubilifeCity_LucasAtLeastFourPokemon: + Message JubilifeCity_Text_LucasWhoaYouAlreadyHaveNumPokemonWithYou Return -JubilifeCity_Lucas_LessThan4Mon: - Message 6 +JubilifeCity_LucasLessThanFourPokemon: + Message JubilifeCity_Text_LucasIThinkYouShouldCatchSomeMore Return -_02BB: - ApplyMovement 7, _0474 - ApplyMovement LOCALID_PLAYER, _04F8 +JubilifeCity_CounterpartLeave: + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartLeaveFirstArrival + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWatchCounterpartLeave WaitMovement - RemoveObject 7 - SetVar VAR_JUBILIFE_STATE, 1 + RemoveObject LOCALID_COUNTERPART + SetVar VAR_JUBILIFE_CITY_STATE, 1 ReleaseAll End -_02DB: +JubilifeCity_PlayerAndCounterpartWalkNorth: CloseMessage GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8004, 173, _030C - GoToIfEq VAR_0x8004, 174, _0320 - GoToIfEq VAR_0x8004, 175, _0334 + GoToIfEq VAR_0x8004, 173, JubilifeCity_PlayerAndCounterpartWalkNorthX173 + GoToIfEq VAR_0x8004, 174, JubilifeCity_PlayerAndCounterpartWalkNorthX174 + GoToIfEq VAR_0x8004, 175, JubilifeCity_PlayerAndCounterpartWalkNorthX175 End -_030C: - ApplyMovement 7, _0454 - ApplyMovement LOCALID_PLAYER, _04B4 +JubilifeCity_PlayerAndCounterpartWalkNorthX173: + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWalkNorthX173 + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWalkNorthX173 WaitMovement Return -_0320: - ApplyMovement 7, _046C - ApplyMovement LOCALID_PLAYER, _04D4 +JubilifeCity_PlayerAndCounterpartWalkNorthX174: + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWalkNorthX174 + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWalkNorthX174 WaitMovement Return -_0334: - ApplyMovement 7, _0460 - ApplyMovement LOCALID_PLAYER, _04C4 +JubilifeCity_PlayerAndCounterpartWalkNorthX175: + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWalkNorthX175 + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWalkNorthX175 WaitMovement Return -_0348: - ApplyMovement 31, _0518 +JubilifeCity_LookerWalkAround: + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkAround WaitMovement - ApplyMovement 31, _0544 - ApplyMovement 7, _047C - ApplyMovement LOCALID_PLAYER, _04DC + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkEast + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWalkToLooker + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWalkToLooker WaitMovement Return -_036E: - ApplyMovement 31, _0550 +JubilifeCity_LookerNoticePlayerAndCounterpart: + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerNoticePlayerAndCounterpart WaitMovement Common_SetLookerBGM - Message 12 - Message 13 + Message JubilifeCity_Text_WHAAAT + Message JubilifeCity_Text_HowDidYouUnmaskMe CloseMessage - ApplyMovement 7, _0484 + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWalkOnSpotNorth WaitMovement Return -_0390: - Message 16 - Message 17 +JubilifeCity_IsTheSayingDontBeAThiefFamiliarToYou: + Message JubilifeCity_Text_IKnowBetterNotToBelieveThat + Message JubilifeCity_Text_IsTheSayingDontBeAThiefFamiliarToYou ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _03B6 - GoToIfEq VAR_RESULT, MENU_NO, _03BB + GoToIfEq VAR_RESULT, MENU_YES, JubilifeCity_TakingWhatBelongsToOthersIsWrong + GoToIfEq VAR_RESULT, MENU_NO, JubilifeCity_YouClaimToNotKnowIt End -_03B6: - Message 18 +JubilifeCity_TakingWhatBelongsToOthersIsWrong: + Message JubilifeCity_Text_TakingWhatBelongsToOthersIsWrong Return -_03BB: - Message 19 +JubilifeCity_YouClaimToNotKnowIt: + Message JubilifeCity_Text_YouClaimToNotKnowIt Return -_03C0: - Message 20 +JubilifeCity_LookerGiveVSRecorderAndLeave: + Message JubilifeCity_Text_PerhapsYouCanMakeUseOfThis SetVar VAR_0x8004, ITEM_VS_RECORDER SetVar VAR_0x8005, 1 Common_GiveItemQuantity - Message 21 + Message JubilifeCity_Text_ThatVsRecorderItIsANiftyDeviceForRecordingAMatch CloseMessage - ApplyMovement 31, _055C + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkWestEastSouth WaitMovement - Message 22 + Message JubilifeCity_Text_YouMustInformMeOfAnyHappenings CloseMessage - ApplyMovement 7, _04A4 - ApplyMovement LOCALID_PLAYER, _0504 - ApplyMovement 31, _0574 + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWatchLookerLeave + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWatchLookerLeave + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerLeaveFistArrival WaitMovement - SetPosition 31, 186, 0, 0x2F4, 1 - SetObjectEventPos 31, 186, 0x2F4 + SetPosition LOCALID_LOOKER, 186, 0, 756, DIR_SOUTH + SetObjectEventPos LOCALID_LOOKER, 186, 756 Common_FadeToDefaultMusic4 Return -_041B: - ApplyMovement 7, _048C - ApplyMovement LOCALID_PLAYER, _04EC +JubilifeCity_CounterpartWalkToTrainersSchool: + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWalkToTrainersSchool + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWatchCounterpartWalkToTrainersSchool WaitMovement Return -_042F: - ApplyMovement 7, _0498 +JubilifeCity_CounterpartWalkBackFromTrainersSchool: + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWalkBackFromTrainersSchool WaitMovement Return .balign 4, 0 -_043C: +JubilifeCity_Movement_CounterpartNoticePlayer: WalkNormalSouth 4 EmoteExclamationMark Delay16 EndMovement .balign 4, 0 -_044C: +JubilifeCity_Movement_CounterpartWalkToPlayerFirstArrival: WalkNormalSouth 3 EndMovement .balign 4, 0 -_0454: +JubilifeCity_Movement_CounterpartWalkNorthX173: WalkNormalEast WalkNormalNorth 18 EndMovement .balign 4, 0 -_0460: +JubilifeCity_Movement_CounterpartWalkNorthX175: WalkNormalWest WalkNormalNorth 18 EndMovement .balign 4, 0 -_046C: +JubilifeCity_Movement_CounterpartWalkNorthX174: WalkNormalNorth 18 EndMovement .balign 4, 0 -_0474: +JubilifeCity_Movement_CounterpartLeaveFirstArrival: WalkNormalSouth 9 EndMovement .balign 4, 0 -_047C: +JubilifeCity_Movement_CounterpartWalkToLooker: WalkNormalNorth 2 EndMovement .balign 4, 0 -_0484: +JubilifeCity_Movement_CounterpartWalkOnSpotNorth: WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_048C: +JubilifeCity_Movement_CounterpartWalkToTrainersSchool: WalkNormalSouth WalkNormalWest 2 EndMovement .balign 4, 0 -_0498: +JubilifeCity_Movement_CounterpartWalkBackFromTrainersSchool: WalkNormalNorth WalkNormalEast 2 EndMovement .balign 4, 0 -_04A4: +JubilifeCity_Movement_CounterpartWatchLookerLeave: WalkOnSpotNormalEast Delay8 4 WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_04B4: +JubilifeCity_Movement_PlayerWalkNorthX173: WalkNormalNorth WalkNormalEast WalkNormalNorth 17 EndMovement .balign 4, 0 -_04C4: +JubilifeCity_Movement_PlayerWalkNorthX175: WalkNormalNorth WalkNormalWest WalkNormalNorth 17 EndMovement .balign 4, 0 -_04D4: +JubilifeCity_Movement_PlayerWalkNorthX174: WalkNormalNorth 18 EndMovement .balign 4, 0 -_04DC: +JubilifeCity_Movement_PlayerWalkToLooker: WalkNormalNorth 2 WalkNormalEast WalkNormalNorth EndMovement .balign 4, 0 -_04EC: +JubilifeCity_Movement_PlayerWatchCounterpartWalkToTrainersSchool: Delay4 WalkOnSpotNormalWest EndMovement .balign 4, 0 -_04F8: +JubilifeCity_Movement_PlayerWatchCounterpartLeave: Delay8 WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0504: +JubilifeCity_Movement_PlayerWatchLookerLeave: Delay8 WalkOnSpotNormalEast Delay8 3 @@ -394,7 +395,7 @@ _0504: EndMovement .balign 4, 0 -_0518: +JubilifeCity_Movement_LookerWalkAround: WalkOnSpotFastWest Delay8 2 WalkOnSpotFastSouth @@ -408,19 +409,19 @@ _0518: EndMovement .balign 4, 0 -_0544: +JubilifeCity_Movement_LookerWalkEast: WalkSlowEast WalkFastEast 2 EndMovement .balign 4, 0 -_0550: +JubilifeCity_Movement_LookerNoticePlayerAndCounterpart: WalkOnSpotFastSouth EmoteExclamationMark EndMovement .balign 4, 0 -_055C: +JubilifeCity_Movement_LookerWalkWestEastSouth: WalkOnSpotFastWest Delay8 WalkOnSpotFastEast @@ -429,7 +430,7 @@ _055C: EndMovement .balign 4, 0 -_0574: +JubilifeCity_Movement_LookerLeaveFistArrival: WalkFastEast 3 WalkOnSpotFastWest Delay8 @@ -437,102 +438,102 @@ _0574: WalkFastNorth 7 EndMovement -_058C: +JubilifeCity_ExpertM2: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfBadgeAcquired BADGE_ID_COAL, _05B2 - Message 29 + GoToIfBadgeAcquired BADGE_ID_COAL, JubilifeCity_HaveYouPaidAVisitToTheTVStation + Message JubilifeCity_Text_JubilifeCitysBuiltOnLandTheyCarvedOutOfAMountain WaitABXPadPress CloseMessage ReleaseAll End -_05B2: - Message 30 +JubilifeCity_HaveYouPaidAVisitToTheTVStation: + Message JubilifeCity_Text_HaveYouPaidAVisitToTheTVStation WaitABXPadPress CloseMessage ReleaseAll End -_05BD: +JubilifeCity_AceTrainerM3: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 92 + Message JubilifeCity_Text_PastHereIsTheGlobalTerminal WaitABXPadPress CloseMessage ReleaseAll End -JubilifeCity_GTSGreeter_HasNoBadges: +JubilifeCity_TriggerGTSGreeterBlockPlayer: LockAll GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 779, _0601 - GoToIfEq VAR_0x8005, 780, _062A - GoToIfEq VAR_0x8005, 781, _0653 + GoToIfEq VAR_0x8005, 779, JubilifeCity_GTSGreeterBlockPlayerZ779 + GoToIfEq VAR_0x8005, 780, JubilifeCity_GTSGreeterBlockPlayerZ780 + GoToIfEq VAR_0x8005, 781, JubilifeCity_GTSGreeterBlockPlayerZ781 End -_0601: - ApplyMovement 26, _0680 +JubilifeCity_GTSGreeterBlockPlayerZ779: + ApplyMovement LOCALID_ACE_TRAINER_M_3, JubilifeCity_Movement_GTSGreeterNoticePlayerZ779 WaitMovement - Message 91 + Message JubilifeCity_Text_TheGlobalTerminalIsOffLimitsIfYouDontHaveAGymBadge CloseMessage - ApplyMovement 26, _06B0 - ApplyMovement LOCALID_PLAYER, _06F8 + ApplyMovement LOCALID_ACE_TRAINER_M_3, JubilifeCity_Movement_GTSGreeterWalkBackZ779 + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerStepBackEast WaitMovement - GoTo _067C + GoTo JubilifeCity_GTSGreeterBlockPlayerRelease End -_062A: - ApplyMovement 26, _0690 +JubilifeCity_GTSGreeterBlockPlayerZ780: + ApplyMovement LOCALID_ACE_TRAINER_M_3, JubilifeCity_Movement_GTSGreeterNoticePlayerZ780 WaitMovement - Message 91 + Message JubilifeCity_Text_TheGlobalTerminalIsOffLimitsIfYouDontHaveAGymBadge CloseMessage - ApplyMovement 26, _06C8 - ApplyMovement LOCALID_PLAYER, _06F8 + ApplyMovement LOCALID_ACE_TRAINER_M_3, JubilifeCity_Movement_GTSGreeterWalkBackZ780 + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerStepBackEast WaitMovement - GoTo _067C + GoTo JubilifeCity_GTSGreeterBlockPlayerRelease End -_0653: - ApplyMovement 26, _06A0 +JubilifeCity_GTSGreeterBlockPlayerZ781: + ApplyMovement LOCALID_ACE_TRAINER_M_3, JubilifeCity_Movement_GTSGreeterNoticePlayerZ781 WaitMovement - Message 91 + Message JubilifeCity_Text_TheGlobalTerminalIsOffLimitsIfYouDontHaveAGymBadge CloseMessage - ApplyMovement 26, _06E0 - ApplyMovement LOCALID_PLAYER, _06F8 + ApplyMovement LOCALID_ACE_TRAINER_M_3, JubilifeCity_Movement_GTSGreeterWalkBackZ781 + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerStepBackEast WaitMovement - GoTo _067C + GoTo JubilifeCity_GTSGreeterBlockPlayerRelease End -_067C: +JubilifeCity_GTSGreeterBlockPlayerRelease: ReleaseAll End .balign 4, 0 -_0680: +JubilifeCity_Movement_GTSGreeterNoticePlayerZ779: EmoteExclamationMark WalkNormalSouth WalkOnSpotNormalEast EndMovement .balign 4, 0 -_0690: +JubilifeCity_Movement_GTSGreeterNoticePlayerZ780: EmoteExclamationMark WalkNormalSouth 2 WalkOnSpotNormalEast EndMovement .balign 4, 0 -_06A0: +JubilifeCity_Movement_GTSGreeterNoticePlayerZ781: EmoteExclamationMark WalkNormalSouth 3 WalkOnSpotNormalEast EndMovement .balign 4, 0 -_06B0: +JubilifeCity_Movement_GTSGreeterWalkBackZ779: WalkNormalEast Delay8 2 WalkNormalWest @@ -541,7 +542,7 @@ _06B0: EndMovement .balign 4, 0 -_06C8: +JubilifeCity_Movement_GTSGreeterWalkBackZ780: WalkNormalEast Delay8 2 WalkNormalWest @@ -550,7 +551,7 @@ _06C8: EndMovement .balign 4, 0 -_06E0: +JubilifeCity_Movement_GTSGreeterWalkBackZ781: WalkNormalEast Delay8 2 WalkNormalWest @@ -559,135 +560,135 @@ _06E0: EndMovement .balign 4, 0 -_06F8: +JubilifeCity_Movement_PlayerStepBackEast: WalkNormalEast EndMovement -_0700: +JubilifeCity_TriggerLookerBlockRoute203: LockAll GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 0x2F5, _073E - GoToIfEq VAR_0x8005, 0x2F6, _0758 - GoToIfEq VAR_0x8005, 0x2F7, _0772 - GoToIfEq VAR_0x8005, 0x2F8, _078C + GoToIfEq VAR_0x8005, 757, JubilifeCity_LookerWalkToPlayerZ757 + GoToIfEq VAR_0x8005, 758, JubilifeCity_LookerWalkToPlayerZ758 + GoToIfEq VAR_0x8005, 759, JubilifeCity_LookerWalkToPlayerZ759 + GoToIfEq VAR_0x8005, 760, JubilifeCity_LookerWalkToPlayerZ760 End -_073E: - ApplyMovement LOCALID_PLAYER, _0894 - ApplyMovement 31, _08B4 +JubilifeCity_LookerWalkToPlayerZ757: + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWalkOnSpotWest + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkToPlayerZ757 WaitMovement - GoTo _07A6 + GoTo JubilifeCity_LookerBlockPlayer End -_0758: - ApplyMovement LOCALID_PLAYER, _0894 - ApplyMovement 31, _08CC +JubilifeCity_LookerWalkToPlayerZ758: + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWalkOnSpotWest + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkToPlayerZ758 WaitMovement - GoTo _07A6 + GoTo JubilifeCity_LookerBlockPlayer End -_0772: - ApplyMovement LOCALID_PLAYER, _0894 - ApplyMovement 31, _08E4 +JubilifeCity_LookerWalkToPlayerZ759: + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWalkOnSpotWest + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkToPlayerZ759 WaitMovement - GoTo _07A6 + GoTo JubilifeCity_LookerBlockPlayer End -_078C: - ApplyMovement LOCALID_PLAYER, _0894 - ApplyMovement 31, _08FC +JubilifeCity_LookerWalkToPlayerZ760: + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWalkOnSpotWest + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkToPlayerZ760 WaitMovement - GoTo _07A6 + GoTo JubilifeCity_LookerBlockPlayer End -_07A6: - Call _07FC +JubilifeCity_LookerBlockPlayer: + Call JubilifeCity_LookerBlockPlayerMessage CloseMessage - ApplyMovement LOCALID_PLAYER, _08AC - ApplyMovement 31, _0914 + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWalkWestWithLooker + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkWestWithPlayer WaitMovement GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 0x2F5, _0846 - GoToIfEq VAR_0x8005, 0x2F6, _0858 - GoToIfEq VAR_0x8005, 0x2F7, _086A - GoToIfEq VAR_0x8005, 0x2F8, _087C + GoToIfEq VAR_0x8005, 757, JubilifeCity_LookerWalkBackZ757 + GoToIfEq VAR_0x8005, 758, JubilifeCity_LookerWalkBackZ758 + GoToIfEq VAR_0x8005, 759, JubilifeCity_LookerWalkBackZ759 + GoToIfEq VAR_0x8005, 760, JubilifeCity_LookerWalkBackZ760 End -_07FC: - GoToIfUnset FLAG_UNK_0x00F1, _0817 - GoToIfUnset FLAG_UNK_0x00F3, _081C - Message 35 +JubilifeCity_LookerBlockPlayerMessage: + GoToIfUnset FLAG_TALKED_TO_TRAINERS_SCHOOL_RIVAL, JubilifeCity_HelloMyFriendHaveYouVisitedTheTrainersSchool + GoToIfUnset FLAG_OBTAINED_POKETCH, JubilifeCity_TellMeHaveYouNotObtainedAPoketch + Message JubilifeCity_Text_ItIsYouHaveYouNotObtainedAGymBadge Return -_0817: - Message 32 +JubilifeCity_HelloMyFriendHaveYouVisitedTheTrainersSchool: + Message JubilifeCity_Text_HelloMyFriendHaveYouVisitedTheTrainersSchool Return -_081C: - Message 34 +JubilifeCity_TellMeHaveYouNotObtainedAPoketch: + Message JubilifeCity_Text_TellMeHaveYouNotObtainedAPoketch Return -_0821: - GoToIfUnset FLAG_UNK_0x00F1, _083C - GoToIfUnset FLAG_UNK_0x00F3, _0841 - Message 35 +JubilifeCity_LookerMessageDidntObtainPoketch: + GoToIfUnset FLAG_TALKED_TO_TRAINERS_SCHOOL_RIVAL, JubilifeCity_ItIsYouHaveYouVisitedTheTrainersSchool + GoToIfUnset FLAG_OBTAINED_POKETCH, JubilifeCity_ItIsYouHaveYouNotObtainedAPoketch + Message JubilifeCity_Text_ItIsYouHaveYouNotObtainedAGymBadge Return -_083C: - Message 31 +JubilifeCity_ItIsYouHaveYouVisitedTheTrainersSchool: + Message JubilifeCity_Text_ItIsYouHaveYouVisitedTheTrainersSchool Return -_0841: - Message 33 +JubilifeCity_ItIsYouHaveYouNotObtainedAPoketch: + Message JubilifeCity_Text_ItIsYouHaveYouNotObtainedAPoketch Return -_0846: - ApplyMovement 31, _0924 +JubilifeCity_LookerWalkBackZ757: + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkBackZ757 WaitMovement - GoTo _088E + GoTo JubilifeCity_Movement_LookerRelease End -_0858: - ApplyMovement 31, _0930 +JubilifeCity_LookerWalkBackZ758: + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkBackZ758 WaitMovement - GoTo _088E + GoTo JubilifeCity_Movement_LookerRelease End -_086A: - ApplyMovement 31, _093C +JubilifeCity_LookerWalkBackZ759: + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkBackZ759 WaitMovement - GoTo _088E + GoTo JubilifeCity_Movement_LookerRelease End -_087C: - ApplyMovement 31, _0948 +JubilifeCity_LookerWalkBackZ760: + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkBackZ760 WaitMovement - GoTo _088E + GoTo JubilifeCity_Movement_LookerRelease End -_088E: +JubilifeCity_Movement_LookerRelease: ReleaseAll End .balign 4, 0 -_0894: +JubilifeCity_Movement_PlayerWalkOnSpotWest: Delay8 5 WalkOnSpotNormalWest EndMovement .balign 4, 0 -_08A0: +JubilifeCity_Movement_PlayerFaceWest: Delay8 5 FaceWest EndMovement .balign 4, 0 -_08AC: +JubilifeCity_Movement_PlayerWalkWestWithLooker: WalkNormalWest EndMovement .balign 4, 0 -_08B4: +JubilifeCity_Movement_LookerWalkToPlayerZ757: FaceSouth EmoteExclamationMark Delay16 @@ -696,7 +697,7 @@ _08B4: EndMovement .balign 4, 0 -_08CC: +JubilifeCity_Movement_LookerWalkToPlayerZ758: FaceSouth EmoteExclamationMark Delay16 @@ -705,7 +706,7 @@ _08CC: EndMovement .balign 4, 0 -_08E4: +JubilifeCity_Movement_LookerWalkToPlayerZ759: FaceSouth EmoteExclamationMark Delay16 @@ -714,7 +715,7 @@ _08E4: EndMovement .balign 4, 0 -_08FC: +JubilifeCity_Movement_LookerWalkToPlayerZ760: FaceSouth EmoteExclamationMark Delay16 @@ -723,184 +724,184 @@ _08FC: EndMovement .balign 4, 0 -_0914: +JubilifeCity_Movement_LookerWalkWestWithPlayer: LockDir WalkNormalWest UnlockDir EndMovement .balign 4, 0 -_0924: +JubilifeCity_Movement_LookerWalkBackZ757: WalkNormalNorth WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0930: +JubilifeCity_Movement_LookerWalkBackZ758: WalkNormalNorth 2 WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_093C: +JubilifeCity_Movement_LookerWalkBackZ759: WalkNormalNorth 3 WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0948: +JubilifeCity_Movement_LookerWalkBackZ760: WalkNormalNorth 4 WalkOnSpotNormalSouth EndMovement -_0954: +JubilifeCity_Looker: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x00F3, _097F - Call _0821 + GoToIfSet FLAG_OBTAINED_POKETCH, JubilifeCity_ItIsYouHaveYouNotObtainedAGymBadge + Call JubilifeCity_LookerMessageDidntObtainPoketch WaitABPress CloseMessage - ApplyMovement 31, _09D4 + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerFaceSouth WaitMovement ReleaseAll End -_097F: - Message 35 +JubilifeCity_ItIsYouHaveYouNotObtainedAGymBadge: + Message JubilifeCity_Text_ItIsYouHaveYouNotObtainedAGymBadge WaitABPress CloseMessage - ApplyMovement 31, _09D4 + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerFaceSouth WaitMovement ReleaseAll End -JubilifeCity_Looker_PalPadCheck: +JubilifeCity_CheckPalPad: CheckItem ITEM_PAL_PAD, 1, VAR_RESULT - GoToIfEq VAR_RESULT, 1, _09BD - Message 36 + GoToIfEq VAR_RESULT, TRUE, JubilifeCity_ISeeThatYouHaveObtainedItAPalPadForYourself + Message JubilifeCity_Text_TellMeHaveYouNotObtainedAPalPad CloseMessage - ApplyMovement 31, _1558 + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkOnSpotWestEast WaitMovement - Message 38 + Message JubilifeCity_Text_IShallTakeMyInvestigationElsewhere Return -_09BD: - Message 37 +JubilifeCity_ISeeThatYouHaveObtainedItAPalPadForYourself: + Message JubilifeCity_Text_ISeeThatYouHaveObtainedItAPalPadForYourself CloseMessage - ApplyMovement 31, _1558 + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkOnSpotWestEast WaitMovement - Message 38 + Message JubilifeCity_Text_IShallTakeMyInvestigationElsewhere Return .balign 4, 0 -_09D4: +JubilifeCity_Movement_LookerFaceSouth: FaceSouth EndMovement -_09DC: +JubilifeCity_TriggerTeamGalactic: LockAll - ApplyMovement 18, _0E94 + ApplyMovement LOCALID_GRUNT_M_2, JubilifeCity_Movement_GruntWalkOnSpotEast WaitMovement - Message 64 + Message JubilifeCity_Text_HandOverAllYourResearchFindings CloseMessage GetPlayerMapPos VAR_0x8000, VAR_0x8001 - GoToIfEq VAR_0x8000, 173, _0A1C - GoToIfEq VAR_0x8000, 174, _0A36 - GoToIfEq VAR_0x8000, 175, _0A50 + GoToIfEq VAR_0x8000, 173, JubilifeCity_PlayerWalkToProfRowanX173 + GoToIfEq VAR_0x8000, 174, JubilifeCity_PlayerWalkToProfRowanX174 + GoToIfEq VAR_0x8000, 175, JubilifeCity_PlayerWalkToProfRowanX175 End -_0A1C: - ApplyMovement 16, _0EBC - ApplyMovement LOCALID_PLAYER, _0DD0 +JubilifeCity_PlayerWalkToProfRowanX173: + ApplyMovement LOCALID_PROF_ROWAN, JubilifeCity_Movement_ProfRowanNoticePlayer + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWalkToProfRowanX173 WaitMovement - GoTo _0A6A + GoTo JubilifeCity_TeamGalacticBanter End -_0A36: - ApplyMovement 16, _0EBC - ApplyMovement LOCALID_PLAYER, _0DE4 +JubilifeCity_PlayerWalkToProfRowanX174: + ApplyMovement LOCALID_PROF_ROWAN, JubilifeCity_Movement_ProfRowanNoticePlayer + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWalkToProfRowanX174 WaitMovement - GoTo _0A6A + GoTo JubilifeCity_TeamGalacticBanter End -_0A50: - ApplyMovement 16, _0EBC - ApplyMovement LOCALID_PLAYER, _0DF8 +JubilifeCity_PlayerWalkToProfRowanX175: + ApplyMovement LOCALID_PROF_ROWAN, JubilifeCity_Movement_ProfRowanNoticePlayer + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWalkToProfRowanX175 WaitMovement - GoTo _0A6A + GoTo JubilifeCity_TeamGalacticBanter End -_0A6A: +JubilifeCity_TeamGalacticBanter: BufferPlayerName 0 BufferCounterpartName 1 - Message 65 - ApplyMovement 18, _0E94 + Message JubilifeCity_Text_ThatsOreburghsGymBadgeISee + ApplyMovement LOCALID_GRUNT_M_2, JubilifeCity_Movement_GruntWalkOnSpotEast WaitMovement - Message 66 - ApplyMovement 16, _0EC8 + Message JubilifeCity_Text_OhProfessorOfRowanMustYouBeSoDifficult + ApplyMovement LOCALID_PROF_ROWAN, JubilifeCity_Movement_ProfRowanWalkOnSpotWest WaitMovement - Message 67 - ApplyMovement 16, _0ED0 + Message JubilifeCity_Text_WhyMustYouBeSuchANuisance + ApplyMovement LOCALID_PROF_ROWAN, JubilifeCity_Movement_ProfRowanWalkOnSpotSouth WaitMovement - Message 68 - ApplyMovement 17, _0E9C - ApplyMovement 18, _0E9C + Message JubilifeCity_Text_MyGoodnessYouCallYourselvesAdults + ApplyMovement LOCALID_GRUNT_M_1, JubilifeCity_Movement_GruntWalkOnSpotFastEast + ApplyMovement LOCALID_GRUNT_M_2, JubilifeCity_Movement_GruntWalkOnSpotFastEast WaitMovement - Message 69 - Message 70 - ApplyMovement 7, _0E44 + Message JubilifeCity_Text_WeWillMakeYouRegretInsultingTeamGalactic + Message JubilifeCity_Text_YouKidsGiveTheseThugsALessonInCivilityPlease + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWalkOnSpotSouth WaitMovement GetPlayerGender VAR_RESULT - GoToIfEq VAR_RESULT, GENDER_MALE, _0ADC - GoToIfEq VAR_RESULT, GENDER_FEMALE, _0AED + GoToIfEq VAR_RESULT, GENDER_MALE, JubilifeCity_DawnPlayerLetsBattleTogether + GoToIfEq VAR_RESULT, GENDER_FEMALE, JubilifeCity_LucasPlayerJoinMeAndBattleTheseGuys End -_0ADC: +JubilifeCity_DawnPlayerLetsBattleTogether: BufferCounterpartName 0 BufferPlayerName 1 - Message 71 - GoTo _0AFE + Message JubilifeCity_Text_DawnPlayerLetsBattleTogether + GoTo JubilifeCity_TeamGalacticBattle End -_0AED: +JubilifeCity_LucasPlayerJoinMeAndBattleTheseGuys: BufferCounterpartName 0 BufferPlayerName 1 - Message 72 - GoTo _0AFE + Message JubilifeCity_Text_LucasPlayerJoinMeAndBattleTheseGuys + GoTo JubilifeCity_TeamGalacticBattle End -_0AFE: +JubilifeCity_TeamGalacticBattle: CloseMessage - ApplyMovement 16, _0F00 + ApplyMovement LOCALID_PROF_ROWAN, JubilifeCity_Movement_ProfRowanWalkOnSpotWest2 WaitMovement - ApplyMovement 7, _0E4C - ApplyMovement LOCALID_PLAYER, _0F30 + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWalkToGrunt + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWalkToGrunt WaitMovement Call JubilifeCity_SetPlayerCounterpartPartnerTeam StartTagBattle VAR_0x8004, TRAINER_GALACTIC_GRUNT_JUBILIFE_CITY_1, TRAINER_GALACTIC_GRUNT_JUBILIFE_CITY_2 CheckWonBattle VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, _0DB7 - ApplyMovement 18, _0EB4 + GoToIfEq VAR_RESULT, FALSE, JubilifeCity_BlackOut + ApplyMovement LOCALID_GRUNT_M_2, JubilifeCity_Movement_GruntWalkOnSpotEast2 WaitMovement - Message 73 + Message JubilifeCity_Text_WeWillRetreatForNow CloseMessage - ApplyMovement 17, _0EA4 - ApplyMovement 18, _0EAC + ApplyMovement LOCALID_GRUNT_M_1, JubilifeCity_Movement_Grunt1Leave + ApplyMovement LOCALID_GRUNT_M_2, JubilifeCity_Movement_Grunt2Leave WaitMovement - RemoveObject 17 - RemoveObject 18 + RemoveObject LOCALID_GRUNT_M_1 + RemoveObject LOCALID_GRUNT_M_2 SetFlag FLAG_HIDE_JUBILIFE_GALACTIC_GRUNTS - ApplyMovement 16, _0EF8 - ApplyMovement 7, _0E54 + ApplyMovement LOCALID_PROF_ROWAN, JubilifeCity_Movement_ProfRowanWalkOnSpotSouth2 + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWalkToPlayerAfterGalacticBattle WaitMovement BufferPlayerName 0 - Message 74 - ApplyMovement 7, _0E60 + Message JubilifeCity_Text_ThatLotTheyCalledThemselvesTeamGalactic + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWalkOnSpotSouth2 WaitMovement GetPlayerGender VAR_RESULT - GoToIfEq VAR_RESULT, GENDER_MALE, _0C30 - GoToIfEq VAR_RESULT, GENDER_FEMALE, _0C41 + GoToIfEq VAR_RESULT, GENDER_MALE, JubilifeCity_DawnTheProfessorStudiesTheEvolutionOfPokemonToo + GoToIfEq VAR_RESULT, GENDER_FEMALE, JubilifeCity_LucasTheProfessorStudiesTheEvolutionOfPokemonToo End JubilifeCity_SetPlayerCounterpartPartnerTeam: @@ -930,120 +931,120 @@ JubilifeCity_SetLucasPartnerTeam: JubilifeCity_Return: Return -_0C30: +JubilifeCity_DawnTheProfessorStudiesTheEvolutionOfPokemonToo: BufferCounterpartName 0 BufferPlayerName 1 - Message 75 - GoTo _0C52 + Message JubilifeCity_Text_DawnTheProfessorStudiesTheEvolutionOfPokemonToo + GoTo JubilifeCity_CounterpartAndProfRowanLeave End -_0C41: +JubilifeCity_LucasTheProfessorStudiesTheEvolutionOfPokemonToo: BufferCounterpartName 0 BufferPlayerName 1 - Message 76 - GoTo _0C52 + Message JubilifeCity_Text_LucasTheProfessorStudiesTheEvolutionOfPokemonToo + GoTo JubilifeCity_CounterpartAndProfRowanLeave End -_0C52: +JubilifeCity_CounterpartAndProfRowanLeave: BufferPlayerName 0 - Message 77 + Message JubilifeCity_Text_WhyDontYouCollectAllTheGymBadgesOfSinnoh CloseMessage - ApplyMovement 7, _0E68 - ApplyMovement 16, _0ED8 - ApplyMovement LOCALID_PLAYER, _0E08 + ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartLeaveAfterGalacticBattle + ApplyMovement LOCALID_PROF_ROWAN, JubilifeCity_Movement_ProfRowanLeave + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWatchCounterpartAndProfRowanLeave WaitMovement - GoTo _0C7C + GoTo JubilifeCity_CollectorJubilifeTV End -_0C7C: - RemoveObject 7 - RemoveObject 16 +JubilifeCity_CollectorJubilifeTV: + RemoveObject LOCALID_COUNTERPART + RemoveObject LOCALID_PROF_ROWAN ClearFlag FLAG_HIDE_SANDGEM_TOWN_LAB_PROF_ROWAN - SetVar VAR_JUBILIFE_STATE, 4 - SetVar VAR_JUBILIFE_LOOKER_PALPAD, 2 + SetVar VAR_JUBILIFE_CITY_STATE, 4 + SetVar VAR_JUBILIFE_LOOKER_PAL_PAD_STATE, 2 SetVar VAR_OREBURGH_STATE, 3 - RemoveObject 24 - RemoveObject 25 - RemoveObject 27 - SetObjectEventPos 30, 174, 0x2EE - SetObjectEventMovementType 30, MOVEMENT_TYPE_LOOK_NORTH - ClearFlag FLAG_UNK_0x018B - AddObject 30 - LockObject 30 - ApplyMovement 30, _0DC0 + RemoveObject LOCALID_CLOWN_1 + RemoveObject LOCALID_CLOWN_2 + RemoveObject LOCALID_CLOWN_3 + SetObjectEventPos LOCALID_COLLECTOR, 174, 750 + SetObjectEventMovementType LOCALID_COLLECTOR, MOVEMENT_TYPE_LOOK_NORTH + ClearFlag FLAG_HIDE_JUBILIFE_CITY_COLLECTOR + AddObject LOCALID_COLLECTOR + LockObject LOCALID_COLLECTOR + ApplyMovement LOCALID_COLLECTOR, JubilifeCity_Movement_CollectorWalkToPlayer WaitMovement - Message 78 - Call _0CF0 - Message 79 + Message JubilifeCity_Text_OhThatWasVeryGood + Call JubilifeCity_GiveFashionCaseAndAccessories + Message JubilifeCity_Text_DressUpYourPokemonAndWatchTheirAppealGrow CloseMessage WaitTime 15, VAR_RESULT - ApplyMovement 30, _0DC8 + ApplyMovement LOCALID_COLLECTOR, JubilifeCity_Movement_CollectorLeave WaitMovement - RemoveObject 30 + RemoveObject LOCALID_COLLECTOR ReleaseAll End -_0CF0: +JubilifeCity_GiveFashionCaseAndAccessories: SetVar VAR_0x8004, ITEM_FASHION_CASE SetVar VAR_0x8005, 1 Common_GiveItemQuantity - SetFlag FLAG_UNK_0x00F2 - Call _0D58 - Call _0D58 - Call _0D58 - Call _0D58 - Call _0D58 - Call _0D72 - Call _0D72 - Call _0D72 - Call _0D72 - Call _0D72 + SetFlag FLAG_OBTAINED_FASHION_CASE + Call JubilifeCity_GiveRandomAccessoryFluff + Call JubilifeCity_GiveRandomAccessoryFluff + Call JubilifeCity_GiveRandomAccessoryFluff + Call JubilifeCity_GiveRandomAccessoryFluff + Call JubilifeCity_GiveRandomAccessoryFluff + Call JubilifeCity_GiveRandomAccessoryFeatherOrMustache + Call JubilifeCity_GiveRandomAccessoryFeatherOrMustache + Call JubilifeCity_GiveRandomAccessoryFeatherOrMustache + Call JubilifeCity_GiveRandomAccessoryFeatherOrMustache + Call JubilifeCity_GiveRandomAccessoryFeatherOrMustache AddContestBackdrop 0 SetVar VAR_MAP_LOCAL_1, 0x270F - Call _0D8C - Call _0D8C + Call JubilifeCity_GiveRandomContestBackdrop + Call JubilifeCity_GiveRandomContestBackdrop Return -_0D58: +JubilifeCity_GiveRandomAccessoryFluff: GetRandom VAR_RESULT, 6 - SetVar VAR_0x8004, 0 + SetVar VAR_0x8004, ACCESSORY_WHITE_FLUFF AddVar VAR_0x8004, VAR_RESULT AddAccessory VAR_0x8004, 1 Return -_0D72: +JubilifeCity_GiveRandomAccessoryFeatherOrMustache: GetRandom VAR_RESULT, 6 - SetVar VAR_0x8004, 18 + SetVar VAR_0x8004, ACCESSORY_BLUE_FEATHER AddVar VAR_0x8004, VAR_RESULT AddAccessory VAR_0x8004, 1 Return -_0D8C: +JubilifeCity_GiveRandomContestBackdrop: GetRandom VAR_RESULT, 8 - GoToIfEq VAR_MAP_LOCAL_1, VAR_RESULT, _0D8C + GoToIfEq VAR_MAP_LOCAL_1, VAR_RESULT, JubilifeCity_GiveRandomContestBackdrop SetVar VAR_MAP_LOCAL_1, VAR_RESULT SetVar VAR_0x8004, 1 AddVar VAR_0x8004, VAR_RESULT AddContestBackdrop VAR_0x8004 Return -_0DB7: +JubilifeCity_BlackOut: BlackOutFromBattle ReleaseAll End .balign 4, 0 -_0DC0: +JubilifeCity_Movement_CollectorWalkToPlayer: WalkNormalNorth 8 EndMovement .balign 4, 0 -_0DC8: +JubilifeCity_Movement_CollectorLeave: WalkNormalSouth 8 EndMovement .balign 4, 0 -_0DD0: +JubilifeCity_Movement_PlayerWalkToProfRowanX173: Delay8 2 WalkNormalNorth WalkNormalEast 2 @@ -1051,7 +1052,7 @@ _0DD0: EndMovement .balign 4, 0 -_0DE4: +JubilifeCity_Movement_PlayerWalkToProfRowanX174: Delay8 2 WalkNormalNorth WalkNormalEast @@ -1059,14 +1060,14 @@ _0DE4: EndMovement .balign 4, 0 -_0DF8: +JubilifeCity_Movement_PlayerWalkToProfRowanX175: Delay8 2 WalkNormalNorth 2 WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_0E08: +JubilifeCity_Movement_PlayerWatchCounterpartAndProfRowanLeave: Delay8 WalkOnSpotNormalEast Delay8 @@ -1088,28 +1089,28 @@ JubilifeCity_UnusedMovement2: EndMovement .balign 4, 0 -_0E44: +JubilifeCity_Movement_CounterpartWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0E4C: +JubilifeCity_Movement_CounterpartWalkToGrunt: WalkNormalWest EndMovement .balign 4, 0 -_0E54: +JubilifeCity_Movement_CounterpartWalkToPlayerAfterGalacticBattle: WalkNormalWest WalkNormalSouth EndMovement .balign 4, 0 -_0E60: +JubilifeCity_Movement_CounterpartWalkOnSpotSouth2: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0E68: +JubilifeCity_Movement_CounterpartLeaveAfterGalacticBattle: WalkNormalEast WalkNormalSouth 9 EndMovement @@ -1127,48 +1128,48 @@ JubilifeCity_UnusedMovement4: EndMovement .balign 4, 0 -_0E94: +JubilifeCity_Movement_GruntWalkOnSpotEast: WalkOnSpotNormalEast EndMovement .balign 4, 0 -_0E9C: +JubilifeCity_Movement_GruntWalkOnSpotFastEast: WalkOnSpotFastEast 2 EndMovement .balign 4, 0 -_0EA4: +JubilifeCity_Movement_Grunt1Leave: WalkFastNorth 9 EndMovement .balign 4, 0 -_0EAC: +JubilifeCity_Movement_Grunt2Leave: WalkFastNorth 10 EndMovement .balign 4, 0 -_0EB4: +JubilifeCity_Movement_GruntWalkOnSpotEast2: WalkOnSpotNormalEast EndMovement .balign 4, 0 -_0EBC: +JubilifeCity_Movement_ProfRowanNoticePlayer: WalkOnSpotNormalSouth EmoteExclamationMark EndMovement .balign 4, 0 -_0EC8: +JubilifeCity_Movement_ProfRowanWalkOnSpotWest: WalkOnSpotFastWest EndMovement .balign 4, 0 -_0ED0: +JubilifeCity_Movement_ProfRowanWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0ED8: +JubilifeCity_Movement_ProfRowanLeave: WalkNormalSouth 9 EndMovement @@ -1183,12 +1184,12 @@ JubilifeCity_UnusedMovement6: EndMovement .balign 4, 0 -_0EF8: +JubilifeCity_Movement_ProfRowanWalkOnSpotSouth2: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0F00: +JubilifeCity_Movement_ProfRowanWalkOnSpotWest2: WalkOnSpotNormalWest EndMovement @@ -1213,331 +1214,331 @@ JubilifeCity_UnusedMovement11: EndMovement .balign 4, 0 -_0F30: +JubilifeCity_Movement_PlayerWalkToGrunt: WalkNormalWest WalkOnSpotNormalNorth EndMovement -_0F3C: +JubilifeCity_SchoolKidM1: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 80 + Message JubilifeCity_Text_CanYouTellMeWhatTypeOfPokemonYouLike InitGlobalTextListMenu 29, 11, 0, VAR_RESULT, NO_EXIT_ON_B SetMenuXOriginToRight - AddListMenuEntry 45, 0 - AddListMenuEntry 46, 1 - AddListMenuEntry 47, 2 + AddListMenuEntry MenuEntries_Text_TypePreferenceFire, 0 + AddListMenuEntry MenuEntries_Text_TypePreferenceWater, 1 + AddListMenuEntry MenuEntries_Text_TypePreferenceGrass, 2 ShowListMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _0F97 - GoToIfEq VAR_0x8008, 1, _0FA2 - Message 83 + GoToIfEq VAR_0x8008, 0, JubilifeCity_TheFireTypeYouMustHaveAFieryPersonality + GoToIfEq VAR_0x8008, 1, JubilifeCity_APersonThatLikesTheWaterTypeMustBeSomewhatCool + Message JubilifeCity_Text_YouChoseTheGrassTypeNoWonderYouLookSoCalm WaitABXPadPress CloseMessage ReleaseAll End -_0F97: - Message 81 +JubilifeCity_TheFireTypeYouMustHaveAFieryPersonality: + Message JubilifeCity_Text_TheFireTypeYouMustHaveAFieryPersonality WaitABXPadPress CloseMessage ReleaseAll End -_0FA2: - Message 82 +JubilifeCity_APersonThatLikesTheWaterTypeMustBeSomewhatCool: + Message JubilifeCity_Text_APersonThatLikesTheWaterTypeMustBeSomewhatCool WaitABXPadPress CloseMessage ReleaseAll End -_0FAD: +JubilifeCity_Twin: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 84 + Message JubilifeCity_Text_DidYouSeeMeOnTV WaitABXPadPress CloseMessage ReleaseAll End -_0FC0: +JubilifeCity_AceTrainerM1: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 87 + Message JubilifeCity_Text_HiyaWheredYouComeFrom WaitABXPadPress CloseMessage ReleaseAll End -_0FD3: +JubilifeCity_AceTrainerF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 85 + Message JubilifeCity_Text_WhenYouWalkWithYourPokemonTheyGraduallyGrowFriendlier WaitABXPadPress CloseMessage ReleaseAll End -_0FE6: +JubilifeCity_ExpertM1: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 88 + Message JubilifeCity_Text_HelloTrainerDoYouKnowMuchAboutPokemon ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _1011 - GoToIfEq VAR_RESULT, MENU_NO, _101C + GoToIfEq VAR_RESULT, MENU_YES, JubilifeCity_AhISeeYouAreKnowledgeable + GoToIfEq VAR_RESULT, MENU_NO, JubilifeCity_OhYoureNotKnowledgeable End -_1011: - Message 89 +JubilifeCity_AhISeeYouAreKnowledgeable: + Message JubilifeCity_Text_AhISeeYouAreKnowledgeable WaitABXPadPress CloseMessage ReleaseAll End -_101C: - Message 90 +JubilifeCity_OhYoureNotKnowledgeable: + Message JubilifeCity_Text_OhYoureNotKnowledgeable WaitABXPadPress CloseMessage ReleaseAll End -_1027: +JubilifeCity_SchoolKidM2: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 86 + Message JubilifeCity_Text_AtMostYouCanHaveSixPokemonWithYou WaitABXPadPress CloseMessage ReleaseAll End -_103A: - ShowMapSign 95 +JubilifeCity_MapSign: + ShowMapSign JubilifeCity_Text_MapSign End -_1051: - ShowLandmarkSign 96 +JubilifeCity_LandmarkSignJubilifeCondominiums: + ShowLandmarkSign JubilifeCity_Text_JubilifeCondominiumsTenantsWanted End -_1068: - ShowLandmarkSign 97 +JubilifeCity_LandmarkSignPoketchCompany: + ShowLandmarkSign JubilifeCity_Text_ThePoketchCompanyPokemonWatchesForTheWorld End -_107F: - ShowLandmarkSign 98 +JubilifeCity_LandmarkSignTrainersSchool: + ShowLandmarkSign JubilifeCity_Text_TrainersSchoolTheFirstStepForTrainers End -_1096: - ShowLandmarkSign 99 +JubilifeCity_LandmarkSignJubilifeTV: + ShowLandmarkSign JubilifeCity_Text_JubilifeTVTheFunAndGamesTVStation End -_10AD: - ShowLandmarkSign 100 +JubilifeCity_LandmarkSignGlobalTerminal: + ShowLandmarkSign JubilifeCity_Text_TheGlobalTerminalYourGatewayToTheWholeWorld End -_10C4: +JubilifeCity_TriggerPoketchCampaign: LockAll - ApplyMovement 23, _1178 - ApplyMovement LOCALID_PLAYER, _1170 + ApplyMovement LOCALID_POKETCH_CO_PRESIDENT, JubilifeCity_Movement_PoketchCoPresidentNoticePlayer + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerFaceNorthPoketchCoPresident WaitMovement GetPlayerMapPos VAR_0x8004, VAR_0x8005 - CallIfEq VAR_0x8004, 172, _1133 - CallIfEq VAR_0x8004, 173, _113F - CallIfEq VAR_0x8004, 174, _114B - CallIfEq VAR_0x8004, 175, _1157 - CallIfEq VAR_0x8004, 176, _1163 - Message 39 - SetVar VAR_UNK_0x40E7, 2 - Message 40 + CallIfEq VAR_0x8004, 172, JubilifeCity_PoketchCoPresidentWalkToPlayerX172 + CallIfEq VAR_0x8004, 173, JubilifeCity_PoketchCoPresidentWalkToPlayerX173 + CallIfEq VAR_0x8004, 174, JubilifeCity_PoketchCoPresidentWalkToPlayerX174 + CallIfEq VAR_0x8004, 175, JubilifeCity_PoketchCoPresidentWalkToPlayerX175 + CallIfEq VAR_0x8004, 176, JubilifeCity_PoketchCoPresidentWalkToPlayerX176 + Message JubilifeCity_Text_YouCallYourselfAPokemonTrainerAndYetYouHaveNoPoketch + SetVar VAR_POKETCH_CAMPAIGN_STATE, 2 + Message JubilifeCity_Text_AllYouHaveToDoIsFindThreeClownsInJubilifeCity WaitABXPadPress CloseMessage ReleaseAll End -_1133: - ApplyMovement 23, _1184 +JubilifeCity_PoketchCoPresidentWalkToPlayerX172: + ApplyMovement LOCALID_POKETCH_CO_PRESIDENT, JubilifeCity_Movement_PoketchCoPresidentWalkToPlayerX172 WaitMovement Return -_113F: - ApplyMovement 23, _1194 +JubilifeCity_PoketchCoPresidentWalkToPlayerX173: + ApplyMovement LOCALID_POKETCH_CO_PRESIDENT, JubilifeCity_Movement_PoketchCoPresidentWalkToPlayerX173 WaitMovement Return -_114B: - ApplyMovement 23, _11A4 +JubilifeCity_PoketchCoPresidentWalkToPlayerX174: + ApplyMovement LOCALID_POKETCH_CO_PRESIDENT, JubilifeCity_Movement_PoketchCoPresidentWalkToPlayerX174 WaitMovement Return -_1157: - ApplyMovement 23, _11AC +JubilifeCity_PoketchCoPresidentWalkToPlayerX175: + ApplyMovement LOCALID_POKETCH_CO_PRESIDENT, JubilifeCity_Movement_PoketchCoPresidentWalkToPlayerX175 WaitMovement Return -_1163: - ApplyMovement 23, _11BC +JubilifeCity_PoketchCoPresidentWalkToPlayerX176: + ApplyMovement LOCALID_POKETCH_CO_PRESIDENT, JubilifeCity_Movement_PoketchCoPresidentWalkToPlayerX176 WaitMovement Return .balign 4, 0 -_1170: +JubilifeCity_Movement_PlayerFaceNorthPoketchCoPresident: FaceNorth EndMovement .balign 4, 0 -_1178: +JubilifeCity_Movement_PoketchCoPresidentNoticePlayer: WalkOnSpotNormalSouth EmoteExclamationMark EndMovement .balign 4, 0 -_1184: +JubilifeCity_Movement_PoketchCoPresidentWalkToPlayerX172: WalkNormalSouth 2 WalkNormalWest 2 WalkNormalSouth 2 EndMovement .balign 4, 0 -_1194: +JubilifeCity_Movement_PoketchCoPresidentWalkToPlayerX173: WalkNormalSouth 2 WalkNormalWest WalkNormalSouth 2 EndMovement .balign 4, 0 -_11A4: +JubilifeCity_Movement_PoketchCoPresidentWalkToPlayerX174: WalkNormalSouth 4 EndMovement .balign 4, 0 -_11AC: +JubilifeCity_Movement_PoketchCoPresidentWalkToPlayerX175: WalkNormalSouth 2 WalkNormalEast WalkNormalSouth 2 EndMovement .balign 4, 0 -_11BC: +JubilifeCity_Movement_PoketchCoPresidentWalkToPlayerX176: WalkNormalSouth 2 WalkNormalEast 2 WalkNormalSouth 2 EndMovement -_11CC: +JubilifeCity_PoketchCoPresident: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer SetVar VAR_0x8004, 0 - Call _11F8 - GoToIfEq VAR_0x8004, 3, _1223 - Message 41 + Call JubilifeCity_SetObtainedCouponsCount + GoToIfEq VAR_0x8004, 3, JubilifeCity_GivePoketch + Message JubilifeCity_Text_CollectACouponFromEachClownThenComeSeeMeOK WaitABXPadPress CloseMessage ReleaseAll End -_11F8: - CallIfSet FLAG_OBTAINED_COUPON_1, _121B - CallIfSet FLAG_OBTAINED_COUPON_2, _121B - CallIfSet FLAG_OBTAINED_COUPON_3, _121B +JubilifeCity_SetObtainedCouponsCount: + CallIfSet FLAG_OBTAINED_COUPON_1, JubilifeCity_IncreaseObtainedCouponsCount + CallIfSet FLAG_OBTAINED_COUPON_2, JubilifeCity_IncreaseObtainedCouponsCount + CallIfSet FLAG_OBTAINED_COUPON_3, JubilifeCity_IncreaseObtainedCouponsCount Return -_121B: +JubilifeCity_IncreaseObtainedCouponsCount: AddVar VAR_0x8004, 1 Return -_1223: - Message 42 +JubilifeCity_GivePoketch: + Message JubilifeCity_Text_InReturnForTheseCouponsIPresentYouThisPokemonWatch RemoveItem ITEM_COUPON_1, 1, VAR_RESULT RemoveItem ITEM_COUPON_2, 1, VAR_RESULT RemoveItem ITEM_COUPON_3, 1, VAR_RESULT ScrCmd_131 - SetVar VAR_JUBILIFE_STATE, 2 + SetVar VAR_JUBILIFE_CITY_STATE, 2 RegisterPoketchApp POKETCH_APPID_DIGITALWATCH RegisterPoketchApp POKETCH_APPID_CALCULATOR RegisterPoketchApp POKETCH_APPID_PEDOMETER RegisterPoketchApp POKETCH_APPID_PARTYSTATUS BufferPlayerName 0 - Message 43 + Message JubilifeCity_Text_PlayerReceivedAPoketch PlaySound SEQ_FANFA4 WaitSound - Message 44 + Message JubilifeCity_Text_YouCanAddAppsToYourPoketch CloseMessage GetPlayerDir VAR_RESULT - GoToIfEq VAR_RESULT, 0, _12A1 - GoToIfEq VAR_RESULT, 1, _12BB - GoToIfEq VAR_RESULT, 2, _12A1 - GoToIfEq VAR_RESULT, 3, _12A1 + GoToIfEq VAR_RESULT, DIR_NORTH, JubilifeCity_PoketchCoPresidentLeaveNorthWestEast + GoToIfEq VAR_RESULT, DIR_SOUTH, JubilifeCity_PoketchCoPresidentLeaveSouth + GoToIfEq VAR_RESULT, DIR_WEST, JubilifeCity_PoketchCoPresidentLeaveNorthWestEast + GoToIfEq VAR_RESULT, DIR_EAST, JubilifeCity_PoketchCoPresidentLeaveNorthWestEast End -_12A1: - ApplyMovement 23, _12FC - ApplyMovement LOCALID_PLAYER, _1314 +JubilifeCity_PoketchCoPresidentLeaveNorthWestEast: + ApplyMovement LOCALID_POKETCH_CO_PRESIDENT, JubilifeCity_Movement_PoketchCoPresidentLeaveNorthWestEast + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWatchPoketchCoPresidentLeaveNorthWestEast WaitMovement - GoTo _12D5 + GoTo JubilifeCity_RemovePoketchCoPresident End -_12BB: - ApplyMovement 23, _12F0 - ApplyMovement LOCALID_PLAYER, _1304 +JubilifeCity_PoketchCoPresidentLeaveSouth: + ApplyMovement LOCALID_POKETCH_CO_PRESIDENT, JubilifeCity_Movement_PoketchCoPresidentLeaveSouth + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWatchPoketchCoPresidentLeaveSouth WaitMovement - GoTo _12D5 + GoTo JubilifeCity_RemovePoketchCoPresident End -_12D5: - RemoveObject 23 - SetFlag FLAG_UNK_0x00F3 - ClearFlag FLAG_UNK_0x01F7 - RemoveObject 31 - SetFlag FLAG_UNK_0x0181 +JubilifeCity_RemovePoketchCoPresident: + RemoveObject LOCALID_POKETCH_CO_PRESIDENT + SetFlag FLAG_OBTAINED_POKETCH + ClearFlag FLAG_HIDE_POKETCH_CO_1F_POKETCH_CO_PRESIDENT + RemoveObject LOCALID_LOOKER + SetFlag FLAG_HIDE_JUBILIFE_CITY_LOOKER ReleaseAll End .balign 4, 0 -_12F0: +JubilifeCity_Movement_PoketchCoPresidentLeaveSouth: WalkNormalWest WalkNormalNorth 9 EndMovement .balign 4, 0 -_12FC: +JubilifeCity_Movement_PoketchCoPresidentLeaveNorthWestEast: WalkNormalNorth 9 EndMovement .balign 4, 0 -_1304: +JubilifeCity_Movement_PlayerWatchPoketchCoPresidentLeaveSouth: Delay8 WalkOnSpotNormalWest WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_1314: +JubilifeCity_Movement_PlayerWatchPoketchCoPresidentLeaveNorthWestEast: Delay8 WalkOnSpotNormalNorth EndMovement -_1320: +JubilifeCity_Clown1: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_OBTAINED_COUPON_1, _138C - Message 45 + GoToIfSet FLAG_OBTAINED_COUPON_1, JubilifeCity_Clown1ObtainedCoupon + Message JubilifeCity_Text_DoesAPokemonGrowByDefeatingOthersAndGainingExpPoints ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _1356 - GoToIfEq VAR_RESULT, MENU_NO, _137D + GoToIfEq VAR_RESULT, MENU_YES, JubilifeCity_Clown1CorrectAnswer + GoToIfEq VAR_RESULT, MENU_NO, JubilifeCity_Clown1WrongAnswer End -_1356: +JubilifeCity_Clown1CorrectAnswer: PlayFanfare SEQ_SE_DP_PINPON - Message 46 - Message 48 - Message 49 + Message JubilifeCity_Text_DingDingYoureAbsolutelyCorrect1 + Message JubilifeCity_Text_PokemonGrowStrongerByDefeatingOtherPokemonInBattle + Message JubilifeCity_Text_HereYouGoYourPoketchCoupon1 SetVar VAR_0x8004, ITEM_COUPON_1 SetVar VAR_0x8005, 1 SetFlag FLAG_OBTAINED_COUPON_1 @@ -1546,37 +1547,37 @@ _1356: ReleaseAll End -_137D: +JubilifeCity_Clown1WrongAnswer: PlayFanfare SEQ_SE_DP_BOX03 - Message 47 + Message JubilifeCity_Text_BzzzztThatsTheWrongAnswer1 WaitABXPadPress CloseMessage ReleaseAll End -_138C: - Message 50 +JubilifeCity_Clown1ObtainedCoupon: + Message JubilifeCity_Text_PokemonGrowStrongerThroughBattling WaitABXPadPress CloseMessage ReleaseAll End -_1397: +JubilifeCity_Clown2: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_OBTAINED_COUPON_2, _1403 - Message 51 + GoToIfSet FLAG_OBTAINED_COUPON_2, JubilifeCity_Clown2ObtainedCoupon + Message JubilifeCity_Text_AskJustLikePokemonTypesTheMovesOfPokemonAlsoHaveTypes ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _13CD - GoToIfEq VAR_RESULT, MENU_NO, _13F4 + GoToIfEq VAR_RESULT, MENU_YES, JubilifeCity_Clown2CorrectAnswer + GoToIfEq VAR_RESULT, MENU_NO, JubilifeCity_Clown2WrongAnswer End -_13CD: +JubilifeCity_Clown2CorrectAnswer: PlayFanfare SEQ_SE_DP_PINPON - Message 52 - Message 54 - Message 55 + Message JubilifeCity_Text_DingDingYoureAbsolutelyCorrect2 + Message JubilifeCity_Text_IfThePokemonsTypeMatchesItsMovesTypeThatMoveIsMadeMuchMorePowerful + Message JubilifeCity_Text_HereYouGoYourPoketchCoupon2 SetVar VAR_0x8004, ITEM_COUPON_2 SetVar VAR_0x8005, 1 SetFlag FLAG_OBTAINED_COUPON_2 @@ -1585,39 +1586,39 @@ _13CD: ReleaseAll End -_13F4: +JubilifeCity_Clown2WrongAnswer: PlayFanfare SEQ_SE_DP_BOX03 - Message 53 + Message JubilifeCity_Text_BzzzztThatsTheWrongAnswer2 WaitABXPadPress CloseMessage ReleaseAll End -_1403: - Message 56 +JubilifeCity_Clown2ObtainedCoupon: + Message JubilifeCity_Text_IfThePokemonsTypeMatchesItsMovesTypeThatMoveIsMadeMuchMorePowerful2 WaitABXPadPress CloseMessage ReleaseAll End -_140E: +JubilifeCity_Clown3: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfLt VAR_UNK_0x40E7, 2, _149E - GoToIfSet FLAG_OBTAINED_COUPON_3, _1493 - Message 57 + GoToIfLt VAR_POKETCH_CAMPAIGN_STATE, 2, JubilifeCity_YouShouldStickAround + GoToIfSet FLAG_OBTAINED_COUPON_3, JubilifeCity_Clown3ObtainedCoupon + Message JubilifeCity_Text_CanAPokemonHoldAnItem ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _1451 - GoToIfEq VAR_RESULT, MENU_NO, _1484 + GoToIfEq VAR_RESULT, MENU_YES, JubilifeCity_Clown3CorrectAnswer + GoToIfEq VAR_RESULT, MENU_NO, JubilifeCity_Clown3WrongAnswer End -_1451: +JubilifeCity_Clown3CorrectAnswer: PlayFanfare SEQ_SE_DP_PINPON - Message 58 - Message 60 - Message 61 - SetPosition 23, 174, 1, 0x303, 1 + Message JubilifeCity_Text_DingDingYoureAbsolutelyCorrect3 + Message JubilifeCity_Text_APokemonMayHoldASingleItem + Message JubilifeCity_Text_HereYouGoYourPoketchCoupon3 + SetPosition LOCALID_POKETCH_CO_PRESIDENT, 174, 1, 771, DIR_SOUTH SetVar VAR_0x8004, ITEM_COUPON_3 SetVar VAR_0x8005, 1 SetFlag FLAG_OBTAINED_COUPON_3 @@ -1626,91 +1627,91 @@ _1451: ReleaseAll End -_1484: +JubilifeCity_Clown3WrongAnswer: PlayFanfare SEQ_SE_DP_BOX03 - Message 59 + Message JubilifeCity_Text_BzzzztThatsTheWrongAnswer3 WaitABXPadPress CloseMessage ReleaseAll End -_1493: - Message 63 +JubilifeCity_Clown3ObtainedCoupon: + Message JubilifeCity_Text_APokemonMayHoldASingleItem2 WaitABXPadPress CloseMessage ReleaseAll End -_149E: - Message 62 +JubilifeCity_YouShouldStickAround: + Message JubilifeCity_Text_YouShouldStickAround WaitABXPadPress CloseMessage ReleaseAll End -_14A9: +JubilifeCity_KidWithNDS1: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 93 + Message JubilifeCity_Text_ImTradingPokemonWithMyBuddy WaitABXPadPress CloseMessage ReleaseAll End -_14BC: +JubilifeCity_KidWithNDS2: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 94 + Message JubilifeCity_TextIMadeMyPokemonHoldAnItemBeforeTradingIt WaitABXPadPress CloseMessage ReleaseAll End -JubilifeCity_Looker_AfterOneBadgeObtained: +JubilifeCity_TriggerLookerPalPad: LockAll GetPlayerMapPos VAR_0x8004, VAR_0x8005 - SetObjectEventPos 31, 179, VAR_0x8005 - SetObjectEventDir 31, DIR_EAST - SetObjectEventMovementType 31, MOVEMENT_TYPE_LOOK_EAST - ClearFlag FLAG_UNK_0x0181 - AddObject 31 - ApplyMovement 31, _1538 + SetObjectEventPos LOCALID_LOOKER, 179, VAR_0x8005 + SetObjectEventDir LOCALID_LOOKER, DIR_EAST + SetObjectEventMovementType LOCALID_LOOKER, MOVEMENT_TYPE_LOOK_EAST + ClearFlag FLAG_HIDE_JUBILIFE_CITY_LOOKER + AddObject LOCALID_LOOKER + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerNoticePlayer WaitMovement Common_SetLookerBGM - ApplyMovement 31, _1544 - ApplyMovement LOCALID_PLAYER, _08A0 + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkToPlayer + ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerFaceWest WaitMovement - Call JubilifeCity_Looker_PalPadCheck + Call JubilifeCity_CheckPalPad CloseMessage - ApplyMovement 31, _154C + ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerLeavePalPad WaitMovement - RemoveObject 31 + RemoveObject LOCALID_LOOKER Common_FadeToDefaultMusic4 - SetVar VAR_JUBILIFE_LOOKER_PALPAD, 2 + SetVar VAR_JUBILIFE_LOOKER_PAL_PAD_STATE, 2 ReleaseAll End .balign 4, 0 -_1538: +JubilifeCity_Movement_LookerNoticePlayer: WalkSlowEast 2 EmoteExclamationMark EndMovement .balign 4, 0 -_1544: +JubilifeCity_Movement_LookerWalkToPlayer: WalkFastEast 6 EndMovement .balign 4, 0 -_154C: +JubilifeCity_Movement_LookerLeavePalPad: WalkSlowWest WalkFastWest 8 EndMovement .balign 4, 0 -_1558: +JubilifeCity_Movement_LookerWalkOnSpotWestEast: WalkOnSpotNormalWest Delay8 2 WalkOnSpotNormalEast diff --git a/res/field/scripts/scripts_oreburgh_city_gym.s b/res/field/scripts/scripts_oreburgh_city_gym.s index 9ece0cd586..9f91da243e 100644 --- a/res/field/scripts/scripts_oreburgh_city_gym.s +++ b/res/field/scripts/scripts_oreburgh_city_gym.s @@ -30,12 +30,12 @@ OreburghGym_Roark: SetTrainerFlag TRAINER_YOUNGSTER_JONATHON SetTrainerFlag TRAINER_YOUNGSTER_DARIUS SetFlag FLAG_HIDE_BLOCK_POKECENTER_BASEMENT - SetVar VAR_GTS_HAS_BADGES_CHECK_TEST, TRUE - SetVar VAR_JUBILIFE_LOOKER_PALPAD, 1 + SetVar VAR_GTS_ACCESS_STATE, 1 + SetVar VAR_JUBILIFE_LOOKER_PAL_PAD_STATE, 1 SetVar VAR_OREBURGH_STATE, 2 CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, 47, TRAINER_LEADER_ROARK, 0, 0 - SetVar VAR_JUBILIFE_STATE, 3 - ClearFlag FLAG_HIDE_JUBILIFE_COUNTERPART + SetVar VAR_JUBILIFE_CITY_STATE, 3 + ClearFlag FLAG_HIDE_JUBILIFE_CITY_COUNTERPART ClearFlag FLAG_HIDE_JUBILIFE_ROWAN ClearFlag FLAG_HIDE_JUBILIFE_GALACTIC_GRUNTS SetFlag FLAG_HIDE_SANDGEM_TOWN_LAB_PROF_ROWAN diff --git a/res/field/scripts/scripts_unk_0404.s b/res/field/scripts/scripts_pokeball_items.s similarity index 99% rename from res/field/scripts/scripts_unk_0404.s rename to res/field/scripts/scripts_pokeball_items.s index 5cd8b9e1d4..631452579d 100644 --- a/res/field/scripts/scripts_unk_0404.s +++ b/res/field/scripts/scripts_pokeball_items.s @@ -1,5 +1,5 @@ #include "macros/scrcmd.inc" -#include "res/text/bank/unk_0369.h" +#include "res/text/bank/pokeball_items.h" ScriptEntry _0522 diff --git a/res/field/scripts/scripts_poketch_co_1f.s b/res/field/scripts/scripts_poketch_co_1f.s index 7a3819a77a..8a45abe612 100644 --- a/res/field/scripts/scripts_poketch_co_1f.s +++ b/res/field/scripts/scripts_poketch_co_1f.s @@ -12,7 +12,7 @@ _0016: CheckTVInterviewEligible TV_PROGRAM_SEGMENT_THE_POKETCH_WATCH, VAR_MAP_LOCAL_0 GoToIfEq VAR_MAP_LOCAL_0, 0, _003C - GoToIfLt VAR_JUBILIFE_STATE, 2, _003C + GoToIfLt VAR_JUBILIFE_CITY_STATE, 2, _003C ClearFlag FLAG_UNK_0x0212 End diff --git a/res/field/scripts/scripts_route_202.s b/res/field/scripts/scripts_route_202.s index 92eb63a05e..43ec3076fb 100644 --- a/res/field/scripts/scripts_route_202.s +++ b/res/field/scripts/scripts_route_202.s @@ -1,293 +1,294 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_202.h" +#include "res/field/events/events_route_202.h" - ScriptEntry _001E - ScriptEntry _0071 - ScriptEntry _0084 - ScriptEntry _009B - ScriptEntry _00B2 - ScriptEntry _00C7 - ScriptEntry _04C4 + ScriptEntry Route202_OnTransition + ScriptEntry Route202_Youngster + ScriptEntry Route202_ArrowSignpostSandgemTown + ScriptEntry Route202_ArrowSignpostJubilifeCity + ScriptEntry Route202_TrainerTipsSignpost + ScriptEntry Route202_TriggerCatchingTutorial + ScriptEntry Route202_Counterpart ScriptEntryEnd -_001E: - CallIfGe VAR_UNK_0x4087, 2, _005B +Route202_OnTransition: + CallIfGe VAR_ROUTE_202_STATE, 2, Route202_SetCounterpartPokeRadarPosition GetPlayerGender VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, GENDER_MALE, _004B - GoToIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, _0053 + GoToIfEq VAR_MAP_LOCAL_0, GENDER_MALE, Route202_SetCounterpartGraphicsDawn + GoToIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, Route202_SetCounterpartGraphicsLucas End -_004B: - SetVar VAR_OBJ_GFX_ID_0, 97 +Route202_SetCounterpartGraphicsDawn: + SetVar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_PLAYER_F End -_0053: - SetVar VAR_OBJ_GFX_ID_0, 0 +Route202_SetCounterpartGraphicsLucas: + SetVar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_PLAYER_M End -_005B: - SetObjectEventPos 3, 186, 0x331 - SetObjectEventDir 3, DIR_SOUTH - SetObjectEventMovementType 3, MOVEMENT_TYPE_LOOK_SOUTH +Route202_SetCounterpartPokeRadarPosition: + SetObjectEventPos LOCALID_COUNTERPART, 186, 817 + SetObjectEventDir LOCALID_COUNTERPART, DIR_SOUTH + SetObjectEventMovementType LOCALID_COUNTERPART, MOVEMENT_TYPE_LOOK_SOUTH Return -_0071: +Route202_Youngster: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 10 + Message Route202_Text_SomePokemonOnlyAppearInTheMorning WaitABXPadPress CloseMessage ReleaseAll End -_0084: - ShowArrowSign 11 +Route202_ArrowSignpostSandgemTown: + ShowArrowSign Route202_Text_Rt202SandgemTown End -_009B: - ShowArrowSign 12 +Route202_ArrowSignpostJubilifeCity: + ShowArrowSign Route202_Text_Rt202JubilifeCity End -_00B2: - ShowScrollingSign 13 +Route202_TrainerTipsSignpost: + ShowScrollingSign Route202_Text_TrainerTipsPokemonInvolvedInBattleEarnExpPoints End -_00C7: +Route202_TriggerCatchingTutorial: LockAll - ApplyMovement 3, _03C4 - ApplyMovement LOCALID_PLAYER, _04A0 + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartNoticePlayer + ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerDelay WaitMovement GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 0x339, _0124 - GoToIfEq VAR_0x8005, 0x33A, _0134 - GoToIfEq VAR_0x8005, 0x33B, _0144 - GoToIfEq VAR_0x8005, 0x33C, _0154 - GoToIfEq VAR_0x8005, 0x33D, _0164 + GoToIfEq VAR_0x8005, 825, Route202_CounterpartWalkToPlayerZ825 + GoToIfEq VAR_0x8005, 826, Route202_CounterpartWalkToPlayerZ826 + GoToIfEq VAR_0x8005, 827, Route202_CounterpartWalkToPlayerZ827 + GoToIfEq VAR_0x8005, 828, Route202_CounterpartWalkToPlayerZ828 + GoToIfEq VAR_0x8005, 829, Route202_CounterpartWalkToPlayerZ829 End -_0124: - ApplyMovement 3, _03D4 +Route202_CounterpartWalkToPlayerZ825: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkToPlayerZ825 WaitMovement - GoTo _0174 + GoTo Route202_CheckStartCatchingTutorial -_0134: - ApplyMovement 3, _03E4 +Route202_CounterpartWalkToPlayerZ826: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkToPlayerZ826 WaitMovement - GoTo _0174 + GoTo Route202_CheckStartCatchingTutorial -_0144: - ApplyMovement 3, _03F4 +Route202_CounterpartWalkToPlayerZ827: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkToPlayerZ827 WaitMovement - GoTo _0174 + GoTo Route202_CheckStartCatchingTutorial -_0154: - ApplyMovement 3, _0400 +Route202_CounterpartWalkToPlayerZ828: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkToPlayerZ828 WaitMovement - GoTo _0174 + GoTo Route202_CheckStartCatchingTutorial -_0164: - ApplyMovement 3, _0410 +Route202_CounterpartWalkToPlayerZ829: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkToPlayerZ829 WaitMovement - GoTo _0174 + GoTo Route202_CheckStartCatchingTutorial -_0174: - GoToIfUnset FLAG_RECEIVED_PARCEL, _027C +Route202_CheckStartCatchingTutorial: + GoToIfUnset FLAG_RECEIVED_PARCEL, Route202_TellYourFamily GetPlayerGender VAR_RESULT - GoToIfEq VAR_RESULT, GENDER_MALE, _019F - GoToIfEq VAR_RESULT, GENDER_FEMALE, _01B2 + GoToIfEq VAR_RESULT, GENDER_MALE, Route202_DawnIHaventShownYouHowToCatchAPokemon + GoToIfEq VAR_RESULT, GENDER_FEMALE, Route202_LucasDoYouKnowHowToCatchAPokemon End -_019F: +Route202_DawnIHaventShownYouHowToCatchAPokemon: Common_SetCounterpartBGM BufferCounterpartName 0 BufferPlayerName 1 - Message 2 - GoTo _01C5 + Message Route202_Text_DawnIHaventShownYouHowToCatchAPokemon + GoTo Route202_DoCatchingTutorial -_01B2: +Route202_LucasDoYouKnowHowToCatchAPokemon: Common_SetCounterpartBGM BufferCounterpartName 0 BufferPlayerName 1 - Message 7 - GoTo _01C5 + Message Route202_Text_LucasDoYouKnowHowToCatchAPokemon + GoTo Route202_DoCatchingTutorial -_01C5: +Route202_DoCatchingTutorial: CloseMessage - ApplyMovement 3, _0488 - ApplyMovement LOCALID_PLAYER, _04BC + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkWestIntoTallGrass + ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerWalkWestIntoTallGrass WaitMovement StartCatchingTutorial - ApplyMovement 3, _0490 + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkOnSpotEastAfterCatchingTutorial WaitMovement GetPlayerGender VAR_RESULT - GoToIfEq VAR_RESULT, GENDER_MALE, _0205 - GoToIfEq VAR_RESULT, GENDER_FEMALE, _0211 + GoToIfEq VAR_RESULT, GENDER_MALE, Route202_DawnToGetYouStartedIllGiveYouFivePokeBalls + GoToIfEq VAR_RESULT, GENDER_FEMALE, Route202_LucasHereIllGiveYouFivePokeballsToGetYouStarted End -_0205: +Route202_DawnToGetYouStartedIllGiveYouFivePokeBalls: BufferPlayerName 0 - Message 3 - GoTo _021D + Message Route202_Text_DawnToGetYouStartedIllGiveYouFivePokeBalls + GoTo Route202_GivePokeballs -_0211: +Route202_LucasHereIllGiveYouFivePokeballsToGetYouStarted: BufferPlayerName 0 - Message 8 - GoTo _021D + Message Route202_Text_LucasHereIllGiveYouFivePokeballsToGetYouStarted + GoTo Route202_GivePokeballs -_021D: +Route202_GivePokeballs: SetVar VAR_0x8004, ITEM_POKE_BALL SetVar VAR_0x8005, 5 Common_GiveItemQuantity GetPlayerGender VAR_RESULT - GoToIfEq VAR_RESULT, GENDER_MALE, _024D - GoToIfEq VAR_RESULT, GENDER_FEMALE, _0259 + GoToIfEq VAR_RESULT, GENDER_MALE, Route202_DawnLeave + GoToIfEq VAR_RESULT, GENDER_FEMALE, Route202_LucasLeave End -_024D: +Route202_DawnLeave: BufferPlayerName 0 - Message 4 - GoTo _0262 + Message Route202_Text_DawnByeNow + GoTo Route202_CounterpartLeave -_0259: - Message 9 - GoTo _0262 +Route202_LucasLeave: + Message Route202_Text_LucasSeeYouAround + GoTo Route202_CounterpartLeave -_0262: +Route202_CounterpartLeave: CloseMessage - ApplyMovement 3, _0498 + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartLeaveCatchingTutorial WaitMovement - RemoveObject 3 - SetVar VAR_UNK_0x4087, 1 + RemoveObject LOCALID_COUNTERPART + SetVar VAR_ROUTE_202_STATE, 1 ReleaseAll End -_027C: +Route202_TellYourFamily: GetPlayerGender VAR_RESULT - GoToIfEq VAR_RESULT, GENDER_MALE, _029C - GoToIfEq VAR_RESULT, GENDER_FEMALE, _02C8 + GoToIfEq VAR_RESULT, GENDER_MALE, Route202_DawnTellYourFamily + GoToIfEq VAR_RESULT, GENDER_FEMALE, Route202_LucasTellYourFamily End -_029C: +Route202_DawnTellYourFamily: BufferCounterpartName 0 BufferPlayerName 1 - CallIfUnset FLAG_UNK_0x0115, _02BE - CallIfSet FLAG_UNK_0x0115, _02C3 - GoTo _02F4 + CallIfUnset FLAG_TALKED_TO_ROUTE_202_COUNTERPART, Route202_DawnDidYouTellYourFamily + CallIfSet FLAG_TALKED_TO_ROUTE_202_COUNTERPART, Route202_DawnYouShouldGoTellYourFamily + GoTo Route202_CloseMessageTellYourFamily -_02BE: - Message 0 +Route202_DawnDidYouTellYourFamily: + Message Route202_Text_DawnDidYouTellYourFamily Return -_02C3: - Message 1 +Route202_DawnYouShouldGoTellYourFamily: + Message Route202_Text_DawnYouShouldGoTellYourFamily Return -_02C8: +Route202_LucasTellYourFamily: BufferCounterpartName 0 BufferPlayerName 1 - CallIfUnset FLAG_UNK_0x0115, _02EA - CallIfSet FLAG_UNK_0x0115, _02EF - GoTo _02F4 + CallIfUnset FLAG_TALKED_TO_ROUTE_202_COUNTERPART, Route202_LucasDidYouTellYourFamily + CallIfSet FLAG_TALKED_TO_ROUTE_202_COUNTERPART, Route202_LucasWhyDontYouGoTellYourFamily + GoTo Route202_CloseMessageTellYourFamily -_02EA: - Message 5 +Route202_LucasDidYouTellYourFamily: + Message Route202_Text_LucasDidYouTellYourFamily Return -_02EF: - Message 6 +Route202_LucasWhyDontYouGoTellYourFamily: + Message Route202_Text_LucasWhyDontYouGoTellYourFamily Return -_02F4: +Route202_CloseMessageTellYourFamily: CloseMessage - GoToIfEq VAR_0x8005, 0x339, _0339 - GoToIfEq VAR_0x8005, 0x33A, _0351 - GoToIfEq VAR_0x8005, 0x33B, _0369 - GoToIfEq VAR_0x8005, 0x33C, _0381 - GoToIfEq VAR_0x8005, 0x33D, _0399 + GoToIfEq VAR_0x8005, 825, Route202_CounterpartWalkBackZ825 + GoToIfEq VAR_0x8005, 826, Route202_CounterpartWalkBackZ826 + GoToIfEq VAR_0x8005, 827, Route202_CounterpartWalkBackZ827 + GoToIfEq VAR_0x8005, 828, Route202_CounterpartWalkBackZ828 + GoToIfEq VAR_0x8005, 829, Route202_CounterpartWalkBackZ829 End -_0339: - ApplyMovement 3, _0420 - ApplyMovement LOCALID_PLAYER, _04AC +Route202_CounterpartWalkBackZ825: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartPushPlayerAndWalkBackZ825 + ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerStepBackEast WaitMovement - GoTo _03B1 + GoTo Route202_TellYourFamilyEnd -_0351: - ApplyMovement 3, _0434 - ApplyMovement LOCALID_PLAYER, _04AC +Route202_CounterpartWalkBackZ826: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartPushPlayerAndWalkBackZ826 + ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerStepBackEast WaitMovement - GoTo _03B1 + GoTo Route202_TellYourFamilyEnd -_0369: - ApplyMovement 3, _0448 - ApplyMovement LOCALID_PLAYER, _04AC +Route202_CounterpartWalkBackZ827: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartPushPlayerAndWalkBackZ827 + ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerStepBackEast WaitMovement - GoTo _03B1 + GoTo Route202_TellYourFamilyEnd -_0381: - ApplyMovement 3, _0458 - ApplyMovement LOCALID_PLAYER, _04AC +Route202_CounterpartWalkBackZ828: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartPushPlayerAndWalkBackZ828 + ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerStepBackEast WaitMovement - GoTo _03B1 + GoTo Route202_TellYourFamilyEnd -_0399: - ApplyMovement 3, _046C - ApplyMovement LOCALID_PLAYER, _04AC +Route202_CounterpartWalkBackZ829: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartPushPlayerAndWalkBackZ829 + ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerStepBackEast WaitMovement - GoTo _03B1 + GoTo Route202_TellYourFamilyEnd -_03B1: - ApplyMovement 3, _0480 +Route202_TellYourFamilyEnd: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkOnSpotEast WaitMovement - SetFlag FLAG_UNK_0x0115 + SetFlag FLAG_TALKED_TO_ROUTE_202_COUNTERPART ReleaseAll End .balign 4, 0 -_03C4: +Route202_Movement_CounterpartNoticePlayer: WalkOnSpotNormalEast EmoteExclamationMark Delay16 EndMovement .balign 4, 0 -_03D4: +Route202_Movement_CounterpartWalkToPlayerZ825: WalkNormalEast 4 WalkNormalNorth 2 WalkNormalEast EndMovement .balign 4, 0 -_03E4: +Route202_Movement_CounterpartWalkToPlayerZ826: WalkNormalEast 4 WalkNormalNorth WalkNormalEast EndMovement .balign 4, 0 -_03F4: +Route202_Movement_CounterpartWalkToPlayerZ827: WalkNormalEast 4 WalkNormalEast EndMovement .balign 4, 0 -_0400: +Route202_Movement_CounterpartWalkToPlayerZ828: WalkNormalEast 4 WalkNormalSouth WalkNormalEast EndMovement .balign 4, 0 -_0410: +Route202_Movement_CounterpartWalkToPlayerZ829: WalkNormalEast 4 WalkNormalSouth 2 WalkNormalEast EndMovement .balign 4, 0 -_0420: +Route202_Movement_CounterpartPushPlayerAndWalkBackZ825: WalkNormalEast WalkNormalWest 4 WalkNormalWest 2 @@ -295,7 +296,7 @@ _0420: EndMovement .balign 4, 0 -_0434: +Route202_Movement_CounterpartPushPlayerAndWalkBackZ826: WalkNormalEast WalkNormalWest 4 WalkNormalWest 2 @@ -303,14 +304,14 @@ _0434: EndMovement .balign 4, 0 -_0448: +Route202_Movement_CounterpartPushPlayerAndWalkBackZ827: WalkNormalEast WalkNormalWest 4 WalkNormalWest 2 EndMovement .balign 4, 0 -_0458: +Route202_Movement_CounterpartPushPlayerAndWalkBackZ828: WalkNormalEast WalkNormalWest 4 WalkNormalWest 2 @@ -318,7 +319,7 @@ _0458: EndMovement .balign 4, 0 -_046C: +Route202_Movement_CounterpartPushPlayerAndWalkBackZ829: WalkNormalEast WalkNormalWest 4 WalkNormalWest 2 @@ -326,179 +327,179 @@ _046C: EndMovement .balign 4, 0 -_0480: +Route202_Movement_CounterpartWalkOnSpotEast: WalkOnSpotNormalEast EndMovement .balign 4, 0 -_0488: +Route202_Movement_CounterpartWalkWestIntoTallGrass: WalkNormalWest 2 EndMovement .balign 4, 0 -_0490: +Route202_Movement_CounterpartWalkOnSpotEastAfterCatchingTutorial: WalkOnSpotNormalEast EndMovement .balign 4, 0 -_0498: +Route202_Movement_CounterpartLeaveCatchingTutorial: WalkNormalWest 12 EndMovement .balign 4, 0 -_04A0: +Route202_Movement_PlayerDelay: Delay8 FaceWest EndMovement .balign 4, 0 -_04AC: +Route202_Movement_PlayerStepBackEast: LockDir WalkNormalEast UnlockDir EndMovement .balign 4, 0 -_04BC: +Route202_Movement_PlayerWalkWestIntoTallGrass: WalkNormalWest 2 EndMovement -_04C4: +Route202_Counterpart: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer BufferPlayerName 0 GetPlayerDir VAR_0x8002 GetPlayerGender VAR_0x8000 - CallIfEq VAR_0x8000, GENDER_MALE, _0653 - CallIfEq VAR_0x8000, GENDER_FEMALE, _0658 + CallIfEq VAR_0x8000, GENDER_MALE, Route202_DawnLetMeShowYouHowThePokeRadarWorks + CallIfEq VAR_0x8000, GENDER_FEMALE, Route202_LucasLetMeExplainHowThePokeRadarWorks CloseMessage PlayMusic SEQ_POKERADAR - AddCameraOverrideObject 189, 0x332 + AddCameraOverrideObject 189, 818 ApplyFreeCameraMovement _06F8 WaitMovement RemoveCameraOverrideObject - ApplyMovement 3, _0690 - ApplyMovement LOCALID_PLAYER, _06D0 + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartFaceGrassPatchEast + ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerFaceGrassPatchEast WaitMovement WaitTime 15, VAR_RESULT - CallIfEq VAR_0x8000, 0, _065D - CallIfEq VAR_0x8000, 1, _0662 + CallIfEq VAR_0x8000, 0, Route202_DawnTheresAPokemonInThatPatchOfTallGrass + CallIfEq VAR_0x8000, 1, Route202_LucasTheresAPokemonInThatPatchOfTallGrass CloseMessage WaitTime 15, VAR_RESULT PlayDefaultMusic - CallIfEq VAR_0x8002, 0, _05D1 - CallIfEq VAR_0x8002, 1, _05E5 - CallIfEq VAR_0x8002, 2, _05F9 - CallIfEq VAR_0x8002, 3, _0605 - CallIfEq VAR_0x8000, 0, _0667 - CallIfEq VAR_0x8000, 1, _066C + CallIfEq VAR_0x8002, DIR_NORTH, Route202_PlayerCounterpartFaceEachOtherNorth + CallIfEq VAR_0x8002, DIR_SOUTH, Route202_PlayerCounterpartFaceEachOtherSouth + CallIfEq VAR_0x8002, DIR_WEST, Route202_PlayerCounterpartFaceEachOtherWest + CallIfEq VAR_0x8002, DIR_EAST, Route202_PlayerCounterpartFaceEachOtherEast + CallIfEq VAR_0x8000, GENDER_MALE, Route202_DawnNowThisIsWhereItGetsInteresting + CallIfEq VAR_0x8000, GENDER_FEMALE, Route202_LucasNowHeresTheStrangePart CloseMessage - CallIfEq VAR_0x8002, 0, _0611 - CallIfEq VAR_0x8002, 1, _061D - CallIfEq VAR_0x8002, 2, _0629 - CallIfEq VAR_0x8002, 3, _0635 - GoTo _0641 + CallIfEq VAR_0x8002, DIR_NORTH, Route202_CounterpartLeavePokeRadarNorth + CallIfEq VAR_0x8002, DIR_SOUTH, Route202_CounterpartLeavePokeRadarSouth + CallIfEq VAR_0x8002, DIR_WEST, Route202_CounterpartLeavePokeRadarWest + CallIfEq VAR_0x8002, DIR_EAST, Route202_CounterpartLeavePokeRadarEast + GoTo Route202_CounterpartPokeRadarEnd End -_05D1: - ApplyMovement 3, _0698 - ApplyMovement LOCALID_PLAYER, _06D8 +Route202_PlayerCounterpartFaceEachOtherNorth: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkOnSpotSouthToFacePlayer + ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerWalkOnSpotNorthToFaceCounterpart WaitMovement Return -_05E5: - ApplyMovement 3, _06A0 - ApplyMovement LOCALID_PLAYER, _06E0 +Route202_PlayerCounterpartFaceEachOtherSouth: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkOnSpotNorthToFacePlayer + ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerWalkOnSpotSouthToFaceCounterpart WaitMovement Return -_05F9: - ApplyMovement LOCALID_PLAYER, _06E8 +Route202_PlayerCounterpartFaceEachOtherWest: + ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerWalkOnSpotWestToFaceCounterpart WaitMovement Return -_0605: - ApplyMovement 3, _06B0 +Route202_PlayerCounterpartFaceEachOtherEast: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkOnSpotWestToFacePlayer WaitMovement Return -_0611: - ApplyMovement 3, _0674 +Route202_CounterpartLeavePokeRadarNorth: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartLeavePokeRadarNorth WaitMovement Return -_061D: - ApplyMovement 3, _0684 +Route202_CounterpartLeavePokeRadarSouth: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartLeavePokeRadarSouthWestEast WaitMovement Return -_0629: - ApplyMovement 3, _0684 +Route202_CounterpartLeavePokeRadarWest: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartLeavePokeRadarSouthWestEast WaitMovement Return -_0635: - ApplyMovement 3, _0684 +Route202_CounterpartLeavePokeRadarEast: + ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartLeavePokeRadarSouthWestEast WaitMovement Return -_0641: - RemoveObject 3 +Route202_CounterpartPokeRadarEnd: + RemoveObject LOCALID_COUNTERPART ClearFlag FLAG_HIDE_SANDGEM_TOWN_COUNTERPART - SetVar VAR_UNK_0x4087, 3 + SetVar VAR_ROUTE_202_STATE, 3 ReleaseAll End -_0653: - Message 14 +Route202_DawnLetMeShowYouHowThePokeRadarWorks: + Message Route202_Text_DawnLetMeShowYouHowThePokeRadarWorks Return -_0658: - Message 17 +Route202_LucasLetMeExplainHowThePokeRadarWorks: + Message Route202_Text_LucasLetMeExplainHowThePokeRadarWorks Return -_065D: - Message 15 +Route202_DawnTheresAPokemonInThatPatchOfTallGrass: + Message Route202_Text_DawnTheresAPokemonInThatPatchOfTallGrass Return -_0662: - Message 18 +Route202_LucasTheresAPokemonInThatPatchOfTallGrass: + Message Route202_Text_LucasTheresAPokemonInThatPatchOfTallGrass Return -_0667: - Message 16 +Route202_DawnNowThisIsWhereItGetsInteresting: + Message Route202_Text_DawnNowThisIsWhereItGetsInteresting Return -_066C: - Message 19 +Route202_LucasNowHeresTheStrangePart: + Message Route202_Text_LucasNowHeresTheStrangePart Return .balign 4, 0 -_0674: +Route202_Movement_CounterpartLeavePokeRadarNorth: WalkNormalWest WalkNormalSouth 3 WalkNormalWest 10 EndMovement .balign 4, 0 -_0684: +Route202_Movement_CounterpartLeavePokeRadarSouthWestEast: WalkNormalSouth 3 WalkNormalWest 10 EndMovement .balign 4, 0 -_0690: +Route202_Movement_CounterpartFaceGrassPatchEast: FaceEast EndMovement .balign 4, 0 -_0698: +Route202_Movement_CounterpartWalkOnSpotSouthToFacePlayer: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_06A0: +Route202_Movement_CounterpartWalkOnSpotNorthToFacePlayer: WalkOnSpotNormalNorth EndMovement @@ -507,7 +508,7 @@ Route202_UnusedMovement: EndMovement .balign 4, 0 -_06B0: +Route202_Movement_CounterpartWalkOnSpotWestToFacePlayer: WalkOnSpotNormalWest EndMovement @@ -522,22 +523,22 @@ Route202_UnusedMovement3: EndMovement .balign 4, 0 -_06D0: +Route202_Movement_PlayerFaceGrassPatchEast: FaceEast EndMovement .balign 4, 0 -_06D8: +Route202_Movement_PlayerWalkOnSpotNorthToFaceCounterpart: WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_06E0: +Route202_Movement_PlayerWalkOnSpotSouthToFaceCounterpart: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_06E8: +Route202_Movement_PlayerWalkOnSpotWestToFaceCounterpart: WalkOnSpotNormalWest EndMovement diff --git a/res/field/scripts/scripts_trainers_school.s b/res/field/scripts/scripts_trainers_school.s index e22afdc714..00b4f65ab1 100644 --- a/res/field/scripts/scripts_trainers_school.s +++ b/res/field/scripts/scripts_trainers_school.s @@ -69,10 +69,10 @@ _00F2: PlayFanfare SEQ_SE_DP_KAIDAN2 RemoveObject 1 WaitFanfare SEQ_SE_DP_KAIDAN2 - SetVar VAR_UNK_0x40E7, 1 - SetFlag FLAG_UNK_0x00F1 - ClearFlag FLAG_UNK_0x01F6 - ClearFlag FLAG_UNK_0x01F5 + SetVar VAR_POKETCH_CAMPAIGN_STATE, 1 + SetFlag FLAG_TALKED_TO_TRAINERS_SCHOOL_RIVAL + ClearFlag FLAG_HIDE_JUBILIFE_CITY_POKETCH_CO_PRESIDENT + ClearFlag FLAG_HIDE_JUBILIFE_CITY_CLOWNS_1_AND_2 ReleaseAll End diff --git a/res/field/scripts/scripts_unk_0397.s b/res/field/scripts/scripts_unk_0397.s index b7ff94df78..eac03669d8 100644 --- a/res/field/scripts/scripts_unk_0397.s +++ b/res/field/scripts/scripts_unk_0397.s @@ -42,7 +42,7 @@ _005C: _0078: SetFlag FLAG_HIDE_BLOCK_POKECENTER_BASEMENT - SetVar VAR_GTS_HAS_BADGES_CHECK_TEST, 1 + SetVar VAR_GTS_ACCESS_STATE, 1 SetVar VAR_UNK_0x40D4, 1 End diff --git a/res/field/scripts/scripts_unk_1051.s b/res/field/scripts/scripts_unk_1051.s index 166882c77a..0d811e566f 100644 --- a/res/field/scripts/scripts_unk_1051.s +++ b/res/field/scripts/scripts_unk_1051.s @@ -145,8 +145,8 @@ _029F: _02B1: RemoveObject 4 - ClearFlag FLAG_UNK_0x0188 - SetVar VAR_UNK_0x4087, 2 + ClearFlag FLAG_HIDE_ROUTE_202_COUNTERPART + SetVar VAR_ROUTE_202_STATE, 2 ReleaseAll End diff --git a/res/text/unk_0380.json b/res/text/hidden_items.json similarity index 100% rename from res/text/unk_0380.json rename to res/text/hidden_items.json diff --git a/res/text/jubilife_city.json b/res/text/jubilife_city.json index d42a02bfaa..95541ba1d6 100644 --- a/res/text/jubilife_city.json +++ b/res/text/jubilife_city.json @@ -2,14 +2,14 @@ "key": 18323, "messages": [ { - "id": "pl_msg_00000023_00000", + "id": "JubilifeCity_Text_DawnAreYouCatchingPokemon", "en_US": [ "Dawn: Hi, {STRVAR_1 3, 1, 0}!\n", "Are you catching Pokémon?\r" ] }, { - "id": "pl_msg_00000023_00001", + "id": "JubilifeCity_Text_DawnWowYouveAlreadyGotNumPokemonWithYou", "en_US": [ "Wow! You’ve already got {STRVAR_1 50, 0, 0} Pokémon\n", "with you!\r", @@ -18,7 +18,7 @@ ] }, { - "id": "pl_msg_00000023_00002", + "id": "JubilifeCity_Text_DawnIThinkYoudFeelALotSaferIfYouWereToCatchSomeMore", "en_US": [ "...Um...\r", "I think you’d feel a lot safer if you\n", @@ -28,7 +28,7 @@ ] }, { - "id": "pl_msg_00000023_00003", + "id": "JubilifeCity_Text_DawnFollowMe", "en_US": [ "Oh, I know! Don’t you think it’s\n", "better to know more about Pokémon?\r", @@ -39,21 +39,21 @@ ] }, { - "id": "pl_msg_00000023_00004", + "id": "JubilifeCity_Text_LucasHowManyPokemonhaveYouCaught", "en_US": [ "Lucas: Hey, {STRVAR_1 3, 1, 0}!\n", "How many Pokémon have you caught?\r" ] }, { - "id": "pl_msg_00000023_00005", + "id": "JubilifeCity_Text_LucasWhoaYouAlreadyHaveNumPokemonWithYou", "en_US": [ "Whoa! You already have {STRVAR_1 50, 0, 0} Pokémon\n", "with you!\r" ] }, { - "id": "pl_msg_00000023_00006", + "id": "JubilifeCity_Text_LucasIThinkYouShouldCatchSomeMore", "en_US": [ "Huh?\n", "I think you should catch some more.\r", @@ -64,7 +64,7 @@ ] }, { - "id": "pl_msg_00000023_00007", + "id": "JubilifeCity_Text_LucasFollowMe", "en_US": [ "Hey, that’s right! Don’t you think it’s\n", "better to know more about Pokémon?\r", @@ -75,33 +75,33 @@ ] }, { - "id": "pl_msg_00000023_00008", + "id": "JubilifeCity_Text_DawnThatManWhatIsHeDoing", "en_US": [ "Dawn: That man...\n", "What is he doing?\r" ] }, { - "id": "pl_msg_00000023_00009", + "id": "JubilifeCity_Text_DawnUm", "en_US": "Dawn: Um..." }, { - "id": "pl_msg_00000023_00010", + "id": "JubilifeCity_Text_LucasThatGuyWhatsHeDoing", "en_US": [ "Lucas: That guy...\n", "What’s he doing?\r" ] }, { - "id": "pl_msg_00000023_00011", + "id": "JubilifeCity_Text_LucasUhExcuse", "en_US": "Lucas: Uh, excuse..." }, { - "id": "pl_msg_00000023_00012", + "id": "JubilifeCity_Text_WHAAAT", "en_US": "WHAAAT?!\r" }, { - "id": "pl_msg_00000023_00013", + "id": "JubilifeCity_Text_HowDidYouUnmaskMe", "en_US": [ "Mysterious man: ...How did you know?\r", "How did you unmask me as a member of\n", @@ -109,21 +109,21 @@ ] }, { - "id": "pl_msg_00000023_00014", + "id": "JubilifeCity_Text_DawnIWasJustMakingConversation", "en_US": [ "Dawn: Huh? What? I beg your pardon?\n", "I was just making conversation...\r" ] }, { - "id": "pl_msg_00000023_00015", + "id": "JubilifeCity_Text_LucasIWasJustMakingSmallTalk", "en_US": [ "Lucas: Huh? What? Are you kidding?\n", "I was just making small talk...\r" ] }, { - "id": "pl_msg_00000023_00016", + "id": "JubilifeCity_Text_IKnowBetterNotToBelieveThat", "en_US": [ "Shady man: ...Heh. You claim you were\n", "only making conversation, do you?\r", @@ -137,7 +137,7 @@ ] }, { - "id": "pl_msg_00000023_00017", + "id": "JubilifeCity_Text_IsTheSayingDontBeAThiefFamiliarToYou", "en_US": [ "Now that my cover has been blown, let\n", "me introduce myself.\r", @@ -152,14 +152,14 @@ ] }, { - "id": "pl_msg_00000023_00018", + "id": "JubilifeCity_Text_TakingWhatBelongsToOthersIsWrong", "en_US": [ "Looker: Yes, that is correct.\n", "Taking what belongs to others is wrong.\r" ] }, { - "id": "pl_msg_00000023_00019", + "id": "JubilifeCity_Text_YouClaimToNotKnowIt", "en_US": [ "Looker: No? You claim to not know it?\n", "How could that be?\r", @@ -170,7 +170,7 @@ ] }, { - "id": "pl_msg_00000023_00020", + "id": "JubilifeCity_Text_PerhapsYouCanMakeUseOfThis", "en_US": [ "Unfortunately, there are apparently\n", "those who do not heed those words.\r", @@ -183,7 +183,7 @@ ] }, { - "id": "pl_msg_00000023_00021", + "id": "JubilifeCity_Text_ThatVsRecorderItIsANiftyDeviceForRecordingAMatch", "en_US": [ "That Vs. Recorder, it is a nifty device\n", "for recording a match.\r", @@ -195,7 +195,7 @@ ] }, { - "id": "pl_msg_00000023_00022", + "id": "JubilifeCity_Text_YouMustInformMeOfAnyHappenings", "en_US": [ "Looker: Also, I have a request.\r", "If you were to see me again, I ask that\n", @@ -208,14 +208,14 @@ ] }, { - "id": "pl_msg_00000023_00023", + "id": "JubilifeCity_Text_DawnWorkingForTheInternationPoliceMustBeHard", "en_US": [ "Dawn: ...Working for the International\n", "Police must be hard.\r" ] }, { - "id": "pl_msg_00000023_00024", + "id": "JubilifeCity_Text_DawnHereItIsItsTheTrainersSchool", "en_US": [ "{STRVAR_1 3, 0, 0}, here it is.\n", "It’s the Trainers’ School.\f", @@ -223,7 +223,7 @@ ] }, { - "id": "pl_msg_00000023_00025", + "id": "JubilifeCity_Text_DawnISawYourFriendRivalGoInEarlier", "en_US": [ "I saw your friend {STRVAR_1 3, 1, 0} go in\n", "earlier.\r", @@ -232,14 +232,14 @@ ] }, { - "id": "pl_msg_00000023_00026", + "id": "JubilifeCity_Text_LucasWorkingForTheInternationPoliceSoundsHard", "en_US": [ "Lucas: ...Working for the International\n", "Police sounds hard.\r" ] }, { - "id": "pl_msg_00000023_00027", + "id": "JubilifeCity_Text_LucasHereWeAreThisIsTheTrainersSchool", "en_US": [ "{STRVAR_1 3, 0, 0}, here we are.\n", "This is the Trainers’ School.\f", @@ -247,7 +247,7 @@ ] }, { - "id": "pl_msg_00000023_00028", + "id": "JubilifeCity_Text_LucasYourPalRivalWentInEarier", "en_US": [ "Your pal {STRVAR_1 3, 1, 0} went in earlier.\n", "He might still be studying in there.\r", @@ -255,7 +255,7 @@ ] }, { - "id": "pl_msg_00000023_00029", + "id": "JubilifeCity_Text_JubilifeCitysBuiltOnLandTheyCarvedOutOfAMountain", "en_US": [ "Jubilife City’s built on land they\n", "carved out of a mountain.\r", @@ -264,7 +264,7 @@ ] }, { - "id": "pl_msg_00000023_00030", + "id": "JubilifeCity_Text_HaveYouPaidAVisitToTheTVStation", "en_US": [ "Hello! Let me ask you, have you paid\n", "a visit to the TV station?\r", @@ -277,7 +277,7 @@ ] }, { - "id": "pl_msg_00000023_00031", + "id": "JubilifeCity_Text_ItIsYouHaveYouVisitedTheTrainersSchool", "en_US": [ "Ah, it is you! Have no fear.\n", "There are no shady characters about.\r", @@ -288,7 +288,7 @@ ] }, { - "id": "pl_msg_00000023_00032", + "id": "JubilifeCity_Text_HelloMyFriendHaveYouVisitedTheTrainersSchool", "en_US": [ "Looker: Hello, my friend.\n", "Have you visited the Trainers’ School?\r", @@ -297,7 +297,7 @@ ] }, { - "id": "pl_msg_00000023_00033", + "id": "JubilifeCity_Text_ItIsYouHaveYouNotObtainedAPoketch", "en_US": [ "Ah, it is you! Have no fear.\n", "There are no shady characters about.\r", @@ -308,7 +308,7 @@ ] }, { - "id": "pl_msg_00000023_00034", + "id": "JubilifeCity_Text_TellMeHaveYouNotObtainedAPoketch", "en_US": [ "Looker: Tell me, have you not obtained\n", "a Pokétch?\r", @@ -317,7 +317,7 @@ ] }, { - "id": "pl_msg_00000023_00035", + "id": "JubilifeCity_Text_ItIsYouHaveYouNotObtainedAGymBadge", "en_US": [ "Ah, it is you! Have no fear.\n", "There are no shady characters about.\r", @@ -328,7 +328,7 @@ ] }, { - "id": "pl_msg_00000023_00036", + "id": "JubilifeCity_Text_TellMeHaveYouNotObtainedAPalPad", "en_US": [ "Looker: Tell me, have you not obtained\n", "a Pal Pad?\r", @@ -337,7 +337,7 @@ ] }, { - "id": "pl_msg_00000023_00037", + "id": "JubilifeCity_Text_ISeeThatYouHaveObtainedItAPalPadForYourself", "en_US": [ "Ah, yes. I see that you have obtained\n", "it, a Pal Pad for yourself.\r", @@ -351,7 +351,7 @@ ] }, { - "id": "pl_msg_00000023_00038", + "id": "JubilifeCity_Text_IShallTakeMyInvestigationElsewhere", "en_US": [ "Anyway, there appears to be no one\n", "shady in this Jubilife City.\r", @@ -362,7 +362,7 @@ ] }, { - "id": "pl_msg_00000023_00039", + "id": "JubilifeCity_Text_YouCallYourselfAPokemonTrainerAndYetYouHaveNoPoketch", "en_US": [ "Oh, oh, oh?\r", "You call yourself a Pokémon Trainer?\n", @@ -374,7 +374,7 @@ ] }, { - "id": "pl_msg_00000023_00040", + "id": "JubilifeCity_Text_AllYouHaveToDoIsFindThreeClownsInJubilifeCity", "en_US": [ "You see, I invented, and now\n", "manufacture, Pokétches.\r", @@ -387,7 +387,7 @@ ] }, { - "id": "pl_msg_00000023_00041", + "id": "JubilifeCity_Text_CollectACouponFromEachClownThenComeSeeMeOK", "en_US": [ "The three clowns will each ask you\n", "a skill-testing question.\r", @@ -400,7 +400,7 @@ ] }, { - "id": "pl_msg_00000023_00042", + "id": "JubilifeCity_Text_InReturnForTheseCouponsIPresentYouThisPokemonWatch", "en_US": [ "OK, let me count your Coupons!\n", "I’ll use the Pokétch here...\r", @@ -412,11 +412,11 @@ ] }, { - "id": "pl_msg_00000023_00043", + "id": "JubilifeCity_Text_PlayerReceivedAPoketch", "en_US": "{STRVAR_1 3, 0, 0} received a {COLOR 1}Pokétch{COLOR 0}!{YESNO 1}" }, { - "id": "pl_msg_00000023_00044", + "id": "JubilifeCity_Text_YouCanAddAppsToYourPoketch", "en_US": [ "You can add apps to your Pokétch\n", "to make it even more versatile!\r", @@ -425,7 +425,7 @@ ] }, { - "id": "pl_msg_00000023_00045", + "id": "JubilifeCity_Text_DoesAPokemonGrowByDefeatingOthersAndGainingExpPoints", "en_US": [ "Hi! I’m a Pokétch campaign clown!\n", "Let’s roll out my question!\r", @@ -434,21 +434,21 @@ ] }, { - "id": "pl_msg_00000023_00046", + "id": "JubilifeCity_Text_DingDingYoureAbsolutelyCorrect1", "en_US": [ "Ding-ding!\n", "You’re absolutely correct!\r" ] }, { - "id": "pl_msg_00000023_00047", + "id": "JubilifeCity_Text_BzzzztThatsTheWrongAnswer1", "en_US": [ "Bzzzzt!\n", "That’s the wrong answer..." ] }, { - "id": "pl_msg_00000023_00048", + "id": "JubilifeCity_Text_PokemonGrowStrongerByDefeatingOtherPokemonInBattle", "en_US": [ "Pokémon grow stronger by defeating\n", "other Pokémon in battle.\r", @@ -458,14 +458,14 @@ ] }, { - "id": "pl_msg_00000023_00049", + "id": "JubilifeCity_Text_HereYouGoYourPoketchCoupon1", "en_US": [ "Here you go!\n", "Your Pokétch Coupon!\r" ] }, { - "id": "pl_msg_00000023_00050", + "id": "JubilifeCity_Text_PokemonGrowStrongerThroughBattling", "en_US": [ "Pokémon grow stronger through\n", "battling.\r", @@ -475,7 +475,7 @@ ] }, { - "id": "pl_msg_00000023_00051", + "id": "JubilifeCity_Text_AskJustLikePokemonTypesTheMovesOfPokemonAlsoHaveTypes", "en_US": [ "Hi! I’m a Pokétch campaign clown!\n", "Let’s roll out my question!\r", @@ -484,21 +484,21 @@ ] }, { - "id": "pl_msg_00000023_00052", + "id": "JubilifeCity_Text_DingDingYoureAbsolutelyCorrect2", "en_US": [ "Ding-ding!\n", "You’re absolutely correct!\r" ] }, { - "id": "pl_msg_00000023_00053", + "id": "JubilifeCity_Text_BzzzztThatsTheWrongAnswer2", "en_US": [ "Bzzzzt!\n", "That’s the wrong answer..." ] }, { - "id": "pl_msg_00000023_00054", + "id": "JubilifeCity_Text_IfThePokemonsTypeMatchesItsMovesTypeThatMoveIsMadeMuchMorePowerful", "en_US": [ "If the Pokémon’s type matches its\n", "move’s type, that move is made much\f", @@ -506,14 +506,14 @@ ] }, { - "id": "pl_msg_00000023_00055", + "id": "JubilifeCity_Text_HereYouGoYourPoketchCoupon2", "en_US": [ "Here you go!\n", "Your Pokétch Coupon!\r" ] }, { - "id": "pl_msg_00000023_00056", + "id": "JubilifeCity_Text_IfThePokemonsTypeMatchesItsMovesTypeThatMoveIsMadeMuchMorePowerful2", "en_US": [ "If the Pokémon’s type matches its\n", "move’s type, that move is made much\f", @@ -521,7 +521,7 @@ ] }, { - "id": "pl_msg_00000023_00057", + "id": "JubilifeCity_Text_CanAPokemonHoldAnItem", "en_US": [ "Hi! I’m a Pokétch campaign clown!\n", "Let’s roll out my question!\r", @@ -529,21 +529,21 @@ ] }, { - "id": "pl_msg_00000023_00058", + "id": "JubilifeCity_Text_DingDingYoureAbsolutelyCorrect3", "en_US": [ "Ding-ding!\n", "You’re absolutely correct!\r" ] }, { - "id": "pl_msg_00000023_00059", + "id": "JubilifeCity_Text_BzzzztThatsTheWrongAnswer3", "en_US": [ "Bzzzzt!\n", "That’s the wrong answer..." ] }, { - "id": "pl_msg_00000023_00060", + "id": "JubilifeCity_Text_APokemonMayHoldASingleItem", "en_US": [ "A Pokémon may hold a single item.\r", "Some items become effective as soon\n", @@ -553,14 +553,14 @@ ] }, { - "id": "pl_msg_00000023_00061", + "id": "JubilifeCity_Text_HereYouGoYourPoketchCoupon3", "en_US": [ "Here you go!\n", "Your Pokétch Coupon!\r" ] }, { - "id": "pl_msg_00000023_00062", + "id": "JubilifeCity_Text_YouShouldStickAround", "en_US": [ "Hi, there. You should stick around.\n", "We’re doing a Pokétch campaign soon.\r", @@ -569,7 +569,7 @@ ] }, { - "id": "pl_msg_00000023_00063", + "id": "JubilifeCity_Text_APokemonMayHoldASingleItem2", "en_US": [ "A Pokémon may hold a single item.\r", "Some items become effective as soon\n", @@ -579,7 +579,7 @@ ] }, { - "id": "pl_msg_00000023_00064", + "id": "JubilifeCity_Text_HandOverAllYourResearchFindings", "en_US": [ "Mystery man: Now, now, now, now, now!\n", "Professor Rowan, you must comply.\r", @@ -590,7 +590,7 @@ ] }, { - "id": "pl_msg_00000023_00065", + "id": "JubilifeCity_Text_ThatsOreburghsGymBadgeISee", "en_US": [ "Rowan: Ah, {STRVAR_1 3, 0, 0}.\n", "Well? How is the Pokédex progressing?\r", @@ -603,7 +603,7 @@ ] }, { - "id": "pl_msg_00000023_00066", + "id": "JubilifeCity_Text_OhProfessorOfRowanMustYouBeSoDifficult", "en_US": [ "Mystery man: Oh, professor of Pokémon,\n", "must you be so difficult?\r", @@ -614,7 +614,7 @@ ] }, { - "id": "pl_msg_00000023_00067", + "id": "JubilifeCity_Text_WhyMustYouBeSuchANuisance", "en_US": [ "Rowan: Quiet, you lot!\n", "Why must you be such a nuisance?\r", @@ -633,7 +633,7 @@ ] }, { - "id": "pl_msg_00000023_00068", + "id": "JubilifeCity_Text_MyGoodnessYouCallYourselvesAdults", "en_US": [ "My goodness...\n", "You call yourselves adults?\r", @@ -642,7 +642,7 @@ ] }, { - "id": "pl_msg_00000023_00069", + "id": "JubilifeCity_Text_WeWillMakeYouRegretInsultingTeamGalactic", "en_US": [ "Mystery man: Eeeeeh!\n", "You had to make this personal!\r", @@ -653,28 +653,28 @@ ] }, { - "id": "pl_msg_00000023_00070", + "id": "JubilifeCity_Text_YouKidsGiveTheseThugsALessonInCivilityPlease", "en_US": [ "Rowan: You kids, give these thugs a\n", "lesson in civility, please.\r" ] }, { - "id": "pl_msg_00000023_00071", + "id": "JubilifeCity_Text_DawnPlayerLetsBattleTogether", "en_US": [ "Dawn: {STRVAR_1 3, 1, 0}!\n", "Let’s battle together!\r" ] }, { - "id": "pl_msg_00000023_00072", + "id": "JubilifeCity_Text_LucasPlayerJoinMeAndBattleTheseGuys", "en_US": [ "Lucas: {STRVAR_1 3, 1, 0}!\n", "Join me and battle these guys!\r" ] }, { - "id": "pl_msg_00000023_00073", + "id": "JubilifeCity_Text_WeWillRetreatForNow", "en_US": [ "Grunt 1: You leave us no option.\n", "We will retreat for now.\r", @@ -683,7 +683,7 @@ ] }, { - "id": "pl_msg_00000023_00074", + "id": "JubilifeCity_Text_ThatLotTheyCalledThemselvesTeamGalactic", "en_US": [ "Rowan: That lot...\n", "They called themselves Team Galactic.\r", @@ -698,7 +698,7 @@ ] }, { - "id": "pl_msg_00000023_00075", + "id": "JubilifeCity_Text_DawnTheProfessorStudiesTheEvolutionOfPokemonToo", "en_US": [ "Dawn: {STRVAR_1 3, 1, 0}, did you know?\r", "The professor studies the evolution\n", @@ -712,7 +712,7 @@ ] }, { - "id": "pl_msg_00000023_00076", + "id": "JubilifeCity_Text_LucasTheProfessorStudiesTheEvolutionOfPokemonToo", "en_US": [ "Lucas: {STRVAR_1 3, 1, 0}, did you know\n", "about this?\r", @@ -727,7 +727,7 @@ ] }, { - "id": "pl_msg_00000023_00077", + "id": "JubilifeCity_Text_WhyDontYouCollectAllTheGymBadgesOfSinnoh", "en_US": [ "Rowan: It’s all over, so you can \n", "relax now.\r", @@ -750,7 +750,7 @@ ] }, { - "id": "pl_msg_00000023_00078", + "id": "JubilifeCity_Text_OhThatWasVeryGood", "en_US": [ "Oh, that was very good!\n", "Nicely done! Truly excellent!\r", @@ -761,7 +761,7 @@ ] }, { - "id": "pl_msg_00000023_00079", + "id": "JubilifeCity_Text_DressUpYourPokemonAndWatchTheirAppealGrow", "en_US": [ "Contained within that Fashion Case...\r", "You will find a whole spectrum of chic\n", @@ -776,7 +776,7 @@ ] }, { - "id": "pl_msg_00000023_00080", + "id": "JubilifeCity_Text_CanYouTellMeWhatTypeOfPokemonYouLike", "en_US": [ "The way you look...\n", "You’re obviously a Trainer!\r", @@ -785,7 +785,7 @@ ] }, { - "id": "pl_msg_00000023_00081", + "id": "JubilifeCity_Text_TheFireTypeYouMustHaveAFieryPersonality", "en_US": [ "The Fire type?\n", "You must have a fiery personality.\r", @@ -794,7 +794,7 @@ ] }, { - "id": "pl_msg_00000023_00082", + "id": "JubilifeCity_Text_APersonThatLikesTheWaterTypeMustBeSomewhatCool", "en_US": [ "A person that likes the Water type\n", "must be somewhat cool.\r", @@ -803,7 +803,7 @@ ] }, { - "id": "pl_msg_00000023_00083", + "id": "JubilifeCity_Text_YouChoseTheGrassTypeNoWonderYouLookSoCalm", "en_US": [ "You chose the Grass type?\n", "No wonder you look so calm.\r", @@ -812,21 +812,21 @@ ] }, { - "id": "pl_msg_00000023_00084", + "id": "JubilifeCity_Text_DidYouSeeMeOnTV", "en_US": [ "Did you see me on TV?\n", "I was in an interview!" ] }, { - "id": "pl_msg_00000023_00085", + "id": "JubilifeCity_Text_WhenYouWalkWithYourPokemonTheyGraduallyGrowFriendlier", "en_US": [ "When you walk with your Pokémon,\n", "they gradually grow friendlier." ] }, { - "id": "pl_msg_00000023_00086", + "id": "JubilifeCity_Text_AtMostYouCanHaveSixPokemonWithYou", "en_US": [ "OK, set six Poké Balls in my\n", "belt...\r", @@ -835,7 +835,7 @@ ] }, { - "id": "pl_msg_00000023_00087", + "id": "JubilifeCity_Text_HiyaWheredYouComeFrom", "en_US": [ "Hiya, where’d you come from?\r", "...\r", @@ -846,14 +846,14 @@ ] }, { - "id": "pl_msg_00000023_00088", + "id": "JubilifeCity_Text_HelloTrainerDoYouKnowMuchAboutPokemon", "en_US": [ "Hello, Trainer!\n", "Do you know much about Pokémon?" ] }, { - "id": "pl_msg_00000023_00089", + "id": "JubilifeCity_Text_AhISeeYouAreKnowledgeable", "en_US": [ "Ah, I see!\n", "You are knowledgeable!\r", @@ -864,7 +864,7 @@ ] }, { - "id": "pl_msg_00000023_00090", + "id": "JubilifeCity_Text_OhYoureNotKnowledgeable", "en_US": [ "Oh, you’re not knowledgeable...\n", "But not to worry!\f", @@ -874,7 +874,7 @@ ] }, { - "id": "pl_msg_00000023_00091", + "id": "JubilifeCity_Text_TheGlobalTerminalIsOffLimitsIfYouDontHaveAGymBadge", "en_US": [ "Past here is the Global Terminal, your\n", "gateway to the world!\r", @@ -885,7 +885,7 @@ ] }, { - "id": "pl_msg_00000023_00092", + "id": "JubilifeCity_Text_PastHereIsTheGlobalTerminal", "en_US": [ "Past here is the Global Terminal.\n", "It lets you trade with the whole world!\r", @@ -895,11 +895,11 @@ ] }, { - "id": "pl_msg_00000023_00093", + "id": "JubilifeCity_Text_ImTradingPokemonWithMyBuddy", "en_US": "I’m trading Pokémon with my buddy!" }, { - "id": "pl_msg_00000023_00094", + "id": "JubilifeCity_TextIMadeMyPokemonHoldAnItemBeforeTradingIt", "en_US": [ "I made my Pokémon hold an item before\n", "trading it.\r", @@ -908,42 +908,42 @@ ] }, { - "id": "pl_msg_00000023_00095", + "id": "JubilifeCity_Text_MapSign", "en_US": [ "Jubilife City\n", "City of Joy" ] }, { - "id": "pl_msg_00000023_00096", + "id": "JubilifeCity_Text_JubilifeCondominiumsTenantsWanted", "en_US": [ "Jubilife Condominiums\n", "Tenants Wanted!" ] }, { - "id": "pl_msg_00000023_00097", + "id": "JubilifeCity_Text_ThePoketchCompanyPokemonWatchesForTheWorld", "en_US": [ "The Pokétch Company\n", "Pokémon Watches for the World!" ] }, { - "id": "pl_msg_00000023_00098", + "id": "JubilifeCity_Text_TrainersSchoolTheFirstStepForTrainers", "en_US": [ "Trainers’ School\n", "The First Step for Trainers!" ] }, { - "id": "pl_msg_00000023_00099", + "id": "JubilifeCity_Text_JubilifeTVTheFunAndGamesTVStation", "en_US": [ "Jubilife TV\n", "The Fun-and-Games TV Station!" ] }, { - "id": "pl_msg_00000023_00100", + "id": "JubilifeCity_Text_TheGlobalTerminalYourGatewayToTheWholeWorld", "en_US": [ "The Global Terminal\n", "Your Gateway to the Whole World!" diff --git a/res/text/menu_entries.json b/res/text/menu_entries.json index 8ccaf77922..b903d09817 100644 --- a/res/text/menu_entries.json +++ b/res/text/menu_entries.json @@ -182,15 +182,15 @@ "en_US": "CANCEL" }, { - "id": "pl_msg_00000361_00045", + "id": "MenuEntries_Text_TypePreferenceFire", "en_US": "FIRE" }, { - "id": "pl_msg_00000361_00046", + "id": "MenuEntries_Text_TypePreferenceWater", "en_US": "WATER" }, { - "id": "pl_msg_00000361_00047", + "id": "MenuEntries_Text_TypePreferenceGrass", "en_US": "GRASS" }, { diff --git a/res/text/unk_0369.json b/res/text/pokeball_items.json similarity index 100% rename from res/text/unk_0369.json rename to res/text/pokeball_items.json diff --git a/res/text/route_202.json b/res/text/route_202.json index 7d0952b332..d5fdc8ba7e 100644 --- a/res/text/route_202.json +++ b/res/text/route_202.json @@ -2,7 +2,7 @@ "key": 40592, "messages": [ { - "id": "pl_msg_00000467_00000", + "id": "Route202_Text_DawnDidYouTellYourFamily", "en_US": [ "Dawn: {STRVAR_1 3, 1, 0}?!\r", "Did you tell your family that you’re\n", @@ -15,7 +15,7 @@ ] }, { - "id": "pl_msg_00000467_00001", + "id": "Route202_Text_DawnYouShouldGoTellYourFamily", "en_US": [ "Dawn: You should go tell your family\n", "that you’re helping the professor.\r", @@ -23,7 +23,7 @@ ] }, { - "id": "pl_msg_00000467_00002", + "id": "Route202_Text_DawnIHaventShownYouHowToCatchAPokemon", "en_US": [ "Dawn: Oh, that’s right!\r", "{STRVAR_1 3, 1, 0}, I haven’t shown you\n", @@ -33,7 +33,7 @@ ] }, { - "id": "pl_msg_00000467_00003", + "id": "Route202_Text_DawnToGetYouStartedIllGiveYouFivePokeBalls", "en_US": [ "Dawn: Giggle...\n", "See? Isn’t it neat?\r", @@ -52,7 +52,7 @@ ] }, { - "id": "pl_msg_00000467_00004", + "id": "Route202_Text_DawnByeNow", "en_US": [ "If you have lots of Pokémon with you,\n", "it will be safer on long trips.\r", @@ -63,7 +63,7 @@ ] }, { - "id": "pl_msg_00000467_00005", + "id": "Route202_Text_LucasDidYouTellYourFamily", "en_US": [ "Lucas: {STRVAR_1 3, 1, 0}?!\r", "Did you tell your family that you’re\n", @@ -76,7 +76,7 @@ ] }, { - "id": "pl_msg_00000467_00006", + "id": "Route202_Text_LucasWhyDontYouGoTellYourFamily", "en_US": [ "Lucas: Why don’t you go tell your\n", "family that the professor asked for\f", @@ -85,7 +85,7 @@ ] }, { - "id": "pl_msg_00000467_00007", + "id": "Route202_Text_LucasDoYouKnowHowToCatchAPokemon", "en_US": [ "Lucas: {STRVAR_1 3, 1, 0}, do you know\n", "how to catch a Pokémon?\r", @@ -94,7 +94,7 @@ ] }, { - "id": "pl_msg_00000467_00008", + "id": "Route202_Text_LucasHereIllGiveYouFivePokeballsToGetYouStarted", "en_US": [ "Lucas: And that’s how it’s done.\r", "Actually, I should have lowered the\n", @@ -111,7 +111,7 @@ ] }, { - "id": "pl_msg_00000467_00009", + "id": "Route202_Text_LucasSeeYouAround", "en_US": [ "If you have lots of Pokémon with you,\n", "you’ll be able to travel farther.\r", @@ -121,7 +121,7 @@ ] }, { - "id": "pl_msg_00000467_00010", + "id": "Route202_Text_SomePokemonOnlyAppearInTheMorning", "en_US": [ "Some Pokémon only appear in the\n", "morning.\r", @@ -131,21 +131,21 @@ ] }, { - "id": "pl_msg_00000467_00011", + "id": "Route202_Text_Rt202SandgemTown", "en_US": [ "Rt. 202\n", "Sandgem Town" ] }, { - "id": "pl_msg_00000467_00012", + "id": "Route202_Text_Rt202JubilifeCity", "en_US": [ "Rt. 202\n", "Jubilife City" ] }, { - "id": "pl_msg_00000467_00013", + "id": "Route202_Text_TrainerTipsPokemonInvolvedInBattleEarnExpPoints", "en_US": [ "Trainer Tips!\r", "All Pokémon that are involved in\n", @@ -155,7 +155,7 @@ ] }, { - "id": "pl_msg_00000467_00014", + "id": "Route202_Text_DawnLetMeShowYouHowThePokeRadarWorks", "en_US": [ "Dawn: Hi, {STRVAR_1 3, 0, 0}!\n", "I was waiting for you.\r", @@ -166,7 +166,7 @@ ] }, { - "id": "pl_msg_00000467_00015", + "id": "Route202_Text_DawnTheresAPokemonInThatPatchOfTallGrass", "en_US": [ "Dawn: See?\n", "Did you notice the tall grass rustling?\r", @@ -177,7 +177,7 @@ ] }, { - "id": "pl_msg_00000467_00016", + "id": "Route202_Text_DawnNowThisIsWhereItGetsInteresting", "en_US": [ "Now, this is where it gets interesting.\r", "If you see another patch of rustling\n", @@ -190,7 +190,7 @@ ] }, { - "id": "pl_msg_00000467_00017", + "id": "Route202_Text_LucasLetMeExplainHowThePokeRadarWorks", "en_US": [ "Lucas: {STRVAR_1 3, 0, 0}.\r", "Let me explain how the Poké Radar\n", @@ -200,7 +200,7 @@ ] }, { - "id": "pl_msg_00000467_00018", + "id": "Route202_Text_LucasTheresAPokemonInThatPatchOfTallGrass", "en_US": [ "Lucas: There!\n", "Did you see the tall grass rustling?\r", @@ -211,7 +211,7 @@ ] }, { - "id": "pl_msg_00000467_00019", + "id": "Route202_Text_LucasNowHeresTheStrangePart", "en_US": [ "Now, here’s the strange part.\r", "If you see another patch of rustling\n", diff --git a/src/scrcmd.c b/src/scrcmd.c index b672171a7e..33355b9e51 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -567,7 +567,7 @@ static BOOL ScrCmd_Unused_1CE(ScriptContext *ctx); static BOOL ScrCmd_AddAccessory(ScriptContext *ctx); static BOOL ScrCmd_CanFitAccessory(ScriptContext *ctx); static BOOL ScrCmd_Unused_1D4(ScriptContext *ctx); -static BOOL ScrCmd_ObtainContestBackdrop(ScriptContext *ctx); +static BOOL ScrCmd_AddContestBackdrop(ScriptContext *ctx); static BOOL ScrCmd_CheckBackdrop(ScriptContext *ctx); static BOOL ScrCmd_OpenPartyMenuForUnionRoomBattle(ScriptContext *ctx); static BOOL ScrCmd_OpenPartyMenuForContest(ScriptContext *ctx); @@ -1237,7 +1237,7 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_AddAccessory, ScrCmd_CanFitAccessory, ScrCmd_Unused_1D4, - ScrCmd_ObtainContestBackdrop, + ScrCmd_AddContestBackdrop, ScrCmd_CheckBackdrop, ScrCmd_1D7, ScrCmd_1D8, @@ -5966,7 +5966,7 @@ static BOOL ScrCmd_Unused_1D4(ScriptContext *ctx) return FALSE; } -static BOOL ScrCmd_ObtainContestBackdrop(ScriptContext *ctx) +static BOOL ScrCmd_AddContestBackdrop(ScriptContext *ctx) { u16 backdropID = ScriptContext_GetVar(ctx); diff --git a/src/script_manager.c b/src/script_manager.c index b36580cc84..7ddcbad99a 100644 --- a/src/script_manager.c +++ b/src/script_manager.c @@ -53,8 +53,8 @@ Entry(8950, scripts_unk_0498, TEXT_BANK_UNK_0539) \ Entry(8900, scripts_unk_0424, TEXT_BANK_UNK_0431) \ Entry(SCRIPT_ID_OFFSET_SAFARI_GAME, scripts_safari_game, TEXT_BANK_SAFARI_GAME) \ - Entry(SCRIPT_ID_OFFSET_HIDDEN_ITEMS, scripts_unk_0408, TEXT_BANK_UNK_0380) \ - Entry(7000, scripts_unk_0404, TEXT_BANK_UNK_0369) \ + Entry(SCRIPT_ID_OFFSET_HIDDEN_ITEMS, scripts_hidden_items, TEXT_BANK_HIDDEN_ITEMS) \ + Entry(SCRIPT_ID_OFFSET_POKEBALL_ITEMS, scripts_pokeball_items, TEXT_BANK_POKEBALL_ITEMS) \ Entry(SCRIPT_ID_OFFSET_DOUBLE_BATTLES, scripts_unk_1114, TEXT_BANK_COMMON_STRINGS) \ Entry(SCRIPT_ID_OFFSET_SINGLE_BATTLES, scripts_unk_1114, TEXT_BANK_COMMON_STRINGS) \ Entry(2800, scripts_berry_tree_interaction, TEXT_BANK_BERRY_TREES) \