diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 46807ecdf1..c337de1f2c 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -1067,17 +1067,17 @@ .short 165 .endm - .macro ScrCmd_0A6 arg0, arg1, arg2 + .macro ScrCmd_0A6 slot, destVar, arg2 .short 166 - .short \arg0 - .short \arg1 + .short \slot + .short \destVar .short \arg2 .endm - .macro ScrCmd_0A7 arg0, arg1 + .macro ShowDressUpPhoto slot, destVar .short 167 - .short \arg0 - .short \arg1 + .short \slot + .short \destVar .endm .macro ScrCmd_0A8 arg0, arg1 @@ -1804,10 +1804,10 @@ .short \destVar .endm - .macro ScrCmd_12E arg0, arg1 + .macro DressUpPhotoHasData slot, destVar .short 302 - .short \arg0 - .short \arg1 + .short \slot + .short \destVar .endm .macro ScrCmd_12F arg0, arg1 @@ -1825,9 +1825,9 @@ .short 305 .endm - .macro ScrCmd_132 arg0 + .macro CheckPoketchEnabled destVar .short 306 - .short \arg0 + .short \destVar .endm .macro RegisterPoketchApp appID @@ -2503,9 +2503,9 @@ .short \arg0 .endm - .macro ScrCmd_1B5 arg0 + .macro ScrCmd_1B5 listIndex .short 437 - .short \arg0 + .short \listIndex .endm .macro GetTimeOfDay destVarID @@ -3464,25 +3464,25 @@ .short 578 .endm - .macro ScrCmd_243 arg0, arg1, arg2 + .macro ChooseCustomMessageWord unused, resultVar, destVar .short 579 - .short \arg0 - .short \arg1 - .short \arg2 + .short \unused + .short \resultVar + .short \destVar .endm - .macro ScrCmd_244 arg0, arg1, arg2, arg3 + .macro ChooseTwoCustomMessageWords unused, resultVar, destVar1, destVar2 .short 580 - .short \arg0 - .short \arg1 - .short \arg2 - .short \arg3 + .short \unused + .short \resultVar + .short \destVar1 + .short \destVar2 .endm - .macro ScrCmd_245 arg0, arg1 + .macro BufferCustomMessageWord idx, customMessageWord .short 581 - .short \arg0 - .short \arg1 + .short \idx + .short \customMessageWord .endm .macro GetGameVersion destVar @@ -3502,13 +3502,13 @@ .short \slot .endm - .macro ScrCmd_249 arg0, arg1, arg2, arg3, arg4 + .macro GetWallpaperFromCustomMessageWords destVar, customMessageWord1, customMessageWord2, customMessageWord3, customMessageWord4 .short 585 - .short \arg0 - .short \arg1 - .short \arg2 - .short \arg3 - .short \arg4 + .short \destVar + .short \customMessageWord1 + .short \customMessageWord2 + .short \customMessageWord3 + .short \customMessageWord4 .endm .macro GetCapturedFlagCount destFlagCount @@ -4083,13 +4083,13 @@ .endif .endm - .macro ScrCmd_2AA arg0, arg1, arg2, arg3, arg4 + .macro CheckIsMysteryGiftPhrase destVar, customMessageWord1, customMessageWord2, customMessageWord3, customMessageWord4 .short 682 - .short \arg0 - .short \arg1 - .short \arg2 - .short \arg3 - .short \arg4 + .short \destVar + .short \customMessageWord1 + .short \customMessageWord2 + .short \customMessageWord3 + .short \customMessageWord4 .endm .macro ScrCmd_2AB arg0 @@ -4693,7 +4693,7 @@ .short \arg0 .endm - .macro ScrCmd_316 + .macro Dummy316 .short 790 .endm diff --git a/generated/game_records.txt b/generated/game_records.txt index 395c11828b..d049e16ad0 100644 --- a/generated/game_records.txt +++ b/generated/game_records.txt @@ -52,7 +52,7 @@ RECORD_UNK_050 RECORD_UNK_051 RECORD_UNK_052 RECORD_UNK_053 -RECORD_UNK_054 +RECORD_TIMES_DRESSED_UP_POKEMON RECORD_UNK_055 RECORD_TIMES_STUCK_IN_DEEP_MUD RECORD_UNK_057 diff --git a/generated/object_events_gfx.txt b/generated/object_events_gfx.txt index fed119bb05..738da2e225 100644 --- a/generated/object_events_gfx.txt +++ b/generated/object_events_gfx.txt @@ -109,8 +109,8 @@ OBJ_EVENT_GFX_UNK_107 OBJ_EVENT_GFX_UNK_108 OBJ_EVENT_GFX_UNK_109 OBJ_EVENT_GFX_UNK_110 -OBJ_EVENT_GFX_UNK_111 -OBJ_EVENT_GFX_UNK_112 +OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1 +OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2 OBJ_EVENT_GFX_UNK_113 OBJ_EVENT_GFX_UNK_114 OBJ_EVENT_GFX_UNK_115 diff --git a/generated/text_banks.txt b/generated/text_banks.txt index 28eba705f2..193680e68a 100644 --- a/generated/text_banks.txt +++ b/generated/text_banks.txt @@ -370,7 +370,7 @@ TEXT_BANK_BATTLE_STRINGS TEXT_BANK_VISIBLE_ITEMS TEXT_BANK_NPC_TRADE_NAMES TEXT_BANK_FURNITURE_NAMES -TEXT_BANK_UNK_0372 +TEXT_BANK_MYSTERY_GIFT_PHRASE TEXT_BANK_BLACK_OUT_SCENE TEXT_BANK_GROUP_CONNECTION TEXT_BANK_UNK_0375 diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index b5bf38f412..38f2ffb1df 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -124,7 +124,7 @@ FLAG_UNK_0x007A FLAG_UNK_0x007B FLAG_UNK_0x007C FLAG_OBTAINED_FANTINA_TM65 -FLAG_UNK_0x007E +FLAG_OBTAINED_FOCUS_BAND FLAG_UNK_0x007F FLAG_UNK_0x0080 FLAG_UNK_0x0081 @@ -134,7 +134,7 @@ FLAG_OLD_ROD_OBTAINED FLAG_UNK_0x0085 FLAG_UNK_0x0086 FLAG_TALKED_TO_MOM -FLAG_UNK_0x0088 +FLAG_ENTERED_DRESSING_ROOM FLAG_OBTAINED_ALL_BATTLE_FRONTIER_GOLD_PRINTS FLAG_UNK_0x008A FLAG_UNK_0x008B @@ -189,7 +189,7 @@ FLAG_UNK_0x00BB FLAG_UNK_0x00BC FLAG_UNK_0x00BD FLAG_UNK_0x00BE -FLAG_UNK_0x00BF +FLAG_OBTAINED_QUICK_CLAW FLAG_UNK_0x00C0 FLAG_UNK_0x00C1 FLAG_UNK_0x00C2 @@ -315,7 +315,7 @@ FLAG_UNK_0x0139 FLAG_UNK_0x013A FLAG_UNK_0x013B FLAG_UNK_0x013C -FLAG_UNK_0x013D +VAR_OBTAINED_ACCESSORY_STARTER_MASK FLAG_DEFEATED_COMMANDER_SATURN_VALOR_CAVERN FLAG_UNK_0x013F FLAG_UNK_0x0140 @@ -385,8 +385,8 @@ FLAG_UNK_0x017F FLAG_UNK_0x0180 FLAG_HIDE_JUBILIFE_CITY_LOOKER FLAG_UNK_0x0182 -FLAG_UNK_0x0183 -FLAG_UNK_0x0184 +FLAG_HIDE_POKECENTER_DAILY_TRAINER_1 +FLAG_HIDE_POKECENTER_DAILY_TRAINER_2 FLAG_VEILSTONE_STORE_B1F_HIDE_PROF_ROWAN FLAG_HIDE_CANALAVE_LIBRARY_1F_LUCIAN FLAG_UNK_0x0187 @@ -520,7 +520,7 @@ FLAG_HIDE_HEARTHOME_ROUTE_209_ROADBLOCK FLAG_HIDE_HEARTHOME_ROUTE_209_GATE_RIVAL FLAG_UNK_0x0208 FLAG_UNK_0x0209 -FLAG_UNK_0x020A +FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN FLAG_UNK_0x020B FLAG_UNK_0x020C FLAG_UNK_0x020D @@ -528,10 +528,10 @@ FLAG_UNK_0x020E FLAG_UNK_0x020F FLAG_UNK_0x0210 FLAG_UNK_0x0211 -FLAG_UNK_0x0212 +FLAG_HIDE_POKETCH_CO_1F_REPORTER FLAG_UNK_0x0213 FLAG_UNK_0x0214 -FLAG_UNK_0x0215 +FLAG_HIDE_JUBILIFE_TV_2F_REPORTER FLAG_UNK_0x0216 FLAG_UNK_0x0217 FLAG_UNK_0x0218 @@ -654,8 +654,8 @@ FLAG_HIDE_LAKE_VERITY_PROF_ROWAN FLAG_HIDE_LAKE_VERITY_COUNTERPART FLAG_UNK_0x028E FLAG_UNK_0x028F -FLAG_UNK_0x0290 -FLAG_UNK_0x0291 +FLAG_HIDE_JUBILIFE_TV_3F_GLOBAL_RANKING_ROOM_WORKER +FLAG_HIDE_JUBILIFE_TV_3F_GROUP_RANKING_ROOM_WORKER FLAG_UNK_0x0292 FLAG_UNK_0x0293 FLAG_UNK_0x0294 @@ -2729,7 +2729,7 @@ FLAG_UNK_0x0AA5 FLAG_UNK_0x0AA6 FLAG_UNK_0x0AA7 FLAG_UNK_0x0AA8 -FLAG_UNK_0x0AA9 +FLAG_CHECKED_LUCKY_NUMBER FLAG_UNK_0x0AAA FLAG_UNK_0x0AAB FLAG_UNK_0x0AAC @@ -2739,7 +2739,7 @@ FLAG_UNK_0x0AAF FLAG_UNK_0x0AB0 FLAG_UNK_0x0AB1 FLAG_UNK_0x0AB2 -FLAG_UNK_0x0AB3 +FLAG_OBTAINED_LOTTERY_PRIZE FLAG_UNK_0x0AB4 FLAG_AMITY_SQUARE_MAN_GIFT_RECEIVED FLAG_UNK_0x0AB6 @@ -4341,7 +4341,7 @@ VAR_UNK_0x40EE VAR_RIVAL_BEAT_SUNYSHORE_GYM VAR_GTS_ACCESS_STATE VAR_UNK_0x40F1 -VAR_UNK_0x40F2 +VAR_LOTTERY_PRIZE_ITEM VAR_PAL_PARK_STATE VAR_UNK_0x40F4 VAR_UNK_0x40F5 @@ -4365,7 +4365,7 @@ VAR_UNK_0x4106 VAR_VEILSTONE_STORE_MASK VAR_UNK_0x4108 VAR_UNK_0x4109 -VAR_UNK_0x410A +VAR_ACCESSORY_STARTER_MASK VAR_TURNBACK_CAVE_PILLARS_SEEN VAR_TURNBACK_CAVE_ROOMS_VISITED VAR_UNK_0x410D diff --git a/include/overlay005/ov5_021F6454.h b/include/overlay005/ov5_021F6454.h index e29ff81a36..6f3a789afa 100644 --- a/include/overlay005/ov5_021F6454.h +++ b/include/overlay005/ov5_021F6454.h @@ -15,7 +15,7 @@ BOOL ScrCmd_300(ScriptContext *param0); BOOL ScrCmd_301(ScriptContext *param0); BOOL ScrCmd_GetPartyMonForm2(ScriptContext *ctx); BOOL ScrCmd_30F(ScriptContext *param0); -BOOL ScrCmd_316(ScriptContext *param0); +BOOL ScrCmd_Dummy316(ScriptContext *ctx); BOOL ScrCmd_32C(ScriptContext *param0); BOOL ScrCmd_32D(ScriptContext *param0); BOOL ScrCmd_32E(ScriptContext *param0); diff --git a/res/field/events/events_battle_tower_elevator.json b/res/field/events/events_battle_tower_elevator.json index 0badcb6846..883b02330a 100644 --- a/res/field/events/events_battle_tower_elevator.json +++ b/res/field/events/events_battle_tower_elevator.json @@ -3,7 +3,7 @@ "object_events": [ { "id": "BATTLE_TOWER_ELEVATOR_UNK_111_0", - "graphics_id": "OBJ_EVENT_GFX_UNK_111", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_canalave_city_mart.json b/res/field/events/events_canalave_city_mart.json index d609368413..2973457887 100644 --- a/res/field/events/events_canalave_city_mart.json +++ b/res/field/events/events_canalave_city_mart.json @@ -51,7 +51,7 @@ "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x020A", + "hidden_flag": "FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN", "script": 10201, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_canalave_city_pokecenter_1f.json b/res/field/events/events_canalave_city_pokecenter_1f.json index 33b29efeb6..1f98ad61c9 100644 --- a/res/field/events/events_canalave_city_pokecenter_1f.json +++ b/res/field/events/events_canalave_city_pokecenter_1f.json @@ -48,10 +48,10 @@ }, { "id": "CANALAVE_CITY_POKECENTER_1F_UNK_111_3", - "graphics_id": "OBJ_EVENT_GFX_UNK_111", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0183", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1", "script": 10401, "initial_dir": 1, "data": [], @@ -63,10 +63,10 @@ }, { "id": "CANALAVE_CITY_POKECENTER_1F_UNK_112_4", - "graphics_id": "OBJ_EVENT_GFX_UNK_112", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0184", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2", "script": 10402, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_celestic_town_pokecenter_1f.json b/res/field/events/events_celestic_town_pokecenter_1f.json index c50b3a1744..1b4408725d 100644 --- a/res/field/events/events_celestic_town_pokecenter_1f.json +++ b/res/field/events/events_celestic_town_pokecenter_1f.json @@ -63,10 +63,10 @@ }, { "id": "CELESTIC_TOWN_POKECENTER_1F_UNK_111_4", - "graphics_id": "OBJ_EVENT_GFX_UNK_111", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0183", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1", "script": 10401, "initial_dir": 1, "data": [], @@ -78,10 +78,10 @@ }, { "id": "CELESTIC_TOWN_POKECENTER_1F_UNK_112_5", - "graphics_id": "OBJ_EVENT_GFX_UNK_112", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0184", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2", "script": 10402, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_eterna_city_mart.json b/res/field/events/events_eterna_city_mart.json index ef042bdabc..35e833b244 100644 --- a/res/field/events/events_eterna_city_mart.json +++ b/res/field/events/events_eterna_city_mart.json @@ -66,7 +66,7 @@ "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x020A", + "hidden_flag": "FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN", "script": 10201, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_eterna_city_pokecenter_1f.json b/res/field/events/events_eterna_city_pokecenter_1f.json index bfca4ff5fb..1ce575dce0 100644 --- a/res/field/events/events_eterna_city_pokecenter_1f.json +++ b/res/field/events/events_eterna_city_pokecenter_1f.json @@ -78,10 +78,10 @@ }, { "id": "ETERNA_CITY_POKECENTER_1F_UNK_111_5", - "graphics_id": "OBJ_EVENT_GFX_UNK_111", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0183", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1", "script": 10401, "initial_dir": 1, "data": [], @@ -93,10 +93,10 @@ }, { "id": "ETERNA_CITY_POKECENTER_1F_UNK_112_6", - "graphics_id": "OBJ_EVENT_GFX_UNK_112", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0184", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2", "script": 10402, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_fight_area_mart.json b/res/field/events/events_fight_area_mart.json index de621dbee1..dbadfb5694 100644 --- a/res/field/events/events_fight_area_mart.json +++ b/res/field/events/events_fight_area_mart.json @@ -51,7 +51,7 @@ "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x020A", + "hidden_flag": "FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN", "script": 10201, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_fight_area_pokecenter_1f.json b/res/field/events/events_fight_area_pokecenter_1f.json index bd881c0fb8..895f776beb 100644 --- a/res/field/events/events_fight_area_pokecenter_1f.json +++ b/res/field/events/events_fight_area_pokecenter_1f.json @@ -63,10 +63,10 @@ }, { "id": "FIGHT_AREA_POKECENTER_1F_UNK_111_4", - "graphics_id": "OBJ_EVENT_GFX_UNK_111", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0183", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1", "script": 10401, "initial_dir": 1, "data": [], @@ -78,10 +78,10 @@ }, { "id": "FIGHT_AREA_POKECENTER_1F_UNK_112_5", - "graphics_id": "OBJ_EVENT_GFX_UNK_112", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0184", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2", "script": 10402, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_floaroma_town_mart.json b/res/field/events/events_floaroma_town_mart.json index 48690baf6a..099366d8d0 100644 --- a/res/field/events/events_floaroma_town_mart.json +++ b/res/field/events/events_floaroma_town_mart.json @@ -68,7 +68,7 @@ "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x020A", + "hidden_flag": "FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN", "script": 10201, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_floaroma_town_pokecenter_1f.json b/res/field/events/events_floaroma_town_pokecenter_1f.json index 678d4edc87..e3ede5273f 100644 --- a/res/field/events/events_floaroma_town_pokecenter_1f.json +++ b/res/field/events/events_floaroma_town_pokecenter_1f.json @@ -63,10 +63,10 @@ }, { "id": "FLOAROMA_TOWN_POKECENTER_1F_UNK_111_4", - "graphics_id": "OBJ_EVENT_GFX_UNK_111", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0183", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1", "script": 10401, "initial_dir": 1, "data": [], @@ -78,10 +78,10 @@ }, { "id": "FLOAROMA_TOWN_POKECENTER_1F_UNK_112_5", - "graphics_id": "OBJ_EVENT_GFX_UNK_112", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0184", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2", "script": 10402, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_hearthome_city_mart.json b/res/field/events/events_hearthome_city_mart.json index 59152beaf3..60d6e53850 100644 --- a/res/field/events/events_hearthome_city_mart.json +++ b/res/field/events/events_hearthome_city_mart.json @@ -66,7 +66,7 @@ "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x020A", + "hidden_flag": "FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN", "script": 10201, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_hearthome_city_pokecenter_1f.json b/res/field/events/events_hearthome_city_pokecenter_1f.json index 08da7ede92..08a75e2b93 100644 --- a/res/field/events/events_hearthome_city_pokecenter_1f.json +++ b/res/field/events/events_hearthome_city_pokecenter_1f.json @@ -63,10 +63,10 @@ }, { "id": "HEARTHOME_CITY_POKECENTER_1F_UNK_111_4", - "graphics_id": "OBJ_EVENT_GFX_UNK_111", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0183", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1", "script": 10401, "initial_dir": 1, "data": [], @@ -78,10 +78,10 @@ }, { "id": "HEARTHOME_CITY_POKECENTER_1F_UNK_112_5", - "graphics_id": "OBJ_EVENT_GFX_UNK_112", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0184", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2", "script": 10402, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_jubilife_city_condominiums_1f.json b/res/field/events/events_jubilife_city_condominiums_1f.json index 6d43304904..fd171c8ff0 100644 --- a/res/field/events/events_jubilife_city_condominiums_1f.json +++ b/res/field/events/events_jubilife_city_condominiums_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_CITY_CONDOMINIUMS_1F_EXPERT_F_0", + "id": "LOCALID_EXPERT_F", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -17,7 +17,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_CONDOMINIUMS_1F_PACHIRISU_1", + "id": "LOCALID_PACHIRISU", "graphics_id": "OBJ_EVENT_GFX_PACHIRISU", "movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -32,7 +32,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_CONDOMINIUMS_1F_PIKACHU_2", + "id": "LOCALID_PIKACHU", "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -47,7 +47,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_CONDOMINIUMS_1F_BEAUTY_3", + "id": "LOCALID_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", diff --git a/res/field/events/events_jubilife_city_condominiums_2f.json b/res/field/events/events_jubilife_city_condominiums_2f.json index 1dbeabf40b..e3e598624d 100644 --- a/res/field/events/events_jubilife_city_condominiums_2f.json +++ b/res/field/events/events_jubilife_city_condominiums_2f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_CITY_CONDOMINIUMS_2F_BUG_CATCHER_0", + "id": "LOCALID_BUG_CATCHER", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_CONDOMINIUMS_2F_POKEMON_BREEDER_M_1", + "id": "LOCALID_POKEMON_BREEDER_M", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_city_condominiums_3f.json b/res/field/events/events_jubilife_city_condominiums_3f.json index 469e110af1..f8a465d72d 100644 --- a/res/field/events/events_jubilife_city_condominiums_3f.json +++ b/res/field/events/events_jubilife_city_condominiums_3f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_CITY_CONDOMINIUMS_3F_LASS_0", + "id": "LOCALID_LASS", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_CONDOMINIUMS_3F_COLLECTOR_1", + "id": "LOCALID_COLLECTOR", "graphics_id": "OBJ_EVENT_GFX_COLLECTOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_city_condominiums_4f.json b/res/field/events/events_jubilife_city_condominiums_4f.json index a10e15f962..e7273384fe 100644 --- a/res/field/events/events_jubilife_city_condominiums_4f.json +++ b/res/field/events/events_jubilife_city_condominiums_4f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_CITY_CONDOMINIUMS_4F_BEAUTY_0", + "id": "LOCALID_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_city_mart.json b/res/field/events/events_jubilife_city_mart.json index 7774dcca51..3e8fd89063 100644 --- a/res/field/events/events_jubilife_city_mart.json +++ b/res/field/events/events_jubilife_city_mart.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_CITY_MART_GUITARIST_0", + "id": "LOCALID_GUITARIST", "graphics_id": "OBJ_EVENT_GFX_GUITARIST", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_MART_POKEFAN_F_1", + "id": "LOCALID_POKEFAN_F", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_MART_CASHIER_F_2", + "id": "LOCALID_CASHIER_F", "graphics_id": "OBJ_EVENT_GFX_CASHIER_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_MART_CASHIER_M_3", + "id": "LOCALID_CASHIER_M", "graphics_id": "OBJ_EVENT_GFX_CASHIER_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,11 +62,11 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_MART_MYSTERY_GIFT_DELIVERYMAN_4", + "id": "LOCALID_MYSTERY_GIFT_DELIVERYMAN", "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x020A", + "hidden_flag": "FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN", "script": 10201, "initial_dir": 1, "data": [], @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_MART_BEAUTY_5", + "id": "LOCALID_BEAUTY_5", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_city_pokecenter_1f.json b/res/field/events/events_jubilife_city_pokecenter_1f.json index bd163543e8..d9281c879d 100644 --- a/res/field/events/events_jubilife_city_pokecenter_1f.json +++ b/res/field/events/events_jubilife_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_CITY_POKECENTER_1F_ACE_TRAINER_F_0", + "id": "LOCALID_ACE_TRAINER_F", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_POKECENTER_1F_SCHOOL_KID_M_1", + "id": "LOCALID_SCHOOL_KID_M", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_POKECENTER_1F_TWIN_2", + "id": "LOCALID_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_POKECENTER_1F_POKECENTER_NURSE_3", + "id": "LOCALID_POKECENTER_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_POKECENTER_1F_TEALA_4", + "id": "LOCALID_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,11 +77,11 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_POKECENTER_1F_UNK_111_5", - "graphics_id": "OBJ_EVENT_GFX_UNK_111", + "id": "LOCALID_DAILY_TRAINER_1", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0183", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1", "script": 10401, "initial_dir": 1, "data": [], @@ -92,11 +92,11 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_POKECENTER_1F_UNK_112_6", - "graphics_id": "OBJ_EVENT_GFX_UNK_112", + "id": "LOCALID_DAILY_TRAINER_2", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0184", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2", "script": 10402, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_jubilife_city_pokecenter_2f.json b/res/field/events/events_jubilife_city_pokecenter_2f.json index cfdc875914..5aa231366f 100644 --- a/res/field/events/events_jubilife_city_pokecenter_2f.json +++ b/res/field/events/events_jubilife_city_pokecenter_2f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_CITY_POKECENTER_2F_TEALA_0", + "id": "LOCALID_TEALA_WEST", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_POKECENTER_2F_TEALA_1", + "id": "LOCALID_TEALA_MIDDLE", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_POKECENTER_2F_TEALA_2", + "id": "LOCALID_TEALA_EAST", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_city_pokecenter_b1f.json b/res/field/events/events_jubilife_city_pokecenter_b1f.json index e9052fa64c..528eded8b4 100644 --- a/res/field/events/events_jubilife_city_pokecenter_b1f.json +++ b/res/field/events/events_jubilife_city_pokecenter_b1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_CITY_POKECENTER_B1FWIFI_PLAZA_ATTENDANT_F_0", + "id": "LOCALID_WIFI_PLAZA_ATTENDANT_F", "graphics_id": "OBJ_EVENT_GFX_WIFI_PLAZA_ATTENDANT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_POKECENTER_B1F_TEALA_1", + "id": "LOCALID_TEALA_MIDDLE", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_POKECENTER_B1F_TEALA_2", + "id": "LOCALID_TEALA_EAST", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_city_south_house_1f.json b/res/field/events/events_jubilife_city_south_house_1f.json index a308f18452..a864616df0 100644 --- a/res/field/events/events_jubilife_city_south_house_1f.json +++ b/res/field/events/events_jubilife_city_south_house_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_CITY_SOUTH_HOUSE_1F_ACE_TRAINER_M_0", + "id": "LOCALID_ACE_TRAINER_M", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_SOUTH_HOUSE_1F_LASS_1", + "id": "LOCALID_LASS", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_SOUTH_HOUSE_1F_PACHIRISU_2", + "id": "LOCALID_PACHIRISU", "graphics_id": "OBJ_EVENT_GFX_PACHIRISU", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_city_south_house_2f.json b/res/field/events/events_jubilife_city_south_house_2f.json index ed767a9706..e407850e2b 100644 --- a/res/field/events/events_jubilife_city_south_house_2f.json +++ b/res/field/events/events_jubilife_city_south_house_2f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_CITY_SOUTH_HOUSE_2F_YOUNGSTER_0", + "id": "LOCALID_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_SOUTH_HOUSE_2F_POKEFAN_F_1", + "id": "LOCALID_POKEFAN_F", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 1 }, { - "id": "JUBILIFE_CITY_SOUTH_HOUSE_2F_POKEMON_BREEDER_F_2", + "id": "LOCALID_POKEMON_BREEDER_F", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_city_south_house_3f.json b/res/field/events/events_jubilife_city_south_house_3f.json index 5886cbe883..e32e40a4a2 100644 --- a/res/field/events/events_jubilife_city_south_house_3f.json +++ b/res/field/events/events_jubilife_city_south_house_3f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_CITY_SOUTH_HOUSE_3F_POKEFAN_M_0", + "id": "LOCALID_POKEFAN_M", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_city_southwest_house_1f.json b/res/field/events/events_jubilife_city_southwest_house_1f.json index a0342f01b1..fa7990a837 100644 --- a/res/field/events/events_jubilife_city_southwest_house_1f.json +++ b/res/field/events/events_jubilife_city_southwest_house_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_CITY_SOUTHWEST_HOUSE_1F_YOUNGSTER_0", + "id": "LOCALID_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_SOUTHWEST_HOUSE_1F_PIKACHU_1", + "id": "LOCALID_PIKACHU", "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_SOUTHWEST_HOUSE_1F_MIDDLE_AGED_MAN_2", + "id": "LOCALID_POKETCH_CO_PRESIDENT", "graphics_id": "OBJ_EVENT_GFX_MIDDLE_AGED_MAN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_city_southwest_house_2f.json b/res/field/events/events_jubilife_city_southwest_house_2f.json index cf525b72f8..3d90f684d7 100644 --- a/res/field/events/events_jubilife_city_southwest_house_2f.json +++ b/res/field/events/events_jubilife_city_southwest_house_2f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_CITY_SOUTHWEST_HOUSE_2F_ACE_TRAINER_M_0", + "id": "LOCALID_ACE_TRAINER_M", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_SOUTHWEST_HOUSE_2F_BEAUTY_1", + "id": "LOCALID_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_SOUTHWEST_HOUSE_2F_COLLECTOR_2", + "id": "LOCALID_COLLECTOR", "graphics_id": "OBJ_EVENT_GFX_COLLECTOR", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "JUBILIFE_CITY_SOUTHWEST_HOUSE_2F_LASS_3", + "id": "LOCALID_LASS", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_tv_1f.json b/res/field/events/events_jubilife_tv_1f.json index 1b372d7d25..da4a4b1020 100644 --- a/res/field/events/events_jubilife_tv_1f.json +++ b/res/field/events/events_jubilife_tv_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_TV_1F_BEAUTY_0", + "id": "LOCALID_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_1F_GYM_GUIDE_1", + "id": "LOCALID_GYM_GUIDE", "graphics_id": "OBJ_EVENT_GFX_GYM_GUIDE", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_1F_MIDDLE_AGED_MAN_2", + "id": "LOCALID_POKETCH_CO_PRESIDENT", "graphics_id": "OBJ_EVENT_GFX_MIDDLE_AGED_MAN", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_1F_ACE_TRAINER_SNOW_F_3", + "id": "LOCALID_ACE_TRAINER_SNOW_F", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_SNOW_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_1F_ACE_TRAINER_M_4", + "id": "LOCALID_ACE_TRAINER_M", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_tv_2f.json b/res/field/events/events_jubilife_tv_2f.json index b19ecbbbd3..77f95a1310 100644 --- a/res/field/events/events_jubilife_tv_2f.json +++ b/res/field/events/events_jubilife_tv_2f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_TV_2F_IDOL_0", + "id": "LOCALID_IDOL", "graphics_id": "OBJ_EVENT_GFX_IDOL", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_2F_GYM_GUIDE_1", + "id": "LOCALID_GYM_GUIDE", "graphics_id": "OBJ_EVENT_GFX_GYM_GUIDE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,11 +32,11 @@ "y": 0 }, { - "id": "JUBILIFE_TV_2F_REPORTER_2", + "id": "LOCALID_REPORTER", "graphics_id": "OBJ_EVENT_GFX_REPORTER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0215", + "hidden_flag": "FLAG_HIDE_JUBILIFE_TV_2F_REPORTER", "script": 10158, "initial_dir": 3, "data": [], @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_2F_ROUGHNECK_3", + "id": "LOCALID_ROUGHNECK", "graphics_id": "OBJ_EVENT_GFX_ROUGHNECK", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_tv_2f_gallery.json b/res/field/events/events_jubilife_tv_2f_gallery.json index 9ff28b7ac3..50a3e07569 100644 --- a/res/field/events/events_jubilife_tv_2f_gallery.json +++ b/res/field/events/events_jubilife_tv_2f_gallery.json @@ -91,7 +91,7 @@ ], "object_events": [ { - "id": "JUBILIFE_TV_2F_GALLERY_HIKER_0", + "id": "LOCALID_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -106,7 +106,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_2F_GALLERY_POKEMON_BREEDER_M_1", + "id": "LOCALID_POKEMON_BREEDER_M", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -121,7 +121,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_2F_GALLERY_TWIN_2", + "id": "LOCALID_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_tv_3f.json b/res/field/events/events_jubilife_tv_3f.json index 6ad2975686..3a1b11dc6c 100644 --- a/res/field/events/events_jubilife_tv_3f.json +++ b/res/field/events/events_jubilife_tv_3f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_TV_3F_BEAUTY_0", + "id": "LOCALID_BEAUTY_1", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_3F_BEAUTY_1", + "id": "LOCALID_BEAUTY_2", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_3F_GYM_GUIDE_2", + "id": "LOCALID_GYM_GUIDE_1", "graphics_id": "OBJ_EVENT_GFX_GYM_GUIDE", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_3F_GYM_GUIDE_3", + "id": "LOCALID_GYM_GUIDE_2", "graphics_id": "OBJ_EVENT_GFX_GYM_GUIDE", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_tv_3f_global_ranking_room.json b/res/field/events/events_jubilife_tv_3f_global_ranking_room.json index ca0e0dafc4..c2e2aec767 100644 --- a/res/field/events/events_jubilife_tv_3f_global_ranking_room.json +++ b/res/field/events/events_jubilife_tv_3f_global_ranking_room.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "id": "JUBILIFE_TV_3F_GLOBAL_RANKING_ROOM_FISHERMAN_0", + "id": "LOCALID_FISHERMAN", "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -42,7 +42,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_3F_GLOBAL_RANKING_ROOM_ACE_TRAINER_F_1", + "id": "LOCALID_ACE_TRAINER_F", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -57,7 +57,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_3F_GLOBAL_RANKING_ROOM_COLLECTOR_2", + "id": "LOCALID_COLLECTOR", "graphics_id": "OBJ_EVENT_GFX_COLLECTOR", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -72,11 +72,11 @@ "y": 0 }, { - "id": "JUBILIFE_TV_3F_GLOBAL_RANKING_ROOM_WORKER_3", + "id": "LOCALID_WORKER", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0290", + "hidden_flag": "FLAG_HIDE_JUBILIFE_TV_3F_GLOBAL_RANKING_ROOM_WORKER", "script": 7, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_jubilife_tv_3f_group_ranking_room.json b/res/field/events/events_jubilife_tv_3f_group_ranking_room.json index 2ada16903f..7aa2d09672 100644 --- a/res/field/events/events_jubilife_tv_3f_group_ranking_room.json +++ b/res/field/events/events_jubilife_tv_3f_group_ranking_room.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "id": "JUBILIFE_TV_3F_GROUP_RANKING_ROOM_YOUNGSTER_0", + "id": "LOCALID_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -42,7 +42,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_3F_GROUP_RANKING_ROOM_BATTLE_GIRL_1", + "id": "LOCALID_BATTLE_GIRL", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -57,11 +57,11 @@ "y": 0 }, { - "id": "JUBILIFE_TV_3F_GROUP_RANKING_ROOM_WORKER_2", + "id": "LOCALID_WORKER", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0291", + "hidden_flag": "FLAG_HIDE_JUBILIFE_TV_3F_GROUP_RANKING_ROOM_WORKER", "script": 6, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_jubilife_tv_4f.json b/res/field/events/events_jubilife_tv_4f.json index c1f3dd1b3e..86703b6603 100644 --- a/res/field/events/events_jubilife_tv_4f.json +++ b/res/field/events/events_jubilife_tv_4f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "JUBILIFE_TV_4F_MIDDLE_AGED_MAN_0", + "id": "LOCALID_POKETCH_CO_PRESIDENT", "graphics_id": "OBJ_EVENT_GFX_MIDDLE_AGED_MAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_4F_RECEPTIONIST_1", + "id": "LOCALID_RECEPTIONIST", "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "JUBILIFE_TV_4F_POKEMON_BREEDER_F_2", + "id": "LOCALID_POKEMON_BREEDER_F", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_jubilife_tv_elevator.json b/res/field/events/events_jubilife_tv_elevator.json index b54ca5a664..48c4c71b5b 100644 --- a/res/field/events/events_jubilife_tv_elevator.json +++ b/res/field/events/events_jubilife_tv_elevator.json @@ -11,7 +11,7 @@ ], "object_events": [ { - "id": "JUBILIFE_TV_ELEVATOR_RECEPTIONIST_0", + "id": "LOCALID_RECEPTIONIST", "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_oreburgh_city_mart.json b/res/field/events/events_oreburgh_city_mart.json index 753ec301a8..a5f1ad7b2e 100644 --- a/res/field/events/events_oreburgh_city_mart.json +++ b/res/field/events/events_oreburgh_city_mart.json @@ -66,7 +66,7 @@ "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x020A", + "hidden_flag": "FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN", "script": 10201, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_oreburgh_city_pokecenter_1f.json b/res/field/events/events_oreburgh_city_pokecenter_1f.json index 95d229e408..0e03ed24e8 100644 --- a/res/field/events/events_oreburgh_city_pokecenter_1f.json +++ b/res/field/events/events_oreburgh_city_pokecenter_1f.json @@ -78,10 +78,10 @@ }, { "id": "OREBURGH_CITY_POKECENTER_1F_UNK_111_5", - "graphics_id": "OBJ_EVENT_GFX_UNK_111", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0183", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1", "script": 10401, "initial_dir": 1, "data": [], @@ -93,10 +93,10 @@ }, { "id": "OREBURGH_CITY_POKECENTER_1F_UNK_112_6", - "graphics_id": "OBJ_EVENT_GFX_UNK_112", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0184", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2", "script": 10402, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_pastoria_city_mart.json b/res/field/events/events_pastoria_city_mart.json index 85bb7e45a1..2aa051f0c0 100644 --- a/res/field/events/events_pastoria_city_mart.json +++ b/res/field/events/events_pastoria_city_mart.json @@ -75,7 +75,7 @@ "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x020A", + "hidden_flag": "FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN", "script": 10201, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_pastoria_city_pokecenter_1f.json b/res/field/events/events_pastoria_city_pokecenter_1f.json index 220b828e51..96eaddc935 100644 --- a/res/field/events/events_pastoria_city_pokecenter_1f.json +++ b/res/field/events/events_pastoria_city_pokecenter_1f.json @@ -48,10 +48,10 @@ }, { "id": "PASTORIA_CITY_POKECENTER_1F_UNK_111_3", - "graphics_id": "OBJ_EVENT_GFX_UNK_111", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0183", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1", "script": 10401, "initial_dir": 1, "data": [], @@ -63,10 +63,10 @@ }, { "id": "PASTORIA_CITY_POKECENTER_1F_UNK_112_4", - "graphics_id": "OBJ_EVENT_GFX_UNK_112", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0184", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2", "script": 10402, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_poketch_co_1f.json b/res/field/events/events_poketch_co_1f.json index 1b1134fa7b..257164d752 100644 --- a/res/field/events/events_poketch_co_1f.json +++ b/res/field/events/events_poketch_co_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "POKETCH_CO_1F_SCIENTIST_M_0", + "id": "LOCALID_SCIENTIST_M", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,11 +17,11 @@ "y": 0 }, { - "id": "POKETCH_CO_1F_REPORTER_1", + "id": "LOCALID_REPORTER", "graphics_id": "OBJ_EVENT_GFX_REPORTER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0212", + "hidden_flag": "FLAG_HIDE_POKETCH_CO_1F_REPORTER", "script": 10155, "initial_dir": 3, "data": [], @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "POKETCH_CO_1F_RECEPTIONIST_2", + "id": "LOCALID_RECEPTIONIST", "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "POKETCH_CO_1F_MIDDLE_AGED_MAN_3", + "id": "LOCALID_POKETCH_CO_PRESIDENT", "graphics_id": "OBJ_EVENT_GFX_MIDDLE_AGED_MAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "POKETCH_CO_1F_LASS_4", + "id": "LOCALID_LASS", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_poketch_co_2f.json b/res/field/events/events_poketch_co_2f.json index b370d45ec3..1f393b9af7 100644 --- a/res/field/events/events_poketch_co_2f.json +++ b/res/field/events/events_poketch_co_2f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "POKETCH_CO_2F_POKEFAN_M_0", + "id": "LOCALID_POKEFAN_M", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "POKETCH_CO_2F_OLD_MAN_1", + "id": "LOCALID_OLD_MAN", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "POKETCH_CO_2F_CLEFAIRY_2", + "id": "LOCALID_CLEFAIRY", "graphics_id": "OBJ_EVENT_GFX_CLEFAIRY", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "POKETCH_CO_2F_PACHIRISU_3", + "id": "LOCALID_PACHIRISU", "graphics_id": "OBJ_EVENT_GFX_PACHIRISU", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_poketch_co_3f.json b/res/field/events/events_poketch_co_3f.json index 785fd807ae..864a93b979 100644 --- a/res/field/events/events_poketch_co_3f.json +++ b/res/field/events/events_poketch_co_3f.json @@ -35,7 +35,7 @@ ], "object_events": [ { - "id": "POKETCH_CO_3F_NINJA_BOY_0", + "id": "LOCALID_NINJA_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -50,7 +50,7 @@ "y": 0 }, { - "id": "POKETCH_CO_3F_POKEFAN_F_1", + "id": "LOCALID_POKEFAN_F", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -65,7 +65,7 @@ "y": 0 }, { - "id": "POKETCH_CO_3F_EXPERT_F_2", + "id": "LOCALID_EXPERT_F", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_resort_area_pokecenter_1f.json b/res/field/events/events_resort_area_pokecenter_1f.json index f0b7541cef..765a19ab53 100644 --- a/res/field/events/events_resort_area_pokecenter_1f.json +++ b/res/field/events/events_resort_area_pokecenter_1f.json @@ -48,10 +48,10 @@ }, { "id": "RESORT_AREA_POKECENTER_1F_UNK_111_3", - "graphics_id": "OBJ_EVENT_GFX_UNK_111", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0183", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1", "script": 10401, "initial_dir": 1, "data": [], @@ -63,10 +63,10 @@ }, { "id": "RESORT_AREA_POKECENTER_1F_UNK_112_4", - "graphics_id": "OBJ_EVENT_GFX_UNK_112", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0184", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2", "script": 10402, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_sandgem_town_mart.json b/res/field/events/events_sandgem_town_mart.json index f67be907cc..2085002907 100644 --- a/res/field/events/events_sandgem_town_mart.json +++ b/res/field/events/events_sandgem_town_mart.json @@ -51,7 +51,7 @@ "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x020A", + "hidden_flag": "FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN", "script": 10201, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_snowpoint_city_mart.json b/res/field/events/events_snowpoint_city_mart.json index 40ad37fb7a..2aea7a19d7 100644 --- a/res/field/events/events_snowpoint_city_mart.json +++ b/res/field/events/events_snowpoint_city_mart.json @@ -51,7 +51,7 @@ "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x020A", + "hidden_flag": "FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN", "script": 10201, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_snowpoint_city_pokecenter_1f.json b/res/field/events/events_snowpoint_city_pokecenter_1f.json index c91157166a..d88ca3d273 100644 --- a/res/field/events/events_snowpoint_city_pokecenter_1f.json +++ b/res/field/events/events_snowpoint_city_pokecenter_1f.json @@ -78,10 +78,10 @@ }, { "id": "SNOWPOINT_CITY_POKECENTER_1F_UNK_111_5", - "graphics_id": "OBJ_EVENT_GFX_UNK_111", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0183", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1", "script": 10401, "initial_dir": 1, "data": [], @@ -93,10 +93,10 @@ }, { "id": "SNOWPOINT_CITY_POKECENTER_1F_UNK_112_6", - "graphics_id": "OBJ_EVENT_GFX_UNK_112", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0184", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2", "script": 10402, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_solaceon_town_mart.json b/res/field/events/events_solaceon_town_mart.json index 15316574bd..43c43e5223 100644 --- a/res/field/events/events_solaceon_town_mart.json +++ b/res/field/events/events_solaceon_town_mart.json @@ -66,7 +66,7 @@ "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x020A", + "hidden_flag": "FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN", "script": 10201, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_solaceon_town_pokecenter_1f.json b/res/field/events/events_solaceon_town_pokecenter_1f.json index ae89c2306a..5a069afb1b 100644 --- a/res/field/events/events_solaceon_town_pokecenter_1f.json +++ b/res/field/events/events_solaceon_town_pokecenter_1f.json @@ -48,10 +48,10 @@ }, { "id": "SOLACEON_TOWN_POKECENTER_1F_UNK_111_3", - "graphics_id": "OBJ_EVENT_GFX_UNK_111", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0183", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1", "script": 10401, "initial_dir": 1, "data": [], @@ -63,10 +63,10 @@ }, { "id": "SOLACEON_TOWN_POKECENTER_1F_UNK_112_4", - "graphics_id": "OBJ_EVENT_GFX_UNK_112", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0184", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2", "script": 10402, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_sunyshore_city_mart.json b/res/field/events/events_sunyshore_city_mart.json index 207d2d6a69..56284013f1 100644 --- a/res/field/events/events_sunyshore_city_mart.json +++ b/res/field/events/events_sunyshore_city_mart.json @@ -51,7 +51,7 @@ "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x020A", + "hidden_flag": "FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN", "script": 10201, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_sunyshore_city_pokecenter_1f.json b/res/field/events/events_sunyshore_city_pokecenter_1f.json index 8a663eb2b1..170db146be 100644 --- a/res/field/events/events_sunyshore_city_pokecenter_1f.json +++ b/res/field/events/events_sunyshore_city_pokecenter_1f.json @@ -63,10 +63,10 @@ }, { "id": "SUNYSHORE_CITY_POKECENTER_1F_UNK_111_4", - "graphics_id": "OBJ_EVENT_GFX_UNK_111", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0183", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1", "script": 10401, "initial_dir": 1, "data": [], @@ -78,10 +78,10 @@ }, { "id": "SUNYSHORE_CITY_POKECENTER_1F_UNK_112_5", - "graphics_id": "OBJ_EVENT_GFX_UNK_112", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0184", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2", "script": 10402, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_survival_area_mart.json b/res/field/events/events_survival_area_mart.json index c5cb27aae8..c96e4e20e8 100644 --- a/res/field/events/events_survival_area_mart.json +++ b/res/field/events/events_survival_area_mart.json @@ -51,7 +51,7 @@ "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x020A", + "hidden_flag": "FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN", "script": 10201, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_veilstone_city_pokecenter_1f.json b/res/field/events/events_veilstone_city_pokecenter_1f.json index f1c2ef66b0..311a4e02d9 100644 --- a/res/field/events/events_veilstone_city_pokecenter_1f.json +++ b/res/field/events/events_veilstone_city_pokecenter_1f.json @@ -48,10 +48,10 @@ }, { "id": "VEILSTONE_CITY_POKECENTER_1F_UNK_111_3", - "graphics_id": "OBJ_EVENT_GFX_UNK_111", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0183", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_1", "script": 10401, "initial_dir": 1, "data": [], @@ -63,10 +63,10 @@ }, { "id": "VEILSTONE_CITY_POKECENTER_1F_UNK_112_4", - "graphics_id": "OBJ_EVENT_GFX_UNK_112", + "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0184", + "hidden_flag": "FLAG_HIDE_POKECENTER_DAILY_TRAINER_2", "script": 10402, "initial_dir": 1, "data": [], diff --git a/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s b/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s index 5090b2f012..026fd144f3 100644 --- a/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s +++ b/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s @@ -23,8 +23,8 @@ _0032: _0038: LockAll SetVar VAR_UNK_0x4113, 1 - SetFlag FLAG_UNK_0x0290 - SetFlag FLAG_UNK_0x0291 + SetFlag FLAG_HIDE_JUBILIFE_TV_3F_GLOBAL_RANKING_ROOM_WORKER + SetFlag FLAG_HIDE_JUBILIFE_TV_3F_GROUP_RANKING_ROOM_WORKER Call _02C1 Message 0 CloseMessage diff --git a/res/field/scripts/scripts_jubilife_city_condominiums_1f.s b/res/field/scripts/scripts_jubilife_city_condominiums_1f.s index 91e2be932b..812ff56860 100644 --- a/res/field/scripts/scripts_jubilife_city_condominiums_1f.s +++ b/res/field/scripts/scripts_jubilife_city_condominiums_1f.s @@ -2,72 +2,72 @@ #include "res/text/bank/jubilife_city_condominiums_1f.h" - ScriptEntry _0012 - ScriptEntry _0025 - ScriptEntry _0044 - ScriptEntry _0063 + ScriptEntry JubilifeCityCondominiums1F_ExpertF + ScriptEntry JubilifeCityCondominiums1F_Pikachu + ScriptEntry JubilifeCityCondominiums1F_Pachirisu + ScriptEntry JubilifeCityCondominiums1F_Beauty ScriptEntryEnd -_0012: +JubilifeCityCondominiums1F_ExpertF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message JubilifeCityCondominiums1F_Text_IsntMyPoketchQuiteFetching WaitABXPadPress CloseMessage ReleaseAll End -_0025: +JubilifeCityCondominiums1F_Pikachu: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer WaitFanfare SEQ_SE_CONFIRM PlayCry SPECIES_PIKACHU - Message 1 + Message JubilifeCityCondominiums1F_Text_PiikaPi WaitCry WaitABXPadPress CloseMessage ReleaseAll End -_0044: +JubilifeCityCondominiums1F_Pachirisu: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer WaitFanfare SEQ_SE_CONFIRM PlayCry SPECIES_PACHIRISU - Message 2 + Message JubilifeCityCondominiums1F_Text_Pachipachii WaitCry WaitABXPadPress CloseMessage ReleaseAll End -_0063: +JubilifeCityCondominiums1F_Beauty: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x00BF, _00B7 + GoToIfSet FLAG_OBTAINED_QUICK_CLAW, JubilifeCityCondominiums1F_ObtainedQuickClaw BufferItemName 0, ITEM_QUICK_CLAW - Message 3 + Message JubilifeCityCondominiums1F_Text_YourPokemonIsQuiteAdorableTryMakingItHoldThis SetVar VAR_0x8004, ITEM_QUICK_CLAW SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _00AD - SetFlag FLAG_UNK_0x00BF + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, JubilifeCityCondominiums1F_BagIsFull + SetFlag FLAG_OBTAINED_QUICK_CLAW Common_GiveItemQuantityNoLineFeed CloseMessage ReleaseAll End -_00AD: +JubilifeCityCondominiums1F_BagIsFull: Common_MessageBagIsFull CloseMessage ReleaseAll End -_00B7: - Message 4 +JubilifeCityCondominiums1F_ObtainedQuickClaw: + Message JubilifeCityCondominiums1F_Text_APokemonHoldingThatQuickClawCanSometimesAttackFirst WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_city_condominiums_2f.s b/res/field/scripts/scripts_jubilife_city_condominiums_2f.s index 8ce0283f99..c19ed61c2b 100644 --- a/res/field/scripts/scripts_jubilife_city_condominiums_2f.s +++ b/res/field/scripts/scripts_jubilife_city_condominiums_2f.s @@ -2,25 +2,25 @@ #include "res/text/bank/jubilife_city_condominiums_2f.h" - ScriptEntry _000A - ScriptEntry _001D + ScriptEntry JubilifeCityCondominiums2F_BugCatcher + ScriptEntry JubilifeCityCondominiums2F_PokemonBreederM ScriptEntryEnd -_000A: +JubilifeCityCondominiums2F_BugCatcher: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message JubilifeCityCondominiums2F_Text_ILikeHowPokemonCanUseAttacks WaitABXPadPress CloseMessage ReleaseAll End -_001D: +JubilifeCityCondominiums2F_PokemonBreederM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message JubilifeCityCondominiums2F_Text_DidYouBuySomeHealBallsAtThePokeMart WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_city_condominiums_3f.s b/res/field/scripts/scripts_jubilife_city_condominiums_3f.s index 5ad320431a..f2339920f6 100644 --- a/res/field/scripts/scripts_jubilife_city_condominiums_3f.s +++ b/res/field/scripts/scripts_jubilife_city_condominiums_3f.s @@ -2,25 +2,25 @@ #include "res/text/bank/jubilife_city_condominiums_3f.h" - ScriptEntry _000A - ScriptEntry _001D + ScriptEntry JubilifeCityCondominiums3F_Collector + ScriptEntry JubilifeCityCondominiums3F_Lass ScriptEntryEnd -_000A: +JubilifeCityCondominiums3F_Collector: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message JubilifeCityCondominiums3F_Text_ICanTradePokemonAroundTheWorldUsingNintendoWFC WaitABXPadPress CloseMessage ReleaseAll End -_001D: +JubilifeCityCondominiums3F_Lass: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message JubilifeCityCondominiums3F_Text_TheWorldYouCanReachWithNintendoWFC WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_city_condominiums_4f.s b/res/field/scripts/scripts_jubilife_city_condominiums_4f.s index 96b1c5c074..13a5c1f4b5 100644 --- a/res/field/scripts/scripts_jubilife_city_condominiums_4f.s +++ b/res/field/scripts/scripts_jubilife_city_condominiums_4f.s @@ -2,32 +2,32 @@ #include "res/text/bank/jubilife_city_condominiums_4f.h" - ScriptEntry _0006 + ScriptEntry JubilifeCityCondominiums4F_Beauty ScriptEntryEnd -_0006: +JubilifeCityCondominiums4F_Beauty: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x007E, _004B - Message 0 + GoToIfSet FLAG_OBTAINED_FOCUS_BAND, JubilifeCityCondominiums4F_ObtainedFocusBand + Message JubilifeCityCondominiums4F_Text_ForSomeoneLikeYouThisMightBePerfect SetVar VAR_0x8004, ITEM_FOCUS_BAND SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _0056 - SetFlag FLAG_UNK_0x007E + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, JubilifeCityCondominiums4F_BagIsFull + SetFlag FLAG_OBTAINED_FOCUS_BAND Common_GiveItemQuantityNoLineFeed CloseMessage ReleaseAll End -_004B: - Message 1 +JubilifeCityCondominiums4F_ObtainedFocusBand: + Message JubilifeCityCondominiums4F_Text_ThereAreItemsThatAreUsefulOnlyWhenTheyreHeldByPokemon WaitABXPadPress CloseMessage ReleaseAll End -_0056: +JubilifeCityCondominiums4F_BagIsFull: Common_MessageBagIsFull CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s b/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s index 3eef5602ef..ffe4ff6a0b 100644 --- a/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s @@ -1,42 +1,43 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_pokecenter_1f.h" +#include "res/field/events/events_jubilife_city_pokecenter_1f.h" - ScriptEntry _0012 - ScriptEntry _001E - ScriptEntry _0031 - ScriptEntry _0044 + ScriptEntry JubilifeCityPokecenter1F_Nurse + ScriptEntry JubilifeCityPokecenter1F_Twin + ScriptEntry JubilifeCityPokecenter1F_SchoolKidM + ScriptEntry JubilifeCityPokecenter1F_TrainerF ScriptEntryEnd -_0012: - Common_CallPokecenterNurse 3 +JubilifeCityPokecenter1F_Nurse: + Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE End -_001E: +JubilifeCityPokecenter1F_Twin: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message JubilifeCityPokecenter1F_Text_AllTypesHaveStrengthsAndWeaknesses WaitABXPadPress CloseMessage ReleaseAll End -_0031: +JubilifeCityPokecenter1F_SchoolKidM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message JubilifeCityPokecenter1F_Text_InTheUnionRoomUpstairsYouCanChatAndTradeWithOtherPeople WaitABXPadPress CloseMessage ReleaseAll End -_0044: +JubilifeCityPokecenter1F_TrainerF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 2 + Message JubilifeCityPokecenter1F_Text_YouCanStillCatchAPokemonIfYouAlreadyHaveSixTravelingWithYou WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_city_south_house_1f.s b/res/field/scripts/scripts_jubilife_city_south_house_1f.s index 23ea3e1dd3..b12049b923 100644 --- a/res/field/scripts/scripts_jubilife_city_south_house_1f.s +++ b/res/field/scripts/scripts_jubilife_city_south_house_1f.s @@ -2,38 +2,38 @@ #include "res/text/bank/jubilife_city_south_house_1f.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _0034 + ScriptEntry JubilifeCitySouthHouse1F_AceTrainerM + ScriptEntry JubilifeCitySouthHouse1F_Lass + ScriptEntry JubilifeCitySouthHouse1F_Pachirisu ScriptEntryEnd -_000E: +JubilifeCitySouthHouse1F_AceTrainerM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message JubilifeCitySouthHouse1F_PokemonAreWonderfulDeeplyMysteriousCreatures WaitABXPadPress CloseMessage ReleaseAll End -_0021: +JubilifeCitySouthHouse1F_Lass: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message JubilifeCitySouthHouse1F_TalkToEveryoneYouSee WaitABXPadPress CloseMessage ReleaseAll End -_0034: +JubilifeCitySouthHouse1F_Pachirisu: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer WaitFanfare SEQ_SE_CONFIRM PlayCry SPECIES_PACHIRISU - Message 2 + Message JubilifeCitySouthHouse1F_PachirisuKukkuuh WaitCry WaitABXPadPress CloseMessage diff --git a/res/field/scripts/scripts_jubilife_city_south_house_2f.s b/res/field/scripts/scripts_jubilife_city_south_house_2f.s index 1a6560724e..d9c5d2f638 100644 --- a/res/field/scripts/scripts_jubilife_city_south_house_2f.s +++ b/res/field/scripts/scripts_jubilife_city_south_house_2f.s @@ -2,36 +2,36 @@ #include "res/text/bank/jubilife_city_south_house_2f.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _0034 + ScriptEntry JubilifeCitySouthHouse2F_Youngster + ScriptEntry JubilifeCitySouthHouse2F_PokefanF + ScriptEntry JubilifeCitySouthHouse2F_PokemonBreederF ScriptEntryEnd -_000E: +JubilifeCitySouthHouse2F_Youngster: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message JubilifeCitySouthHouse2F_SomeKindsOfPokemonEvolveWhenTheyGetStrongerFromBattling WaitABXPadPress CloseMessage ReleaseAll End -_0021: +JubilifeCitySouthHouse2F_PokefanF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message JubilifeCitySouthHouse2F_EvolutionMakesPokemonJustThatMuchMoreFascinating WaitABXPadPress CloseMessage ReleaseAll End -_0034: +JubilifeCitySouthHouse2F_PokemonBreederF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 2 + Message JubilifeCitySouthHouse2F_DidntProfRowanConductResearchWithProfOak WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_city_south_house_3f.s b/res/field/scripts/scripts_jubilife_city_south_house_3f.s index 67cc28ecef..754901a76c 100644 --- a/res/field/scripts/scripts_jubilife_city_south_house_3f.s +++ b/res/field/scripts/scripts_jubilife_city_south_house_3f.s @@ -2,14 +2,14 @@ #include "res/text/bank/jubilife_city_south_house_3f.h" - ScriptEntry _0006 + ScriptEntry JubilifeCitySouthHouse3F_PokefanM ScriptEntryEnd -_0006: +JubilifeCitySouthHouse3F_PokefanM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message JubilifeCitySouthHouse3F_WhenIGiveMyPokemonNicknamesItsLikeTheyreMyVeryOwn WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s b/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s index 4850902fea..226da2913d 100644 --- a/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s +++ b/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s @@ -2,39 +2,39 @@ #include "res/text/bank/jubilife_city_southwest_house_1f.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _0040 + ScriptEntry JubilifeCitySouthwestHouse1F_Youngster + ScriptEntry JubilifeCitySouthwestHouse1F_Pikachu + ScriptEntry JubilifeCitySouthwestHouse1F_MiddleAgedMan ScriptEntryEnd -_000E: +JubilifeCitySouthwestHouse1F_Youngster: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message JubilifeCitySouthwestHouse1F_Text_IGotMyPikachuThroughATradeFromSomeone WaitABXPadPress CloseMessage ReleaseAll End -_0021: +JubilifeCitySouthwestHouse1F_Pikachu: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer WaitFanfare SEQ_SE_CONFIRM PlayCry SPECIES_PIKACHU - Message 1 + Message JubilifeCitySouthwestHouse1F_Text_PikachuPikapikapikaaah WaitCry WaitABXPadPress CloseMessage ReleaseAll End -_0040: +JubilifeCitySouthwestHouse1F_MiddleAgedMan: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 2 + Message JubilifeCitySouthwestHouse1F_Text_IfEveryoneAroundTheWorldHadPokemon WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s b/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s index 5d58b08708..f6ee25aad7 100644 --- a/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s +++ b/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s @@ -2,47 +2,47 @@ #include "res/text/bank/jubilife_city_southwest_house_2f.h" - ScriptEntry _0012 - ScriptEntry _0025 - ScriptEntry _0038 - ScriptEntry _004B + ScriptEntry JubilifeCitySouthwestHouse2F_AceTrainerM + ScriptEntry JubilifeCitySouthwestHouse2F_Beauty + ScriptEntry JubilifeCitySouthwestHouse2F_Collector + ScriptEntry JubilifeCitySouthwestHouse2F_Lass ScriptEntryEnd -_0012: +JubilifeCitySouthwestHouse2F_AceTrainerM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message JubilifeCitySouthwestHouse2F_Text_WeComeFromFarawayLand WaitABXPadPress CloseMessage ReleaseAll End -_0025: +JubilifeCitySouthwestHouse2F_Beauty: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message JubilifeCitySouthwestHouse2F_Text_ILikeLookAtPokemonIGetFromFriendInTrade WaitABXPadPress CloseMessage ReleaseAll End -_0038: +JubilifeCitySouthwestHouse2F_Collector: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 2 + Message JubilifeCitySouthwestHouse2F_Text_YouCanTradePokemonWithPeopleAroundTheWorldOnNintendoWFC WaitABXPadPress CloseMessage ReleaseAll End -_004B: +JubilifeCitySouthwestHouse2F_Lass: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 3 + Message JubilifeCitySouthwestHouse2F_Text_WhenYouConnectWithPeopleOnNintendoWFCItsHardToBe WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_tv_1f.s b/res/field/scripts/scripts_jubilife_tv_1f.s index 07dd6f8f1a..4f7c9b8c35 100644 --- a/res/field/scripts/scripts_jubilife_tv_1f.s +++ b/res/field/scripts/scripts_jubilife_tv_1f.s @@ -2,215 +2,215 @@ #include "res/text/bank/jubilife_tv_1f.h" - ScriptEntry _0028 - ScriptEntry _002A - ScriptEntry _003D - ScriptEntry _003F - ScriptEntry _027E - ScriptEntry _0291 - ScriptEntry _02A4 - ScriptEntry _0026 - ScriptEntry _02A6 + ScriptEntry JubilifeTV1F_Unused1 + ScriptEntry JubilifeTV1F_GymGuide + ScriptEntry JubilifeTV1F_Unused2 + ScriptEntry JubilifeTV1F_AceTrainerSnowF + ScriptEntry JubilifeTV1F_Beauty + ScriptEntry JubilifeTV1F_MiddleAgedMan + ScriptEntry JubilifeTV1F_Unused3 + ScriptEntry JubilifeTV1F_OnTransition + ScriptEntry JubilifeTV1F_AceTrainerM ScriptEntryEnd -_0026: +JubilifeTV1F_OnTransition: End -_0028: +JubilifeTV1F_Unused1: End -_002A: +JubilifeTV1F_GymGuide: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message JubilifeTV1F_Text_WhyDontYouTryDressingUpYourPokemonNow WaitABXPadPress CloseMessage ReleaseAll End -_003D: +JubilifeTV1F_Unused2: End -_003F: +JubilifeTV1F_AceTrainerSnowF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfNe VAR_UNK_0x40F2, 0, _0257 - GoToIfSet FLAG_UNK_0x0AB3, _00A0 - GoToIfSet FLAG_UNK_0x0AA9, _0084 - Message 1 + GoToIfNe VAR_LOTTERY_PRIZE_ITEM, 0, JubilifeTV1F_GiveStoredLotteryPrize + GoToIfSet FLAG_OBTAINED_LOTTERY_PRIZE, JubilifeTV1F_YouveAlreadyDrawnALotoTicketToday + GoToIfSet FLAG_CHECKED_LUCKY_NUMBER, JubilifeTV1F_AskCheckLuckyNumberAgain + Message JubilifeTV1F_Text_ThisIsThePokemonLotteryCorner ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _00B6 - GoTo _00AB + GoToIfEq VAR_RESULT, MENU_YES, JubilifeTV1F_CheckTodaysLuckyNumber + GoTo JubilifeTV1F_OhISeePleaseDoVisitUsAgain -_0084: - Message 18 +JubilifeTV1F_AskCheckLuckyNumberAgain: + Message JubilifeTV1F_Text_WouldYouLikeToCheckTodaysLuckyNumberAgain ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _00B6 - GoTo _00AB + GoToIfEq VAR_RESULT, MENU_YES, JubilifeTV1F_CheckTodaysLuckyNumber + GoTo JubilifeTV1F_OhISeePleaseDoVisitUsAgain End -_00A0: - Message 2 +JubilifeTV1F_YouveAlreadyDrawnALotoTicketToday: + Message JubilifeTV1F_Text_YouveAlreadyDrawnALotoTicketToday WaitABXPadPress CloseMessage ReleaseAll End -_00AB: - Message 3 +JubilifeTV1F_OhISeePleaseDoVisitUsAgain: + Message JubilifeTV1F_Text_OhISeePleaseDoVisitUsAgain WaitABXPadPress CloseMessage ReleaseAll End -_00B6: - SetFlag FLAG_UNK_0x0AA9 - Message 4 +JubilifeTV1F_CheckTodaysLuckyNumber: + SetFlag FLAG_CHECKED_LUCKY_NUMBER + Message JubilifeTV1F_Text_FirstIllLookUpTodaysPokemonLotteryCornerLuckyNumber GetJubilifeLotteryTrainerID VAR_0x8000 BufferVarPaddingDigits 0, VAR_0x8000, PADDING_MODE_ZEROES, 5 - Message 5 + Message JubilifeTV1F_Text_YourLotoTicketNumberIsNum CheckForJubilifeLotteryWinner VAR_0x8001, VAR_0x8002, VAR_0x8003, VAR_0x8000 - GoToIfEq VAR_0x8002, 0, _00F5 - GoToIfEq VAR_0x8003, 0, _0100 - GoTo _010E + GoToIfEq VAR_0x8002, 0, JubilifeTV1F_NoMatch + GoToIfEq VAR_0x8003, FALSE, JubilifeTV1F_MatchedTeamsPokemon + GoTo JubilifeTV1F_MatchedPCBoxedPokemon -_00F5: - Message 8 +JubilifeTV1F_NoMatch: + Message JubilifeTV1F_Text_ImSorryYouDidntGetAMatch WaitABXPadPress CloseMessage ReleaseAll End -_0100: +JubilifeTV1F_MatchedTeamsPokemon: BufferPartyMonNickname 0, VAR_0x8001 - Message 6 - GoTo _011C + Message JubilifeTV1F_Text_CongratulationsTheIDOfYourTeamsPokemonMatchesYourLotoTicketNumber + GoTo JubilifeTV1F_CheckMatchedDigits -_010E: +JubilifeTV1F_MatchedPCBoxedPokemon: BufferMonNicknameFromPC 0, VAR_0x8001 - Message 7 - GoTo _011C + Message JubilifeTV1F_Text_CongratulationsTheIDOfYourPCBoxedPokemonMatchesYourLotoTicketNumber + GoTo JubilifeTV1F_CheckMatchedDigits -_011C: +JubilifeTV1F_CheckMatchedDigits: SetVar VAR_0x8008, VAR_0x8002 - GoToIfEq VAR_0x8008, 1, _0165 - GoToIfEq VAR_0x8008, 2, _0170 - GoToIfEq VAR_0x8008, 3, _0179 - GoToIfEq VAR_0x8008, 4, _0182 - GoToIfEq VAR_0x8008, 5, _018B + GoToIfEq VAR_0x8008, 1, JubilifeTV1F_LastDigitMatched + GoToIfEq VAR_0x8008, 2, JubilifeTV1F_LastTwoDigitsMatched + GoToIfEq VAR_0x8008, 3, JubilifeTV1F_LastThreeDigitsMatched + GoToIfEq VAR_0x8008, 4, JubilifeTV1F_LastFourDigitsMatched + GoToIfEq VAR_0x8008, 5, JubilifeTV1F_LastFiveDigitsMatched End -_0165: - Message 9 - GoTo _0194 +JubilifeTV1F_LastDigitMatched: + Message JubilifeTV1F_Text_TheLastDigitMatchedSoYouWinTheFourthPrize + GoTo JubilifeTV1F_SetLotteryPrize End -_0170: - Message 11 - GoTo _0194 +JubilifeTV1F_LastTwoDigitsMatched: + Message JubilifeTV1F_Text_TheLastTwoDigitsMatchedSoYouWinTheThirdPrize + GoTo JubilifeTV1F_SetLotteryPrize -_0179: - Message 12 - GoTo _0194 +JubilifeTV1F_LastThreeDigitsMatched: + Message JubilifeTV1F_Text_TheLastThreeDigitsMatchedSoYouWinTheSecondPrize + GoTo JubilifeTV1F_SetLotteryPrize -_0182: - Message 13 - GoTo _0194 +JubilifeTV1F_LastFourDigitsMatched: + Message JubilifeTV1F_Text_TheLastFourDigitsMatchedSoYouWinTheFirstPrize + GoTo JubilifeTV1F_SetLotteryPrize -_018B: - Message 14 - GoTo _0194 +JubilifeTV1F_LastFiveDigitsMatched: + Message JubilifeTV1F_Text_OhMyGoodnessAllFiveDigitsMatchedYouveWonTheJackpotPrize + GoTo JubilifeTV1F_SetLotteryPrize -_0194: +JubilifeTV1F_SetLotteryPrize: SetVar VAR_0x8008, VAR_0x8002 - GoToIfEq VAR_0x8008, 1, _01DD - GoToIfEq VAR_0x8008, 2, _01EB - GoToIfEq VAR_0x8008, 3, _01F7 - GoToIfEq VAR_0x8008, 4, _0203 - GoToIfEq VAR_0x8008, 5, _020F + GoToIfEq VAR_0x8008, 1, JubilifeTV1F_SetFourthPrize + GoToIfEq VAR_0x8008, 2, JubilifeTV1F_SetThirdPrize + GoToIfEq VAR_0x8008, 3, JubilifeTV1F_SetSecondPrize + GoToIfEq VAR_0x8008, 4, JubilifeTV1F_SetFirstPrize + GoToIfEq VAR_0x8008, 5, JubilifeTV1F_SetJackpotPrize End -_01DD: +JubilifeTV1F_SetFourthPrize: SetVar VAR_0x8003, ITEM_ULTRA_BALL - GoTo _021B + GoTo JubilifeTV1F_GiveLotteryPrize End -_01EB: +JubilifeTV1F_SetThirdPrize: SetVar VAR_0x8003, ITEM_PP_UP - GoTo _021B + GoTo JubilifeTV1F_GiveLotteryPrize -_01F7: +JubilifeTV1F_SetSecondPrize: SetVar VAR_0x8003, ITEM_EXP_SHARE - GoTo _021B + GoTo JubilifeTV1F_GiveLotteryPrize -_0203: +JubilifeTV1F_SetFirstPrize: SetVar VAR_0x8003, ITEM_MAX_REVIVE - GoTo _021B + GoTo JubilifeTV1F_GiveLotteryPrize -_020F: +JubilifeTV1F_SetJackpotPrize: SetVar VAR_0x8003, ITEM_MASTER_BALL - GoTo _021B + GoTo JubilifeTV1F_GiveLotteryPrize -_021B: +JubilifeTV1F_GiveLotteryPrize: SetVar VAR_0x8004, VAR_0x8003 SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _0246 + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, JubilifeTV1F_OhYouSeemToHaveNoRoomForThis Common_GiveItemQuantity - GoTo _0269 + GoTo JubilifeTV1F_PleaseDoVisitAgain -_0246: - SetVar VAR_UNK_0x40F2, VAR_0x8002 - Message 15 +JubilifeTV1F_OhYouSeemToHaveNoRoomForThis: + SetVar VAR_LOTTERY_PRIZE_ITEM, VAR_0x8002 + Message JubilifeTV1F_Text_OhYouSeemToHaveNoRoomForThis WaitABXPadPress CloseMessage ReleaseAll End -_0257: +JubilifeTV1F_GiveStoredLotteryPrize: BufferPlayerName 0 - Message 16 - SetVar VAR_0x8002, VAR_UNK_0x40F2 - GoTo _0194 - -_0269: - SetVar VAR_UNK_0x40F2, 0 - SetFlag FLAG_UNK_0x0AB3 - Message 17 + Message JubilifeTV1F_Text_ThisIsThePrizeWeveBeenHoldingForYou + SetVar VAR_0x8002, VAR_LOTTERY_PRIZE_ITEM + GoTo JubilifeTV1F_SetLotteryPrize + +JubilifeTV1F_PleaseDoVisitAgain: + SetVar VAR_LOTTERY_PRIZE_ITEM, 0 + SetFlag FLAG_OBTAINED_LOTTERY_PRIZE + Message JubilifeTV1F_Text_PleaseDoVisitAgain WaitABXPadPress CloseMessage ReleaseAll End -_027E: +JubilifeTV1F_Beauty: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 19 + Message JubilifeTV1F_Text_TheyKeepTrackOfOfficialRecordsHere WaitABXPadPress CloseMessage ReleaseAll End -_0291: +JubilifeTV1F_MiddleAgedMan: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 20 + Message JubilifeTV1F_Text_ImGoingToGetCommercialsShownOnTV WaitABXPadPress CloseMessage ReleaseAll End -_02A4: +JubilifeTV1F_Unused3: End -_02A6: +JubilifeTV1F_AceTrainerM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 21 + Message JubilifeTV1F_Text_TheTVStationInterviewsAllSortsOfTrainersForItsShows WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_tv_2f.s b/res/field/scripts/scripts_jubilife_tv_2f.s index baa292e650..2e701eb067 100644 --- a/res/field/scripts/scripts_jubilife_tv_2f.s +++ b/res/field/scripts/scripts_jubilife_tv_2f.s @@ -2,76 +2,76 @@ #include "res/text/bank/jubilife_tv_2f.h" - ScriptEntry _0031 - ScriptEntry _0044 - ScriptEntry _00CC - ScriptEntry _0012 + ScriptEntry JubilifeTV2F_Idol + ScriptEntry JubilifeTV2F_GymGuide + ScriptEntry JubilifeTV2F_Roughneck + ScriptEntry JubilifeTV2F_OnTransition ScriptEntryEnd -_0012: +JubilifeTV2F_OnTransition: CheckTVInterviewEligible TV_PROGRAM_SEGMENT_RIGHT_ON_PHOTO_CORNER, VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, 0, _002B - ClearFlag FLAG_UNK_0x0215 + GoToIfEq VAR_MAP_LOCAL_0, 0, JubilifeTV2F_SetFlagHideJubilifeTV2FReporter + ClearFlag FLAG_HIDE_JUBILIFE_TV_2F_REPORTER End -_002B: - SetFlag FLAG_UNK_0x0215 +JubilifeTV2F_SetFlagHideJubilifeTV2FReporter: + SetFlag FLAG_HIDE_JUBILIFE_TV_2F_REPORTER End -_0031: +JubilifeTV2F_Idol: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message JubilifeTV2F_Text_WhatAccessoriesWillGoWellWithMyDressToday WaitABXPadPress CloseMessage ReleaseAll End -_0044: +JubilifeTV2F_GymGuide: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x013D, _00A4 + GoToIfSet VAR_OBTAINED_ACCESSORY_STARTER_MASK, JubilifeTV2F_IHopeYouGetIntoCollectingAccessoriesForYourPokemon GetPlayerStarterSpecies VAR_RESULT - CallIfEq VAR_RESULT, SPECIES_TURTWIG, _00B4 - CallIfEq VAR_RESULT, SPECIES_CHIMCHAR, _00BC - CallIfEq VAR_RESULT, SPECIES_PIPLUP, _00C4 - SetVar VAR_UNK_0x410A, VAR_0x8004 + CallIfEq VAR_RESULT, SPECIES_TURTWIG, JubilifeTV2F_SetAccessoryTurtwigMask + CallIfEq VAR_RESULT, SPECIES_CHIMCHAR, JubilifeTV2F_SetAccessoryChimcharMask + CallIfEq VAR_RESULT, SPECIES_PIPLUP, JubilifeTV2F_SetAccessoryPiplupMask + SetVar VAR_ACCESSORY_STARTER_MASK, VAR_0x8004 BufferAccessoryNameWithArticle 0, VAR_0x8004 - Message 1 + Message JubilifeTV2F_Text_SoAGiftForOurFutureStar SetVar VAR_0x8005, 1 Common_GiveAccessoryWaitForConfirm - SetFlag FLAG_UNK_0x013D + SetFlag VAR_OBTAINED_ACCESSORY_STARTER_MASK CloseMessage ReleaseAll End -_00A4: - BufferAccessoryName 0, VAR_UNK_0x410A - Message 2 +JubilifeTV2F_IHopeYouGetIntoCollectingAccessoriesForYourPokemon: + BufferAccessoryName 0, VAR_ACCESSORY_STARTER_MASK + Message JubilifeTV2F_Text_IHopeYouGetIntoCollectingAccessoriesForYourPokemon WaitABXPadPress CloseMessage ReleaseAll End -_00B4: +JubilifeTV2F_SetAccessoryTurtwigMask: SetVar VAR_0x8004, ACCESSORY_TURTWIG_MASK Return -_00BC: +JubilifeTV2F_SetAccessoryChimcharMask: SetVar VAR_0x8004, ACCESSORY_CHIMCHAR_MASK Return -_00C4: +JubilifeTV2F_SetAccessoryPiplupMask: SetVar VAR_0x8004, ACCESSORY_PIPLUP_MASK Return -_00CC: +JubilifeTV2F_Roughneck: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 3 + Message JubilifeTV2F_Text_TheRoomAtTheBackIsOurDreamyFittingRoom WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s index 9497170907..7100e25bfe 100644 --- a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s +++ b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s @@ -1,80 +1,81 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_tv_2f_gallery.h" - - - ScriptEntry _003A - ScriptEntry _03CC - ScriptEntry _0409 - ScriptEntry _0446 - ScriptEntry _0483 - ScriptEntry _04C0 - ScriptEntry _04FD - ScriptEntry _053A - ScriptEntry _0577 - ScriptEntry _05B4 - ScriptEntry _05F1 - ScriptEntry _062E - ScriptEntry _0676 - ScriptEntry _0689 +#include "res/field/events/events_jubilife_tv_2f_gallery.h" + + + ScriptEntry JubilifeTV2FGallery_Hiker + ScriptEntry JubilifeTV2FGallery_Frame0 + ScriptEntry JubilifeTV2FGallery_Frame1 + ScriptEntry JubilifeTV2FGallery_Frame2 + ScriptEntry JubilifeTV2FGallery_Frame3 + ScriptEntry JubilifeTV2FGallery_Frame4 + ScriptEntry JubilifeTV2FGallery_Frame5 + ScriptEntry JubilifeTV2FGallery_Frame6 + ScriptEntry JubilifeTV2FGallery_Frame7 + ScriptEntry JubilifeTV2FGallery_Frame8 + ScriptEntry JubilifeTV2FGallery_Frame9 + ScriptEntry JubilifeTV2FGallery_Frame10 + ScriptEntry JubilifeTV2FGallery_PokemonBreederM + ScriptEntry JubilifeTV2FGallery_Twin ScriptEntryEnd -_003A: +JubilifeTV2FGallery_Hiker: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer SetVar VAR_0x8007, 0 - CallIfUnset FLAG_UNK_0x0088, _006F - GoToIfEq VAR_MAP_LOCAL_1, 0, _0077 - GoToIfEq VAR_MAP_LOCAL_1, 1, _0080 + CallIfUnset FLAG_ENTERED_DRESSING_ROOM, _006F + GoToIfEq VAR_MAP_LOCAL_1, 0, JubilifeTV2FGallery_AskDressUpPokemon + GoToIfEq VAR_MAP_LOCAL_1, 1, JubilifeTV2FGallery_AskDressUpPokemonChangePhoto End _006F: SetVar VAR_0x8007, 1 Return -_0077: - Message 1 - GoTo _00B5 +JubilifeTV2FGallery_AskDressUpPokemon: + Message JubilifeTV2FGallery_Text_DressUpYourPokemonYouWillDoThisWontYou + GoTo JubilifeTV2FGallery_YesNoDressUpPokemon -_0080: - Message 11 - GoTo _00B5 +JubilifeTV2FGallery_AskDressUpPokemonChangePhoto: + Message JubilifeTV2FGallery_Text_WouldYouLikeToDressUpAPokemonDearie + GoTo JubilifeTV2FGallery_YesNoDressUpPokemon -_0089: - Message 3 +JubilifeTV2FGallery_ShouldIExplainToYouHowToDressUpYourPokemon: + Message JubilifeTV2FGallery_Text_ShouldIExplainToYouHowToDressUpYourPokemon ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _00AC - GoToIfEq VAR_RESULT, MENU_NO, _00F5 + GoToIfEq VAR_RESULT, MENU_YES, JubilifeTV2FGallery_JustChooseTheAccessoriesAndPutThemOnYourPokemon + GoToIfEq VAR_RESULT, MENU_NO, JubilifeTV2FGallery_SetPokemonForDressUp End -_00AC: - Message 6 - GoTo _00D5 +JubilifeTV2FGallery_JustChooseTheAccessoriesAndPutThemOnYourPokemon: + Message JubilifeTV2FGallery_Text_JustChooseTheAccessoriesAndPutThemOnYourPokemon + GoTo JubilifeTV2FGallery_YesNoDressUpPokemonAfterExplanation -_00B5: +JubilifeTV2FGallery_YesNoDressUpPokemon: ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _0089 - GoToIfEq VAR_RESULT, MENU_NO, _02B3 + GoToIfEq VAR_RESULT, MENU_YES, JubilifeTV2FGallery_ShouldIExplainToYouHowToDressUpYourPokemon + GoToIfEq VAR_RESULT, MENU_NO, JubilifeTV2FGallery_OhYouSillyThingWheresYourSenseOfAdventure End -_00D5: +JubilifeTV2FGallery_YesNoDressUpPokemonAfterExplanation: ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _00F5 - GoToIfEq VAR_RESULT, MENU_NO, _02B3 + GoToIfEq VAR_RESULT, MENU_YES, JubilifeTV2FGallery_SetPokemonForDressUp + GoToIfEq VAR_RESULT, MENU_NO, JubilifeTV2FGallery_OhYouSillyThingWheresYourSenseOfAdventure End -_00F5: +JubilifeTV2FGallery_SetPokemonForDressUp: GetPartyCount VAR_RESULT - GoToIfEq VAR_RESULT, 1, _0115 - GoToIfNe VAR_RESULT, 1, _0121 + GoToIfEq VAR_RESULT, 1, JubilifeTV2FGallery_SetOnlyPokemonForDressUp + GoToIfNe VAR_RESULT, 1, JubilifeTV2FGallery_ChoosePokemonForDressUp End -_0115: +JubilifeTV2FGallery_SetOnlyPokemonForDressUp: SetVar VAR_MAP_LOCAL_2, 0 - GoTo _016C + GoTo JubilifeTV2FGallery_TehehehIHopeYouWillDressItUpAdorably -_0121: - Message 4 +JubilifeTV2FGallery_ChoosePokemonForDressUp: + Message JubilifeTV2FGallery_Text_OohIWonderWhichPokemonYoullDressUp CloseMessage FadeScreenOut WaitFadeScreen @@ -83,382 +84,382 @@ _0121: ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_MAP_LOCAL_2, 0xFF, _02B3 + GoToIfEq VAR_MAP_LOCAL_2, 0xFF, JubilifeTV2FGallery_OhYouSillyThingWheresYourSenseOfAdventure GetPartyMonSpecies VAR_MAP_LOCAL_2, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _02BE - GoTo _016C + GoToIfEq VAR_RESULT, SPECIES_NONE, JubilifeTV2FGallery_OohNonNonNonThatsAnEgg + GoTo JubilifeTV2FGallery_TehehehIHopeYouWillDressItUpAdorably -_016C: - Message 5 +JubilifeTV2FGallery_TehehehIHopeYouWillDressItUpAdorably: + Message JubilifeTV2FGallery_Text_TehehehIHopeYouWillDressItUpAdorably CloseMessage GetPlayerDir VAR_0x8006 - GoToIfEq VAR_0x8006, 0, _019E - GoToIfEq VAR_0x8006, 2, _01B8 - GoToIfEq VAR_0x8006, 3, _01D2 + GoToIfEq VAR_0x8006, DIR_NORTH, JubilifeTV2FGallery_EnterDressingRoomNorth + GoToIfEq VAR_0x8006, DIR_WEST, JubilifeTV2FGallery_EnterDressingRoomWest + GoToIfEq VAR_0x8006, DIR_EAST, JubilifeTV2FGallery_EnterDressingRoomEast End -_019E: - ApplyMovement 0, _0374 +JubilifeTV2FGallery_EnterDressingRoomNorth: + ApplyMovement LOCALID_HIKER, JubilifeTV2FGallery_Movement_HikerMoveOutOfTheWayNorth WaitMovement - ApplyMovement LOCALID_PLAYER, _0340 + ApplyMovement LOCALID_PLAYER, JubilifeTV2FGallery_Movement_PlayerEnterDressingRoomNorth WaitMovement - GoTo _01EC + GoTo JubilifeTV2FGallery_EnterDressingRoom -_01B8: - ApplyMovement 0, _0380 +JubilifeTV2FGallery_EnterDressingRoomWest: + ApplyMovement LOCALID_HIKER, JubilifeTV2FGallery_Movement_HikerMoveOutOfTheWayWest WaitMovement - ApplyMovement LOCALID_PLAYER, _0348 + ApplyMovement LOCALID_PLAYER, JubilifeTV2FGallery_Movement_PlayerEnterDressingRoomWest WaitMovement - GoTo _01EC + GoTo JubilifeTV2FGallery_EnterDressingRoom -_01D2: - ApplyMovement 0, _038C +JubilifeTV2FGallery_EnterDressingRoomEast: + ApplyMovement LOCALID_HIKER, JubilifeTV2FGallery_Movement_HikerMoveOutOfTheWayEast WaitMovement - ApplyMovement LOCALID_PLAYER, _0354 + ApplyMovement LOCALID_PLAYER, JubilifeTV2FGallery_Movement_PlayerEnterDressingRoomEast WaitMovement - GoTo _01EC + GoTo JubilifeTV2FGallery_EnterDressingRoom -_01EC: - SetFlag FLAG_UNK_0x0088 +JubilifeTV2FGallery_EnterDressingRoom: + SetFlag FLAG_ENTERED_DRESSING_ROOM FadeScreenOut WaitFadeScreen ScrCmd_0A6 VAR_MAP_LOCAL_2, VAR_0x8005, VAR_0x8007 ReturnToField - ApplyMovement LOCALID_PLAYER, _0360 + ApplyMovement LOCALID_PLAYER, JubilifeTV2FGallery_Movement_PlayerFaceSouth WaitMovement FadeScreenIn WaitFadeScreen - GoToIfEq VAR_0x8006, 0, _0245 - GoToIfEq VAR_0x8006, 2, _025F - GoToIfEq VAR_0x8006, 3, _0279 + GoToIfEq VAR_0x8006, DIR_NORTH, JubilifeTV2FGallery_ExitDressingRoomNorth + GoToIfEq VAR_0x8006, DIR_WEST, JubilifeTV2FGallery_ExitDressingRoomWest + GoToIfEq VAR_0x8006, DIR_EAST, JubilifeTV2FGallery_ExitDressingRoomEast End -_0245: - ApplyMovement LOCALID_PLAYER, _0368 +JubilifeTV2FGallery_ExitDressingRoomNorth: + ApplyMovement LOCALID_PLAYER, JubilifeTV2FGallery_Movement_PlayerExitDressingRoom WaitMovement - ApplyMovement 0, _0398 + ApplyMovement LOCALID_HIKER, JubilifeTV2FGallery_Movement_HikerBlockDoorNorth WaitMovement - GoTo _0293 + GoTo JubilifeTV2FGallery_CheckDressUpPokemonResult -_025F: - ApplyMovement LOCALID_PLAYER, _0368 +JubilifeTV2FGallery_ExitDressingRoomWest: + ApplyMovement LOCALID_PLAYER, JubilifeTV2FGallery_Movement_PlayerExitDressingRoom WaitMovement - ApplyMovement 0, _03A4 + ApplyMovement LOCALID_HIKER, JubilifeTV2FGallery_Movement_HikerBlockDoorWest WaitMovement - GoTo _0293 + GoTo JubilifeTV2FGallery_CheckDressUpPokemonResult -_0279: - ApplyMovement LOCALID_PLAYER, _0368 +JubilifeTV2FGallery_ExitDressingRoomEast: + ApplyMovement LOCALID_PLAYER, JubilifeTV2FGallery_Movement_PlayerExitDressingRoom WaitMovement - ApplyMovement 0, _03B0 + ApplyMovement LOCALID_HIKER, JubilifeTV2FGallery_Movement_HikerBlockDoorEast WaitMovement - GoTo _0293 + GoTo JubilifeTV2FGallery_CheckDressUpPokemonResult -_0293: - GoToIfEq VAR_0x8005, 0, _0335 +JubilifeTV2FGallery_CheckDressUpPokemonResult: + GoToIfEq VAR_0x8005, 0, JubilifeTV2FGallery_OhYouCameOutWithoutDoingAnythingHowDisappointing SetVar VAR_MAP_LOCAL_1, 1 - Message 7 + Message JubilifeTV2FGallery_Text_OohNiceWorkOhButItNeedsToHaveATitle WaitABXPadPress CloseMessage - GoTo _02C7 + GoTo JubilifeTV2FGallery_SetDressUpPhotoTitle -_02B3: - Message 2 +JubilifeTV2FGallery_OhYouSillyThingWheresYourSenseOfAdventure: + Message JubilifeTV2FGallery_Text_OhYouSillyThingWheresYourSenseOfAdventure WaitABXPadPress CloseMessage ReleaseAll End -_02BE: - Message 13 - GoTo _0121 +JubilifeTV2FGallery_OohNonNonNonThatsAnEgg: + Message JubilifeTV2FGallery_Text_OohNonNonNonThatsAnEgg + GoTo JubilifeTV2FGallery_ChoosePokemonForDressUp -_02C7: +JubilifeTV2FGallery_SetDressUpPhotoTitle: FadeScreenOut WaitFadeScreen - ScrCmd_243 0, VAR_RESULT, VAR_0x8004 + ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8004 ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, 0, _0328 + GoToIfEq VAR_RESULT, 0, JubilifeTV2FGallery_OhNonNonNonItWillBeForlornWithoutATitle SetDressUpPhotoTitle VAR_0x8004 - IncrementGameRecord RECORD_UNK_054 - ScrCmd_316 - ScrCmd_245 0, VAR_0x8004 - Message 8 - ApplyMovement 0, _03BC + IncrementGameRecord RECORD_TIMES_DRESSED_UP_POKEMON + Dummy316 + BufferCustomMessageWord 0, VAR_0x8004 + Message JubilifeTV2FGallery_Text_OohYesYesIGetItNow + ApplyMovement LOCALID_HIKER, JubilifeTV2FGallery_Movement_HikerFaceEast WaitMovement - Message 14 + Message JubilifeTV2FGallery_Text_IPutYourPhotoUpRightHere WaitABXPadPress CloseMessage - ApplyMovement 0, _03C4 + ApplyMovement LOCALID_HIKER, JubilifeTV2FGallery_Movement_HikerFaceSouth WaitMovement ReleaseAll End -_0328: - Message 9 +JubilifeTV2FGallery_OhNonNonNonItWillBeForlornWithoutATitle: + Message JubilifeTV2FGallery_Text_OhNonNonNonItWillBeForlornWithoutATitle WaitABXPadPress CloseMessage - GoTo _02C7 + GoTo JubilifeTV2FGallery_SetDressUpPhotoTitle -_0335: - Message 10 +JubilifeTV2FGallery_OhYouCameOutWithoutDoingAnythingHowDisappointing: + Message JubilifeTV2FGallery_Text_OhYouCameOutWithoutDoingAnythingHowDisappointing WaitABXPadPress CloseMessage ReleaseAll End .balign 4, 0 -_0340: +JubilifeTV2FGallery_Movement_PlayerEnterDressingRoomNorth: WalkSlowNorth 2 EndMovement .balign 4, 0 -_0348: +JubilifeTV2FGallery_Movement_PlayerEnterDressingRoomWest: WalkSlowWest WalkSlowNorth EndMovement .balign 4, 0 -_0354: +JubilifeTV2FGallery_Movement_PlayerEnterDressingRoomEast: WalkSlowEast WalkSlowNorth EndMovement .balign 4, 0 -_0360: +JubilifeTV2FGallery_Movement_PlayerFaceSouth: FaceSouth EndMovement .balign 4, 0 -_0368: +JubilifeTV2FGallery_Movement_PlayerExitDressingRoom: WalkSlowSouth 2 FaceNorth EndMovement .balign 4, 0 -_0374: +JubilifeTV2FGallery_Movement_HikerMoveOutOfTheWayNorth: WalkNormalWest FaceEast EndMovement .balign 4, 0 -_0380: +JubilifeTV2FGallery_Movement_HikerMoveOutOfTheWayWest: WalkNormalWest FaceEast EndMovement .balign 4, 0 -_038C: +JubilifeTV2FGallery_Movement_HikerMoveOutOfTheWayEast: WalkNormalEast FaceWest EndMovement .balign 4, 0 -_0398: +JubilifeTV2FGallery_Movement_HikerBlockDoorNorth: WalkNormalEast FaceSouth EndMovement .balign 4, 0 -_03A4: +JubilifeTV2FGallery_Movement_HikerBlockDoorWest: WalkNormalEast FaceSouth EndMovement .balign 4, 0 -_03B0: +JubilifeTV2FGallery_Movement_HikerBlockDoorEast: WalkNormalWest FaceSouth EndMovement .balign 4, 0 -_03BC: +JubilifeTV2FGallery_Movement_HikerFaceEast: FaceEast EndMovement .balign 4, 0 -_03C4: +JubilifeTV2FGallery_Movement_HikerFaceSouth: FaceSouth EndMovement -_03CC: +JubilifeTV2FGallery_Frame0: PlayFanfare SEQ_SE_CONFIRM LockAll - ScrCmd_12E 0, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _066B + DressUpPhotoHasData 0, VAR_RESULT + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto FadeScreenOut WaitFadeScreen - ScrCmd_0A7 0, VAR_RESULT + ShowDressUpPhoto 0, VAR_RESULT ReturnToField FadeScreenIn WaitFadeScreen ReleaseAll End -_0409: +JubilifeTV2FGallery_Frame1: PlayFanfare SEQ_SE_CONFIRM LockAll - ScrCmd_12E 1, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _066B + DressUpPhotoHasData 1, VAR_RESULT + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto FadeScreenOut WaitFadeScreen - ScrCmd_0A7 1, VAR_RESULT + ShowDressUpPhoto 1, VAR_RESULT ReturnToField FadeScreenIn WaitFadeScreen ReleaseAll End -_0446: +JubilifeTV2FGallery_Frame2: PlayFanfare SEQ_SE_CONFIRM LockAll - ScrCmd_12E 2, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _066B + DressUpPhotoHasData 2, VAR_RESULT + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto FadeScreenOut WaitFadeScreen - ScrCmd_0A7 2, VAR_RESULT + ShowDressUpPhoto 2, VAR_RESULT ReturnToField FadeScreenIn WaitFadeScreen ReleaseAll End -_0483: +JubilifeTV2FGallery_Frame3: PlayFanfare SEQ_SE_CONFIRM LockAll - ScrCmd_12E 3, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _066B + DressUpPhotoHasData 3, VAR_RESULT + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto FadeScreenOut WaitFadeScreen - ScrCmd_0A7 3, VAR_RESULT + ShowDressUpPhoto 3, VAR_RESULT ReturnToField FadeScreenIn WaitFadeScreen ReleaseAll End -_04C0: +JubilifeTV2FGallery_Frame4: PlayFanfare SEQ_SE_CONFIRM LockAll - ScrCmd_12E 4, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _066B + DressUpPhotoHasData 4, VAR_RESULT + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto FadeScreenOut WaitFadeScreen - ScrCmd_0A7 4, VAR_RESULT + ShowDressUpPhoto 4, VAR_RESULT ReturnToField FadeScreenIn WaitFadeScreen ReleaseAll End -_04FD: +JubilifeTV2FGallery_Frame5: PlayFanfare SEQ_SE_CONFIRM LockAll - ScrCmd_12E 5, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _066B + DressUpPhotoHasData 5, VAR_RESULT + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto FadeScreenOut WaitFadeScreen - ScrCmd_0A7 5, VAR_RESULT + ShowDressUpPhoto 5, VAR_RESULT ReturnToField FadeScreenIn WaitFadeScreen ReleaseAll End -_053A: +JubilifeTV2FGallery_Frame6: PlayFanfare SEQ_SE_CONFIRM LockAll - ScrCmd_12E 6, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _066B + DressUpPhotoHasData 6, VAR_RESULT + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto FadeScreenOut WaitFadeScreen - ScrCmd_0A7 6, VAR_RESULT + ShowDressUpPhoto 6, VAR_RESULT ReturnToField FadeScreenIn WaitFadeScreen ReleaseAll End -_0577: +JubilifeTV2FGallery_Frame7: PlayFanfare SEQ_SE_CONFIRM LockAll - ScrCmd_12E 7, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _066B + DressUpPhotoHasData 7, VAR_RESULT + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto FadeScreenOut WaitFadeScreen - ScrCmd_0A7 7, VAR_RESULT + ShowDressUpPhoto 7, VAR_RESULT ReturnToField FadeScreenIn WaitFadeScreen ReleaseAll End -_05B4: +JubilifeTV2FGallery_Frame8: PlayFanfare SEQ_SE_CONFIRM LockAll - ScrCmd_12E 8, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _066B + DressUpPhotoHasData 8, VAR_RESULT + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto FadeScreenOut WaitFadeScreen - ScrCmd_0A7 8, VAR_RESULT + ShowDressUpPhoto 8, VAR_RESULT ReturnToField FadeScreenIn WaitFadeScreen ReleaseAll End -_05F1: +JubilifeTV2FGallery_Frame9: PlayFanfare SEQ_SE_CONFIRM LockAll - ScrCmd_12E 9, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _066B + DressUpPhotoHasData 9, VAR_RESULT + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto FadeScreenOut WaitFadeScreen - ScrCmd_0A7 9, VAR_RESULT + ShowDressUpPhoto 9, VAR_RESULT ReturnToField FadeScreenIn WaitFadeScreen ReleaseAll End -_062E: +JubilifeTV2FGallery_Frame10: PlayFanfare SEQ_SE_CONFIRM LockAll - ScrCmd_12E 10, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _066B + DressUpPhotoHasData 10, VAR_RESULT + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto FadeScreenOut WaitFadeScreen - ScrCmd_0A7 10, VAR_RESULT + ShowDressUpPhoto 10, VAR_RESULT ReturnToField FadeScreenIn WaitFadeScreen ReleaseAll End -_066B: - Message 15 +JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto: + Message JubilifeTV2FGallery_Text_ItsAFrameForHoldingAPokemonPortraitPhoto WaitABXPadPress CloseMessage ReleaseAll End -_0676: +JubilifeTV2FGallery_PokemonBreederM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 16 + Message JubilifeTV2FGallery_Text_TheyDisplayPhotosFromTrainersYouBeenMixinRecordsWithRight WaitABXPadPress CloseMessage ReleaseAll End -_0689: +JubilifeTV2FGallery_Twin: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 17 + Message JubilifeTV2FGallery_Text_SomeoneGaveMeANewBackdropWhenIWentToTheGlobalTerminal WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_tv_3f.s b/res/field/scripts/scripts_jubilife_tv_3f.s index a521f9f216..99dee39ecf 100644 --- a/res/field/scripts/scripts_jubilife_tv_3f.s +++ b/res/field/scripts/scripts_jubilife_tv_3f.s @@ -1,120 +1,121 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_tv_3f.h" +#include "res/field/events/events_jubilife_tv_3f.h" - ScriptEntry _0012 - ScriptEntry _0054 - ScriptEntry _0067 - ScriptEntry _007A + ScriptEntry JubilifeTV3F_Beauty1 + ScriptEntry JubilifeTV3F_Beauty2 + ScriptEntry JubilifeTV3F_GymGuide1 + ScriptEntry JubilifeTV3F_GymGuide2 ScriptEntryEnd -_0012: +JubilifeTV3F_Beauty1: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - ApplyMovement 0, _0044 + ApplyMovement LOCALID_BEAUTY_1, JubilifeTV3F_Movement_BeautyFaceEastGroupRankingRoom WaitMovement - Message 0 + Message JubilifeTV3F_Text_TheRoomClosestToTheStairsIsTheGroupRankingRoom CloseMessage WaitTime 8, VAR_RESULT - ApplyMovement 0, _004C + ApplyMovement LOCALID_BEAUTY_1, JubilifeTV3F_Movement_BeautyFaceWestGlobalRankingRoom WaitMovement - Message 1 + Message JubilifeTV3F_Text_TheRoomOnTheOppositeSideIsTheGlobalRankingRoom WaitABXPadPress CloseMessage ReleaseAll End .balign 4, 0 -_0044: +JubilifeTV3F_Movement_BeautyFaceEastGroupRankingRoom: FaceEast EndMovement .balign 4, 0 -_004C: +JubilifeTV3F_Movement_BeautyFaceWestGlobalRankingRoom: FaceWest EndMovement -_0054: +JubilifeTV3F_Beauty2: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 2 + Message JubilifeTV3F_Text_TheMoreTradesIMakeTheBetterMyOddsOfWinningThePokemonLottery WaitABXPadPress CloseMessage ReleaseAll End -_0067: +JubilifeTV3F_GymGuide1: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 3 + Message JubilifeTV3F_Text_RecordsAreFineThings WaitABXPadPress CloseMessage ReleaseAll End -_007A: +JubilifeTV3F_GymGuide2: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 4 + Message JubilifeTV3F_Text_WillYouTellMeYourOpinionOnTV ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _009C - GoTo _015B + GoToIfEq VAR_RESULT, MENU_YES, JubilifeTV3F_ChooseCustomMessageWords + GoTo JubilifeTV3F_OhAllRightICanUnderstandHowBusyItMustGetForYou -_009C: +JubilifeTV3F_ChooseCustomMessageWords: FadeScreenOut WaitFadeScreen CloseMessage - ScrCmd_244 0, VAR_RESULT, VAR_0x8000, VAR_0x8001 + ChooseTwoCustomMessageWords 0, VAR_RESULT, VAR_0x8000, VAR_0x8001 ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, 0, _015B - Message 5 + GoToIfEq VAR_RESULT, FALSE, JubilifeTV3F_OhAllRightICanUnderstandHowBusyItMustGetForYou + Message JubilifeTV3F_Text_MovingRightAlongWhatFeedbackCanYouGiveMeAboutTV FadeScreenOut WaitFadeScreen CloseMessage - ScrCmd_244 0, VAR_RESULT, VAR_0x8002, VAR_0x8003 + ChooseTwoCustomMessageWords 0, VAR_RESULT, VAR_0x8002, VAR_0x8003 ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, 0, _015B - ScrCmd_249 VAR_RESULT, VAR_0x8000, VAR_0x8001, VAR_0x8002, VAR_0x8003 - GoToIfEq VAR_RESULT, 0xFF, _0131 - GoToIfEq VAR_RESULT, 0, _0131 - GoTo _0166 + GoToIfEq VAR_RESULT, FALSE, JubilifeTV3F_OhAllRightICanUnderstandHowBusyItMustGetForYou + GetWallpaperFromCustomMessageWords VAR_RESULT, VAR_0x8000, VAR_0x8001, VAR_0x8002, VAR_0x8003 + GoToIfEq VAR_RESULT, 0xFF, JubilifeTV3F_CheckIsMysteryGiftPhrase + GoToIfEq VAR_RESULT, 0, JubilifeTV3F_CheckIsMysteryGiftPhrase + GoTo JubilifeTV3F_IThinkICanSwingADealToGetYouANewWallpaperForYourPCBoxes -_0131: - ScrCmd_2AA VAR_RESULT, VAR_0x8000, VAR_0x8001, VAR_0x8002, VAR_0x8003 - GoToIfEq VAR_RESULT, 0, _0150 - GoTo _0171 +JubilifeTV3F_CheckIsMysteryGiftPhrase: + CheckIsMysteryGiftPhrase VAR_RESULT, VAR_0x8000, VAR_0x8001, VAR_0x8002, VAR_0x8003 + GoToIfEq VAR_RESULT, FALSE, JubilifeTV3F_ThanksForAnsweringMyQuestion + GoTo JubilifeTV3F_IThinkICanSwingADealSoYouCanReceiveAMysteryGift -_0150: - Message 6 +JubilifeTV3F_ThanksForAnsweringMyQuestion: + Message JubilifeTV3F_Text_ThanksForAnsweringMyQuestion WaitABXPadPress CloseMessage ReleaseAll End -_015B: - Message 7 +JubilifeTV3F_OhAllRightICanUnderstandHowBusyItMustGetForYou: + Message JubilifeTV3F_Text_OhAllRightICanUnderstandHowBusyItMustGetForYou WaitABXPadPress CloseMessage ReleaseAll End -_0166: - Message 8 +JubilifeTV3F_IThinkICanSwingADealToGetYouANewWallpaperForYourPCBoxes: + Message JubilifeTV3F_Text_IThinkICanSwingADealToGetYouANewWallpaperForYourPCBoxes WaitABXPadPress CloseMessage ReleaseAll End -_0171: - Message 9 +JubilifeTV3F_IThinkICanSwingADealSoYouCanReceiveAMysteryGift: + Message JubilifeTV3F_Text_IThinkICanSwingADealSoYouCanReceiveAMysteryGift WaitABXPadPress UnlockMysteryGift CloseMessage diff --git a/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s b/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s index 39dd424e9d..948d1964cf 100644 --- a/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s +++ b/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s @@ -2,71 +2,71 @@ #include "res/text/bank/jubilife_tv_3f_global_ranking_room.h" - ScriptEntry _001E - ScriptEntry _002C - ScriptEntry _003A - ScriptEntry _0048 - ScriptEntry _005B - ScriptEntry _006E - ScriptEntry _0081 + ScriptEntry JubilifeTV3FGlobalRankingRoom_RecordMachinePokemon + ScriptEntry JubilifeTV3FGlobalRankingRoom_RecordMachineBattles + ScriptEntry JubilifeTV3FGlobalRankingRoom_RecordMachineContests + ScriptEntry JubilifeTV3FGlobalRankingRoom_AceTrainerF + ScriptEntry JubilifeTV3FGlobalRankingRoom_Collector + ScriptEntry JubilifeTV3FGlobalRankingRoom_Fisherman + ScriptEntry JubilifeTV3FGlobalRankingRoom_Worker ScriptEntryEnd -_001E: +JubilifeTV3FGlobalRankingRoom_RecordMachinePokemon: PlayFanfare SEQ_SE_CONFIRM LockAll ScrCmd_1B5 0 ReleaseAll End -_002C: +JubilifeTV3FGlobalRankingRoom_RecordMachineBattles: PlayFanfare SEQ_SE_CONFIRM LockAll ScrCmd_1B5 1 ReleaseAll End -_003A: +JubilifeTV3FGlobalRankingRoom_RecordMachineContests: PlayFanfare SEQ_SE_CONFIRM LockAll ScrCmd_1B5 2 ReleaseAll End -_0048: +JubilifeTV3FGlobalRankingRoom_AceTrainerF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message JubilifeTV3FGlobalRankingRoom_Text_SomeoneBrokeMyPokemonCatchingRecord WaitABXPadPress CloseMessage ReleaseAll End -_005B: +JubilifeTV3FGlobalRankingRoom_Collector: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message JubilifeTV3FGlobalRankingRoom_Text_IBetItdFeelGreatIfICouldBeNumberOneHere WaitABXPadPress CloseMessage ReleaseAll End -_006E: +JubilifeTV3FGlobalRankingRoom_Fisherman: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 2 + Message JubilifeTV3FGlobalRankingRoom_Text_ImTryingForTheWorldRecordAtPokemonFishing WaitABXPadPress CloseMessage ReleaseAll End -_0081: +JubilifeTV3FGlobalRankingRoom_Worker: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 3 + Message JubilifeTV3FGlobalRankingRoom_Text_SorryImStillFineTuningThisThingyHere WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s b/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s index d75b200d78..5b0f3bd93b 100644 --- a/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s +++ b/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s @@ -2,60 +2,60 @@ #include "res/text/bank/jubilife_tv_3f_group_ranking_room.h" - ScriptEntry _001A - ScriptEntry _0028 - ScriptEntry _0036 - ScriptEntry _0044 - ScriptEntry _0057 - ScriptEntry _006A + ScriptEntry JubilifeTV3FGroupRankingRoom_RecordMachinePokemon + ScriptEntry JubilifeTV3FGroupRankingRoom_RecordMachineBattles + ScriptEntry JubilifeTV3FGroupRankingRoom_RecordMachineContests + ScriptEntry JubilifeTV3FGroupRankingRoom_Youngster + ScriptEntry JubilifeTV3FGroupRankingRoom_BattleGirl + ScriptEntry JubilifeTV3FGroupRankingRoom_Worker ScriptEntryEnd -_001A: +JubilifeTV3FGroupRankingRoom_RecordMachinePokemon: PlayFanfare SEQ_SE_CONFIRM LockAll ScrCmd_1B5 3 ReleaseAll End -_0028: +JubilifeTV3FGroupRankingRoom_RecordMachineBattles: PlayFanfare SEQ_SE_CONFIRM LockAll ScrCmd_1B5 4 ReleaseAll End -_0036: +JubilifeTV3FGroupRankingRoom_RecordMachineContests: PlayFanfare SEQ_SE_CONFIRM LockAll ScrCmd_1B5 5 ReleaseAll End -_0044: +JubilifeTV3FGroupRankingRoom_Youngster: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message JubilifeTV3FGroupRankingRoom_Text_YouCanSeeTheRankingsOfPeopleInYourGroupHere WaitABXPadPress CloseMessage ReleaseAll End -_0057: +JubilifeTV3FGroupRankingRoom_BattleGirl: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message JubilifeTV3FGroupRankingRoom_Text_TheseRankingsAreNifty WaitABXPadPress CloseMessage ReleaseAll End -_006A: +JubilifeTV3FGroupRankingRoom_Worker: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 2 + Message JubilifeTV3FGroupRankingRoom_Text_SorryImStillFineTuningThisThingyHere WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_tv_4f.s b/res/field/scripts/scripts_jubilife_tv_4f.s index 3c52fc5880..83b167ea3b 100644 --- a/res/field/scripts/scripts_jubilife_tv_4f.s +++ b/res/field/scripts/scripts_jubilife_tv_4f.s @@ -2,36 +2,36 @@ #include "res/text/bank/jubilife_tv_4f.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _0034 + ScriptEntry JubilifeTV4F_MiddleAgedMan + ScriptEntry JubilifeTV4F_Receptionist + ScriptEntry JubilifeTV4F_PokemonBreederF ScriptEntryEnd -_000E: +JubilifeTV4F_MiddleAgedMan: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message JubilifeTV4F_Text_YourExploitsAreFantastic WaitABXPadPress CloseMessage ReleaseAll End -_0021: +JubilifeTV4F_Receptionist: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message JubilifeTV4F_Text_ParticipationForAllIsOurTVNetworksMotto WaitABXPadPress CloseMessage ReleaseAll End -_0034: +JubilifeTV4F_PokemonBreederF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 2 + Message JubilifeTV4F_Text_WerePromotingTheThemeSmilesAreDreamy WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_mystery_gift_deliveryman.s b/res/field/scripts/scripts_mystery_gift_deliveryman.s index 4e7d6f7f83..5afe8748b3 100644 --- a/res/field/scripts/scripts_mystery_gift_deliveryman.s +++ b/res/field/scripts/scripts_mystery_gift_deliveryman.s @@ -10,12 +10,12 @@ _000A: LoadMysteryGift CheckAvailableMysteryGift VAR_UNK_0x40ED GoToIfEq VAR_UNK_0x40ED, 0, _002B - ClearFlag FLAG_UNK_0x020A + ClearFlag FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN UnloadMysteryGift End _002B: - SetFlag FLAG_UNK_0x020A + SetFlag FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN UnloadMysteryGift End diff --git a/res/field/scripts/scripts_pokemon_center_daily_trainers.s b/res/field/scripts/scripts_pokemon_center_daily_trainers.s index 3cf7705956..fa086919bc 100644 --- a/res/field/scripts/scripts_pokemon_center_daily_trainers.s +++ b/res/field/scripts/scripts_pokemon_center_daily_trainers.s @@ -26,8 +26,8 @@ ScriptEntryEnd PokemonCenterDailyTrainers_CheckUnlockedVSSeeker: - SetFlag FLAG_UNK_0x0183 - SetFlag FLAG_UNK_0x0184 + SetFlag FLAG_HIDE_POKECENTER_DAILY_TRAINER_1 + SetFlag FLAG_HIDE_POKECENTER_DAILY_TRAINER_2 GoToIfUnset FLAG_UNLOCKED_VS_SEEKER_LVL_1, PokemonCenterDailyTrainers_End Call PokemonCenterDailyTrainers_SetNPCs End @@ -123,43 +123,43 @@ PokemonCenterDailyTrainers_SetNPCsSaturday: Return PokemonCenterDailyTrainers_SetNPCGrace: - ClearFlag FLAG_UNK_0x0183 + ClearFlag FLAG_HIDE_POKECENTER_DAILY_TRAINER_1 SetVar VAR_NPC_1, GRACE Return PokemonCenterDailyTrainers_SetNPCsTevinAndKinsey: - ClearFlag FLAG_UNK_0x0183 - ClearFlag FLAG_UNK_0x0184 + ClearFlag FLAG_HIDE_POKECENTER_DAILY_TRAINER_1 + ClearFlag FLAG_HIDE_POKECENTER_DAILY_TRAINER_2 SetVar VAR_NPC_1, KINSEY SetVar VAR_NPC_2, TEVIN Return PokemonCenterDailyTrainers_SetNPCsTevinAndKinsey2: - ClearFlag FLAG_UNK_0x0183 - ClearFlag FLAG_UNK_0x0184 + ClearFlag FLAG_HIDE_POKECENTER_DAILY_TRAINER_1 + ClearFlag FLAG_HIDE_POKECENTER_DAILY_TRAINER_2 SetVar VAR_NPC_1, KINSEY SetVar VAR_NPC_2, TEVIN Return PokemonCenterDailyTrainers_SetNPCLee: - ClearFlag FLAG_UNK_0x0183 + ClearFlag FLAG_HIDE_POKECENTER_DAILY_TRAINER_1 SetVar VAR_NPC_1, LEE Return PokemonCenterDailyTrainers_SetNPCsRoxyAndOli: - ClearFlag FLAG_UNK_0x0183 - ClearFlag FLAG_UNK_0x0184 + ClearFlag FLAG_HIDE_POKECENTER_DAILY_TRAINER_1 + ClearFlag FLAG_HIDE_POKECENTER_DAILY_TRAINER_2 SetVar VAR_NPC_1, ROXY_AND_OLI_1 SetVar VAR_NPC_2, ROXY_AND_OLI_2 Return PokemonCenterDailyTrainers_SetNPCAriel: - ClearFlag FLAG_UNK_0x0183 + ClearFlag FLAG_HIDE_POKECENTER_DAILY_TRAINER_1 SetVar VAR_NPC_1, ARIEL Return PokemonCenterDailyTrainers_SetNPCArturo: - ClearFlag FLAG_UNK_0x0183 + ClearFlag FLAG_HIDE_POKECENTER_DAILY_TRAINER_1 SetVar VAR_NPC_1, ARTURO Return diff --git a/res/field/scripts/scripts_poketch_co_1f.s b/res/field/scripts/scripts_poketch_co_1f.s index 8a45abe612..5b2db8e757 100644 --- a/res/field/scripts/scripts_poketch_co_1f.s +++ b/res/field/scripts/scripts_poketch_co_1f.s @@ -1,171 +1,172 @@ #include "macros/scrcmd.inc" #include "res/text/bank/poketch_co_1f.h" +#include "res/field/events/events_poketch_co_1f.h" - ScriptEntry _0042 - ScriptEntry _01C3 - ScriptEntry _01D6 - ScriptEntry _01E9 - ScriptEntry _0016 + ScriptEntry PoketchCo1F_PoketchCoPresident + ScriptEntry PoketchCo1F_ScientistM + ScriptEntry PoketchCo1F_Receptionist + ScriptEntry PoketchCo1F_Lass + ScriptEntry PoketchCo1F_OnTransition ScriptEntryEnd -_0016: +PoketchCo1F_OnTransition: CheckTVInterviewEligible TV_PROGRAM_SEGMENT_THE_POKETCH_WATCH, VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, 0, _003C - GoToIfLt VAR_JUBILIFE_CITY_STATE, 2, _003C - ClearFlag FLAG_UNK_0x0212 + GoToIfEq VAR_MAP_LOCAL_0, 0, PoketchCo1F_HideReporter + GoToIfLt VAR_JUBILIFE_CITY_STATE, 2, PoketchCo1F_HideReporter + ClearFlag FLAG_HIDE_POKETCH_CO_1F_REPORTER End -_003C: - SetFlag FLAG_UNK_0x0212 +PoketchCo1F_HideReporter: + SetFlag FLAG_HIDE_POKETCH_CO_1F_REPORTER End -_0042: +PoketchCo1F_PoketchCoPresident: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message PoketchCo1F_Text_ImThePresidentOfThePoketchCompany CountBadgesAcquired VAR_0x8000 - GoToIfEq VAR_0x8000, 0, _0181 + GoToIfEq VAR_0x8000, 0, PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetAGymBadge CheckPoketchAppRegistered POKETCH_APPID_MEMOPAD, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _00C5 + GoToIfEq VAR_RESULT, FALSE, PoketchCo1F_CheckBadgesForMemoPadApp CheckPoketchAppRegistered POKETCH_APPID_MARKINGMAP, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _00DC + GoToIfEq VAR_RESULT, FALSE, PoketchCo1F_CheckBadgesForMarkingMapApp CheckPoketchAppRegistered POKETCH_APPID_LINKSEARCHER, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _00F3 + GoToIfEq VAR_RESULT, FALSE, PoketchCo1F_CheckBadgesForLinkSearcherApp CheckPoketchAppRegistered POKETCH_APPID_MOVETESTER, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _010A + GoToIfEq VAR_RESULT, FALSE, PoketchCo1F_CheckBadgesForMoveTesterApp CheckItem ITEM_POKE_RADAR, 1, VAR_RESULT - GoToIfEq VAR_RESULT, 1, _01B8 - GoTo _01AD + GoToIfEq VAR_RESULT, TRUE, PoketchCo1F_DoYouThinkIShouldSolicitNewPoketchIdeas + GoTo PoketchCo1F_YupAllSortsOfPeopleWillGiveYouPoketchApps -_00C5: +PoketchCo1F_CheckBadgesForMemoPadApp: CountBadgesAcquired VAR_RESULT - GoToIfGe VAR_RESULT, 1, _0121 - GoTo _0181 + GoToIfGe VAR_RESULT, 1, PoketchCo1F_GiveMemoPadApp + GoTo PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetAGymBadge -_00DC: +PoketchCo1F_CheckBadgesForMarkingMapApp: CountBadgesAcquired VAR_RESULT - GoToIfGe VAR_RESULT, 3, _0139 - GoTo _018C + GoToIfGe VAR_RESULT, 3, PoketchCo1F_GiveMarkingMapApp + GoTo PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetThreeGymBadges -_00F3: +PoketchCo1F_CheckBadgesForLinkSearcherApp: CountBadgesAcquired VAR_RESULT - GoToIfGe VAR_RESULT, 5, _0151 - GoTo _0197 + GoToIfGe VAR_RESULT, 5, PoketchCo1F_GiveLinkSearcherApp + GoTo PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetFiveGymBadges -_010A: +PoketchCo1F_CheckBadgesForMoveTesterApp: CountBadgesAcquired VAR_RESULT - GoToIfGe VAR_RESULT, 7, _0169 - GoTo _01A2 + GoToIfGe VAR_RESULT, 7, PoketchCo1F_GiveMoveTesterApp + GoTo PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetSevenGymBadges -_0121: - Message 2 +PoketchCo1F_GiveMemoPadApp: + Message PoketchCo1F_Text_IveDevelopedANewPoketchApp SetVar VAR_0x8004, POKETCH_APPID_MEMOPAD Common_GivePoketchApp - Message 3 + Message PoketchCo1F_Text_ThatsTheMemoPad WaitABXPadPress CloseMessage ReleaseAll End -_0139: - Message 5 +PoketchCo1F_GiveMarkingMapApp: + Message PoketchCo1F_Text_IveDevelopedAnotherNewPoketchApp SetVar VAR_0x8004, POKETCH_APPID_MARKINGMAP Common_GivePoketchApp - Message 6 + Message PoketchCo1F_Text_HavingAMapConstantlyDisplayedIsConvenientNo WaitABXPadPress CloseMessage ReleaseAll End -_0151: - Message 8 +PoketchCo1F_GiveLinkSearcherApp: + Message PoketchCo1F_Text_IveDevelopedYetAnotherNewPoketchApp SetVar VAR_0x8004, POKETCH_APPID_LINKSEARCHER Common_GivePoketchApp - Message 9 + Message PoketchCo1F_Text_IThinkItWillBeUsefulToKnowHowManyPeopleAreCommunicating WaitABXPadPress CloseMessage ReleaseAll End -_0169: - Message 11 +PoketchCo1F_GiveMoveTesterApp: + Message PoketchCo1F_Text_IveDevelopedStillYetAnotherNewPoketchApp SetVar VAR_0x8004, POKETCH_APPID_MOVETESTER Common_GivePoketchApp - Message 12 + Message PoketchCo1F_Text_CheckTypeMatchupsSoYouCanMakeAllYourAttackSuperEffective WaitABXPadPress CloseMessage ReleaseAll End -_0181: - Message 1 +PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetAGymBadge: + Message PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetAGymBadge WaitABXPadPress CloseMessage ReleaseAll End -_018C: - Message 4 +PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetThreeGymBadges: + Message PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetThreeGymBadges WaitABXPadPress CloseMessage ReleaseAll End -_0197: - Message 7 +PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetFiveGymBadges: + Message PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetFiveGymBadges WaitABXPadPress CloseMessage ReleaseAll End -_01A2: - Message 10 +PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetSevenGymBadges: + Message PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetSevenGymBadges WaitABXPadPress CloseMessage ReleaseAll End -_01AD: - Message 13 +PoketchCo1F_YupAllSortsOfPeopleWillGiveYouPoketchApps: + Message PoketchCo1F_Text_YupAllSortsOfPeopleWillGiveYouPoketchApps WaitABXPadPress CloseMessage ReleaseAll End -_01B8: - Message 14 +PoketchCo1F_DoYouThinkIShouldSolicitNewPoketchIdeas: + Message PoketchCo1F_Text_DoYouThinkIShouldSolicitNewPoketchIdeas WaitABXPadPress CloseMessage ReleaseAll End -_01C3: +PoketchCo1F_ScientistM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 15 + Message PoketchCo1F_Text_OhYouCanBeSureIWillKeepDevelopingPoketchApps WaitABXPadPress CloseMessage ReleaseAll End -_01D6: +PoketchCo1F_Receptionist: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 16 + Message PoketchCo1F_Text_WelcomeToThePoketchCompany WaitABXPadPress CloseMessage ReleaseAll End -_01E9: +PoketchCo1F_Lass: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 17 + Message PoketchCo1F_Text_HeyDoYouWatchTV WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_poketch_co_2f.s b/res/field/scripts/scripts_poketch_co_2f.s index 6d407b0efc..286f062094 100644 --- a/res/field/scripts/scripts_poketch_co_2f.s +++ b/res/field/scripts/scripts_poketch_co_2f.s @@ -2,52 +2,52 @@ #include "res/text/bank/poketch_co_2f.h" - ScriptEntry _0012 - ScriptEntry _0025 - ScriptEntry _0038 - ScriptEntry _0057 + ScriptEntry PoketchCo2F_PokefanM + ScriptEntry PoketchCo2F_OldMan + ScriptEntry PoketchCo2F_Clefairy + ScriptEntry PoketchCo2F_Pachirisu ScriptEntryEnd -_0012: +PoketchCo2F_PokefanM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message PoketchCo2F_Text_WellTryToThinkLikeATrainerAndFindWhatPoketchAppsWouldBeGood WaitABXPadPress CloseMessage ReleaseAll End -_0025: +PoketchCo2F_OldMan: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message PoketchCo2F_Text_PokemonWatchThatsPoketchForShort WaitABXPadPress CloseMessage ReleaseAll End -_0038: +PoketchCo2F_Clefairy: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer WaitFanfare SEQ_SE_CONFIRM PlayCry SPECIES_CLEFAIRY - Message 2 + Message PoketchCo2F_Text_ClefairyCleffy WaitCry WaitABXPadPress CloseMessage ReleaseAll End -_0057: +PoketchCo2F_Pachirisu: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer WaitFanfare SEQ_SE_CONFIRM PlayCry SPECIES_PACHIRISU - Message 3 + Message PoketchCo2F_Text_PachirisuPatchii WaitCry WaitABXPadPress CloseMessage diff --git a/res/field/scripts/scripts_poketch_co_3f.s b/res/field/scripts/scripts_poketch_co_3f.s index f5d09321ef..5fe5d9ae6b 100644 --- a/res/field/scripts/scripts_poketch_co_3f.s +++ b/res/field/scripts/scripts_poketch_co_3f.s @@ -1,424 +1,425 @@ #include "macros/scrcmd.inc" #include "res/text/bank/poketch_co_3f.h" +#include "res/text/bank/menu_entries.h" - ScriptEntry _001E - ScriptEntry _0031 - ScriptEntry _0044 - ScriptEntry _0057 - ScriptEntry _01D8 - ScriptEntry _0390 - ScriptEntry _0511 + ScriptEntry PoketchCo3F_NinjaBoy + ScriptEntry PoketchCo3F_PokefanF + ScriptEntry PoketchCo3F_ExpertF + ScriptEntry PoketchCo3F_PCSouthWest + ScriptEntry PoketchCo3F_PCSouthMiddle + ScriptEntry PoketchCo3F_PCSouthEast + ScriptEntry PoketchCo3F_PCNorthWest ScriptEntryEnd -_001E: +PoketchCo3F_NinjaBoy: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message PoketchCo3F_Text_TheresAGirlsModelAndABoysModel WaitABXPadPress CloseMessage ReleaseAll End -_0031: +PoketchCo3F_PokefanF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 1 + Message PoketchCo3F_Text_MyHusbandsThePresident WaitABXPadPress CloseMessage ReleaseAll End -_0044: +PoketchCo3F_ExpertF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 2 + Message PoketchCo3F_Text_PeopleEverywhereMakePoketchApps WaitABXPadPress CloseMessage ReleaseAll End -_0057: +PoketchCo3F_PCSouthWest: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 3 -_0062: - Message 4 + Message PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps1 +PoketchCo3F_PCSouthWestAddMenuEntries: + Message PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout1 InitGlobalTextMenu 1, 1, 0, VAR_0x8004 - ScrCmd_132 VAR_RESULT - GoToIfEq VAR_RESULT, 0, _00A2 - Call _00FE - Call _0122 - Call _0146 - Call _016A - Call _018E - Call _01B2 -_00A2: - AddMenuEntry 0x102, 0 + CheckPoketchEnabled VAR_RESULT + GoToIfEq VAR_RESULT, 0, PoketchCo3F_PCSouthWestShowMenu + Call PoketchCo3F_CheckAddMenuEntryDigitalWatch + Call PoketchCo3F_CheckAddMenuEntryAnalogWatch + Call PoketchCo3F_CheckAddMenuEntryStopwatch + Call PoketchCo3F_CheckAddMenuEntryKitchenTimer + Call PoketchCo3F_CheckAddMenuEntryAlarmClock + Call PoketchCo3F_CheckAddMenuEntryCalendar +PoketchCo3F_PCSouthWestShowMenu: + AddMenuEntry MenuEntries_Text_PoketchDescriptionsExit, 0 ShowMenu - GoToIfEq VAR_0x8004, 1, _0119 - GoToIfEq VAR_0x8004, 2, _013D - GoToIfEq VAR_0x8004, 3, _0161 - GoToIfEq VAR_0x8004, 4, _0185 - GoToIfEq VAR_0x8004, 5, _01A9 - GoToIfEq VAR_0x8004, 6, _01CD + GoToIfEq VAR_0x8004, 1, PoketchCo3F_DescriptionDigitalWatch + GoToIfEq VAR_0x8004, 2, PoketchCo3F_DescriptionAnalogWatch + GoToIfEq VAR_0x8004, 3, PoketchCo3F_DescriptionStopwatch + GoToIfEq VAR_0x8004, 4, PoketchCo3F_DescriptionKitchenTimer + GoToIfEq VAR_0x8004, 5, PoketchCo3F_DescriptionAlarmClock + GoToIfEq VAR_0x8004, 6, PoketchCo3F_DescriptionCalendar CloseMessage ReleaseAll End -_00FE: +PoketchCo3F_CheckAddMenuEntryDigitalWatch: CheckPoketchAppRegistered POKETCH_APPID_DIGITALWATCH, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _01D6 - AddMenuEntry 233, 1 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthWestReturn + AddMenuEntry MenuEntries_Text_DigitalWatch, 1 Return -_0119: - Message 11 - GoTo _0062 +PoketchCo3F_DescriptionDigitalWatch: + Message PoketchCo3F_Text_DescriptionDigitalWatch + GoTo PoketchCo3F_PCSouthWestAddMenuEntries -_0122: +PoketchCo3F_CheckAddMenuEntryAnalogWatch: CheckPoketchAppRegistered POKETCH_APPID_ANALOGWATCH, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _01D6 - AddMenuEntry 237, 2 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthWestReturn + AddMenuEntry MenuEntries_Text_AnalogWatch, 2 Return -_013D: - Message 12 - GoTo _0062 +PoketchCo3F_DescriptionAnalogWatch: + Message PoketchCo3F_Text_DescriptionAnalogWatch + GoTo PoketchCo3F_PCSouthWestAddMenuEntries -_0146: +PoketchCo3F_CheckAddMenuEntryStopwatch: CheckPoketchAppRegistered POKETCH_APPID_STOPWATCH, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _01D6 - AddMenuEntry 234, 3 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthWestReturn + AddMenuEntry MenuEntries_Text_Stopwatch, 3 Return -_0161: - Message 14 - GoTo _0062 +PoketchCo3F_DescriptionStopwatch: + Message PoketchCo3F_Text_DescriptionStopwatch + GoTo PoketchCo3F_PCSouthWestAddMenuEntries -_016A: +PoketchCo3F_CheckAddMenuEntryKitchenTimer: CheckPoketchAppRegistered POKETCH_APPID_KITCHENTIMER, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _01D6 - AddMenuEntry 250, 4 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthWestReturn + AddMenuEntry MenuEntries_Text_KitchenTimer, 4 Return -_0185: - Message 15 - GoTo _0062 +PoketchCo3F_DescriptionKitchenTimer: + Message PoketchCo3F_Text_DescriptionKitchenTimer + GoTo PoketchCo3F_PCSouthWestAddMenuEntries -_018E: +PoketchCo3F_CheckAddMenuEntryAlarmClock: CheckPoketchAppRegistered POKETCH_APPID_ALARMCLOCK, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _01D6 - AddMenuEntry 249, 5 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthWestReturn + AddMenuEntry MenuEntries_Text_AlarmClock, 5 Return -_01A9: - Message 13 - GoTo _0062 +PoketchCo3F_DescriptionAlarmClock: + Message PoketchCo3F_Text_DescriptionAlarmClock + GoTo PoketchCo3F_PCSouthWestAddMenuEntries -_01B2: +PoketchCo3F_CheckAddMenuEntryCalendar: CheckPoketchAppRegistered POKETCH_APPID_CALENDAR, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _01D6 - AddMenuEntry 254, 6 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthWestReturn + AddMenuEntry MenuEntries_Text_Calendar, 6 Return -_01CD: - Message 16 - GoTo _0062 +PoketchCo3F_DescriptionCalendar: + Message PoketchCo3F_Text_DescriptionCalendar + GoTo PoketchCo3F_PCSouthWestAddMenuEntries -_01D6: +PoketchCo3F_PCSouthWestReturn: Return -_01D8: +PoketchCo3F_PCSouthMiddle: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 5 -_01E3: - Message 6 + Message PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps2 +PoketchCo3F_PCSouthMiddleAddMenuEntries: + Message PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout2 InitGlobalTextMenu 1, 1, 0, VAR_0x8004 - ScrCmd_132 VAR_RESULT - GoToIfEq VAR_RESULT, 0, _0229 - Call _0292 - Call _02B6 - Call _02DA - Call _02FE - Call _0322 - Call _0346 - Call _036A -_0229: - AddMenuEntry 0x102, 0 + CheckPoketchEnabled VAR_RESULT + GoToIfEq VAR_RESULT, 0, PoketchCo3F_PCSouthMiddleShowMenu + Call PoketchCo3F_CheckAddMenuEntryCalculator + Call PoketchCo3F_CheckAddMenuEntryMemoPad + Call PoketchCo3F_CheckAddMenuEntryFriendshipChecker + Call PoketchCo3F_CheckAddMenuEntryDaycareChecker + Call PoketchCo3F_CheckAddMenuEntryMatchupChecker + Call PoketchCo3F_CheckAddMenuEntryPokemonHistory + Call PoketchCo3F_CheckAddMenuEntryBerrySearcher +PoketchCo3F_PCSouthMiddleShowMenu: + AddMenuEntry MenuEntries_Text_PoketchDescriptionsExit, 0 ShowMenu - GoToIfEq VAR_0x8004, 1, _02AD - GoToIfEq VAR_0x8004, 2, _02D1 - GoToIfEq VAR_0x8004, 3, _02F5 - GoToIfEq VAR_0x8004, 4, _0319 - GoToIfEq VAR_0x8004, 5, _033D - GoToIfEq VAR_0x8004, 6, _0361 - GoToIfEq VAR_0x8004, 7, _0385 + GoToIfEq VAR_0x8004, 1, PoketchCo3F_DescriptionCalculator + GoToIfEq VAR_0x8004, 2, PoketchCo3F_DescriptionMemoPad + GoToIfEq VAR_0x8004, 3, PoketchCo3F_DescriptionFriendshipChecker + GoToIfEq VAR_0x8004, 4, PoketchCo3F_DescriptionDayCareChecker + GoToIfEq VAR_0x8004, 5, PoketchCo3F_DescriptionMatchupChecker + GoToIfEq VAR_0x8004, 6, PoketchCo3F_DescriptionPokemonHistory + GoToIfEq VAR_0x8004, 7, PoketchCo3F_DescriptionBerrySearcher CloseMessage ReleaseAll End -_0292: +PoketchCo3F_CheckAddMenuEntryCalculator: CheckPoketchAppRegistered POKETCH_APPID_CALCULATOR, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _038E - AddMenuEntry 235, 1 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthMiddleReturn + AddMenuEntry MenuEntries_Text_Calculator, 1 Return -_02AD: - Message 17 - GoTo _01E3 +PoketchCo3F_DescriptionCalculator: + Message PoketchCo3F_Text_DescriptionCalculator + GoTo PoketchCo3F_PCSouthMiddleAddMenuEntries -_02B6: +PoketchCo3F_CheckAddMenuEntryMemoPad: CheckPoketchAppRegistered POKETCH_APPID_MEMOPAD, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _038E - AddMenuEntry 236, 2 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthMiddleReturn + AddMenuEntry MenuEntries_Text_MemoPad, 2 Return -_02D1: - Message 24 - GoTo _01E3 +PoketchCo3F_DescriptionMemoPad: + Message PoketchCo3F_Text_DescriptionMemoPad + GoTo PoketchCo3F_PCSouthMiddleAddMenuEntries -_02DA: +PoketchCo3F_CheckAddMenuEntryFriendshipChecker: CheckPoketchAppRegistered POKETCH_APPID_FRIENDSHIPCHECKER, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _038E - AddMenuEntry 240, 3 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthMiddleReturn + AddMenuEntry MenuEntries_Text_FriendshipChecker, 3 Return -_02F5: - Message 19 - GoTo _01E3 +PoketchCo3F_DescriptionFriendshipChecker: + Message PoketchCo3F_Text_DescriptionFriendshipChecker + GoTo PoketchCo3F_PCSouthMiddleAddMenuEntries -_02FE: +PoketchCo3F_CheckAddMenuEntryDaycareChecker: CheckPoketchAppRegistered POKETCH_APPID_DAYCARECHECKER, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _038E - AddMenuEntry 244, 4 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthMiddleReturn + AddMenuEntry MenuEntries_Text_DayCareChecker, 4 Return -_0319: - Message 20 - GoTo _01E3 +PoketchCo3F_DescriptionDayCareChecker: + Message PoketchCo3F_Text_DescriptionDayCareChecker + GoTo PoketchCo3F_PCSouthMiddleAddMenuEntries -_0322: +PoketchCo3F_CheckAddMenuEntryMatchupChecker: CheckPoketchAppRegistered POKETCH_APPID_MATCHUPCHECKER, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _038E - AddMenuEntry 248, 5 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthMiddleReturn + AddMenuEntry MenuEntries_Text_MatchupChecker, 5 Return -_033D: - Message 21 - GoTo _01E3 +PoketchCo3F_DescriptionMatchupChecker: + Message PoketchCo3F_Text_DescriptionMatchupChecker + GoTo PoketchCo3F_PCSouthMiddleAddMenuEntries -_0346: +PoketchCo3F_CheckAddMenuEntryPokemonHistory: CheckPoketchAppRegistered POKETCH_APPID_POKEMONHISTORY, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _038E - AddMenuEntry 0x101, 6 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthMiddleReturn + AddMenuEntry MenuEntries_Text_PokemonHistory, 6 Return -_0361: - Message 22 - GoTo _01E3 +PoketchCo3F_DescriptionPokemonHistory: + Message PoketchCo3F_Text_DescriptionPokemonHistory + GoTo PoketchCo3F_PCSouthMiddleAddMenuEntries -_036A: +PoketchCo3F_CheckAddMenuEntryBerrySearcher: CheckPoketchAppRegistered POKETCH_APPID_BERRYSEARCHER, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _038E - AddMenuEntry 252, 7 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthMiddleReturn + AddMenuEntry MenuEntries_Text_BerrySearcher, 7 Return -_0385: - Message 23 - GoTo _01E3 +PoketchCo3F_DescriptionBerrySearcher: + Message PoketchCo3F_Text_DescriptionBerrySearcher + GoTo PoketchCo3F_PCSouthMiddleAddMenuEntries -_038E: +PoketchCo3F_PCSouthMiddleReturn: Return -_0390: +PoketchCo3F_PCSouthEast: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 7 -_039B: - Message 8 + Message PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps3 +PoketchCo3F_PCSouthEastAddMenuEntries: + Message PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout3 InitGlobalTextMenu 1, 1, 0, VAR_0x8004 - ScrCmd_132 VAR_RESULT - GoToIfEq VAR_RESULT, 0, _03DB - Call _0437 - Call _045B - Call _047F - Call _04A3 - Call _04C7 - Call _04EB -_03DB: - AddMenuEntry 0x102, 0 + CheckPoketchEnabled VAR_RESULT + GoToIfEq VAR_RESULT, 0, PoketchCo3F_PCSouthEastShowMenu + Call PoketchCo3F_CheckAddMenuEntryPokemonList + Call PoketchCo3F_CheckAddMenuEntryDotArtist + Call PoketchCo3F_CheckAddMenuEntryCoinToss + Call PoketchCo3F_CheckAddMenuEntryRoulette + Call PoketchCo3F_CheckAddMenuEntryColorChanger + Call PoketchCo3F_CheckAddMenuEntryMarkingMap +PoketchCo3F_PCSouthEastShowMenu: + AddMenuEntry MenuEntries_Text_PoketchDescriptionsExit, 0 ShowMenu - GoToIfEq VAR_0x8004, 1, _0452 - GoToIfEq VAR_0x8004, 2, _0476 - GoToIfEq VAR_0x8004, 3, _049A - GoToIfEq VAR_0x8004, 4, _04BE - GoToIfEq VAR_0x8004, 5, _04E2 - GoToIfEq VAR_0x8004, 6, _0506 + GoToIfEq VAR_0x8004, 1, PoketchCo3F_DescriptionPokemonList + GoToIfEq VAR_0x8004, 2, PoketchCo3F_DescriptionDotArtist + GoToIfEq VAR_0x8004, 3, PoketchCo3F_DescriptionCoinToss + GoToIfEq VAR_0x8004, 4, PoketchCo3F_DescriptionRoulette + GoToIfEq VAR_0x8004, 5, PoketchCo3F_DescriptionColorChanger + GoToIfEq VAR_0x8004, 6, PoketchCo3F_DescriptionMarkingMap CloseMessage ReleaseAll End -_0437: +PoketchCo3F_CheckAddMenuEntryPokemonList: CheckPoketchAppRegistered POKETCH_APPID_PARTYSTATUS, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _050F - AddMenuEntry 239, 1 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthEastReturn + AddMenuEntry MenuEntries_Text_PokemonList, 1 Return -_0452: - Message 18 - GoTo _039B +PoketchCo3F_DescriptionPokemonList: + Message PoketchCo3F_Text_DescriptionPokemonList + GoTo PoketchCo3F_PCSouthEastAddMenuEntries -_045B: +PoketchCo3F_CheckAddMenuEntryDotArtist: CheckPoketchAppRegistered POKETCH_APPID_DOTART, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _050F - AddMenuEntry 238, 2 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthEastReturn + AddMenuEntry MenuEntries_Text_DotArtist, 2 Return -_0476: - Message 25 - GoTo _039B +PoketchCo3F_DescriptionDotArtist: + Message PoketchCo3F_Text_DescriptionDotArtist + GoTo PoketchCo3F_PCSouthEastAddMenuEntries -_047F: +PoketchCo3F_CheckAddMenuEntryCoinToss: CheckPoketchAppRegistered POKETCH_APPID_COINTOSS, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _050F - AddMenuEntry 246, 3 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthEastReturn + AddMenuEntry MenuEntries_Text_CoinToss, 3 Return -_049A: - Message 29 - GoTo _039B +PoketchCo3F_DescriptionCoinToss: + Message PoketchCo3F_Text_DescriptionCoinToss + GoTo PoketchCo3F_PCSouthEastAddMenuEntries -_04A3: +PoketchCo3F_CheckAddMenuEntryRoulette: CheckPoketchAppRegistered POKETCH_APPID_ROULETTE, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _050F - AddMenuEntry 245, 4 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthEastReturn + AddMenuEntry MenuEntries_Text_Roulette, 4 Return -_04BE: - Message 28 - GoTo _039B +PoketchCo3F_DescriptionRoulette: + Message PoketchCo3F_Text_DescriptionRoulette + GoTo PoketchCo3F_PCSouthEastAddMenuEntries -_04C7: +PoketchCo3F_CheckAddMenuEntryColorChanger: CheckPoketchAppRegistered POKETCH_APPID_COLORCHANGER, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _050F - AddMenuEntry 253, 5 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthEastReturn + AddMenuEntry MenuEntries_Text_ColorChanger, 5 Return -_04E2: - Message 26 - GoTo _039B +PoketchCo3F_DescriptionColorChanger: + Message PoketchCo3F_Text_DescriptionColorChanger + GoTo PoketchCo3F_PCSouthEastAddMenuEntries -_04EB: +PoketchCo3F_CheckAddMenuEntryMarkingMap: CheckPoketchAppRegistered POKETCH_APPID_MARKINGMAP, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _050F - AddMenuEntry 251, 6 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCSouthEastReturn + AddMenuEntry MenuEntries_Text_MarkingMap, 6 Return -_0506: - Message 27 - GoTo _039B +PoketchCo3F_DescriptionMarkingMap: + Message PoketchCo3F_Text_DescriptionMarkingMap + GoTo PoketchCo3F_PCSouthEastAddMenuEntries -_050F: +PoketchCo3F_PCSouthEastReturn: Return -_0511: +PoketchCo3F_PCNorthWest: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 9 -_051C: - Message 10 + Message PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps4 +PoketchCo3F_PCNorthWestAddMenuEntries: + Message PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout4 InitGlobalTextMenu 1, 1, 0, VAR_0x8004 - ScrCmd_132 VAR_RESULT - GoToIfEq VAR_RESULT, 0, _055C - Call _05B8 - Call _05DC - Call _0600 - Call _0624 - Call _0648 - Call _066C -_055C: - AddMenuEntry 0x102, 0 + CheckPoketchEnabled VAR_RESULT + GoToIfEq VAR_RESULT, 0, PoketchCo3F_PCNorthWestShowMenu + Call PoketchCo3F_CheckAddMenuEntryPedometer + Call PoketchCo3F_CheckAddMenuEntryCounter + Call PoketchCo3F_CheckAddMenuEntryTrainerCounter + Call PoketchCo3F_CheckAddMenuEntryLinkSearcher + Call PoketchCo3F_CheckAddMenuEntryMoveTester + Call PoketchCo3F_CheckAddMenuEntryDowsingMachine +PoketchCo3F_PCNorthWestShowMenu: + AddMenuEntry MenuEntries_Text_PoketchDescriptionsExit, 0 ShowMenu - GoToIfEq VAR_0x8004, 1, _05D3 - GoToIfEq VAR_0x8004, 2, _05F7 - GoToIfEq VAR_0x8004, 3, _061B - GoToIfEq VAR_0x8004, 4, _063F - GoToIfEq VAR_0x8004, 5, _0663 - GoToIfEq VAR_0x8004, 6, _0687 + GoToIfEq VAR_0x8004, 1, PoketchCo3F_DescriptionPedometer + GoToIfEq VAR_0x8004, 2, PoketchCo3F_DescriptionCounter + GoToIfEq VAR_0x8004, 3, PoketchCo3F_DescriptionTrainerCounter + GoToIfEq VAR_0x8004, 4, PoketchCo3F_DescriptionLinkSearcher + GoToIfEq VAR_0x8004, 5, PoketchCo3F_DescriptionMoveTester + GoToIfEq VAR_0x8004, 6, PoketchCo3F_DescriptionDowsingMachine CloseMessage ReleaseAll End -_05B8: +PoketchCo3F_CheckAddMenuEntryPedometer: CheckPoketchAppRegistered POKETCH_APPID_PEDOMETER, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _0690 - AddMenuEntry 243, 1 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCNorthWestReturn + AddMenuEntry MenuEntries_Text_Pedometer, 1 Return -_05D3: - Message 30 - GoTo _051C +PoketchCo3F_DescriptionPedometer: + Message PoketchCo3F_Text_DescriptionPedometer + GoTo PoketchCo3F_PCNorthWestAddMenuEntries -_05DC: +PoketchCo3F_CheckAddMenuEntryCounter: CheckPoketchAppRegistered POKETCH_APPID_COUNTER, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _0690 - AddMenuEntry 242, 2 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCNorthWestReturn + AddMenuEntry MenuEntries_Text_Counter, 2 Return -_05F7: - Message 32 - GoTo _051C +PoketchCo3F_DescriptionCounter: + Message PoketchCo3F_Text_DescriptionCounter + GoTo PoketchCo3F_PCNorthWestAddMenuEntries -_0600: +PoketchCo3F_CheckAddMenuEntryTrainerCounter: CheckPoketchAppRegistered POKETCH_APPID_TRAINERCOUNTER, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _0690 - AddMenuEntry 0x100, 3 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCNorthWestReturn + AddMenuEntry MenuEntries_Text_TrainerCounter, 3 Return -_061B: - Message 33 - GoTo _051C +PoketchCo3F_DescriptionTrainerCounter: + Message PoketchCo3F_Text_DescriptionTrainerCounter + GoTo PoketchCo3F_PCNorthWestAddMenuEntries -_0624: +PoketchCo3F_CheckAddMenuEntryLinkSearcher: CheckPoketchAppRegistered POKETCH_APPID_LINKSEARCHER, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _0690 - AddMenuEntry 0xFF, 4 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCNorthWestReturn + AddMenuEntry MenuEntries_Text_LinkSearcher, 4 Return -_063F: - Message 34 - GoTo _051C +PoketchCo3F_DescriptionLinkSearcher: + Message PoketchCo3F_Text_DescriptionLinkSearcher + GoTo PoketchCo3F_PCNorthWestAddMenuEntries -_0648: +PoketchCo3F_CheckAddMenuEntryMoveTester: CheckPoketchAppRegistered POKETCH_APPID_MOVETESTER, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _0690 - AddMenuEntry 247, 5 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCNorthWestReturn + AddMenuEntry MenuEntries_Text_MoveTester, 5 Return -_0663: - Message 35 - GoTo _051C +PoketchCo3F_DescriptionMoveTester: + Message PoketchCo3F_Text_DescriptionMoveTester + GoTo PoketchCo3F_PCNorthWestAddMenuEntries -_066C: +PoketchCo3F_CheckAddMenuEntryDowsingMachine: CheckPoketchAppRegistered POKETCH_APPID_DOWSINGMACHINE, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _0690 - AddMenuEntry 241, 6 + GoToIfEq VAR_RESULT, FALSE, PoketchCo3F_PCNorthWestReturn + AddMenuEntry MenuEntries_Text_DowsingMachine, 6 Return -_0687: - Message 31 - GoTo _051C +PoketchCo3F_DescriptionDowsingMachine: + Message PoketchCo3F_Text_DescriptionDowsingMachine + GoTo PoketchCo3F_PCNorthWestAddMenuEntries -_0690: +PoketchCo3F_PCNorthWestReturn: Return .balign 4, 0 diff --git a/res/field/scripts/scripts_sunyshore_city_northeast_house.s b/res/field/scripts/scripts_sunyshore_city_northeast_house.s index 5fcb6dd056..8c93819208 100644 --- a/res/field/scripts/scripts_sunyshore_city_northeast_house.s +++ b/res/field/scripts/scripts_sunyshore_city_northeast_house.s @@ -116,12 +116,12 @@ _019E: CloseMessage FadeScreenOut WaitFadeScreen - ScrCmd_243 0, VAR_RESULT, VAR_0x8000 + ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8000 ReturnToField FadeScreenIn WaitFadeScreen GoToIfEq VAR_RESULT, 0, _03EA - ScrCmd_245 0, VAR_0x8000 + BufferCustomMessageWord 0, VAR_0x8000 Message 21 SetFlag FLAG_UNK_0x0AA4 SetPartyMonRibbon VAR_0x8002, RIBBON_SMILE @@ -134,12 +134,12 @@ _01F2: CloseMessage FadeScreenOut WaitFadeScreen - ScrCmd_243 0, VAR_RESULT, VAR_0x8000 + ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8000 ReturnToField FadeScreenIn WaitFadeScreen GoToIfEq VAR_RESULT, 0, _03EA - ScrCmd_245 0, VAR_0x8000 + BufferCustomMessageWord 0, VAR_0x8000 Message 3 SetFlag FLAG_UNK_0x0AA4 SetPartyMonRibbon VAR_0x8002, RIBBON_ALERT @@ -152,12 +152,12 @@ _0246: CloseMessage FadeScreenOut WaitFadeScreen - ScrCmd_243 0, VAR_RESULT, VAR_0x8000 + ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8000 ReturnToField FadeScreenIn WaitFadeScreen GoToIfEq VAR_RESULT, 0, _03EA - ScrCmd_245 0, VAR_0x8000 + BufferCustomMessageWord 0, VAR_0x8000 Message 11 SetFlag FLAG_UNK_0x0AA4 SetPartyMonRibbon VAR_0x8002, RIBBON_SHOCK @@ -170,12 +170,12 @@ _029A: CloseMessage FadeScreenOut WaitFadeScreen - ScrCmd_243 0, VAR_RESULT, VAR_0x8000 + ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8000 ReturnToField FadeScreenIn WaitFadeScreen GoToIfEq VAR_RESULT, 0, _03EA - ScrCmd_245 0, VAR_0x8000 + BufferCustomMessageWord 0, VAR_0x8000 Message 13 SetFlag FLAG_UNK_0x0AA4 SetPartyMonRibbon VAR_0x8002, RIBBON_DOWNCAST @@ -188,12 +188,12 @@ _02EE: CloseMessage FadeScreenOut WaitFadeScreen - ScrCmd_243 0, VAR_RESULT, VAR_0x8000 + ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8000 ReturnToField FadeScreenIn WaitFadeScreen GoToIfEq VAR_RESULT, 0, _03EA - ScrCmd_245 0, VAR_0x8000 + BufferCustomMessageWord 0, VAR_0x8000 Message 15 SetFlag FLAG_UNK_0x0AA4 SetPartyMonRibbon VAR_0x8002, RIBBON_CARELESS @@ -206,12 +206,12 @@ _0342: CloseMessage FadeScreenOut WaitFadeScreen - ScrCmd_243 0, VAR_RESULT, VAR_0x8000 + ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8000 ReturnToField FadeScreenIn WaitFadeScreen GoToIfEq VAR_RESULT, 0, _03EA - ScrCmd_245 0, VAR_0x8000 + BufferCustomMessageWord 0, VAR_0x8000 Message 17 SetFlag FLAG_UNK_0x0AA4 SetPartyMonRibbon VAR_0x8002, RIBBON_RELAX @@ -224,12 +224,12 @@ _0396: CloseMessage FadeScreenOut WaitFadeScreen - ScrCmd_243 0, VAR_RESULT, VAR_0x8000 + ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8000 ReturnToField FadeScreenIn WaitFadeScreen GoToIfEq VAR_RESULT, 0, _03EA - ScrCmd_245 0, VAR_0x8000 + BufferCustomMessageWord 0, VAR_0x8000 Message 19 SetFlag FLAG_UNK_0x0AA4 SetPartyMonRibbon VAR_0x8002, RIBBON_SNOOZE diff --git a/res/field/scripts/scripts_tv_reporter_interviews.s b/res/field/scripts/scripts_tv_reporter_interviews.s index 995c64bb39..24d531a4d3 100644 --- a/res/field/scripts/scripts_tv_reporter_interviews.s +++ b/res/field/scripts/scripts_tv_reporter_interviews.s @@ -121,7 +121,7 @@ _0190: FadeScreenOut WaitFadeScreen CloseMessage - ScrCmd_243 0, VAR_RESULT, VAR_0x8004 + ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8004 ReturnToField FadeScreenIn WaitFadeScreen diff --git a/res/text/jubilife_city_condominiums_1f.json b/res/text/jubilife_city_condominiums_1f.json index a38407cb75..8312b54f51 100644 --- a/res/text/jubilife_city_condominiums_1f.json +++ b/res/text/jubilife_city_condominiums_1f.json @@ -2,7 +2,7 @@ "key": 50210, "messages": [ { - "id": "pl_msg_00000042_00000", + "id": "JubilifeCityCondominiums1F_Text_IsntMyPoketchQuiteFetching", "en_US": [ "Oh, hello, darlings.\n", "Isn’t my Pokétch quite fetching?\r", @@ -13,15 +13,15 @@ ] }, { - "id": "pl_msg_00000042_00001", + "id": "JubilifeCityCondominiums1F_Text_PiikaPi", "en_US": "PIKACHU: Piika pi!" }, { - "id": "pl_msg_00000042_00002", + "id": "JubilifeCityCondominiums1F_Text_Pachipachii", "en_US": "PACHIRISU: Pachipachii?" }, { - "id": "pl_msg_00000042_00003", + "id": "JubilifeCityCondominiums1F_Text_YourPokemonIsQuiteAdorableTryMakingItHoldThis", "en_US": [ "Oh, your Pokémon is quite adorable!\r", "Here, try making it hold this\n", @@ -29,7 +29,7 @@ ] }, { - "id": "pl_msg_00000042_00004", + "id": "JubilifeCityCondominiums1F_Text_APokemonHoldingThatQuickClawCanSometimesAttackFirst", "en_US": [ "A Pokémon holding that Quick Claw can\n", "sometimes attack first, even if it is\f", diff --git a/res/text/jubilife_city_condominiums_2f.json b/res/text/jubilife_city_condominiums_2f.json index def6c852e5..56c23b72e3 100644 --- a/res/text/jubilife_city_condominiums_2f.json +++ b/res/text/jubilife_city_condominiums_2f.json @@ -2,7 +2,7 @@ "key": 50222, "messages": [ { - "id": "pl_msg_00000043_00000", + "id": "JubilifeCityCondominiums2F_Text_ILikeHowPokemonCanUseAttacks", "en_US": [ "I like how Pokémon can use attacks.\n", "That makes things fun and different.\r", @@ -13,7 +13,7 @@ ] }, { - "id": "pl_msg_00000043_00001", + "id": "JubilifeCityCondominiums2F_Text_DidYouBuySomeHealBallsAtThePokeMart", "en_US": [ "Did you buy some Heal Balls at the\n", "Poké Mart?\r", diff --git a/res/text/jubilife_city_condominiums_3f.json b/res/text/jubilife_city_condominiums_3f.json index cb56fb69e3..adfb7a1967 100644 --- a/res/text/jubilife_city_condominiums_3f.json +++ b/res/text/jubilife_city_condominiums_3f.json @@ -2,7 +2,7 @@ "key": 50218, "messages": [ { - "id": "pl_msg_00000044_00000", + "id": "JubilifeCityCondominiums3F_Text_ICanTradePokemonAroundTheWorldUsingNintendoWFC", "en_US": [ "I can trade Pokémon around the world\n", "using Nintendo WFC...\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000044_00001", + "id": "JubilifeCityCondominiums3F_Text_TheWorldYouCanReachWithNintendoWFC", "en_US": [ "The world you can reach with\n", "Nintendo WFC...\f", diff --git a/res/text/jubilife_city_condominiums_4f.json b/res/text/jubilife_city_condominiums_4f.json index a485e4be9c..05800ae3fb 100644 --- a/res/text/jubilife_city_condominiums_4f.json +++ b/res/text/jubilife_city_condominiums_4f.json @@ -2,7 +2,7 @@ "key": 50230, "messages": [ { - "id": "pl_msg_00000045_00000", + "id": "JubilifeCityCondominiums4F_Text_ForSomeoneLikeYouThisMightBePerfect", "en_US": [ "You managed to come out here?\n", "That takes focus!\r", @@ -12,7 +12,7 @@ ] }, { - "id": "pl_msg_00000045_00001", + "id": "JubilifeCityCondominiums4F_Text_ThereAreItemsThatAreUsefulOnlyWhenTheyreHeldByPokemon", "en_US": [ "There are items that are useful only\n", "when they’re held by Pokémon.\r", diff --git a/res/text/jubilife_city_pokecenter_1f.json b/res/text/jubilife_city_pokecenter_1f.json index b93f606ca4..cbe794e81f 100644 --- a/res/text/jubilife_city_pokecenter_1f.json +++ b/res/text/jubilife_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "key": 11187, "messages": [ { - "id": "pl_msg_00000026_00000", + "id": "JubilifeCityPokecenter1F_Text_AllTypesHaveStrengthsAndWeaknesses", "en_US": [ "You know how Pokémon have types like\n", "Water, Fire, and Grass?\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000026_00001", + "id": "JubilifeCityPokecenter1F_Text_InTheUnionRoomUpstairsYouCanChatAndTradeWithOtherPeople", "en_US": [ "In the Union Room upstairs, you can\n", "chat and trade with other people.\r", @@ -20,7 +20,7 @@ ] }, { - "id": "pl_msg_00000026_00002", + "id": "JubilifeCityPokecenter1F_Text_YouCanStillCatchAPokemonIfYouAlreadyHaveSixTravelingWithYou", "en_US": [ "You can still catch a Pokémon if you\n", "already have six traveling with you.\r", @@ -33,7 +33,7 @@ ] }, { - "id": "pl_msg_00000026_00003", + "id": "JubilifeCityPokecenter1F_Text_HiCanWeFeatureYouInANewsPieceWereDoing", "en_US": [ "Hi, can we feature you in a news piece\n", "we’re doing?\r", @@ -42,18 +42,18 @@ ] }, { - "id": "pl_msg_00000026_00004", + "id": "JubilifeCityPokecenter1F_Text_ReporterKinseysLiveInterview", "en_US": "Reporter Kinsey’s live interview!\r" }, { - "id": "pl_msg_00000026_00005", + "id": "JubilifeCityPokecenter1F_Text_UnbelievablePressCoverageDenied", "en_US": [ "Unbelievable! Press coverage denied!\n", "I find you intriguing, too..." ] }, { - "id": "pl_msg_00000026_00006", + "id": "JubilifeCityPokecenter1F_Text_ToGetPeopleToOpenUpWeApproachThemHonestly", "en_US": [ "To get people to open up, we approach\n", "them honestly with no hidden tricks.\r", @@ -62,21 +62,21 @@ ] }, { - "id": "pl_msg_00000026_00007", + "id": "JubilifeCityPokecenter1F_Text_IsItOKToGoForTheScoop", "en_US": [ "I’ve spotted a charismatic Trainer!\n", "Is it OK to go for the scoop?" ] }, { - "id": "pl_msg_00000026_00008", + "id": "JubilifeCityPokecenter1F_Text_AsAProfessionalCameramanIAlwaysGoForTheBestShot", "en_US": [ "As a professional cameraman, I always\n", "go for the best shot!\r" ] }, { - "id": "pl_msg_00000026_00009", + "id": "JubilifeCityPokecenter1F_Text_ThatsADowner", "en_US": [ "That’s a downer...\r", "I thought I’d found a Trainer and\n", @@ -84,7 +84,7 @@ ] }, { - "id": "pl_msg_00000026_00010", + "id": "JubilifeCityPokecenter1F_Text_TheLivelyExpressionsOnYouAndYourPokemonsFaces", "en_US": [ "The lively expressions on you and your\n", "Pokémon’s faces...\r", @@ -92,7 +92,7 @@ ] }, { - "id": "pl_msg_00000026_00011", + "id": "JubilifeCityPokecenter1F_Text_AreWeAllReadyToHaveSomeFun", "en_US": [ "Are we all ready to have some fun?\n", "I sure am! Aren’t you having fun?!\f", @@ -100,21 +100,21 @@ ] }, { - "id": "pl_msg_00000026_00012", + "id": "JubilifeCityPokecenter1F_Text_OKHowShallWeDoThis", "en_US": [ "OK, how shall we do this?\n", "Shall we do something fantastical?\r" ] }, { - "id": "pl_msg_00000026_00013", + "id": "JubilifeCityPokecenter1F_Text_OhHowShallISayThis", "en_US": [ "Oh, how shall I say this...?\n", "It makes me all lonely, I say..." ] }, { - "id": "pl_msg_00000026_00014", + "id": "JubilifeCityPokecenter1F_Text_AClownsMakeupIsAFaceThatsCryingWhileLaughing", "en_US": [ "A clown’s makeup is a face that’s\n", "crying while laughing. Mwahahah!\r", diff --git a/res/text/jubilife_city_south_house_1f.json b/res/text/jubilife_city_south_house_1f.json index f7d010bb95..e6e1146b43 100644 --- a/res/text/jubilife_city_south_house_1f.json +++ b/res/text/jubilife_city_south_house_1f.json @@ -2,7 +2,7 @@ "key": 50194, "messages": [ { - "id": "pl_msg_00000038_00000", + "id": "JubilifeCitySouthHouse1F_PokemonAreWonderfulDeeplyMysteriousCreatures", "en_US": [ "Pokémon are wonderful, deeply\n", "mysterious creatures.\r", @@ -12,7 +12,7 @@ ] }, { - "id": "pl_msg_00000038_00001", + "id": "JubilifeCitySouthHouse1F_TalkToEveryoneYouSee", "en_US": [ "Hello there, Trainer!\r", "If you get stumped and don’t know\n", @@ -26,7 +26,7 @@ ] }, { - "id": "pl_msg_00000038_00002", + "id": "JubilifeCitySouthHouse1F_PachirisuKukkuuh", "en_US": "PACHIRISU: Kukkuuh!" } ] diff --git a/res/text/jubilife_city_south_house_2f.json b/res/text/jubilife_city_south_house_2f.json index 9b8c3b70e7..a740954599 100644 --- a/res/text/jubilife_city_south_house_2f.json +++ b/res/text/jubilife_city_south_house_2f.json @@ -2,7 +2,7 @@ "key": 50206, "messages": [ { - "id": "pl_msg_00000039_00000", + "id": "JubilifeCitySouthHouse2F_SomeKindsOfPokemonEvolveWhenTheyGetStrongerFromBattling", "en_US": [ "Did you know?\r", "Some kinds of Pokémon evolve when\n", @@ -12,7 +12,7 @@ ] }, { - "id": "pl_msg_00000039_00001", + "id": "JubilifeCitySouthHouse2F_EvolutionMakesPokemonJustThatMuchMoreFascinating", "en_US": [ "Evolution makes Pokémon just that\n", "much more fascinating.\r", @@ -21,7 +21,7 @@ ] }, { - "id": "pl_msg_00000039_00002", + "id": "JubilifeCitySouthHouse2F_DidntProfRowanConductResearchWithProfOak", "en_US": [ "Didn’t Prof. Rowan conduct research\n", "with Prof. Oak of the Kanto region?" diff --git a/res/text/jubilife_city_south_house_3f.json b/res/text/jubilife_city_south_house_3f.json index 820f4aefd9..d9488dbb02 100644 --- a/res/text/jubilife_city_south_house_3f.json +++ b/res/text/jubilife_city_south_house_3f.json @@ -2,7 +2,7 @@ "key": 50202, "messages": [ { - "id": "pl_msg_00000040_00000", + "id": "JubilifeCitySouthHouse3F_WhenIGiveMyPokemonNicknamesItsLikeTheyreMyVeryOwn", "en_US": [ "When I give my Pokémon nicknames,\n", "it’s like they’re my very own.\r", diff --git a/res/text/jubilife_city_southwest_house_1f.json b/res/text/jubilife_city_southwest_house_1f.json index c4d1f39e9e..99ea896e44 100644 --- a/res/text/jubilife_city_southwest_house_1f.json +++ b/res/text/jubilife_city_southwest_house_1f.json @@ -2,7 +2,7 @@ "key": 17483, "messages": [ { - "id": "pl_msg_00000050_00000", + "id": "JubilifeCitySouthwestHouse1F_Text_IGotMyPikachuThroughATradeFromSomeone", "en_US": [ "I got my PIKACHU through a trade from\n", "someone somewhere in the world.\r", @@ -16,11 +16,11 @@ ] }, { - "id": "pl_msg_00000050_00001", + "id": "JubilifeCitySouthwestHouse1F_Text_PikachuPikapikapikaaah", "en_US": "PIKACHU: Pikapikapikaaah!" }, { - "id": "pl_msg_00000050_00002", + "id": "JubilifeCitySouthwestHouse1F_Text_IfEveryoneAroundTheWorldHadPokemon", "en_US": [ "If everyone around the world had\n", "Pokémon...\r", diff --git a/res/text/jubilife_city_southwest_house_2f.json b/res/text/jubilife_city_southwest_house_2f.json index dd55e1ff74..83623e1bc5 100644 --- a/res/text/jubilife_city_southwest_house_2f.json +++ b/res/text/jubilife_city_southwest_house_2f.json @@ -2,7 +2,7 @@ "key": 17479, "messages": [ { - "id": "pl_msg_00000051_00000", + "id": "JubilifeCitySouthwestHouse2F_Text_WeComeFromFarawayLand", "en_US": [ "Wi: We come from faraway land.\n", "I come see the Pokémon I trade.\r", @@ -10,7 +10,7 @@ ] }, { - "id": "pl_msg_00000051_00001", + "id": "JubilifeCitySouthwestHouse2F_Text_ILikeLookAtPokemonIGetFromFriendInTrade", "en_US": [ "Fi: I like look at Pokémon I get\n", "from friend in trade.\r", @@ -18,7 +18,7 @@ ] }, { - "id": "pl_msg_00000051_00002", + "id": "JubilifeCitySouthwestHouse2F_Text_YouCanTradePokemonWithPeopleAroundTheWorldOnNintendoWFC", "en_US": [ "You can trade Pokémon with people\n", "around the world on Nintendo WFC...\r", @@ -27,7 +27,7 @@ ] }, { - "id": "pl_msg_00000051_00003", + "id": "JubilifeCitySouthwestHouse2F_Text_WhenYouConnectWithPeopleOnNintendoWFCItsHardToBe", "en_US": [ "When you connect with people on\n", "Nintendo WFC, it’s hard to\f", diff --git a/res/text/jubilife_tv_1f.json b/res/text/jubilife_tv_1f.json index 611129d5ee..295ec9e9c9 100644 --- a/res/text/jubilife_tv_1f.json +++ b/res/text/jubilife_tv_1f.json @@ -2,7 +2,7 @@ "key": 17435, "messages": [ { - "id": "pl_msg_00000030_00000", + "id": "JubilifeTV1F_Text_WhyDontYouTryDressingUpYourPokemonNow", "en_US": [ "Why don’t you try dressing up your\n", "Pokémon now?\r", @@ -13,7 +13,7 @@ ] }, { - "id": "pl_msg_00000030_00001", + "id": "JubilifeTV1F_Text_ThisIsThePokemonLotteryCorner", "en_US": [ "This is the Pokémon Lottery Corner.\n", "I’m Felicity, your attendant today.\r", @@ -25,21 +25,21 @@ ] }, { - "id": "pl_msg_00000030_00002", + "id": "JubilifeTV1F_Text_YouveAlreadyDrawnALotoTicketToday", "en_US": [ "You’ve already drawn a Loto Ticket\n", "today. Please come back tomorrow." ] }, { - "id": "pl_msg_00000030_00003", + "id": "JubilifeTV1F_Text_OhISeePleaseDoVisitUsAgain", "en_US": [ "Oh. I see.\n", "Please do visit us again." ] }, { - "id": "pl_msg_00000030_00004", + "id": "JubilifeTV1F_Text_FirstIllLookUpTodaysPokemonLotteryCornerLuckyNumber", "en_US": [ "First, I’ll look up today’s Pokémon\n", "Lottery Corner lucky number.\r", @@ -47,7 +47,7 @@ ] }, { - "id": "pl_msg_00000030_00005", + "id": "JubilifeTV1F_Text_YourLotoTicketNumberIsNum", "en_US": [ "Your Loto Ticket number is {STRVAR_1 54, 0, 0}.\r", "Now, let’s see if it matches the\n", @@ -55,7 +55,7 @@ ] }, { - "id": "pl_msg_00000030_00006", + "id": "JubilifeTV1F_Text_CongratulationsTheIDOfYourTeamsPokemonMatchesYourLotoTicketNumber", "en_US": [ "Congratulations!\r", "The ID No. of your team’s\n", @@ -64,7 +64,7 @@ ] }, { - "id": "pl_msg_00000030_00007", + "id": "JubilifeTV1F_Text_CongratulationsTheIDOfYourPCBoxedPokemonMatchesYourLotoTicketNumber", "en_US": [ "Congratulations!\r", "The ID No. of your PC-boxed\n", @@ -73,49 +73,49 @@ ] }, { - "id": "pl_msg_00000030_00008", + "id": "JubilifeTV1F_Text_ImSorryYouDidntGetAMatch", "en_US": [ "I’m sorry.\n", "You didn’t get a match..." ] }, { - "id": "pl_msg_00000030_00009", + "id": "JubilifeTV1F_Text_TheLastDigitMatchedSoYouWinTheFourthPrize", "en_US": [ "The last digit matched, so you\n", "win the fourth prize!\r" ] }, { - "id": "pl_msg_00000030_00010", + "id": "JubilifeTV1F_Text_YouGainANewBackdropForUseInFittingRooms", "en_US": [ "You gained a new Backdrop for use\n", "in Fitting Rooms." ] }, { - "id": "pl_msg_00000030_00011", + "id": "JubilifeTV1F_Text_TheLastTwoDigitsMatchedSoYouWinTheThirdPrize", "en_US": [ "The last two digits matched, so you\n", "win the third prize!\r" ] }, { - "id": "pl_msg_00000030_00012", + "id": "JubilifeTV1F_Text_TheLastThreeDigitsMatchedSoYouWinTheSecondPrize", "en_US": [ "The last three digits matched, so you\n", "win the second prize!\r" ] }, { - "id": "pl_msg_00000030_00013", + "id": "JubilifeTV1F_Text_TheLastFourDigitsMatchedSoYouWinTheFirstPrize", "en_US": [ "The last four digits matched, so you\n", "win the first prize!\r" ] }, { - "id": "pl_msg_00000030_00014", + "id": "JubilifeTV1F_Text_OhMyGoodnessAllFiveDigitsMatchedYouveWonTheJackpotPrize", "en_US": [ "Oh, my goodness, all five digits\n", "matched!\r", @@ -127,7 +127,7 @@ ] }, { - "id": "pl_msg_00000030_00015", + "id": "JubilifeTV1F_Text_OhYouSeemToHaveNoRoomForThis", "en_US": [ "...Oh?\n", "You seem to have no room for this.\r", @@ -136,7 +136,7 @@ ] }, { - "id": "pl_msg_00000030_00016", + "id": "JubilifeTV1F_Text_ThisIsThePrizeWeveBeenHoldingForYou", "en_US": [ "{STRVAR_1 3, 0, 0}?\n", "Yes, I’ve been expecting you.\r", @@ -145,14 +145,14 @@ ] }, { - "id": "pl_msg_00000030_00017", + "id": "JubilifeTV1F_Text_PleaseDoVisitAgain", "en_US": [ "Please do visit again!\n", "Good-bye from Felicity, your attendant!" ] }, { - "id": "pl_msg_00000030_00018", + "id": "JubilifeTV1F_Text_WouldYouLikeToCheckTodaysLuckyNumberAgain", "en_US": [ "This is the Pokémon Lottery Corner.\r", "Would you like to check today’s lucky\n", @@ -160,7 +160,7 @@ ] }, { - "id": "pl_msg_00000030_00019", + "id": "JubilifeTV1F_Text_TheyKeepTrackOfOfficialRecordsHere", "en_US": [ "They keep track of official records\n", "here.\r", @@ -171,7 +171,7 @@ ] }, { - "id": "pl_msg_00000030_00020", + "id": "JubilifeTV1F_Text_ImGoingToGetCommercialsShownOnTV", "en_US": [ "I’m going to get commercials shown\n", "on TV.\r", @@ -180,7 +180,7 @@ ] }, { - "id": "pl_msg_00000030_00021", + "id": "JubilifeTV1F_Text_TheTVStationInterviewsAllSortsOfTrainersForItsShows", "en_US": [ "The TV station interviews all sorts of\n", "Trainers for its shows.\r", diff --git a/res/text/jubilife_tv_2f.json b/res/text/jubilife_tv_2f.json index f6c69878c0..e602c76c3f 100644 --- a/res/text/jubilife_tv_2f.json +++ b/res/text/jubilife_tv_2f.json @@ -2,7 +2,7 @@ "key": 17431, "messages": [ { - "id": "pl_msg_00000031_00000", + "id": "JubilifeTV2F_Text_WhatAccessoriesWillGoWellWithMyDressToday", "en_US": [ "I don’t know what to do.\r", "What Accessories will go well with\n", @@ -10,7 +10,7 @@ ] }, { - "id": "pl_msg_00000031_00001", + "id": "JubilifeTV2F_Text_SoAGiftForOurFutureStar", "en_US": [ "The star of tomorrow is... You!\n", "Your Pokémon has a glow about it!\r", @@ -18,7 +18,7 @@ ] }, { - "id": "pl_msg_00000031_00002", + "id": "JubilifeTV2F_Text_IHopeYouGetIntoCollectingAccessoriesForYourPokemon", "en_US": [ "That’s a {STRVAR_1 31, 0, 0}!\r", "I hope you get into collecting\n", @@ -26,7 +26,7 @@ ] }, { - "id": "pl_msg_00000031_00003", + "id": "JubilifeTV2F_Text_TheRoomAtTheBackIsOurDreamyFittingRoom", "en_US": [ "The room at the back is our dreamy\n", "fitting room.\r", diff --git a/res/text/jubilife_tv_2f_gallery.json b/res/text/jubilife_tv_2f_gallery.json index a4acdd2ae5..238bd37707 100644 --- a/res/text/jubilife_tv_2f_gallery.json +++ b/res/text/jubilife_tv_2f_gallery.json @@ -2,11 +2,11 @@ "key": 17419, "messages": [ { - "id": "pl_msg_00000034_00000", + "id": "JubilifeTV2FGallery_Text_Dummy0", "garbage": 58 }, { - "id": "pl_msg_00000034_00001", + "id": "JubilifeTV2FGallery_Text_DressUpYourPokemonYouWillDoThisWontYou", "en_US": [ "Ooh, your Pokémon are so very\n", "charming! How enchanting!\r", @@ -21,14 +21,14 @@ ] }, { - "id": "pl_msg_00000034_00002", + "id": "JubilifeTV2FGallery_Text_OhYouSillyThingWheresYourSenseOfAdventure", "en_US": [ "Oh, you silly thing...\n", "Where’s your sense of adventure?" ] }, { - "id": "pl_msg_00000034_00003", + "id": "JubilifeTV2FGallery_Text_ShouldIExplainToYouHowToDressUpYourPokemon", "en_US": [ "Ooh, ooh, yes! How nice!\n", "Let’s not delay!\r", @@ -37,21 +37,21 @@ ] }, { - "id": "pl_msg_00000034_00004", + "id": "JubilifeTV2FGallery_Text_OohIWonderWhichPokemonYoullDressUp", "en_US": [ "Ooh, I wonder which Pokémon you’ll\n", "dress up?\r" ] }, { - "id": "pl_msg_00000034_00005", + "id": "JubilifeTV2FGallery_Text_TehehehIHopeYouWillDressItUpAdorably", "en_US": [ "Teheheh...\n", "I hope you will dress it up adorably!\r" ] }, { - "id": "pl_msg_00000034_00006", + "id": "JubilifeTV2FGallery_Text_JustChooseTheAccessoriesAndPutThemOnYourPokemon", "en_US": [ "You have a Fashion Case, don’t you?\n", "Ah, oui, wonderful!\r", @@ -66,7 +66,7 @@ ] }, { - "id": "pl_msg_00000034_00007", + "id": "JubilifeTV2FGallery_Text_OohNiceWorkOhButItNeedsToHaveATitle", "en_US": [ "Ooh, nice work!\n", "Let’s display the photo right away!\f", @@ -74,7 +74,7 @@ ] }, { - "id": "pl_msg_00000034_00008", + "id": "JubilifeTV2FGallery_Text_OohYesYesIGetItNow", "en_US": [ "{STRVAR_1 28, 0, 0}...\r", "Ooh, yes, yes! I get it now!\n", @@ -82,21 +82,21 @@ ] }, { - "id": "pl_msg_00000034_00009", + "id": "JubilifeTV2FGallery_Text_OhNonNonNonItWillBeForlornWithoutATitle", "en_US": [ "Oh, non, non, non!\n", "It will be forlorn without a title." ] }, { - "id": "pl_msg_00000034_00010", + "id": "JubilifeTV2FGallery_Text_OhYouCameOutWithoutDoingAnythingHowDisappointing", "en_US": [ "Oh... You came out without doing\n", "anything... How disappointing." ] }, { - "id": "pl_msg_00000034_00011", + "id": "JubilifeTV2FGallery_Text_WouldYouLikeToDressUpAPokemonDearie", "en_US": [ "If you dress up any Pokémon again,\n", "the photo here will be changed.\r", @@ -105,32 +105,32 @@ ] }, { - "id": "pl_msg_00000034_00012", + "id": "JubilifeTV2FGallery_Text_Dummy12", "garbage": 54 }, { - "id": "pl_msg_00000034_00013", + "id": "JubilifeTV2FGallery_Text_OohNonNonNonThatsAnEgg", "en_US": [ "Ooh, non, non, non! That’s an Egg!\n", "It’s too young to be dressing up!\r" ] }, { - "id": "pl_msg_00000034_00014", + "id": "JubilifeTV2FGallery_Text_IPutYourPhotoUpRightHere", "en_US": [ "I put your photo up right here.\n", "It just looks so perfect there!" ] }, { - "id": "pl_msg_00000034_00015", + "id": "JubilifeTV2FGallery_Text_ItsAFrameForHoldingAPokemonPortraitPhoto", "en_US": [ "It’s a frame for holding a Pokémon\n", "portrait photo." ] }, { - "id": "pl_msg_00000034_00016", + "id": "JubilifeTV2FGallery_Text_TheyDisplayPhotosFromTrainersYouBeenMixinRecordsWithRight", "en_US": [ "They display photos from Trainers\n", "you been mixin’ records with, right?\r", @@ -139,7 +139,7 @@ ] }, { - "id": "pl_msg_00000034_00017", + "id": "JubilifeTV2FGallery_Text_SomeoneGaveMeANewBackdropWhenIWentToTheGlobalTerminal", "en_US": [ "Someone gave me a new Backdrop when I\n", "went to the Global Terminal." diff --git a/res/text/jubilife_tv_3f.json b/res/text/jubilife_tv_3f.json index b5d131be1d..66b017ee7f 100644 --- a/res/text/jubilife_tv_3f.json +++ b/res/text/jubilife_tv_3f.json @@ -2,21 +2,21 @@ "key": 17427, "messages": [ { - "id": "pl_msg_00000032_00000", + "id": "JubilifeTV3F_Text_TheRoomClosestToTheStairsIsTheGroupRankingRoom", "en_US": [ "The room closest to the stairs is the\n", "Group Ranking Room.\r" ] }, { - "id": "pl_msg_00000032_00001", + "id": "JubilifeTV3F_Text_TheRoomOnTheOppositeSideIsTheGlobalRankingRoom", "en_US": [ "The room on the opposite side\n", "is the Global Ranking Room." ] }, { - "id": "pl_msg_00000032_00002", + "id": "JubilifeTV3F_Text_TheMoreTradesIMakeTheBetterMyOddsOfWinningThePokemonLottery", "en_US": [ "I just realized something awesome!\n", "I should be trading Pokémon more!\r", @@ -27,7 +27,7 @@ ] }, { - "id": "pl_msg_00000032_00003", + "id": "JubilifeTV3F_Text_RecordsAreFineThings", "en_US": [ "Records are fine things.\n", "They tell you the history of stuff.\r", @@ -36,7 +36,7 @@ ] }, { - "id": "pl_msg_00000032_00004", + "id": "JubilifeTV3F_Text_WillYouTellMeYourOpinionOnTV", "en_US": [ "Hey, there!\n", "How’s it going?\r", @@ -47,7 +47,7 @@ ] }, { - "id": "pl_msg_00000032_00005", + "id": "JubilifeTV3F_Text_MovingRightAlongWhatFeedbackCanYouGiveMeAboutTV", "en_US": [ "Oh, yeah?\n", "That’s interesting.\r", @@ -56,7 +56,7 @@ ] }, { - "id": "pl_msg_00000032_00006", + "id": "JubilifeTV3F_Text_ThanksForAnsweringMyQuestion", "en_US": [ "Oh, yeah?\n", "That’s interesting.\r", @@ -67,7 +67,7 @@ ] }, { - "id": "pl_msg_00000032_00007", + "id": "JubilifeTV3F_Text_OhAllRightICanUnderstandHowBusyItMustGetForYou", "en_US": [ "Oh, all right.\r", "I can understand how busy it must\n", @@ -78,7 +78,7 @@ ] }, { - "id": "pl_msg_00000032_00008", + "id": "JubilifeTV3F_Text_IThinkICanSwingADealToGetYouANewWallpaperForYourPCBoxes", "en_US": [ "...Oh?\r", "The fact that you know that phrase\n", @@ -92,7 +92,7 @@ ] }, { - "id": "pl_msg_00000032_00009", + "id": "JubilifeTV3F_Text_IThinkICanSwingADealSoYouCanReceiveAMysteryGift", "en_US": [ "...Oh?\r", "The fact that you know that phrase\n", diff --git a/res/text/jubilife_tv_3f_global_ranking_room.json b/res/text/jubilife_tv_3f_global_ranking_room.json index fbb3d954ce..1eb2116064 100644 --- a/res/text/jubilife_tv_3f_global_ranking_room.json +++ b/res/text/jubilife_tv_3f_global_ranking_room.json @@ -2,7 +2,7 @@ "key": 17415, "messages": [ { - "id": "pl_msg_00000035_00000", + "id": "JubilifeTV3FGlobalRankingRoom_Text_SomeoneBrokeMyPokemonCatchingRecord", "en_US": [ "Someone broke my Pokémon-catching\n", "record!\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000035_00001", + "id": "JubilifeTV3FGlobalRankingRoom_Text_IBetItdFeelGreatIfICouldBeNumberOneHere", "en_US": [ "I bet it’d feel great if I could be\n", "number one here!\r", @@ -20,7 +20,7 @@ ] }, { - "id": "pl_msg_00000035_00002", + "id": "JubilifeTV3FGlobalRankingRoom_Text_ImTryingForTheWorldRecordAtPokemonFishing", "en_US": [ "I really don’t win many battles...\n", "But it doesn’t get me down.\r", @@ -29,7 +29,7 @@ ] }, { - "id": "pl_msg_00000035_00003", + "id": "JubilifeTV3FGlobalRankingRoom_Text_SorryImStillFineTuningThisThingyHere", "en_US": [ "Sorry, I’m still fine-tuning this\n", "thingy here." diff --git a/res/text/jubilife_tv_3f_group_ranking_room.json b/res/text/jubilife_tv_3f_group_ranking_room.json index e477e764ee..6ffcaf2cae 100644 --- a/res/text/jubilife_tv_3f_group_ranking_room.json +++ b/res/text/jubilife_tv_3f_group_ranking_room.json @@ -2,7 +2,7 @@ "key": 17411, "messages": [ { - "id": "pl_msg_00000036_00000", + "id": "JubilifeTV3FGroupRankingRoom_Text_YouCanSeeTheRankingsOfPeopleInYourGroupHere", "en_US": [ "You can see the rankings of people\n", "in your group here.\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000036_00001", + "id": "JubilifeTV3FGroupRankingRoom_Text_TheseRankingsAreNifty", "en_US": [ "These rankings are nifty!\r", "I’m going to make a group and\n", @@ -19,7 +19,7 @@ ] }, { - "id": "pl_msg_00000036_00002", + "id": "JubilifeTV3FGroupRankingRoom_Text_SorryImStillFineTuningThisThingyHere", "en_US": [ "Sorry, I’m still fine-tuning this\n", "thingy here." diff --git a/res/text/jubilife_tv_4f.json b/res/text/jubilife_tv_4f.json index 55c4f54da5..0fa457961d 100644 --- a/res/text/jubilife_tv_4f.json +++ b/res/text/jubilife_tv_4f.json @@ -2,7 +2,7 @@ "key": 17423, "messages": [ { - "id": "pl_msg_00000033_00000", + "id": "JubilifeTV4F_Text_YourExploitsAreFantastic", "en_US": [ "Your exploits are fantastic!\r", "With our TV station, we can tell\n", @@ -12,14 +12,14 @@ ] }, { - "id": "pl_msg_00000033_00001", + "id": "JubilifeTV4F_Text_ParticipationForAllIsOurTVNetworksMotto", "en_US": [ "“Participation for all” is our TV\n", "network’s motto." ] }, { - "id": "pl_msg_00000033_00002", + "id": "JubilifeTV4F_Text_WerePromotingTheThemeSmilesAreDreamy", "en_US": [ "We’re promoting the theme “Smiles are\n", "dreamy.”\r", diff --git a/res/text/menu_entries.json b/res/text/menu_entries.json index 8d0a99cf4f..a8e1cc629a 100644 --- a/res/text/menu_entries.json +++ b/res/text/menu_entries.json @@ -958,107 +958,107 @@ "en_US": "NO THANKS" }, { - "id": "pl_msg_00000361_00233", + "id": "MenuEntries_Text_DigitalWatch", "en_US": "DIGITAL WATCH" }, { - "id": "pl_msg_00000361_00234", + "id": "MenuEntries_Text_Stopwatch", "en_US": "STOPWATCH" }, { - "id": "pl_msg_00000361_00235", + "id": "MenuEntries_Text_Calculator", "en_US": "CALCULATOR" }, { - "id": "pl_msg_00000361_00236", + "id": "MenuEntries_Text_MemoPad", "en_US": "MEMO PAD" }, { - "id": "pl_msg_00000361_00237", + "id": "MenuEntries_Text_AnalogWatch", "en_US": "ANALOG WATCH" }, { - "id": "pl_msg_00000361_00238", + "id": "MenuEntries_Text_DotArtist", "en_US": "DOT ARTIST" }, { - "id": "pl_msg_00000361_00239", + "id": "MenuEntries_Text_PokemonList", "en_US": "POKéMON LIST" }, { - "id": "pl_msg_00000361_00240", + "id": "MenuEntries_Text_FriendshipChecker", "en_US": "FRIENDSHIP CHECKER" }, { - "id": "pl_msg_00000361_00241", + "id": "MenuEntries_Text_DowsingMachine", "en_US": "DOWSING MACHINE" }, { - "id": "pl_msg_00000361_00242", + "id": "MenuEntries_Text_Counter", "en_US": "COUNTER" }, { - "id": "pl_msg_00000361_00243", + "id": "MenuEntries_Text_Pedometer", "en_US": "PEDOMETER" }, { - "id": "pl_msg_00000361_00244", + "id": "MenuEntries_Text_DayCareChecker", "en_US": "DAY-CARE CHECKER" }, { - "id": "pl_msg_00000361_00245", + "id": "MenuEntries_Text_Roulette", "en_US": "ROULETTE" }, { - "id": "pl_msg_00000361_00246", + "id": "MenuEntries_Text_CoinToss", "en_US": "COIN TOSS" }, { - "id": "pl_msg_00000361_00247", + "id": "MenuEntries_Text_MoveTester", "en_US": "MOVE TESTER" }, { - "id": "pl_msg_00000361_00248", + "id": "MenuEntries_Text_MatchupChecker", "en_US": "MATCHUP CHECKER" }, { - "id": "pl_msg_00000361_00249", + "id": "MenuEntries_Text_AlarmClock", "en_US": "ALARM CLOCK" }, { - "id": "pl_msg_00000361_00250", + "id": "MenuEntries_Text_KitchenTimer", "en_US": "KITCHEN TIMER" }, { - "id": "pl_msg_00000361_00251", + "id": "MenuEntries_Text_MarkingMap", "en_US": "MARKING MAP" }, { - "id": "pl_msg_00000361_00252", + "id": "MenuEntries_Text_BerrySearcher", "en_US": "BERRY SEARCHER" }, { - "id": "pl_msg_00000361_00253", + "id": "MenuEntries_Text_ColorChanger", "en_US": "COLOR CHANGER" }, { - "id": "pl_msg_00000361_00254", + "id": "MenuEntries_Text_Calendar", "en_US": "CALENDAR" }, { - "id": "pl_msg_00000361_00255", + "id": "MenuEntries_Text_LinkSearcher", "en_US": "LINK SEARCHER" }, { - "id": "pl_msg_00000361_00256", + "id": "MenuEntries_Text_TrainerCounter", "en_US": "TRAINER COUNTER" }, { - "id": "pl_msg_00000361_00257", + "id": "MenuEntries_Text_PokemonHistory", "en_US": "POKéMON HISTORY" }, { - "id": "pl_msg_00000361_00258", + "id": "MenuEntries_Text_PoketchDescriptionsExit", "en_US": "EXIT" }, { diff --git a/res/text/unk_0372.json b/res/text/mystery_gift_phrase.json similarity index 70% rename from res/text/unk_0372.json rename to res/text/mystery_gift_phrase.json index 82aef57c4d..adca9ff2dd 100644 --- a/res/text/unk_0372.json +++ b/res/text/mystery_gift_phrase.json @@ -2,14 +2,14 @@ "key": 37072, "messages": [ { - "id": "pl_msg_00000372_00000", + "id": "MysteryGiftPhrase_EveryoneHappyWiFiConnection", "en_US": [ "EVERYONE HAPPY\n", "WI-FI CONNECTION" ] }, { - "id": "pl_msg_00000372_00001", + "id": "MysteryGiftPhrase_CustomMessageWords", "en_US": [ "{STRVAR_1 28, 0, 0} {STRVAR_1 28, 1, 0}\n", "{STRVAR_1 28, 2, 0} {STRVAR_1 28, 3, 0}" diff --git a/res/text/poketch_co_1f.json b/res/text/poketch_co_1f.json index 3328752780..e4f193a41b 100644 --- a/res/text/poketch_co_1f.json +++ b/res/text/poketch_co_1f.json @@ -2,7 +2,7 @@ "key": 17411, "messages": [ { - "id": "pl_msg_00000027_00000", + "id": "PoketchCo1F_Text_ImThePresidentOfThePoketchCompany", "en_US": [ "Hi, hi!\r", "I’m the president of the Pokétch\n", @@ -10,7 +10,7 @@ ] }, { - "id": "pl_msg_00000027_00001", + "id": "PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetAGymBadge", "en_US": [ "I’m developing a new Pokétch app,\n", "but it’s not quite done.\r", @@ -19,7 +19,7 @@ ] }, { - "id": "pl_msg_00000027_00002", + "id": "PoketchCo1F_Text_IveDevelopedANewPoketchApp", "en_US": [ "Hi, hi!\n", "Your patience is rewarded!\r", @@ -27,14 +27,14 @@ ] }, { - "id": "pl_msg_00000027_00003", + "id": "PoketchCo1F_Text_ThatsTheMemoPad", "en_US": [ "That’s the Memo Pad!\n", "It’s... Well, it is what it is!" ] }, { - "id": "pl_msg_00000027_00004", + "id": "PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetThreeGymBadges", "en_US": [ "I’m developing a new Pokétch app,\n", "but it’s not quite done.\r", @@ -43,7 +43,7 @@ ] }, { - "id": "pl_msg_00000027_00005", + "id": "PoketchCo1F_Text_IveDevelopedAnotherNewPoketchApp", "en_US": [ "Hi, hi!\n", "Your patience is rewarded!\r", @@ -52,7 +52,7 @@ ] }, { - "id": "pl_msg_00000027_00006", + "id": "PoketchCo1F_Text_HavingAMapConstantlyDisplayedIsConvenientNo", "en_US": [ "Having a map constantly displayed\n", "is convenient, no?\r", @@ -61,7 +61,7 @@ ] }, { - "id": "pl_msg_00000027_00007", + "id": "PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetFiveGymBadges", "en_US": [ "I’m developing a new Pokétch app,\n", "but it’s not quite done.\r", @@ -70,7 +70,7 @@ ] }, { - "id": "pl_msg_00000027_00008", + "id": "PoketchCo1F_Text_IveDevelopedYetAnotherNewPoketchApp", "en_US": [ "Hi, hi!\n", "Your patience is rewarded!\r", @@ -79,7 +79,7 @@ ] }, { - "id": "pl_msg_00000027_00009", + "id": "PoketchCo1F_Text_IThinkItWillBeUsefulToKnowHowManyPeopleAreCommunicating", "en_US": [ "I think it will be useful to know how\n", "many people are communicating, like\f", @@ -87,7 +87,7 @@ ] }, { - "id": "pl_msg_00000027_00010", + "id": "PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetSevenGymBadges", "en_US": [ "I’m developing a new Pokétch app,\n", "but it’s not quite done.\r", @@ -96,7 +96,7 @@ ] }, { - "id": "pl_msg_00000027_00011", + "id": "PoketchCo1F_Text_IveDevelopedStillYetAnotherNewPoketchApp", "en_US": [ "Hi, hi!\n", "Your patience is rewarded!\r", @@ -105,7 +105,7 @@ ] }, { - "id": "pl_msg_00000027_00012", + "id": "PoketchCo1F_Text_CheckTypeMatchupsSoYouCanMakeAllYourAttackSuperEffective", "en_US": [ "Check type matchups so you can make\n", "all your attacks super effective!\r", @@ -113,7 +113,7 @@ ] }, { - "id": "pl_msg_00000027_00013", + "id": "PoketchCo1F_Text_YupAllSortsOfPeopleWillGiveYouPoketchApps", "en_US": [ "Yup, all sorts of people will give\n", "you Pokétch apps.\r", @@ -121,7 +121,7 @@ ] }, { - "id": "pl_msg_00000027_00014", + "id": "PoketchCo1F_Text_DoYouThinkIShouldSolicitNewPoketchIdeas", "en_US": [ "So, yup, what to do?\r", "Do you think I should solicit new\n", @@ -129,7 +129,7 @@ ] }, { - "id": "pl_msg_00000027_00015", + "id": "PoketchCo1F_Text_OhYouCanBeSureIWillKeepDevelopingPoketchApps", "en_US": [ "Oh, you can be sure I will keep\n", "developing Pokétch apps.\r", @@ -138,7 +138,7 @@ ] }, { - "id": "pl_msg_00000027_00016", + "id": "PoketchCo1F_Text_WelcomeToThePoketchCompany", "en_US": [ "Welcome to the Pokétch Company.\r", "We’re actually a family-run business,\n", @@ -146,7 +146,7 @@ ] }, { - "id": "pl_msg_00000027_00017", + "id": "PoketchCo1F_Text_HeyDoYouWatchTV", "en_US": [ "Hey, do you watch TV?\n", "“Pokétch Detective” is a great show.\r", diff --git a/res/text/poketch_co_2f.json b/res/text/poketch_co_2f.json index bc3992d57b..b0df3432a2 100644 --- a/res/text/poketch_co_2f.json +++ b/res/text/poketch_co_2f.json @@ -2,14 +2,14 @@ "key": 17423, "messages": [ { - "id": "pl_msg_00000028_00000", + "id": "PoketchCo2F_Text_WellTryToThinkLikeATrainerAndFindWhatPoketchAppsWouldBeGood", "en_US": [ "We’ll try to think like a Trainer and find\n", "what Pokétch apps would be good." ] }, { - "id": "pl_msg_00000028_00001", + "id": "PoketchCo2F_Text_PokemonWatchThatsPoketchForShort", "en_US": [ "Pokémon Watch!\n", "That’s Pokétch for short.\r", @@ -20,11 +20,11 @@ ] }, { - "id": "pl_msg_00000028_00002", + "id": "PoketchCo2F_Text_ClefairyCleffy", "en_US": "CLEFAIRY: Cleffy?" }, { - "id": "pl_msg_00000028_00003", + "id": "PoketchCo2F_Text_PachirisuPatchii", "en_US": "PACHIRISU: Patchii?" } ] diff --git a/res/text/poketch_co_3f.json b/res/text/poketch_co_3f.json index 46f440937f..41beea6dec 100644 --- a/res/text/poketch_co_3f.json +++ b/res/text/poketch_co_3f.json @@ -2,7 +2,7 @@ "key": 17419, "messages": [ { - "id": "pl_msg_00000029_00000", + "id": "PoketchCo3F_Text_TheresAGirlsModelAndABoysModel", "en_US": [ "Do you have a Pokétch?\r", "There’s a girl’s model and a boy’s\n", @@ -10,7 +10,7 @@ ] }, { - "id": "pl_msg_00000029_00001", + "id": "PoketchCo3F_Text_MyHusbandsThePresident", "en_US": [ "My husband’s the president.\r", "We started out in a small workshop\n", @@ -20,7 +20,7 @@ ] }, { - "id": "pl_msg_00000029_00002", + "id": "PoketchCo3F_Text_PeopleEverywhereMakePoketchApps", "en_US": [ "People everywhere make Pokétch apps.\r", "You’ll be able to get new apps from\n", @@ -30,63 +30,63 @@ ] }, { - "id": "pl_msg_00000029_00003", + "id": "PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps1", "en_US": [ "There are descriptions of Pokétch\n", "apps.\r" ] }, { - "id": "pl_msg_00000029_00004", + "id": "PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout1", "en_US": [ "Which Pokétch app would\n", "you like to read about?" ] }, { - "id": "pl_msg_00000029_00005", + "id": "PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps2", "en_US": [ "There are descriptions of Pokétch\n", "apps.\r" ] }, { - "id": "pl_msg_00000029_00006", + "id": "PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout2", "en_US": [ "Which Pokétch app would\n", "you like to read about?" ] }, { - "id": "pl_msg_00000029_00007", + "id": "PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps3", "en_US": [ "There are descriptions of Pokétch\n", "apps.\r" ] }, { - "id": "pl_msg_00000029_00008", + "id": "PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout3", "en_US": [ "Which Pokétch app would you like\n", "to read about?" ] }, { - "id": "pl_msg_00000029_00009", + "id": "PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps4", "en_US": [ "There are descriptions of Pokétch\n", "apps.\r" ] }, { - "id": "pl_msg_00000029_00010", + "id": "PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout4", "en_US": [ "Which Pokétch app would you like\n", "to read about?" ] }, { - "id": "pl_msg_00000029_00011", + "id": "PoketchCo3F_Text_DescriptionDigitalWatch", "en_US": [ "The Digital Watch displays the\n", "current time.\r", @@ -95,7 +95,7 @@ ] }, { - "id": "pl_msg_00000029_00012", + "id": "PoketchCo3F_Text_DescriptionAnalogWatch", "en_US": [ "The Analog Watch displays the\n", "current time.\r", @@ -104,7 +104,7 @@ ] }, { - "id": "pl_msg_00000029_00013", + "id": "PoketchCo3F_Text_DescriptionAlarmClock", "en_US": [ "The Alarm Clock can be set to sound\n", "every 24 hours.\r", @@ -113,7 +113,7 @@ ] }, { - "id": "pl_msg_00000029_00014", + "id": "PoketchCo3F_Text_DescriptionStopwatch", "en_US": [ "The Stopwatch is used for measuring\n", "time precisely.\r", @@ -122,7 +122,7 @@ ] }, { - "id": "pl_msg_00000029_00015", + "id": "PoketchCo3F_Text_DescriptionKitchenTimer", "en_US": [ "The Kitchen Timer can count down from\n", "up to 99 minutes, but not precisely.\r", @@ -131,7 +131,7 @@ ] }, { - "id": "pl_msg_00000029_00016", + "id": "PoketchCo3F_Text_DescriptionCalendar", "en_US": [ "Use the monthly Calendar to make\n", "a note of important dates.\r", @@ -140,7 +140,7 @@ ] }, { - "id": "pl_msg_00000029_00017", + "id": "PoketchCo3F_Text_DescriptionCalculator", "en_US": [ "The Calculator can handle up to\n", "ten digits.\r", @@ -149,7 +149,7 @@ ] }, { - "id": "pl_msg_00000029_00018", + "id": "PoketchCo3F_Text_DescriptionPokemonList", "en_US": [ "The Pokémon List indicates the\n", "statuses of your team’s Pokémon.\r", @@ -158,7 +158,7 @@ ] }, { - "id": "pl_msg_00000029_00019", + "id": "PoketchCo3F_Text_DescriptionFriendshipChecker", "en_US": [ "The Friendship Checker indicates how\n", "friendly your Pokémon are to you.\r", @@ -167,7 +167,7 @@ ] }, { - "id": "pl_msg_00000029_00020", + "id": "PoketchCo3F_Text_DescriptionDayCareChecker", "en_US": [ "The Day-Care Checker shows the\n", "Pokémon you have in the Day Care.\r", @@ -176,7 +176,7 @@ ] }, { - "id": "pl_msg_00000029_00021", + "id": "PoketchCo3F_Text_DescriptionMatchupChecker", "en_US": [ "The Matchup Checker tests the\n", "attraction between Pokémon.\r", @@ -185,7 +185,7 @@ ] }, { - "id": "pl_msg_00000029_00022", + "id": "PoketchCo3F_Text_DescriptionPokemonHistory", "en_US": [ "The Pokémon History keeps track of\n", "the Pokémon you have obtained.\r", @@ -194,7 +194,7 @@ ] }, { - "id": "pl_msg_00000029_00023", + "id": "PoketchCo3F_Text_DescriptionBerrySearcher", "en_US": [ "The Berry Searcher is a map that\n", "shows the locations of Berries.\r", @@ -203,7 +203,7 @@ ] }, { - "id": "pl_msg_00000029_00024", + "id": "PoketchCo3F_Text_DescriptionMemoPad", "en_US": [ "The Memo Pad is useful for jotting\n", "down a note, or just doodling.\r", @@ -212,7 +212,7 @@ ] }, { - "id": "pl_msg_00000029_00025", + "id": "PoketchCo3F_Text_DescriptionDotArtist", "en_US": [ "The Dot Artist lets you draw pictures\n", "in a mosaic style.\r", @@ -221,7 +221,7 @@ ] }, { - "id": "pl_msg_00000029_00026", + "id": "PoketchCo3F_Text_DescriptionColorChanger", "en_US": [ "The Color Changer changes the\n", "Pokétch’s display color.\r", @@ -230,7 +230,7 @@ ] }, { - "id": "pl_msg_00000029_00027", + "id": "PoketchCo3F_Text_DescriptionMarkingMap", "en_US": [ "The Marking Map lets you mark\n", "intriguing locations.\r", @@ -239,7 +239,7 @@ ] }, { - "id": "pl_msg_00000029_00028", + "id": "PoketchCo3F_Text_DescriptionRoulette", "en_US": [ "The Roulette features a wheel\n", "that can be written on.\r", @@ -248,7 +248,7 @@ ] }, { - "id": "pl_msg_00000029_00029", + "id": "PoketchCo3F_Text_DescriptionCoinToss", "en_US": [ "The Coin Toss flips a coin that\n", "comes up heads or tails.\r", @@ -257,7 +257,7 @@ ] }, { - "id": "pl_msg_00000029_00030", + "id": "PoketchCo3F_Text_DescriptionPedometer", "en_US": [ "The Pedometer keeps a count of\n", "the number of steps traveled.\r", @@ -266,7 +266,7 @@ ] }, { - "id": "pl_msg_00000029_00031", + "id": "PoketchCo3F_Text_DescriptionDowsingMachine", "en_US": [ "The Dowsing Machine searches for\n", "hidden or obscured items.\r", @@ -275,7 +275,7 @@ ] }, { - "id": "pl_msg_00000029_00032", + "id": "PoketchCo3F_Text_DescriptionCounter", "en_US": [ "The Counter is used for counting\n", "things one at a time.\r", @@ -284,7 +284,7 @@ ] }, { - "id": "pl_msg_00000029_00033", + "id": "PoketchCo3F_Text_DescriptionTrainerCounter", "en_US": [ "The Trainer Counter tracks the\n", "performance of the Poké Radar.\r", @@ -293,7 +293,7 @@ ] }, { - "id": "pl_msg_00000029_00034", + "id": "PoketchCo3F_Text_DescriptionLinkSearcher", "en_US": [ "The Link Searcher searches for\n", "players on wireless communications.\r", @@ -302,7 +302,7 @@ ] }, { - "id": "pl_msg_00000029_00035", + "id": "PoketchCo3F_Text_DescriptionMoveTester", "en_US": [ "The Move Tester checks how effective\n", "moves are by type.\r", diff --git a/src/game_records.c b/src/game_records.c index ec8fee4fec..a3677cac89 100644 --- a/src/game_records.c +++ b/src/game_records.c @@ -141,7 +141,7 @@ static u8 sUsesHighLimit[MAX_RECORDS] = { [RECORD_UNK_051] = FALSE, [RECORD_UNK_052] = FALSE, [RECORD_UNK_053] = FALSE, - [RECORD_UNK_054] = FALSE, + [RECORD_TIMES_DRESSED_UP_POKEMON] = FALSE, [RECORD_UNK_055] = FALSE, [RECORD_TIMES_STUCK_IN_DEEP_MUD] = FALSE, [RECORD_UNK_057] = TRUE, diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index 62298e9d4f..f867e026be 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -874,9 +874,9 @@ BOOL ScrCmd_30F(ScriptContext *param0) return 0; } -BOOL ScrCmd_316(ScriptContext *param0) +BOOL ScrCmd_Dummy316(ScriptContext *ctx) { - return 1; + return TRUE; } static const UnkStruct_ov5_02200C90 Unk_ov5_02200C90[] = { diff --git a/src/scrcmd.c b/src/scrcmd.c index 33355b9e51..2ce1157ad6 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -229,6 +229,7 @@ #include "constdata/const_020EAB80.h" #include "constdata/const_020EAC58.h" #include "constdata/const_020F8BE0.h" +#include "res/text/bank/mystery_gift_phrase.h" typedef struct { SysTask *unk_00; @@ -379,9 +380,9 @@ static BOOL ScrCmd_20B(ScriptContext *ctx); static BOOL ScrCmd_0A5(ScriptContext *ctx); static BOOL ScrCmd_30E(ScriptContext *ctx); static BOOL ScrCmd_0A6(ScriptContext *ctx); -static BOOL ScrCmd_0A7(ScriptContext *ctx); +static BOOL ScrCmd_ShowDressUpPhoto(ScriptContext *ctx); static BOOL ScrCmd_0A8(ScriptContext *ctx); -static BOOL ScrCmd_12E(ScriptContext *ctx); +static BOOL ScrCmd_DressUpPhotoHasData(ScriptContext *ctx); static BOOL ScrCmd_12F(ScriptContext *ctx); static BOOL ScrCmd_SetDressUpPhotoTitle(ScriptContext *ctx); static BOOL ScrCmd_OpenSealCapsuleEditor(ScriptContext *ctx); @@ -456,7 +457,7 @@ static BOOL ScrCmd_12B(ScriptContext *ctx); static BOOL ScrCmd_CheckSaveType(ScriptContext *ctx); static BOOL ScrCmd_TrySaveGame(ScriptContext *ctx); static BOOL ScrCmd_131(ScriptContext *ctx); -static BOOL ScrCmd_132(ScriptContext *ctx); +static BOOL ScrCmd_CheckPoketchEnabled(ScriptContext *ctx); static BOOL ScrCmd_RegisterPoketchApp(ScriptContext *ctx); static BOOL ScrCmd_CheckPoketchAppRegistered(ScriptContext *ctx); static BOOL ScrCmd_135(ScriptContext *ctx); @@ -621,11 +622,11 @@ static BOOL ScrCmd_GetSpeciesFootprintType(ScriptContext *ctx); static BOOL ScrCmd_PlayPokecenterHealingAnimation(ScriptContext *ctx); static BOOL ScrCmd_PlayElevatorAnimation(ScriptContext *ctx); static BOOL ScrCmd_PlayBoatCutscene(ScriptContext *ctx); -static BOOL ScrCmd_243(ScriptContext *ctx); -static BOOL ScrCmd_244(ScriptContext *ctx); -static BOOL ScrCmd_245(ScriptContext *ctx); +static BOOL ScrCmd_ChooseCustomMessageWord(ScriptContext *ctx); +static BOOL ScrCmd_ChooseTwoCustomMessageWords(ScriptContext *ctx); +static BOOL ScrCmd_BufferCustomMessageWord(ScriptContext *ctx); static BOOL ScrCmd_GetGameVersion(ScriptContext *ctx); -static BOOL ScrCmd_249(ScriptContext *ctx); +static BOOL ScrCmd_GetWallpaperFromCustomMessageWords(ScriptContext *ctx); static BOOL ScrCmd_GetCapturedFlagCount(ScriptContext *ctx); static BOOL ScrCmd_LoadPCAnimation(ScriptContext *ctx); static BOOL ScrCmd_PlayPCBootUpAnimation(ScriptContext *ctx); @@ -688,7 +689,7 @@ static BOOL ScrCmd_TrySetUnusedUndergroundField(ScriptContext *ctx); static BOOL ScrCmd_2A3(ScriptContext *ctx); static BOOL ScrCmd_2A4(ScriptContext *ctx); static BOOL ScrCmd_CheckItemIsPlate(ScriptContext *ctx); -static BOOL ScrCmd_2AA(ScriptContext *ctx); +static BOOL ScrCmd_CheckIsMysteryGiftPhrase(ScriptContext *ctx); static BOOL ScrCmd_2AB(ScriptContext *ctx); static BOOL ScrCmd_UnlockMysteryGift(ScriptContext *ctx); static BOOL ScrCmd_2AF(ScriptContext *ctx); @@ -935,7 +936,7 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_Unused_0A4, ScrCmd_0A5, ScrCmd_0A6, - ScrCmd_0A7, + ScrCmd_ShowDressUpPhoto, ScrCmd_0A8, ScrCmd_OpenSealCapsuleEditor, ScrCmd_OpenRegionMap, @@ -1070,11 +1071,11 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_12B, ScrCmd_CheckSaveType, ScrCmd_TrySaveGame, - ScrCmd_12E, + ScrCmd_DressUpPhotoHasData, ScrCmd_12F, ScrCmd_SetDressUpPhotoTitle, ScrCmd_131, - ScrCmd_132, + ScrCmd_CheckPoketchEnabled, ScrCmd_RegisterPoketchApp, ScrCmd_CheckPoketchAppRegistered, ScrCmd_135, @@ -1347,13 +1348,13 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_Dummy240, ScrCmd_Dummy241, ScrCmd_Dummy242, - ScrCmd_243, - ScrCmd_244, - ScrCmd_245, + ScrCmd_ChooseCustomMessageWord, + ScrCmd_ChooseTwoCustomMessageWords, + ScrCmd_BufferCustomMessageWord, ScrCmd_GetGameVersion, ScrCmd_GetFirstNonEggInParty, ScrCmd_GetPartyMonType, - ScrCmd_249, + ScrCmd_GetWallpaperFromCustomMessageWords, ScrCmd_GetCapturedFlagCount, ScrCmd_LoadPCAnimation, ScrCmd_PlayPCBootUpAnimation, @@ -1450,7 +1451,7 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_CheckItemIsPlate, ScrCmd_SubtractCoinsFromVar, ScrCmd_HasCoinsFromVar, - ScrCmd_2AA, + ScrCmd_CheckIsMysteryGiftPhrase, ScrCmd_2AB, ScrCmd_UnlockMysteryGift, ScrCmd_GetMovementType, @@ -1558,7 +1559,7 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_CheckHeapMemory, ScrCmd_GetBattleResult, ScrCmd_315, - ScrCmd_316, + ScrCmd_Dummy316, ScrCmd_GetPlayer3DPos, ScrCmd_StartFatefulEncounter, ScrCmd_StartGiratinaOriginBattle, @@ -3777,16 +3778,16 @@ static BOOL ScrCmd_WaitForTransition(ScriptContext *ctx) return TRUE; } -static BOOL sub_02041D98(FieldSystem *fieldSystem, int param1, int param2) +static BOOL ImageClipsSlotHasData(FieldSystem *fieldSystem, int param1, int slot) { ImageClips *imageClips = SaveData_GetImageClips(fieldSystem->saveData); if (param1 == 0) { - if (!ImageClips_DressUpPhotoHasData(imageClips, param2)) { + if (!ImageClips_DressUpPhotoHasData(imageClips, slot)) { return FALSE; } } else { - if (!sub_02029D2C(imageClips, param2)) { + if (!sub_02029D2C(imageClips, slot)) { return FALSE; } } @@ -3794,11 +3795,11 @@ static BOOL sub_02041D98(FieldSystem *fieldSystem, int param1, int param2) return TRUE; } -static UnkStruct_02041DC8 *sub_02041DC8(enum HeapID heapID, FieldSystem *fieldSystem, int param2, int param3) +static UnkStruct_02041DC8 *sub_02041DC8(enum HeapID heapID, FieldSystem *fieldSystem, int param2, int slot) { ImageClips *imageClips = SaveData_GetImageClips(fieldSystem->saveData); - if (!sub_02041D98(fieldSystem, param2, param3)) { + if (!ImageClipsSlotHasData(fieldSystem, param2, slot)) { return NULL; } @@ -3807,7 +3808,7 @@ static UnkStruct_02041DC8 *sub_02041DC8(enum HeapID heapID, FieldSystem *fieldSy v0->imageClips = imageClips; v0->unk_08 = param2; - v0->unk_04 = param3; + v0->unk_04 = slot; return v0; } @@ -3954,29 +3955,29 @@ static BOOL ScrCmd_30E(ScriptContext *ctx) static BOOL ScrCmd_0A6(ScriptContext *ctx) { - u16 v0 = ScriptContext_GetVar(ctx); - u16 *v1 = ScriptContext_GetVarPointer(ctx); + u16 slot = ScriptContext_GetVar(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); u16 v2 = ScriptContext_GetVar(ctx); - sub_0203DAC0(ctx->fieldSystem->task, v1, ctx->fieldSystem->saveData, v0, v2); + sub_0203DAC0(ctx->fieldSystem->task, destVar, ctx->fieldSystem->saveData, slot, v2); return TRUE; } -static BOOL ScrCmd_0A7(ScriptContext *ctx) +static BOOL ScrCmd_ShowDressUpPhoto(ScriptContext *ctx) { void **v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA); - int v1 = ScriptContext_ReadHalfWord(ctx); - u16 *v2 = ScriptContext_GetVarPointer(ctx); + int slot = ScriptContext_ReadHalfWord(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); - *v0 = sub_02041DC8(HEAP_ID_FIELD2, ctx->fieldSystem, 0, v1); + *v0 = sub_02041DC8(HEAP_ID_FIELD2, ctx->fieldSystem, 0, slot); if (*v0 == NULL) { - *v2 = 1; + *destVar = 1; return TRUE; } - *v2 = 0; + *destVar = 0; sub_0203DB24(ctx->fieldSystem, *v0); ScriptContext_Pause(ctx, sub_02041CC8); @@ -4006,19 +4007,19 @@ static BOOL ScrCmd_0A8(ScriptContext *ctx) return TRUE; } -static BOOL ScrCmd_12E(ScriptContext *ctx) +static BOOL ScrCmd_DressUpPhotoHasData(ScriptContext *ctx) { - int v1 = ScriptContext_ReadHalfWord(ctx); - u16 *v2 = ScriptContext_GetVarPointer(ctx); + int slot = ScriptContext_ReadHalfWord(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); - BOOL v0 = sub_02041D98(ctx->fieldSystem, 0, v1); + BOOL result = ImageClipsSlotHasData(ctx->fieldSystem, 0, slot); - if (v0 == TRUE) { - *v2 = 1; + if (result == TRUE) { + *destVar = TRUE; return TRUE; } - *v2 = 0; + *destVar = FALSE; return TRUE; } @@ -4027,7 +4028,7 @@ static BOOL ScrCmd_12F(ScriptContext *ctx) int v1 = ScriptContext_ReadHalfWord(ctx); u16 *v2 = ScriptContext_GetVarPointer(ctx); - BOOL v0 = sub_02041D98(ctx->fieldSystem, 1, v1); + BOOL v0 = ImageClipsSlotHasData(ctx->fieldSystem, 1, v1); if (v0 == TRUE) { *v2 = 1; @@ -4350,39 +4351,39 @@ static BOOL ScrCmd_2C7(ScriptContext *ctx) return FALSE; } -static BOOL ScrCmd_243(ScriptContext *ctx) +static BOOL ScrCmd_ChooseCustomMessageWord(ScriptContext *ctx) { - u16 v0 = ScriptContext_GetVar(ctx); - u16 *v1 = ScriptContext_GetVarPointer(ctx); - u16 *v2 = ScriptContext_GetVarPointer(ctx); + u16 unused = ScriptContext_GetVar(ctx); + u16 *resultVar = ScriptContext_GetVarPointer(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); - *v2 = 0xffff; - sub_0203D80C(ctx->fieldSystem->task, v1, v2, NULL); + *destVar = 0xFFFF; + sub_0203D80C(ctx->fieldSystem->task, resultVar, destVar, NULL); return TRUE; } -static BOOL ScrCmd_244(ScriptContext *ctx) +static BOOL ScrCmd_ChooseTwoCustomMessageWords(ScriptContext *ctx) { - u16 v0 = ScriptContext_GetVar(ctx); - u16 *v1 = ScriptContext_GetVarPointer(ctx); - u16 *v2 = ScriptContext_GetVarPointer(ctx); - u16 *v3 = ScriptContext_GetVarPointer(ctx); + u16 unused = ScriptContext_GetVar(ctx); + u16 *resultVar = ScriptContext_GetVarPointer(ctx); + u16 *destVar1 = ScriptContext_GetVarPointer(ctx); + u16 *destVar2 = ScriptContext_GetVarPointer(ctx); - *v2 = 0xffff; - *v3 = 0xffff; + *destVar1 = 0xFFFF; + *destVar2 = 0xFFFF; - sub_0203D80C(ctx->fieldSystem->task, v1, v2, v3); + sub_0203D80C(ctx->fieldSystem->task, resultVar, destVar1, destVar2); return TRUE; } -static BOOL ScrCmd_245(ScriptContext *ctx) +static BOOL ScrCmd_BufferCustomMessageWord(ScriptContext *ctx) { - StringTemplate **v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); - u16 v1 = ScriptContext_GetVar(ctx); - u16 v2 = ScriptContext_GetVar(ctx); + StringTemplate **strTemplate = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + u16 idx = ScriptContext_GetVar(ctx); + u16 customMessageWord = ScriptContext_GetVar(ctx); - StringTemplate_SetCustomMessageWord(*v0, v1, v2); + StringTemplate_SetCustomMessageWord(*strTemplate, idx, customMessageWord); return FALSE; } @@ -4987,12 +4988,12 @@ static BOOL ScrCmd_131(ScriptContext *ctx) return TRUE; } -static BOOL ScrCmd_132(ScriptContext *ctx) +static BOOL ScrCmd_CheckPoketchEnabled(ScriptContext *ctx) { Poketch *poketch = SaveData_GetPoketch(ctx->fieldSystem->saveData); - u16 *v1 = ScriptContext_GetVarPointer(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); - *v1 = Poketch_IsEnabled(poketch); + *destVar = Poketch_IsEnabled(poketch); return FALSE; } @@ -5774,9 +5775,9 @@ static BOOL ScrCmd_1B4(ScriptContext *ctx) static BOOL ScrCmd_1B5(ScriptContext *ctx) { - u16 v0 = ScriptContext_GetVar(ctx); + u16 listIndex = ScriptContext_GetVar(ctx); - sub_020703FC(ctx->task, v0); + sub_020703FC(ctx->task, listIndex); return TRUE; } @@ -6421,28 +6422,28 @@ static BOOL ScrCmd_GetGameVersion(ScriptContext *ctx) return FALSE; } -static BOOL ScrCmd_249(ScriptContext *ctx) +static BOOL ScrCmd_GetWallpaperFromCustomMessageWords(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; - TrainerInfo *v1 = SaveData_GetTrainerInfo(FieldSystem_GetSaveData(ctx->fieldSystem)); - u16 *v2 = ScriptContext_GetVarPointer(ctx); + TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(FieldSystem_GetSaveData(ctx->fieldSystem)); + u16 *destVar = ScriptContext_GetVarPointer(ctx); PCBoxes *pcBoxes = SaveData_GetPCBoxes(fieldSystem->saveData); - u16 v4 = ScriptContext_GetVar(ctx); - u16 v5 = ScriptContext_GetVar(ctx); - u16 v6 = ScriptContext_GetVar(ctx); - u16 v7 = ScriptContext_GetVar(ctx); - int v8 = ov6_022479D0(v1, v4, v5, v6, v7, 4); - - if ((v8 == -1) || (v8 > 7)) { - *v2 = 0xff; + u16 customMessageWord1 = ScriptContext_GetVar(ctx); + u16 customMessageWord2 = ScriptContext_GetVar(ctx); + u16 customMessageWord3 = ScriptContext_GetVar(ctx); + u16 customMessageWord4 = ScriptContext_GetVar(ctx); + int wallpaper = ov6_022479D0(trainerInfo, customMessageWord1, customMessageWord2, customMessageWord3, customMessageWord4, HEAP_ID_FIELD1); + + if (wallpaper == -1 || wallpaper > 7) { + *destVar = 0xFF; return FALSE; } - if (PCBoxes_CheckHasUnlockedWallpaper(pcBoxes, v8)) { - *v2 = 0; + if (PCBoxes_CheckHasUnlockedWallpaper(pcBoxes, wallpaper)) { + *destVar = 0; } else { - PCBoxes_UnlockWallpaper(pcBoxes, v8); - *v2 = v8 + 1; + PCBoxes_UnlockWallpaper(pcBoxes, wallpaper); + *destVar = wallpaper + 1; } return FALSE; @@ -7279,30 +7280,30 @@ static BOOL ScrCmd_CheckItemIsPlate(ScriptContext *ctx) return FALSE; } -static BOOL ScrCmd_2AA(ScriptContext *ctx) +static BOOL ScrCmd_CheckIsMysteryGiftPhrase(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; - u16 *v1 = ScriptContext_GetVarPointer(ctx); - u16 v2 = ScriptContext_GetVar(ctx); - u16 v3 = ScriptContext_GetVar(ctx); - u16 v4 = ScriptContext_GetVar(ctx); - u16 v5 = ScriptContext_GetVar(ctx); - StringTemplate *v6 = StringTemplate_Default(HEAP_ID_FIELD3); - MessageLoader *v7 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0372, HEAP_ID_FIELD3); - - StringTemplate_SetCustomMessageWord(v6, 0, v2); - StringTemplate_SetCustomMessageWord(v6, 1, v3); - StringTemplate_SetCustomMessageWord(v6, 2, v4); - StringTemplate_SetCustomMessageWord(v6, 3, v5); - - String *v8 = MessageUtil_ExpandedString(v6, v7, 1, HEAP_ID_FIELD3); - String *v9 = MessageLoader_GetNewString(v7, 0); - *v1 = (String_Compare(v8, v9) == 0); - - String_Free(v8); - String_Free(v9); - MessageLoader_Free(v7); - StringTemplate_Free(v6); + u16 *destVar = ScriptContext_GetVarPointer(ctx); + u16 customMessageWord1 = ScriptContext_GetVar(ctx); + u16 customMessageWord2 = ScriptContext_GetVar(ctx); + u16 customMessageWord3 = ScriptContext_GetVar(ctx); + u16 customMessageWord4 = ScriptContext_GetVar(ctx); + StringTemplate *strTemplate = StringTemplate_Default(HEAP_ID_FIELD3); + MessageLoader *msgLoader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MYSTERY_GIFT_PHRASE, HEAP_ID_FIELD3); + + StringTemplate_SetCustomMessageWord(strTemplate, 0, customMessageWord1); + StringTemplate_SetCustomMessageWord(strTemplate, 1, customMessageWord2); + StringTemplate_SetCustomMessageWord(strTemplate, 2, customMessageWord3); + StringTemplate_SetCustomMessageWord(strTemplate, 3, customMessageWord4); + + String *stringCustomMessageWords = MessageUtil_ExpandedString(strTemplate, msgLoader, MysteryGiftPhrase_CustomMessageWords, HEAP_ID_FIELD3); + String *stringEveryoneHappyWiFiConnection = MessageLoader_GetNewString(msgLoader, MysteryGiftPhrase_EveryoneHappyWiFiConnection); + *destVar = String_Compare(stringCustomMessageWords, stringEveryoneHappyWiFiConnection) == 0; + + String_Free(stringCustomMessageWords); + String_Free(stringEveryoneHappyWiFiConnection); + MessageLoader_Free(msgLoader); + StringTemplate_Free(strTemplate); return FALSE; }