diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index ed2d907dcf..ace0b42186 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -4281,8 +4281,8 @@ .short SCRCMD_UNUSED_2CE .endm - .macro BattleHallCheckUsingSameSpeciesAsPartner species, result - .short SCRCMD_BATTLEHALLCHECKUSINGSAMESPECIESASPARTNER + .macro CheckBattleHallPartnerUsesDifferentSpecies species, result + .short SCRCMD_CHECKBATTLEHALLPARTNERUSESDIFFERENTSPECIES .short \species .short \result .endm @@ -4805,12 +4805,12 @@ .short \form .endm - .macro ScrCmd_329 arg0, arg1, arg2, arg3 - .short SCRCMD_329 - .short \arg0 - .short \arg1 - .short \arg2 - .short \arg3 + .macro GetBattleFrontierReporterPosition x, z, dir, movementType + .short SCRCMD_GETBATTLEFRONTIERREPORTERPOSITION + .short \x + .short \z + .short \dir + .short \movementType .endm .macro ScrCmd_32A arg0 diff --git a/generated/game_records.txt b/generated/game_records.txt index a5283779f7..5131061978 100644 --- a/generated/game_records.txt +++ b/generated/game_records.txt @@ -56,7 +56,7 @@ RECORD_TIMES_DRESSED_UP_POKEMON RECORD_UNK_055 RECORD_TIMES_STUCK_IN_DEEP_MUD RECORD_TIMES_BATTLED_AT_BATTLEGROUND -RECORD_UNK_058 +RECORD_TIMES_STARTED_BATTLE_FRONTIER_CHALLENGE RECORD_UNK_059 RECORD_BATTLE_FACTORY_VICTORIES RECORD_BATTLE_CASTLE_VICTORIES diff --git a/generated/trainer_score_events.txt b/generated/trainer_score_events.txt index c7537aa5a6..6d52dc63c1 100644 --- a/generated/trainer_score_events.txt +++ b/generated/trainer_score_events.txt @@ -36,10 +36,10 @@ TRAINER_SCORE_EVENT_UNDERGROUND_HELP_TRAPPED_PLAYER TRAINER_SCORE_EVENT_UNDERGROUND_NEW_SECRET_BASE TRAINER_SCORE_EVENT_UNDERGROUND_ENTERED TRAINER_SCORE_EVENT_UNDERGROUND_100_STEPS -TRAINER_SCORE_EVENT_UNK_38 -TRAINER_SCORE_EVENT_UNK_39 +TRAINER_SCORE_EVENT_BATTLE_FACTORY_ROUND_COMPLETED +TRAINER_SCORE_EVENT_BATTLE_CASTLE_ROUND_COMPLETED TRAINER_SCORE_EVENT_BATTLE_HALL_ROUND_COMPLETED -TRAINER_SCORE_EVENT_UNK_41 +TRAINER_SCORE_EVENT_BATTLE_ARCADE_ROUND_COMPLETED TRAINER_SCORE_EVENT_ALL_BATTLE_FRONTIER_GOLD_PRINTS TRAINER_SCORE_EVENT_UNK_43 TRAINER_SCORE_EVENT_UNK_44 diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index 09d0f6c0e8..225df0755b 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -487,7 +487,7 @@ FLAG_HIDE_IRON_ISLAND_B2F_LEFT_ROOM_RILEY FLAG_HIDE_VICTORY_ROAD_1F_ROOM_2_MARLEY FLAG_HIDE_IRON_ISLAND_B2F_LEFT_ROOM_GRUNTS FLAG_HIDE_ROUTE_213_LOOKER -FLAG_UNK_0x01E9 +FLAG_HIDE_BATTLE_TOWER_TEALA FLAG_HIDE_MULTI_BATTLE_ROOM_OPPONENT_1 FLAG_HIDE_MULTI_BATTLE_ROOM_OPPONENT_2 FLAG_HIDE_BATTLE_SALON_CHERYL @@ -524,7 +524,7 @@ FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN FLAG_HIDE_VALLEY_WINDWORKS_OUTSIDE_DRIFLOON FLAG_HIDE_PASTORIA_CITY_GRUNT_M FLAG_HIDE_VEILSTONE_CITY_GALACTIC_WAREHOUSE_LOOKER -FLAG_UNK_0x020E +FLAG_HIDE_BATTLE_TOWER_REPORTER FLAG_HIDE_PASTORIA_CITY_GYM_CRASHER_WAKE FLAG_HIDE_HEARTHOME_CITY_POKEMON_FAN_CLUB_REPORTER FLAG_HIDE_GRAND_LAKE_ROUTE_213_LOBBY_LOOKER @@ -703,9 +703,9 @@ FLAG_ROTOM_ROOM_HIDE_REFRIGERATOR FLAG_ROTOM_ROOM_HIDE_ROTARY_FAN FLAG_ROTOM_ROOM_HIDE_LAWN_MOWER FLAG_UNK_0x02C0 -FLAG_BATTLE_HALL_HIDE_REPORTER +FLAG_HIDE_BATTLE_HALL_REPORTER FLAG_HIDE_ROUTE_214_GATE_TO_VEILSTONE_CITY_REPORTER -FLAG_UNK_0x02C3 +FLAG_HIDE_BATTLE_FRONTIER_REPORTER FLAG_HIDE_SANDGEM_TOWN_PROF_ROWAN FLAG_HIDE_VILLA_DELIVERY_GUY FLAG_HIDE_TEAM_GALACTIC_ETERNA_BUILDING_1F_WALL_BLOCKING_ROTOMS_ROOM @@ -2756,7 +2756,7 @@ FLAG_DEFEATED_INTERVIEWERS_ROXY_AND_OLI FLAG_DEFEATED_POKE_KID_ARIEL FLAG_DEFEATED_GUITARIST_ARTURO FLAG_UNK_0x0AC3 -FLAG_UNK_0x0AC4 +FLAG_SET_BATTLE_HALL_MAJOR_NPC FLAG_DEFEATED_BATTLEGROUND_FANTINA FLAG_DEFEATED_BATTLEGROUND_CANDICE FLAG_DEFEATED_BATTLEGROUND_BYRON @@ -4216,7 +4216,7 @@ VAR_SANDGEM_TOWN_STATE VAR_UNK_0x4072 VAR_SOLACEON_TOWN_STATE VAR_CELESTIC_TOWN_STATE -VAR_UNK_0x4075 +VAR_BATTLE_FRONTIER_DUMMY_STATE VAR_JUBILIFE_LOOKER_PAL_PAD_STATE VAR_JUBILIFE_CITY_STATE VAR_CANALAVE_STATE @@ -4282,15 +4282,15 @@ VAR_UNK_0x40B3 VAR_REVIVED_POKEMON_SPECIES VAR_SUNYSHORE_CITY_EAST_HOUSE_SCIENTIST_STATE VAR_CURRENT_UNDERGROUND_MISSION -VAR_UNK_0x40B7 +VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION VAR_BATTLE_FACTORY_CHALLENGE_TYPE -VAR_UNK_0x40B9 +VAR_BATTLE_FACTORY_CHALLENGE_LEVEL VAR_BATTLE_HALL_LOBBY_LOAD_ACTION VAR_BATTLE_HALL_CHALLENGE_TYPE -VAR_UNK_0x40BC +VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION VAR_BATTLE_CASTLE_CHALLENGE_TYPE VAR_BATTLE_ARCADE_CHALLENGE_TYPE -VAR_UNK_0x40BF +VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION VAR_UNK_0x40C0 VAR_BATTLEGROUND_STATE VAR_RANDOM_SURVIVAL_AREA_RIVAL_MESSAGE @@ -4315,7 +4315,7 @@ VAR_UNK_0x40D4 VAR_UNK_0x40D5 VAR_GALACTIC_HQ_4F_STATE VAR_PASTORIA_CITY_OBSERVATORY_GATE_1F_STATE -VAR_UNK_0x40D8 +VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION VAR_UNK_0x40D9 VAR_SAFARI_GAME_STATE VAR_UNK_0x40DB @@ -4374,7 +4374,7 @@ VAR_PLAYER_HOUSE_POSTGAME_STATE VAR_OLD_CHATEAU_DINING_AREA_OLD_MAN_STATE VAR_OLD_CHATEAU_BACK_MIDDLE_EAST_ROOM_TWIN_STATE VAR_UNK_0x4112 -VAR_UNK_0x4113 +VAR_BATTLE_FRONTIER_GATE_TO_FIGHT_AREA_STATE VAR_ETERNA_CITY_BLOCK_EXITS_STATE VAR_NUM_PLATES_OBTAINED VAR_POKEMON_MANSION_OFFICE_BLOCK_STATUE_STATE diff --git a/include/data/scripts/scrcmd.h b/include/data/scripts/scrcmd.h index 7009b4bbcb..e85a95fcb8 100644 --- a/include/data/scripts/scrcmd.h +++ b/include/data/scripts/scrcmd.h @@ -724,7 +724,7 @@ ScriptCommand(SCRCMD_COUNTREPEATEDSPECIESINPARTY, ScrCm ScriptCommand(SCRCMD_2CC, ScrCmd_2CC) ScriptCommand(SCRCMD_2CD, ScrCmd_2CD) ScriptCommand(SCRCMD_UNUSED_2CE, ScrCmd_Unused_2CE) -ScriptCommand(SCRCMD_BATTLEHALLCHECKUSINGSAMESPECIESASPARTNER, ScrCmd_BattleHallCheckUsingSameSpeciesAsPartner) +ScriptCommand(SCRCMD_CHECKBATTLEHALLPARTNERUSESDIFFERENTSPECIES, ScrCmd_CheckBattleHallPartnerUsesDifferentSpecies) ScriptCommand(SCRCMD_GETBATTLEHALLSELECTEDSLOTS, ScrCmd_GetBattleHallSelectedSlots) ScriptCommand(SCRCMD_2D1, ScrCmd_2D1) ScriptCommand(SCRCMD_2D2, ScrCmd_2D2) @@ -814,7 +814,7 @@ ScriptCommand(SCRCMD_GETNUMSPECIESWITHBATTLEHALLRECORDS, ScrCm ScriptCommand(SCRCMD_GETBATTLEHALLTOTALSINGLESRECORD, ScrCmd_GetBattleHallTotalSinglesRecord) ScriptCommand(SCRCMD_SHOWLISTMENUSETWIDTH, ScrCmd_ShowListMenuSetWidth) ScriptCommand(SCRCMD_SETPARTYGIRATINAFORM, ScrCmd_SetPartyGiratinaForm) -ScriptCommand(SCRCMD_329, ScrCmd_329) +ScriptCommand(SCRCMD_GETBATTLEFRONTIERREPORTERPOSITION, ScrCmd_GetBattleFrontierReporterPosition) ScriptCommand(SCRCMD_32A, ScrCmd_32A) ScriptCommand(SCRCMD_CHECKPARTYHASFATEFULENCOUNTERREGIGIGAS, ScrCmd_CheckPartyHasFatefulEncounterRegigigas) ScriptCommand(SCRCMD_ACTIVATEREGIRUINSDOT, ScrCmd_ActivateRegiRuinsDot) diff --git a/include/scrcmd_battle_hall.h b/include/scrcmd_battle_hall.h index 9b92d1349f..b51d39cb7a 100644 --- a/include/scrcmd_battle_hall.h +++ b/include/scrcmd_battle_hall.h @@ -5,7 +5,7 @@ BOOL ScrCmd_2CC(ScriptContext *param0); BOOL ScrCmd_2D1(ScriptContext *param0); -BOOL ScrCmd_BattleHallCheckUsingSameSpeciesAsPartner(ScriptContext *param0); +BOOL ScrCmd_CheckBattleHallPartnerUsesDifferentSpecies(ScriptContext *param0); BOOL ScrCmd_GetBattleHallRecordKeeperStats(ScriptContext *param0); BOOL ScrCmd_GetNumSpeciesWithBattleHallRecords(ScriptContext *param0); BOOL ScrCmd_GetBattleHallTotalSinglesRecord(ScriptContext *param0); diff --git a/include/scrcmd_tv_broadcast.h b/include/scrcmd_tv_broadcast.h index 2f38e69171..991167da88 100644 --- a/include/scrcmd_tv_broadcast.h +++ b/include/scrcmd_tv_broadcast.h @@ -13,6 +13,6 @@ BOOL ScrCmd_CallTVInterview(ScriptContext *ctx); BOOL ScrCmd_CheckTVInterviewEligible(ScriptContext *ctx); BOOL ScrCmd_27C(ScriptContext *param0); BOOL ScrCmd_GetCurrentSafariGameCaughtNum(ScriptContext *ctx); -BOOL ScrCmd_329(ScriptContext *param0); +BOOL ScrCmd_GetBattleFrontierReporterPosition(ScriptContext *ctx); #endif // POKEPLATINUM_SCRCMD_TV_BROADCAST_H diff --git a/res/field/events/events_battle_arcade.json b/res/field/events/events_battle_arcade.json index d52be209a1..e17a296b8b 100644 --- a/res/field/events/events_battle_arcade.json +++ b/res/field/events/events_battle_arcade.json @@ -11,7 +11,7 @@ ], "object_events": [ { - "id": "BATTLE_ARCADE_FRONTIER_SINGLE_ATTENDANT_0", + "id": "LOCALID_SINGLE_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_SINGLE_ATTENDANT", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -26,7 +26,7 @@ "y": 0 }, { - "id": "BATTLE_ARCADE_FRONTIER_MULTI_ATTENDANT_1", + "id": "LOCALID_MULTI_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_MULTI_ATTENDANT", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -41,7 +41,7 @@ "y": 0 }, { - "id": "BATTLE_ARCADE_PSYCHIC_2", + "id": "LOCALID_PSYCHIC", "graphics_id": "OBJ_EVENT_GFX_PSYCHIC", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -56,7 +56,7 @@ "y": 0 }, { - "id": "BATTLE_ARCADE_WAITRESS_3", + "id": "LOCALID_WAITRESS", "graphics_id": "OBJ_EVENT_GFX_WAITRESS", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -71,7 +71,7 @@ "y": 0 }, { - "id": "BATTLE_ARCADE_CAMPER_4", + "id": "LOCALID_CAMPER", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -86,7 +86,7 @@ "y": 0 }, { - "id": "BATTLE_ARCADE_BEAUTY_5", + "id": "LOCALID_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -101,7 +101,7 @@ "y": 0 }, { - "id": "BATTLE_ARCADE_WORKER_6", + "id": "LOCALID_WORKER", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -116,7 +116,7 @@ "y": 0 }, { - "id": "BATTLE_ARCADE_BUG_CATCHER_7", + "id": "LOCALID_BUG_CATCHER", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -131,7 +131,7 @@ "y": 0 }, { - "id": "BATTLE_ARCADE_TUBER_F_8", + "id": "LOCALID_TUBER_F", "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -146,7 +146,7 @@ "y": 0 }, { - "id": "BATTLE_ARCADE_PARASOL_LADY_9", + "id": "LOCALID_PARASOL_LADY", "graphics_id": "OBJ_EVENT_GFX_PARASOL_LADY", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -161,7 +161,7 @@ "y": 0 }, { - "id": "BATTLE_ARCADE_HIKER_10", + "id": "LOCALID_HIKER_1", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -176,7 +176,7 @@ "y": 0 }, { - "id": "BATTLE_ARCADE_HIKER_11", + "id": "LOCALID_HIKER_2", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_battle_castle.json b/res/field/events/events_battle_castle.json index 54c9108d1e..164cfa6c65 100644 --- a/res/field/events/events_battle_castle.json +++ b/res/field/events/events_battle_castle.json @@ -11,7 +11,7 @@ ], "object_events": [ { - "id": "BATTLE_CASTLE_FRONTIER_SINGLE_ATTENDANT_0", + "id": "LOCALID_SINGLE_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_SINGLE_ATTENDANT", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -26,7 +26,7 @@ "y": 0 }, { - "id": "BATTLE_CASTLE_FRONTIER_MULTI_ATTENDANT_1", + "id": "LOCALID_MULTI_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_MULTI_ATTENDANT", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -41,7 +41,7 @@ "y": 0 }, { - "id": "BATTLE_CASTLE_ROUGHNECK_2", + "id": "LOCALID_ROUGHNECK", "graphics_id": "OBJ_EVENT_GFX_ROUGHNECK", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -56,7 +56,7 @@ "y": 0 }, { - "id": "BATTLE_CASTLE_BLACK_BELT_3", + "id": "LOCALID_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -71,7 +71,7 @@ "y": 0 }, { - "id": "BATTLE_CASTLE_GENTLEMAN_4", + "id": "LOCALID_GENTLEMAN", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -86,7 +86,7 @@ "y": 0 }, { - "id": "BATTLE_CASTLE_COLLECTOR_5", + "id": "LOCALID_COLLECTOR", "graphics_id": "OBJ_EVENT_GFX_COLLECTOR", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -101,7 +101,7 @@ "y": 0 }, { - "id": "BATTLE_CASTLE_ARTIST_6", + "id": "LOCALID_ARTIST", "graphics_id": "OBJ_EVENT_GFX_ARTIST", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -116,7 +116,7 @@ "y": 0 }, { - "id": "BATTLE_CASTLE_SOCIALITE_7", + "id": "LOCALID_SOCIALITE", "graphics_id": "OBJ_EVENT_GFX_SOCIALITE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -131,7 +131,7 @@ "y": 0 }, { - "id": "BATTLE_CASTLE_WAITRESS_8", + "id": "LOCALID_WAITRESS", "graphics_id": "OBJ_EVENT_GFX_WAITRESS", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_battle_factory.json b/res/field/events/events_battle_factory.json index 5a6061e78d..06f564c368 100644 --- a/res/field/events/events_battle_factory.json +++ b/res/field/events/events_battle_factory.json @@ -11,7 +11,7 @@ ], "object_events": [ { - "id": "BATTLE_FACTORY_FRONTIER_SINGLE_ATTENDANT_0", + "id": "LOCALID_SINGLE_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_SINGLE_ATTENDANT", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -26,7 +26,7 @@ "y": 0 }, { - "id": "BATTLE_FACTORY_FRONTIER_MULTI_ATTENDANT_1", + "id": "LOCALID_MULTI_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_MULTI_ATTENDANT", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -41,7 +41,7 @@ "y": 0 }, { - "id": "BATTLE_FACTORY_YOUNGSTER_2", + "id": "LOCALID_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -56,7 +56,7 @@ "y": 0 }, { - "id": "BATTLE_FACTORY_BEAUTY_3", + "id": "LOCALID_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -71,7 +71,7 @@ "y": 0 }, { - "id": "BATTLE_FACTORY_POLICEMAN_4", + "id": "LOCALID_POLICEMAN", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -86,7 +86,7 @@ "y": 0 }, { - "id": "BATTLE_FACTORY_SAILOR_5", + "id": "LOCALID_SAILOR", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -101,7 +101,7 @@ "y": 0 }, { - "id": "BATTLE_FACTORY_POKEMON_BREEDER_F_6", + "id": "LOCALID_POKEMON_BREEDER_F", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -116,7 +116,7 @@ "y": 0 }, { - "id": "BATTLE_FACTORY_CLOWN_7", + "id": "LOCALID_CLOWN", "graphics_id": "OBJ_EVENT_GFX_CLOWN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -131,7 +131,7 @@ "y": 0 }, { - "id": "BATTLE_FACTORY_LADY_8", + "id": "LOCALID_LADY", "graphics_id": "OBJ_EVENT_GFX_LADY", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_battle_frontier.json b/res/field/events/events_battle_frontier.json index beb615976e..1cd88bc9e0 100644 --- a/res/field/events/events_battle_frontier.json +++ b/res/field/events/events_battle_frontier.json @@ -163,7 +163,7 @@ ], "object_events": [ { - "id": "BATTLE_FRONTIER_TRAINER_TIPS_SIGNPOST_0", + "id": "LOCALID_TRAINER_TIPS_SIGNPOST_BATTLE_HALL", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -178,7 +178,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_TRAINER_TIPS_SIGNPOST_1", + "id": "LOCALID_TRAINER_TIPS_SIGNPOST_BATTLE_TOWER", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -193,7 +193,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_POKEMON_BREEDER_F_2", + "id": "LOCALID_POKEMON_BREEDER_F", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -208,7 +208,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_EXPERT_F_3", + "id": "LOCALID_EXPERT_F", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -223,7 +223,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_EXPERT_M_4", + "id": "LOCALID_EXPERT_M", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -238,7 +238,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_TWIN_5", + "id": "LOCALID_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -253,7 +253,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_SCHOOL_KID_M_6", + "id": "LOCALID_SCHOOL_KID_M", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -268,7 +268,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_NINJA_BOY_7", + "id": "LOCALID_NINJA_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -283,7 +283,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_IDOL_8", + "id": "LOCALID_IDOL", "graphics_id": "OBJ_EVENT_GFX_IDOL", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -298,7 +298,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_ROUGHNECK_9", + "id": "LOCALID_ROUGHNECK", "graphics_id": "OBJ_EVENT_GFX_ROUGHNECK", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -313,7 +313,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_BLACK_BELT_10", + "id": "LOCALID_BLACK_BELT", "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -328,7 +328,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_FRONTIER_BOOTH_ATTENDANT_11", + "id": "LOCALID_ATTENDANT_SOUTHWEST", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -343,7 +343,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_FRONTIER_BOOTH_ATTENDANT_12", + "id": "LOCALID_ATTENDANT_NORTHWEST", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -358,7 +358,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_FRONTIER_BOOTH_ATTENDANT_13", + "id": "LOCALID_ATTENDANT_SOUTHEAST", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -373,7 +373,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_POKEFAN_M_14", + "id": "LOCALID_POKEFAN_M", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -388,7 +388,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_COLLECTOR_15", + "id": "LOCALID_COLLECTOR", "graphics_id": "OBJ_EVENT_GFX_COLLECTOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -403,7 +403,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_GENTLEMAN_16", + "id": "LOCALID_GENTLEMAN", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -418,7 +418,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_TUBER_M_17", + "id": "LOCALID_TUBER_M", "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -433,7 +433,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_ACE_TRAINER_M_18", + "id": "LOCALID_ACE_TRAINER_M_1", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -448,7 +448,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_COWGIRL_19", + "id": "LOCALID_COWGIRL", "graphics_id": "OBJ_EVENT_GFX_COWGIRL", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -463,7 +463,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_FISHERMAN_20", + "id": "LOCALID_FISHERMAN", "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -478,7 +478,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_PICNICKER_21", + "id": "LOCALID_PICNICKER", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -493,7 +493,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_PARASOL_LADY_22", + "id": "LOCALID_PARASOL_LADY", "graphics_id": "OBJ_EVENT_GFX_PARASOL_LADY", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -508,7 +508,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_WAITRESS_23", + "id": "LOCALID_WAITRESS", "graphics_id": "OBJ_EVENT_GFX_WAITRESS", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -523,7 +523,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_TRAINER_TIPS_SIGNPOST_24", + "id": "LOCALID_TRAINER_TIPS_SIGNPOST_BATTLE_CASTLE", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -538,7 +538,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_TRAINER_TIPS_SIGNPOST_25", + "id": "LOCALID_TRAINER_TIPS_SIGNPOST_BATTLE_ARCADE", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -553,7 +553,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_TRAINER_TIPS_SIGNPOST_26", + "id": "LOCALID_TRAINER_TIPS_SIGNPOST_BATTLE_FACTORY", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -568,7 +568,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_ACE_TRAINER_M_27", + "id": "LOCALID_ACE_TRAINER_M_2", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -583,7 +583,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_ACE_TRAINER_SNOW_F_28", + "id": "LOCALID_ACE_TRAINER_SNOW_F", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_SNOW_F", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -598,11 +598,11 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_REPORTER_29", + "id": "LOCALID_REPORTER", "graphics_id": "OBJ_EVENT_GFX_REPORTER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x02C3", + "hidden_flag": "FLAG_HIDE_BATTLE_FRONTIER_REPORTER", "script": 10168, "initial_dir": 0, "data": [], @@ -719,7 +719,7 @@ "y": 0, "width": 1, "length": 2, - "var": "VAR_UNK_0x4075", + "var": "VAR_BATTLE_FRONTIER_DUMMY_STATE", "value": 0 }, { @@ -729,7 +729,7 @@ "y": 0, "width": 1, "length": 2, - "var": "VAR_UNK_0x4075", + "var": "VAR_BATTLE_FRONTIER_DUMMY_STATE", "value": 0 }, { @@ -739,7 +739,7 @@ "y": 0, "width": 1, "length": 2, - "var": "VAR_UNK_0x4075", + "var": "VAR_BATTLE_FRONTIER_DUMMY_STATE", "value": 0 }, { @@ -749,7 +749,7 @@ "y": 0, "width": 1, "length": 2, - "var": "VAR_UNK_0x4075", + "var": "VAR_BATTLE_FRONTIER_DUMMY_STATE", "value": 0 } ] diff --git a/res/field/events/events_battle_frontier_gate_to_fight_area.json b/res/field/events/events_battle_frontier_gate_to_fight_area.json index 46f005b74a..703d705305 100644 --- a/res/field/events/events_battle_frontier_gate_to_fight_area.json +++ b/res/field/events/events_battle_frontier_gate_to_fight_area.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "BATTLE_FRONTIER_GATE_TO_FIGHT_AREA_POKEMON_BREEDER_M_0", + "id": "LOCALID_POKEMON_BREEDER_M", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_GATE_TO_FIGHT_AREA_EXPERT_M_1", + "id": "LOCALID_EXPERT_M", "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_GATE_TO_FIGHT_AREA_RUIN_MANIAC_2", + "id": "LOCALID_RUIN_MANIAC", "graphics_id": "OBJ_EVENT_GFX_RUIN_MANIAC", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_GATE_TO_FIGHT_AREA_FRONTIER_BOOTH_ATTENDANT_3", + "id": "LOCALID_ATTENDANT_BATTLE_CASTLE", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_GATE_TO_FIGHT_AREA_FRONTIER_BOOTH_ATTENDANT_4", + "id": "LOCALID_ATTENDANT_BATTLE_FACTORY", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_GATE_TO_FIGHT_AREA_FRONTIER_BOOTH_ATTENDANT_5", + "id": "LOCALID_ATTENDANT_GENERAL", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -92,7 +92,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_GATE_TO_FIGHT_AREA_FRONTIER_BOOTH_ATTENDANT_6", + "id": "LOCALID_ATTENDANT_BATTLE_ARCADE", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -107,7 +107,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_GATE_TO_FIGHT_AREA_FRONTIER_BOOTH_ATTENDANT_7", + "id": "LOCALID_ATTENDANT_BATTLE_HALL", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -122,7 +122,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_GATE_TO_FIGHT_AREA_FRONTIER_BOOTH_ATTENDANT_8", + "id": "LOCALID_ATTENDANT_BATTLE_TOWER", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -137,7 +137,7 @@ "y": 0 }, { - "id": "BATTLE_FRONTIER_GATE_TO_FIGHT_AREA_BEAUTY_9", + "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_battle_hall.json b/res/field/events/events_battle_hall.json index 6339cafe26..d7693f9684 100644 --- a/res/field/events/events_battle_hall.json +++ b/res/field/events/events_battle_hall.json @@ -165,7 +165,7 @@ "graphics_id": "OBJ_EVENT_GFX_REPORTER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_BATTLE_HALL_HIDE_REPORTER", + "hidden_flag": "FLAG_HIDE_BATTLE_HALL_REPORTER", "script": 10163, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_battle_tower.json b/res/field/events/events_battle_tower.json index 169dd88242..124548e2a5 100644 --- a/res/field/events/events_battle_tower.json +++ b/res/field/events/events_battle_tower.json @@ -27,7 +27,7 @@ ], "object_events": [ { - "id": "BATTLE_TOWER_FRONTIER_SINGLE_ATTENDANT_0", + "id": "LOCALID_SINGLE_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_SINGLE_ATTENDANT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -42,7 +42,7 @@ "y": 0 }, { - "id": "BATTLE_TOWER_FRONTIER_MULTI_ATTENDANT_1", + "id": "LOCALID_MULTI_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_FRONTIER_MULTI_ATTENDANT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -57,7 +57,7 @@ "y": 0 }, { - "id": "BATTLE_TOWERWIFI_PLAZA_ATTENDANT_F_2", + "id": "LOCALID_WIFI_ATTENDANT", "graphics_id": "OBJ_EVENT_GFX_WIFI_PLAZA_ATTENDANT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -72,11 +72,11 @@ "y": 0 }, { - "id": "BATTLE_TOWER_TEALA_3", + "id": "LOCALID_TEALA", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01E9", + "hidden_flag": "FLAG_HIDE_BATTLE_TOWER_TEALA", "script": 7, "initial_dir": 1, "data": [], @@ -87,7 +87,7 @@ "y": 0 }, { - "id": "BATTLE_TOWER_ARTIST_4", + "id": "LOCALID_ARTIST", "graphics_id": "OBJ_EVENT_GFX_ARTIST", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -102,7 +102,7 @@ "y": 0 }, { - "id": "BATTLE_TOWER_JOGGER_5", + "id": "LOCALID_JOGGER", "graphics_id": "OBJ_EVENT_GFX_JOGGER", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -117,7 +117,7 @@ "y": 0 }, { - "id": "BATTLE_TOWER_IDOL_6", + "id": "LOCALID_IDOL", "graphics_id": "OBJ_EVENT_GFX_IDOL", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -132,7 +132,7 @@ "y": 0 }, { - "id": "BATTLE_TOWER_RICH_BOY_7", + "id": "LOCALID_RICH_BOY", "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -147,7 +147,7 @@ "y": 0 }, { - "id": "BATTLE_TOWER_PIKACHU_8", + "id": "LOCALID_PIKACHU_1", "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -162,7 +162,7 @@ "y": 0 }, { - "id": "BATTLE_TOWER_PIKACHU_9", + "id": "LOCALID_PIKACHU_2", "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -177,7 +177,7 @@ "y": 0 }, { - "id": "BATTLE_TOWER_SCHOOL_KID_M_10", + "id": "LOCALID_SCHOOL_KID_M_1", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -192,7 +192,7 @@ "y": 0 }, { - "id": "BATTLE_TOWER_PARASOL_LADY_11", + "id": "LOCALID_PARASOL_LADY", "graphics_id": "OBJ_EVENT_GFX_PARASOL_LADY", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -207,11 +207,11 @@ "y": 0 }, { - "id": "BATTLE_TOWER_REPORTER_12", + "id": "LOCALID_REPORTER", "graphics_id": "OBJ_EVENT_GFX_REPORTER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x020E", + "hidden_flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER", "script": 10151, "initial_dir": 0, "data": [], @@ -222,7 +222,7 @@ "y": 0 }, { - "id": "BATTLE_TOWER_SCHOOL_KID_M_13", + "id": "LOCALID_SCHOOL_KID_M_2", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -237,7 +237,7 @@ "y": 0 }, { - "id": "BATTLE_TOWER_SCIENTIST_M_14", + "id": "LOCALID_STATS_JUDGE", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/frontier_scripts/frontier_scripts_battle_arcade.s b/res/field/frontier_scripts/frontier_scripts_battle_arcade.s index c32d778ee6..5320346667 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_arcade.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_arcade.s @@ -2693,7 +2693,7 @@ _278C: _279A: FrontierScrCmd_BF 22, 0, 0, VAR_0x8008 - FrontierScrCmd_3D VAR_UNK_0x40BF, 1 + FrontierScrCmd_3D VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 1 Message BattleArcadeScene_Text_BPEarned BufferPlayerName 0 FrontierScrCmd_BF 45, 0, 0, VAR_0x8008 @@ -2985,7 +2985,7 @@ _2C5A: End _2C78: - FrontierScrCmd_3D VAR_UNK_0x40BF, 2 + FrontierScrCmd_3D VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 2 FrontierScrCmd_BF 10, 0, 0, VAR_0x8008 FreeBattleRecording FrontierScrCmd_BA @@ -3032,7 +3032,7 @@ _2D19: _2D31: FrontierScrCmd_BF 21, 0, 0, VAR_0x8008 - FrontierScrCmd_3D VAR_UNK_0x40BF, 3 + FrontierScrCmd_3D VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 3 GoTo _2E0A End @@ -3070,7 +3070,7 @@ _2DB5: _2DBD: FrontierScrCmd_BF 21, 0, 0, VAR_0x8008 - FrontierScrCmd_3D VAR_UNK_0x40BF, 3 + FrontierScrCmd_3D VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 3 GoTo _2DD4 End diff --git a/res/field/frontier_scripts/frontier_scripts_battle_castle.s b/res/field/frontier_scripts/frontier_scripts_battle_castle.s index 6150096f80..d543410334 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_castle.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_castle.s @@ -1424,7 +1424,7 @@ _12C5: _12D3: FrontierScrCmd_A0 22, 0, 0, VAR_0x8008 - FrontierScrCmd_3D VAR_UNK_0x40BC, 1 + FrontierScrCmd_3D VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 1 BufferPlayerName 0 Message BattleCastleScene_Text_BPEarned BufferPlayerName 0 @@ -1690,7 +1690,7 @@ _1720: End _173E: - FrontierScrCmd_3D VAR_UNK_0x40BC, 2 + FrontierScrCmd_3D VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 2 FrontierScrCmd_A0 10, 0, 0, VAR_0x8008 FreeBattleRecording FrontierScrCmd_99 @@ -1737,7 +1737,7 @@ _17D9: _17F1: FrontierScrCmd_A0 21, 0, 0, VAR_0x8008 - FrontierScrCmd_3D VAR_UNK_0x40BC, 3 + FrontierScrCmd_3D VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 3 GoTo _18E4 End @@ -1778,7 +1778,7 @@ _1893: _189B: FrontierScrCmd_A0 21, 0, 0, VAR_0x8008 - FrontierScrCmd_3D VAR_UNK_0x40BC, 3 + FrontierScrCmd_3D VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 3 GoTo _18B0 End diff --git a/res/field/frontier_scripts/frontier_scripts_battle_factory.s b/res/field/frontier_scripts/frontier_scripts_battle_factory.s index a031275be8..a209ff6027 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_factory.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_factory.s @@ -427,7 +427,7 @@ _02A8: _02D6: FrontierScrCmd_3E VAR_BATTLE_FACTORY_CHALLENGE_TYPE, VAR_0x8001 - FrontierScrCmd_3E VAR_UNK_0x40B9, VAR_0x8002 + FrontierScrCmd_3E VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, VAR_0x8002 FrontierScrCmd_3E VAR_MAP_LOCAL_3, VAR_0x8003 GetPlayerObjEventGfx VAR_0x8007 GoToIfEq VAR_0x8001, FRONTIER_CHALLENGE_MULTI, _0320 @@ -922,7 +922,7 @@ _0BCB: _0BD9: FrontierScrCmd_67 22, 0, 0, VAR_0x8008 - FrontierScrCmd_3D VAR_UNK_0x40B7, 1 + FrontierScrCmd_3D VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 1 Message BattleFactoryScene_Text_BPEarned BufferPlayerName 0 FrontierScrCmd_67 35, 0, 0, VAR_0x8008 @@ -1229,7 +1229,7 @@ _10B7: SetVar VAR_0x8003, 1 MessageInstant BattleFactoryScene_Text_Saving ShowSavingIcon - FrontierScrCmd_3E VAR_UNK_0x40B9, VAR_0x8008 + FrontierScrCmd_3E VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, VAR_0x8008 GoToIfEq VAR_0x8008, 0, _10DE GoTo _10F7 End @@ -1274,7 +1274,7 @@ _113E: End _115C: - FrontierScrCmd_3D VAR_UNK_0x40B7, 2 + FrontierScrCmd_3D VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 2 FrontierScrCmd_67 10, 0, 0, VAR_0x8008 Call _137B CloseMessage @@ -1322,7 +1322,7 @@ _11FE: _1216: FrontierScrCmd_67 21, 0, 0, VAR_0x8008 - FrontierScrCmd_3D VAR_UNK_0x40B7, 3 + FrontierScrCmd_3D VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 3 GoTo _12F3 End @@ -1359,7 +1359,7 @@ _12A2: _12AA: FrontierScrCmd_67 21, 0, 0, VAR_0x8008 - FrontierScrCmd_3D VAR_UNK_0x40B7, 3 + FrontierScrCmd_3D VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 3 GoTo _12BF End diff --git a/res/field/frontier_scripts/frontier_scripts_battle_tower_battle_room.s b/res/field/frontier_scripts/frontier_scripts_battle_tower_battle_room.s index ffb1a25c53..2dcedd9b9b 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_tower_battle_room.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_tower_battle_room.s @@ -316,7 +316,7 @@ _03DB: _03EF: FreeBattleRecording WaitTime 30, VAR_0x8008 - FrontierScrCmd_3D VAR_UNK_0x40D8, 1 + FrontierScrCmd_3D VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1 CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_0x8008 SetVar FR_VAR_0x8010, VAR_0x8008 GoToIfEq FR_VAR_0x8010, BATTLE_TOWER_MODE_WIFI, _043F @@ -484,7 +484,7 @@ _06B3: End _06D3: - FrontierScrCmd_3D VAR_UNK_0x40D8, 2 + FrontierScrCmd_3D VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 2 CallBattleTowerFunction BT_FUNC_UNK_39, 0, VAR_0x8008 FreeTowerStruct Message BattleTowerBattleRoom_Text_Saving diff --git a/res/field/frontier_scripts/frontier_scripts_battle_tower_multi_battle_room.s b/res/field/frontier_scripts/frontier_scripts_battle_tower_multi_battle_room.s index e1d636a02f..bf58b69da9 100644 --- a/res/field/frontier_scripts/frontier_scripts_battle_tower_multi_battle_room.s +++ b/res/field/frontier_scripts/frontier_scripts_battle_tower_multi_battle_room.s @@ -347,7 +347,7 @@ _03DD: GoToIfEq VAR_0x8008, BATTLE_TOWER_MODE_LINK_MULTI, _0437 GoToIfEq VAR_0x8008, BATTLE_TOWER_MODE_6, _0443 WaitTime 30, VAR_0x8008 - FrontierScrCmd_3D VAR_UNK_0x40D8, 1 + FrontierScrCmd_3D VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1 FadeScreenOut FrontierScrCmd_25 0 FrontierScrCmd_25 1 @@ -365,7 +365,7 @@ _0437: _0443: WaitTime 30, VAR_0x8008 - FrontierScrCmd_3D VAR_UNK_0x40D8, 1 + FrontierScrCmd_3D VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1 ClearReceivedTempDataAllPlayers SyncConnectedPlayers 6 CallIfEq VAR_0x8004, 100, _04D1 @@ -535,7 +535,7 @@ _06E7: End _0707: - FrontierScrCmd_3D VAR_UNK_0x40D8, 2 + FrontierScrCmd_3D VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 2 CallBattleTowerFunction BT_FUNC_UNK_39, 0, VAR_0x8008 FreeTowerStruct Message BattleTowerMultiBattleRoom_Text_ThanksForParticipating diff --git a/res/field/frontier_scripts/frontier_scripts_unknown_10.s b/res/field/frontier_scripts/frontier_scripts_unknown_10.s index bd55d346b9..a6e4166d10 100644 --- a/res/field/frontier_scripts/frontier_scripts_unknown_10.s +++ b/res/field/frontier_scripts/frontier_scripts_unknown_10.s @@ -113,7 +113,7 @@ _0188: FrontierScrCmd_B2 7, 2, 0, VAR_0x8008 SetVar VAR_0x8004, 0 SetVar VAR_0x8009, 2 - FrontierScrCmd_3D VAR_UNK_0x40B9, 0 + FrontierScrCmd_3D VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, 0 GoTo _0254 End @@ -121,7 +121,7 @@ _01A9: FrontierScrCmd_B2 7, 3, 0, VAR_0x8008 SetVar VAR_0x8004, 0 SetVar VAR_0x8009, 3 - FrontierScrCmd_3D VAR_UNK_0x40B9, 1 + FrontierScrCmd_3D VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, 1 GoTo _0254 End @@ -434,7 +434,7 @@ _0766: FrontierScrCmd_25 0 FrontierScrCmd_25 2 FrontierScrCmd_25 3 - IncrementRecordValue RECORD_UNK_058 + IncrementRecordValue RECORD_TIMES_STARTED_BATTLE_FRONTIER_CHALLENGE FrontierScrCmd_B2 9, 0, 0, VAR_0x8008 SetVar FR_VAR_0x8010, VAR_0x8008 GoToIfEq FR_VAR_0x8010, 1, _0842 diff --git a/res/field/scripts/scripts_battle_arcade.s b/res/field/scripts/scripts_battle_arcade.s index 31fe143390..d7a90d450a 100644 --- a/res/field/scripts/scripts_battle_arcade.s +++ b/res/field/scripts/scripts_battle_arcade.s @@ -1,134 +1,135 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_arcade.h" +#include "res/text/bank/menu_entries.h" #include "constants/battle_frontier.h" - ScriptEntry _0065 - ScriptEntry _06B8 - ScriptEntry _06F1 - ScriptEntry _0700 - ScriptEntry _0774 - ScriptEntry _0081 - ScriptEntry _079C - ScriptEntry _07AF - ScriptEntry _07C2 - ScriptEntry _07D5 - ScriptEntry _07E8 - ScriptEntry _07FB - ScriptEntry _080E - ScriptEntry _0821 - ScriptEntry _0046 - ScriptEntry _0834 - ScriptEntry _0845 + ScriptEntry BattleArcade_SingleAttendant + ScriptEntry BattleArcade_OnFrameResumeChallenge + ScriptEntry BattleArcade_OnFrameDidntSaveBeforeQuit + ScriptEntry BattleArcade_OnFrameChallengeEndedCompletedRound + ScriptEntry BattleArcade_OnFrameChallengeEnded + ScriptEntry BattleArcade_MultiAttendant + ScriptEntry BattleArcade_Worker + ScriptEntry BattleArcade_ParasolLady + ScriptEntry BattleArcade_Psychic + ScriptEntry BattleArcade_BugCatcher + ScriptEntry BattleArcade_Waitress + ScriptEntry BattleArcade_Camper + ScriptEntry BattleArcade_Beauty + ScriptEntry BattleArcade_TuberF + ScriptEntry BattleArcade_OnTransition + ScriptEntry BattleArcade_Hiker1 + ScriptEntry BattleArcade_Hiker2 ScriptEntryEnd -_0046: +BattleArcade_OnTransition: CheckTVInterviewEligible TV_PROGRAM_SEGMENT_BATTLE_FRONTIER_FRONTLINE_NEWS_MULTI, VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, 0, _005F - ClearFlag FLAG_UNK_0x02C3 + GoToIfEq VAR_MAP_LOCAL_0, FALSE, BattleArcade_HideBattleFrontierReporter + ClearFlag FLAG_HIDE_BATTLE_FRONTIER_REPORTER End -_005F: - SetFlag FLAG_UNK_0x02C3 +BattleArcade_HideBattleFrontierReporter: + SetFlag FLAG_HIDE_BATTLE_FRONTIER_REPORTER End -_0065: +BattleArcade_SingleAttendant: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer SetVar VAR_MAP_LOCAL_3, 0 SetVar VAR_MAP_LOCAL_4, 0 - GoTo _009D + GoTo BattleArcade_Attendant End -_0081: +BattleArcade_MultiAttendant: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer SetVar VAR_MAP_LOCAL_3, 0 SetVar VAR_MAP_LOCAL_4, 1 - GoTo _009D + GoTo BattleArcade_Attendant End -_009D: +BattleArcade_Attendant: RecordHeapMemory - CallIfEq VAR_MAP_LOCAL_4, 0, _0678 - CallIfEq VAR_MAP_LOCAL_4, 1, _067D - GoTo _00C3 + CallIfEq VAR_MAP_LOCAL_4, 0, BattleArcade_WelcomeToSingleDoubleChallenge + CallIfEq VAR_MAP_LOCAL_4, 1, BattleArcade_WelcomeToMultiChallenge + GoTo BattleArcade_SelectChallenge End -_00C3: - CallIfEq VAR_MAP_LOCAL_4, 0, _0682 - CallIfEq VAR_MAP_LOCAL_4, 1, _069A - AddMenuEntryImm 41, 2 - AddMenuEntryImm 42, 3 +BattleArcade_SelectChallenge: + CallIfEq VAR_MAP_LOCAL_4, 0, BattleArcade_InitMenuSingleDoubleChallenge + CallIfEq VAR_MAP_LOCAL_4, 1, BattleArcade_InitMenuMultiChallenge + AddMenuEntryImm BattleArcade_Text_Info, 2 + AddMenuEntryImm BattleArcade_Text_Cancel, 3 ShowMenu - GoToIfEq VAR_RESULT, 0, _015E - GoToIfEq VAR_RESULT, 1, _018B - GoToIfEq VAR_RESULT, 2, _0123 - GoToIfEq VAR_RESULT, 4, _01B8 - GoTo _0145 + GoToIfEq VAR_RESULT, 0, BattleArcade_TryTakeSingleChallenge + GoToIfEq VAR_RESULT, 1, BattleArcade_TryTakeDoubleChallenge + GoToIfEq VAR_RESULT, 2, BattleArcade_ExplainChallenge + GoToIfEq VAR_RESULT, 4, BattleArcade_TryTakeMultiChallenge + GoTo BattleArcade_EndChallenge End -_0123: - CallIfEq VAR_MAP_LOCAL_4, 0, _06AE - CallIfEq VAR_MAP_LOCAL_4, 1, _06B3 - GoTo _00C3 +BattleArcade_ExplainChallenge: + CallIfEq VAR_MAP_LOCAL_4, 0, BattleArcade_ExplainSingleDoubleChallenge + CallIfEq VAR_MAP_LOCAL_4, 1, BattleArcade_ExplainMultiChallenge + GoTo BattleArcade_SelectChallenge End -_0145: - GoTo _014D +BattleArcade_EndChallenge: + GoTo BattleArcade_HopeToSeeYouAgain End -_014D: - SetVar VAR_UNK_0x40BF, 0 - Message 6 +BattleArcade_HopeToSeeYouAgain: + SetVar VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 0 + Message BattleArcade_Text_HopeToSeeYouAgain WaitButton CloseMessage ReleaseAll End -_015E: +BattleArcade_TryTakeSingleChallenge: SetVar VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE ScrCmd_2D9 0, 3, VAR_RESULT BufferNumber 0, 3 BufferNumber 1, 3 - GoToIfEq VAR_RESULT, 0, _01E5 - GoTo _020B + GoToIfEq VAR_RESULT, 0, BattleArcade_NotEnoughEligiblePokemonSingleDouble + GoTo BattleArcade_SelectPokemon End -_018B: +BattleArcade_TryTakeDoubleChallenge: SetVar VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE ScrCmd_2D9 0, 3, VAR_RESULT BufferNumber 0, 3 BufferNumber 1, 3 - GoToIfEq VAR_RESULT, 0, _01E5 - GoTo _020B + GoToIfEq VAR_RESULT, 0, BattleArcade_NotEnoughEligiblePokemonSingleDouble + GoTo BattleArcade_SelectPokemon End -_01B8: +BattleArcade_TryTakeMultiChallenge: SetVar VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI ScrCmd_2D9 0, 2, VAR_RESULT BufferNumber 0, 2 BufferNumber 1, 2 - GoToIfEq VAR_RESULT, 0, _01F8 - GoTo _020B + GoToIfEq VAR_RESULT, 0, BattleArcade_NotEnoughEligiblePokemonMulti + GoTo BattleArcade_SelectPokemon End -_01E5: - Message 8 - MessageSeenBanlistSpecies 9, 3 - GoTo _0145 +BattleArcade_NotEnoughEligiblePokemonSingleDouble: + Message BattleArcade_Text_NotEnoughEligiblePokemon + MessageSeenBanlistSpecies BattleArcade_Text_Banlist, 3 + GoTo BattleArcade_EndChallenge End -_01F8: - Message 8 - MessageSeenBanlistSpecies 9, 2 - GoTo _0145 +BattleArcade_NotEnoughEligiblePokemonMulti: + Message BattleArcade_Text_NotEnoughEligiblePokemon + MessageSeenBanlistSpecies BattleArcade_Text_Banlist, 2 + GoTo BattleArcade_EndChallenge End -_020B: - Message 7 +BattleArcade_SelectPokemon: + Message BattleArcade_Text_SelectPokemonToEnter CloseMessage FadeScreenOut WaitFadeScreen @@ -137,225 +138,225 @@ _020B: ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_MAP_LOCAL_2, 0xFF, _0145 + GoToIfEq VAR_MAP_LOCAL_2, 0xFF, BattleArcade_EndChallenge TryRevertPokemonForm VAR_MAP_LOCAL_2, VAR_RESULT - GoToIfEq VAR_RESULT, 0xFF, _05E1 + GoToIfEq VAR_RESULT, 0xFF, BattleArcade_GriseousOrbCouldNotBeRemoved TryRevertPokemonForm VAR_MAP_LOCAL_5, VAR_RESULT - GoToIfEq VAR_RESULT, 0xFF, _05E1 + GoToIfEq VAR_RESULT, 0xFF, BattleArcade_GriseousOrbCouldNotBeRemoved TryRevertPokemonForm VAR_MAP_LOCAL_6, VAR_RESULT - GoToIfEq VAR_RESULT, 0xFF, _05E1 + GoToIfEq VAR_RESULT, 0xFF, BattleArcade_GriseousOrbCouldNotBeRemoved GetPartyMonSpecies VAR_MAP_LOCAL_2, VAR_MAP_LOCAL_1 - GoToIfEq VAR_MAP_LOCAL_1, 0, _0145 - GoTo _029B + GoToIfEq VAR_MAP_LOCAL_1, 0, BattleArcade_EndChallenge + GoTo BattleArcade_TryStartChallenge End -_029B: - GoTo _02A3 +BattleArcade_TryStartChallenge: + GoTo BattleArcade_HealAndSaveBeforeChallenge End -_02A3: - CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, _0448 - CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, _0448 +BattleArcade_HealAndSaveBeforeChallenge: + CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleArcade_SetChallengeInProgress + CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleArcade_SetChallengeInProgress SetVar VAR_MAP_LOCAL_0, 0 HealParty Common_SaveGame SetVar VAR_RESULT, VAR_MAP_LOCAL_0 - GoToIfEq VAR_RESULT, 0, _0145 - GoToIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _02F1 - GoTo _04A9 + GoToIfEq VAR_RESULT, 0, BattleArcade_EndChallenge + GoToIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleArcade_BecomeLeaderOrJoinGroup + GoTo BattleArcade_WalkIntoCorridor End -_02F1: - Message 43 +BattleArcade_BecomeLeaderOrJoinGroup: + Message BattleArcade_Text_BecomeLeaderOrJoinGroup InitGlobalTextMenu 30, 1, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm 13, 0 - AddMenuEntryImm 14, 1 - AddMenuEntryImm 5, 2 + AddMenuEntryImm MenuEntries_Text_JoinGroup, 0 + AddMenuEntryImm MenuEntries_Text_BecomeLeader, 1 + AddMenuEntryImm MenuEntries_Text_Exit, 2 ShowMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _0335 - GoToIfEq VAR_0x8008, 1, _0389 - GoTo _0145 + GoToIfEq VAR_0x8008, 0, BattleArcade_LaunchWiFiToJoinGroup + GoToIfEq VAR_0x8008, 1, BattleArcade_LaunchWiFiToBecomeLeader + GoTo BattleArcade_EndChallenge End -_0335: - Message 44 +BattleArcade_LaunchWiFiToJoinGroup: + Message BattleArcade_Text_NeedToLaunchWiFiComm ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _02F1 + GoToIfEq VAR_RESULT, MENU_NO, BattleArcade_BecomeLeaderOrJoinGroup CloseMessage StartBattleClient 32, 0, 0, VAR_RESULT - GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, _0377 - GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, _037F - GoTo _03DD + GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, BattleArcade_CancelJoiningGroup + GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, BattleArcade_ErrorJoiningGroup + GoTo BattleArcade_StartMultiChallenge End -_0377: - GoTo _02F1 +BattleArcade_CancelJoiningGroup: + GoTo BattleArcade_BecomeLeaderOrJoinGroup End -_037F: +BattleArcade_ErrorJoiningGroup: EndCommunication - GoTo _02F1 + GoTo BattleArcade_BecomeLeaderOrJoinGroup End -_0389: - Message 44 +BattleArcade_LaunchWiFiToBecomeLeader: + Message BattleArcade_Text_NeedToLaunchWiFiComm ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _02F1 + GoToIfEq VAR_RESULT, MENU_NO, BattleArcade_BecomeLeaderOrJoinGroup CloseMessage StartBattleServer 32, 0, 0, VAR_RESULT - GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, _03CB - GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, _03D3 - GoTo _03DD + GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, BattleArcade_CancelBecomingLeader + GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, BattleArcade_ErrorBecomingLeader + GoTo BattleArcade_StartMultiChallenge End -_03CB: - GoTo _02F1 +BattleArcade_CancelBecomingLeader: + GoTo BattleArcade_BecomeLeaderOrJoinGroup End -_03D3: +BattleArcade_ErrorBecomingLeader: EndCommunication - GoTo _02F1 + GoTo BattleArcade_BecomeLeaderOrJoinGroup End -_03DD: +BattleArcade_StartMultiChallenge: ClearReceivedTempDataAllPlayers ScrCmd_135 154 GetPartyMonSpecies VAR_MAP_LOCAL_2, VAR_0x8000 GetPartyMonSpecies VAR_MAP_LOCAL_5, VAR_0x8001 ScrCmd_2DA VAR_0x8000, VAR_0x8001, VAR_RESULT SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 1, _0450 - GoToIfEq VAR_0x8008, 2, _0466 - GoToIfEq VAR_0x8008, 3, _047C + GoToIfEq VAR_0x8008, 1, BattleArcade_BothTrainerChosePokemon1 + GoToIfEq VAR_0x8008, 2, BattleArcade_BothTrainerChosePokemon2 + GoToIfEq VAR_0x8008, 3, BattleArcade_BothTrainerChosePokemon1And2 ClearReceivedTempDataAllPlayers ScrCmd_135 156 - Message 45 - CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _0448 - Call _06DF - GoTo _04A9 + Message BattleArcade_Text_MustSaveFirst + CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleArcade_SetChallengeInProgress + Call BattleArcade_SaveGame + GoTo BattleArcade_WalkIntoCorridor End -_0448: - SetVar VAR_UNK_0x40BF, 0xFF +BattleArcade_SetChallengeInProgress: + SetVar VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 0xFF Return -_0450: - Call _049F +BattleArcade_BothTrainerChosePokemon1: + Call BattleArcade_EndCommunicationSamePokemon BufferPartyMonSpecies 0, VAR_MAP_LOCAL_2 - Message 29 - GoTo _0497 + Message BattleArcade_Text_BothTrainersChoseThisPokemon + GoTo BattleArcade_ChoseSamePokemonCancel End -_0466: - Call _049F +BattleArcade_BothTrainerChosePokemon2: + Call BattleArcade_EndCommunicationSamePokemon BufferPartyMonSpecies 0, VAR_MAP_LOCAL_5 - Message 29 - GoTo _0497 + Message BattleArcade_Text_BothTrainersChoseThisPokemon + GoTo BattleArcade_ChoseSamePokemonCancel End -_047C: - Call _049F +BattleArcade_BothTrainerChosePokemon1And2: + Call BattleArcade_EndCommunicationSamePokemon BufferPartyMonSpecies 0, VAR_MAP_LOCAL_2 BufferPartyMonSpecies 1, VAR_MAP_LOCAL_5 - Message 30 - GoTo _0497 + Message BattleArcade_Text_BothTrainersChoseThesePokemon + GoTo BattleArcade_ChoseSamePokemonCancel End -_0497: - GoTo _0145 +BattleArcade_ChoseSamePokemonCancel: + GoTo BattleArcade_EndChallenge End -_049F: +BattleArcade_EndCommunicationSamePokemon: ClearReceivedTempDataAllPlayers ScrCmd_135 157 EndCommunication Return -_04A9: - CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, _0549 - CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, _0564 - CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _057F +BattleArcade_WalkIntoCorridor: + CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleArcade_WalkToCorridorSingleChallenge + CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleArcade_WalkToCorridorDoubleChallenge + CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleArcade_WalkToCorridorMultiChallenge PlaySE SEQ_SE_DP_KAIDAN2 - GoTo _04DC + GoTo BattleArcade_StartChallenge End -_04DC: +BattleArcade_StartChallenge: FadeScreenOut WaitFadeScreen - CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, _05A5 - CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, _05B9 - CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _05CD - IncrementGameRecord RECORD_UNK_058 + CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleArcade_WalkBackInvisiblySingleChallenge + CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleArcade_WalkBackInvisiblyDoubleChallenge + CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleArcade_WalkBackInvisiblyMultiChallenge + IncrementGameRecord RECORD_TIMES_STARTED_BATTLE_FRONTIER_CHALLENGE CreateJournalEvent LOCATION_EVENT_BATTLE_ARCADE, 0, 0, 0, 0 WaitForTransition ScrCmd_2C4 15 - CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _0545 + CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleArcade_EndCommunication ReturnToField FadeScreenIn WaitFadeScreen AssertHeapMemory End -_0545: +BattleArcade_EndCommunication: EndCommunication Return -_0549: - Message 32 +BattleArcade_WalkToCorridorSingleChallenge: + Message BattleArcade_Text_ThisWayPlease WaitABPress CloseMessage - ApplyMovement LOCALID_PLAYER, _05F0 - ApplyMovement VAR_LAST_TALKED, _0610 + ApplyMovement LOCALID_PLAYER, BattleArcade_Movement_PlayerWalkToCorridorSingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleArcade_Movement_AttendantWalkToCorridorSingleDoubleChallenge WaitMovement Return -_0564: - Message 32 +BattleArcade_WalkToCorridorDoubleChallenge: + Message BattleArcade_Text_ThisWayPlease WaitABPress CloseMessage - ApplyMovement LOCALID_PLAYER, _05F0 - ApplyMovement VAR_LAST_TALKED, _0610 + ApplyMovement LOCALID_PLAYER, BattleArcade_Movement_PlayerWalkToCorridorSingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleArcade_Movement_AttendantWalkToCorridorSingleDoubleChallenge WaitMovement Return -_057F: - MessageNoSkip 32 +BattleArcade_WalkToCorridorMultiChallenge: + MessageNoSkip BattleArcade_Text_ThisWayPlease WaitTime 10, VAR_RESULT ClearReceivedTempDataAllPlayers ScrCmd_135 155 CloseMessage - ApplyMovement LOCALID_PLAYER, _0604 - ApplyMovement VAR_LAST_TALKED, _0624 + ApplyMovement LOCALID_PLAYER, BattleArcade_Movement_PlayerWalkToCorridorMultiChallenge + ApplyMovement VAR_LAST_TALKED, BattleArcade_Movement_AttendantWalkToCorridorMultiChallenge WaitMovement Return -_05A5: - ApplyMovement LOCALID_PLAYER, _0630 - ApplyMovement VAR_LAST_TALKED, _0658 +BattleArcade_WalkBackInvisiblySingleChallenge: + ApplyMovement LOCALID_PLAYER, BattleArcade_Movement_PlayerWalkBackSingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleArcade_Movement_AttendantWalkBackSingleDoubleChallenge WaitMovement Return -_05B9: - ApplyMovement LOCALID_PLAYER, _0630 - ApplyMovement VAR_LAST_TALKED, _0658 +BattleArcade_WalkBackInvisiblyDoubleChallenge: + ApplyMovement LOCALID_PLAYER, BattleArcade_Movement_PlayerWalkBackSingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleArcade_Movement_AttendantWalkBackSingleDoubleChallenge WaitMovement Return -_05CD: - ApplyMovement LOCALID_PLAYER, _0648 - ApplyMovement VAR_LAST_TALKED, _066C +BattleArcade_WalkBackInvisiblyMultiChallenge: + ApplyMovement LOCALID_PLAYER, BattleArcade_Movement_PlayerWalkBackMultiChallenge + ApplyMovement VAR_LAST_TALKED, BattleArcade_Movement_AttendantWalkBackMultiChallenge WaitMovement Return -_05E1: - SetVar VAR_UNK_0x40BF, 0 +BattleArcade_GriseousOrbCouldNotBeRemoved: + SetVar VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 0 Common_GriseousOrbCouldNotBeRemoved End .balign 4, 0 -_05F0: +BattleArcade_Movement_PlayerWalkToCorridorSingleDoubleChallenge: WalkNormalNorth 2 WalkNormalEast WalkNormalNorth 2 @@ -363,13 +364,13 @@ _05F0: EndMovement .balign 4, 0 -_0604: +BattleArcade_Movement_PlayerWalkToCorridorMultiChallenge: WalkNormalNorth 4 SetInvisible EndMovement .balign 4, 0 -_0610: +BattleArcade_Movement_AttendantWalkToCorridorSingleDoubleChallenge: WalkNormalNorth WalkNormalEast WalkNormalNorth 2 @@ -377,13 +378,13 @@ _0610: EndMovement .balign 4, 0 -_0624: +BattleArcade_Movement_AttendantWalkToCorridorMultiChallenge: WalkNormalNorth 3 SetInvisible EndMovement .balign 4, 0 -_0630: +BattleArcade_Movement_PlayerWalkBackSingleDoubleChallenge: WalkFasterSouth 2 WalkFasterWest WalkFasterSouth 2 @@ -392,14 +393,14 @@ _0630: EndMovement .balign 4, 0 -_0648: +BattleArcade_Movement_PlayerWalkBackMultiChallenge: WalkFasterSouth 4 FaceNorth SetVisible EndMovement .balign 4, 0 -_0658: +BattleArcade_Movement_AttendantWalkBackSingleDoubleChallenge: WalkFasterSouth WalkFasterWest WalkFasterSouth 2 @@ -407,53 +408,53 @@ _0658: EndMovement .balign 4, 0 -_066C: +BattleArcade_Movement_AttendantWalkBackMultiChallenge: WalkFasterSouth 3 SetVisible EndMovement -_0678: - Message 0 +BattleArcade_WelcomeToSingleDoubleChallenge: + Message BattleArcade_Text_WelcomeToSingleDoubleChallenge Return -_067D: - Message 3 +BattleArcade_WelcomeToMultiChallenge: + Message BattleArcade_Text_WelcomeToMultiChallenge Return -_0682: +BattleArcade_InitMenuSingleDoubleChallenge: InitLocalTextMenu 31, 9, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm 38, 0 - AddMenuEntryImm 39, 1 - Message 1 + AddMenuEntryImm BattleArcade_Text_SingleBattle, 0 + AddMenuEntryImm BattleArcade_Text_DoubleBattle, 1 + Message BattleArcade_Text_TakeWhichChallenge Return -_069A: +BattleArcade_InitMenuMultiChallenge: InitLocalTextMenu 31, 11, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm 40, 4 - Message 4 + AddMenuEntryImm BattleArcade_Text_TakeChallenge, 4 + Message BattleArcade_Text_AskTakeMultiChallenge Return -_06AE: - Message 2 +BattleArcade_ExplainSingleDoubleChallenge: + Message BattleArcade_Text_ExplainSingleDoubleChallenge Return -_06B3: - Message 5 +BattleArcade_ExplainMultiChallenge: + Message BattleArcade_Text_ExplainMultiChallenge Return -_06B8: +BattleArcade_OnFrameResumeChallenge: RecordHeapMemory SetVar VAR_MAP_LOCAL_3, 1 - SetVar VAR_UNK_0x40BF, 0 - Message 33 - Call _0448 - Call _06DF - GoTo _04A9 + SetVar VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 0 + Message BattleArcade_Text_MustSaveBeforeResuming + Call BattleArcade_SetChallengeInProgress + Call BattleArcade_SaveGame + GoTo BattleArcade_WalkIntoCorridor End -_06DF: +BattleArcade_SaveGame: ShowSavingIcon TrySaveGame VAR_RESULT HideSavingIcon @@ -461,45 +462,45 @@ _06DF: WaitSE SEQ_SE_DP_SAVE Return -_06F1: - Message 34 +BattleArcade_OnFrameDidntSaveBeforeQuit: + Message BattleArcade_Text_DidntSaveBeforeQuit ScrCmd_2DC VAR_BATTLE_ARCADE_CHALLENGE_TYPE - GoTo _0145 + GoTo BattleArcade_EndChallenge End -_0700: - CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, _073C - CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, _073C - CallIfEq VAR_BATTLE_ARCADE_PRINT_STATE, 1, _0742 - CallIfEq VAR_BATTLE_ARCADE_PRINT_STATE, 3, _0759 - GoTo _0145 +BattleArcade_OnFrameChallengeEndedCompletedRound: + CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleArcade_IncrementTrainerScoreRoundCompleted + CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleArcade_IncrementTrainerScoreRoundCompleted + CallIfEq VAR_BATTLE_ARCADE_PRINT_STATE, 1, BattleArcade_EarnedSilverPrint + CallIfEq VAR_BATTLE_ARCADE_PRINT_STATE, 3, BattleArcade_EarnedGoldPrint + GoTo BattleArcade_EndChallenge End -_073C: - IncrementTrainerScore TRAINER_SCORE_EVENT_UNK_41 +BattleArcade_IncrementTrainerScoreRoundCompleted: + IncrementTrainerScore TRAINER_SCORE_EVENT_BATTLE_ARCADE_ROUND_COMPLETED Return -_0742: - Message 35 +BattleArcade_EarnedSilverPrint: + Message BattleArcade_Text_PrintForVictory BufferPlayerName 0 - Message 37 + Message BattleArcade_Text_SilverPrintAdded PlayFanfare SEQ_FANFA4 WaitFanfare SetVar VAR_BATTLE_ARCADE_PRINT_STATE, 2 Return -_0759: - Message 35 +BattleArcade_EarnedGoldPrint: + Message BattleArcade_Text_PrintForVictory BufferPlayerName 0 - Message 36 + Message BattleArcade_Text_GoldPrintAdded PlayFanfare SEQ_FANFA4 WaitFanfare SetVar VAR_BATTLE_ARCADE_PRINT_STATE, 4 Common_CheckAllFrontierGoldPrintsObtained Return -_0774: - GoTo _0145 +BattleArcade_OnFrameChallengeEnded: + GoTo BattleArcade_EndChallenge End BattleArcade_UnusedMovement: @@ -514,44 +515,44 @@ BattleArcade_UnusedMovement2: WalkNormalNorth EndMovement -_079C: - NPCMessage 46 +BattleArcade_Worker: + NPCMessage BattleArcade_Text_RuleGameBoard End -_07AF: - NPCMessage 47 +BattleArcade_ParasolLady: + NPCMessage BattleArcade_Text_ComesDownToLuck End -_07C2: - NPCMessage 48 +BattleArcade_Psychic: + NPCMessage BattleArcade_Text_NothingToDoAboutLuck End -_07D5: - NPCMessage 49 +BattleArcade_BugCatcher: + NPCMessage BattleArcade_Text_DontBeAwestruck End -_07E8: - NPCMessage 50 +BattleArcade_Waitress: + NPCMessage BattleArcade_Text_PeculiarFashionSense End -_07FB: - NPCMessage 51 +BattleArcade_Camper: + NPCMessage BattleArcade_Text_StartBattlesWithTrickRoom End -_080E: - NPCMessage 52 +BattleArcade_Beauty: + NPCMessage BattleArcade_Text_ThrilledByUnknownHand End -_0821: - NPCMessage 53 +BattleArcade_TuberF: + NPCMessage BattleArcade_Text_BlamingGameBoardIsPitiful End -_0834: - EventMessage 54 +BattleArcade_Hiker1: + EventMessage BattleArcade_Text_FigureThisOneOut End -_0845: - EventMessage 55 +BattleArcade_Hiker2: + EventMessage BattleArcade_Text_GroundTypesArentAffected End .balign 4, 0 diff --git a/res/field/scripts/scripts_battle_castle.s b/res/field/scripts/scripts_battle_castle.s index c2a7536358..ad53a1cbeb 100644 --- a/res/field/scripts/scripts_battle_castle.s +++ b/res/field/scripts/scripts_battle_castle.s @@ -1,131 +1,132 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_castle.h" +#include "res/text/bank/menu_entries.h" #include "constants/battle_frontier.h" - ScriptEntry _0059 - ScriptEntry _06A4 - ScriptEntry _06DD - ScriptEntry _06EC - ScriptEntry _0760 - ScriptEntry _0075 - ScriptEntry _0788 - ScriptEntry _079B - ScriptEntry _07AE - ScriptEntry _07C1 - ScriptEntry _07D4 - ScriptEntry _07E7 - ScriptEntry _07FA - ScriptEntry _003A + ScriptEntry BattleCastle_SingleAttendant + ScriptEntry BattleCastle_OnFrameResumeChallenge + ScriptEntry BattleCastle_OnFrameDidntSaveBeforeQuit + ScriptEntry BattleCastle_OnFrameChallengeEndedCompletedRound + ScriptEntry BattleCastle_OnFrameChallengeEnded + ScriptEntry BattleCastle_MultiAttendant + ScriptEntry BattleCastle_Artist + ScriptEntry BattleCastle_Socialite + ScriptEntry BattleCastle_Waitress + ScriptEntry BattleCastle_Collector + ScriptEntry BattleCastle_Roughneck + ScriptEntry BattleCastle_Gentleman + ScriptEntry BattleCastle_BlackBelt + ScriptEntry BattleCastle_OnTransition ScriptEntryEnd -_003A: +BattleCastle_OnTransition: CheckTVInterviewEligible TV_PROGRAM_SEGMENT_BATTLE_FRONTIER_FRONTLINE_NEWS_MULTI, VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, 0, _0053 - ClearFlag FLAG_UNK_0x02C3 + GoToIfEq VAR_MAP_LOCAL_0, FALSE, BattleCastle_HideBattleFrontierReporter + ClearFlag FLAG_HIDE_BATTLE_FRONTIER_REPORTER End -_0053: - SetFlag FLAG_UNK_0x02C3 +BattleCastle_HideBattleFrontierReporter: + SetFlag FLAG_HIDE_BATTLE_FRONTIER_REPORTER End -_0059: +BattleCastle_SingleAttendant: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer SetVar VAR_MAP_LOCAL_3, 0 SetVar VAR_MAP_LOCAL_4, 0 - GoTo _0091 + GoTo BattleCastle_Attendant End -_0075: +BattleCastle_MultiAttendant: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer SetVar VAR_MAP_LOCAL_3, 0 SetVar VAR_MAP_LOCAL_4, 1 - GoTo _0091 + GoTo BattleCastle_Attendant End -_0091: +BattleCastle_Attendant: RecordHeapMemory - CallIfEq VAR_MAP_LOCAL_4, 0, _0664 - CallIfEq VAR_MAP_LOCAL_4, 1, _0669 - GoTo _00B7 + CallIfEq VAR_MAP_LOCAL_4, 0, BattleCastle_WelcomeToSingleDoubleChallenge + CallIfEq VAR_MAP_LOCAL_4, 1, BattleCastle_WelcomeToMultiChallenge + GoTo BattleCastle_SelectChallenge End -_00B7: - CallIfEq VAR_MAP_LOCAL_4, 0, _066E - CallIfEq VAR_MAP_LOCAL_4, 1, _0686 - AddMenuEntryImm 41, 2 - AddMenuEntryImm 42, 3 +BattleCastle_SelectChallenge: + CallIfEq VAR_MAP_LOCAL_4, 0, BattleCastle_InitMenuSingleDoubleChallenge + CallIfEq VAR_MAP_LOCAL_4, 1, BattleCastle_InitMenuMultiChallenge + AddMenuEntryImm BattleCastle_Text_Info, 2 + AddMenuEntryImm BattleCastle_Text_Cancel, 3 ShowMenu - GoToIfEq VAR_RESULT, 0, _0152 - GoToIfEq VAR_RESULT, 1, _017F - GoToIfEq VAR_RESULT, 2, _0117 - GoToIfEq VAR_RESULT, 4, _01AC - GoTo _0139 + GoToIfEq VAR_RESULT, 0, BattleCastle_TryTakeSingleChallenge + GoToIfEq VAR_RESULT, 1, BattleCastle_TryTakeDoubleChallenge + GoToIfEq VAR_RESULT, 2, BattleCastle_ExplainChallenge + GoToIfEq VAR_RESULT, 4, BattleCastle_TryTakeMultiChallenge + GoTo BattleCastle_EndChallenge End -_0117: - CallIfEq VAR_MAP_LOCAL_4, 0, _069A - CallIfEq VAR_MAP_LOCAL_4, 1, _069F - GoTo _00B7 +BattleCastle_ExplainChallenge: + CallIfEq VAR_MAP_LOCAL_4, 0, BattleCastle_ExplainSingleDoubleChallenge + CallIfEq VAR_MAP_LOCAL_4, 1, BattleCastle_ExplainMultiChallenge + GoTo BattleCastle_SelectChallenge End -_0139: - GoTo _0141 +BattleCastle_EndChallenge: + GoTo BattleCastle_HopeToSeeYouAgain End -_0141: - SetVar VAR_UNK_0x40BC, 0 - Message 6 +BattleCastle_HopeToSeeYouAgain: + SetVar VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 0 + Message BattleCastle_Text_HopeToSeeYouAgain WaitButton CloseMessage ReleaseAll End -_0152: +BattleCastle_TryTakeSingleChallenge: SetVar VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE ScrCmd_2D2 0, 3, VAR_RESULT BufferNumber 0, 3 BufferNumber 1, 3 - GoToIfEq VAR_RESULT, 0, _01D9 - GoTo _01FF + GoToIfEq VAR_RESULT, 0, BattleCastle_NotEnoughEligiblePokemonSingleDouble + GoTo BattleCastle_SelectPokemon End -_017F: +BattleCastle_TryTakeDoubleChallenge: SetVar VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE ScrCmd_2D2 0, 3, VAR_RESULT BufferNumber 0, 3 BufferNumber 1, 3 - GoToIfEq VAR_RESULT, 0, _01D9 - GoTo _01FF + GoToIfEq VAR_RESULT, 0, BattleCastle_NotEnoughEligiblePokemonSingleDouble + GoTo BattleCastle_SelectPokemon End -_01AC: +BattleCastle_TryTakeMultiChallenge: SetVar VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI ScrCmd_2D2 0, 2, VAR_RESULT BufferNumber 0, 2 BufferNumber 1, 2 - GoToIfEq VAR_RESULT, 0, _01EC - GoTo _01FF + GoToIfEq VAR_RESULT, 0, BattleCastle_NotEnoughEligiblePokemonMulti + GoTo BattleCastle_SelectPokemon End -_01D9: - Message 8 - MessageSeenBanlistSpecies 9, 3 - GoTo _0139 +BattleCastle_NotEnoughEligiblePokemonSingleDouble: + Message BattleCastle_Text_NotEnoughEligiblePokemon + MessageSeenBanlistSpecies BattleCastle_Text_Banlist, 3 + GoTo BattleCastle_EndChallenge End -_01EC: - Message 8 - MessageSeenBanlistSpecies 9, 2 - GoTo _0139 +BattleCastle_NotEnoughEligiblePokemonMulti: + Message BattleCastle_Text_NotEnoughEligiblePokemon + MessageSeenBanlistSpecies BattleCastle_Text_Banlist, 2 + GoTo BattleCastle_EndChallenge End -_01FF: - Message 7 +BattleCastle_SelectPokemon: + Message BattleCastle_Text_SelectPokemonToEnter CloseMessage FadeScreenOut WaitFadeScreen @@ -134,231 +135,231 @@ _01FF: ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_MAP_LOCAL_2, 0xFF, _0139 + GoToIfEq VAR_MAP_LOCAL_2, 0xFF, BattleCastle_EndChallenge TryRevertPokemonForm VAR_MAP_LOCAL_2, VAR_RESULT - GoToIfEq VAR_RESULT, 0xFF, _05D5 + GoToIfEq VAR_RESULT, 0xFF, BattleCastle_GriseousOrbCouldNotBeRemoved TryRevertPokemonForm VAR_MAP_LOCAL_5, VAR_RESULT - GoToIfEq VAR_RESULT, 0xFF, _05D5 + GoToIfEq VAR_RESULT, 0xFF, BattleCastle_GriseousOrbCouldNotBeRemoved TryRevertPokemonForm VAR_MAP_LOCAL_6, VAR_RESULT - GoToIfEq VAR_RESULT, 0xFF, _05D5 + GoToIfEq VAR_RESULT, 0xFF, BattleCastle_GriseousOrbCouldNotBeRemoved GetPartyMonSpecies VAR_MAP_LOCAL_2, VAR_MAP_LOCAL_1 - GoToIfEq VAR_MAP_LOCAL_1, 0, _0139 - GoTo _028F + GoToIfEq VAR_MAP_LOCAL_1, 0, BattleCastle_EndChallenge + GoTo BattleCastle_TryStartChallenge End -_028F: - GoTo _0297 +BattleCastle_TryStartChallenge: + GoTo BattleCastle_HealAndSaveBeforeChallenge End -_0297: - CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, _043C - CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, _043C +BattleCastle_HealAndSaveBeforeChallenge: + CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleCastle_SetChallengeInProgress + CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleCastle_SetChallengeInProgress SetVar VAR_MAP_LOCAL_0, 0 HealParty Common_SaveGame SetVar VAR_RESULT, VAR_MAP_LOCAL_0 - GoToIfEq VAR_RESULT, 0, _0139 - GoToIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _02E5 - GoTo _049D + GoToIfEq VAR_RESULT, 0, BattleCastle_EndChallenge + GoToIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleCastle_BecomeLeaderOrJoinGroup + GoTo BattleCastle_WalkIntoCorridor End -_02E5: - Message 43 +BattleCastle_BecomeLeaderOrJoinGroup: + Message BattleCastle_Text_BecomeLeaderOrJoinGroup InitGlobalTextMenu 30, 1, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm 13, 0 - AddMenuEntryImm 14, 1 - AddMenuEntryImm 5, 2 + AddMenuEntryImm MenuEntries_Text_JoinGroup, 0 + AddMenuEntryImm MenuEntries_Text_BecomeLeader, 1 + AddMenuEntryImm MenuEntries_Text_Exit, 2 ShowMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _0329 - GoToIfEq VAR_0x8008, 1, _037D - GoTo _0139 + GoToIfEq VAR_0x8008, 0, BattleCastle_LaunchWiFiToJoinGroup + GoToIfEq VAR_0x8008, 1, BattleCastle_LaunchWiFiToBecomeLeader + GoTo BattleCastle_EndChallenge End -_0329: - Message 44 +BattleCastle_LaunchWiFiToJoinGroup: + Message BattleCastle_Text_NeedToLaunchWiFiComm ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _02E5 + GoToIfEq VAR_RESULT, MENU_NO, BattleCastle_BecomeLeaderOrJoinGroup CloseMessage StartBattleClient 31, 0, 0, VAR_RESULT - GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, _036B - GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, _0373 - GoTo _03D1 + GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, BattleCastle_CancelJoiningGroup + GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, BattleCastle_ErrorJoiningGroup + GoTo BattleCastle_StartMultiChallenge End -_036B: - GoTo _02E5 +BattleCastle_CancelJoiningGroup: + GoTo BattleCastle_BecomeLeaderOrJoinGroup End -_0373: +BattleCastle_ErrorJoiningGroup: EndCommunication - GoTo _02E5 + GoTo BattleCastle_BecomeLeaderOrJoinGroup End -_037D: - Message 44 +BattleCastle_LaunchWiFiToBecomeLeader: + Message BattleCastle_Text_NeedToLaunchWiFiComm ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _02E5 + GoToIfEq VAR_RESULT, MENU_NO, BattleCastle_BecomeLeaderOrJoinGroup CloseMessage StartBattleServer 31, 0, 0, VAR_RESULT - GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, _03BF - GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, _03C7 - GoTo _03D1 + GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, BattleCastle_CancelBecomingLeader + GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, BattleCastle_ErrorBecomingLeader + GoTo BattleCastle_StartMultiChallenge End -_03BF: - GoTo _02E5 +BattleCastle_CancelBecomingLeader: + GoTo BattleCastle_BecomeLeaderOrJoinGroup End -_03C7: +BattleCastle_ErrorBecomingLeader: EndCommunication - GoTo _02E5 + GoTo BattleCastle_BecomeLeaderOrJoinGroup End -_03D1: +BattleCastle_StartMultiChallenge: ClearReceivedTempDataAllPlayers ScrCmd_135 136 GetPartyMonSpecies VAR_MAP_LOCAL_2, VAR_0x8000 GetPartyMonSpecies VAR_MAP_LOCAL_5, VAR_0x8001 ScrCmd_2D3 VAR_0x8000, VAR_0x8001, VAR_RESULT SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 1, _0444 - GoToIfEq VAR_0x8008, 2, _045A - GoToIfEq VAR_0x8008, 3, _0470 + GoToIfEq VAR_0x8008, 1, BattleCastle_BothTrainerChosePokemon1 + GoToIfEq VAR_0x8008, 2, BattleCastle_BothTrainerChosePokemon2 + GoToIfEq VAR_0x8008, 3, BattleCastle_BothTrainerChosePokemon1And2 ClearReceivedTempDataAllPlayers ScrCmd_135 138 - Message 45 - CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _043C - Call _06CB - GoTo _049D + Message BattleCastle_Text_MustSaveFirst + CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleCastle_SetChallengeInProgress + Call BattleCastle_SaveGame + GoTo BattleCastle_WalkIntoCorridor End -_043C: - SetVar VAR_UNK_0x40BC, 0xFF +BattleCastle_SetChallengeInProgress: + SetVar VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 0xFF Return -_0444: - Call _0493 +BattleCastle_BothTrainerChosePokemon1: + Call BattleCastle_EndCommunicationSamePokemon BufferPartyMonSpecies 0, VAR_MAP_LOCAL_2 - Message 29 - GoTo _048B + Message BattleCastle_Text_BothTrainersChoseThisPokemon + GoTo BattleCastle_ChoseSamePokemonCancel End -_045A: - Call _0493 +BattleCastle_BothTrainerChosePokemon2: + Call BattleCastle_EndCommunicationSamePokemon BufferPartyMonSpecies 0, VAR_MAP_LOCAL_5 - Message 29 - GoTo _048B + Message BattleCastle_Text_BothTrainersChoseThisPokemon + GoTo BattleCastle_ChoseSamePokemonCancel End -_0470: - Call _0493 +BattleCastle_BothTrainerChosePokemon1And2: + Call BattleCastle_EndCommunicationSamePokemon BufferPartyMonSpecies 0, VAR_MAP_LOCAL_2 BufferPartyMonSpecies 1, VAR_MAP_LOCAL_5 - Message 30 - GoTo _048B + Message BattleCastle_Text_BothTrainersChoseThesePokemon + GoTo BattleCastle_ChoseSamePokemonCancel End -_048B: - GoTo _0139 +BattleCastle_ChoseSamePokemonCancel: + GoTo BattleCastle_EndChallenge End -_0493: +BattleCastle_EndCommunicationSamePokemon: ClearReceivedTempDataAllPlayers ScrCmd_135 139 EndCommunication Return -_049D: - CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, _053D - CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, _0558 - CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _0573 +BattleCastle_WalkIntoCorridor: + CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleCastle_WalkToCorridorSingleChallenge + CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleCastle_WalkToCorridorDoubleChallenge + CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleCastle_WalkToCorridorMultiChallenge PlaySE SEQ_SE_DP_KAIDAN2 - GoTo _04D0 + GoTo BattleCastle_StartChallenge End -_04D0: +BattleCastle_StartChallenge: FadeScreenOut WaitFadeScreen - CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, _0599 - CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, _05AD - CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _05C1 - IncrementGameRecord RECORD_UNK_058 + CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleCastle_WalkBackInvisiblySingleChallenge + CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleCastle_WalkBackInvisiblyDoubleChallenge + CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleCastle_WalkBackInvisiblyMultiChallenge + IncrementGameRecord RECORD_TIMES_STARTED_BATTLE_FRONTIER_CHALLENGE CreateJournalEvent LOCATION_EVENT_BATTLE_CASTLE, 0, 0, 0, 0 WaitForTransition ScrCmd_2C4 11 - CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _0539 + CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleCastle_EndCommunication ReturnToField FadeScreenIn WaitFadeScreen AssertHeapMemory End -_0539: +BattleCastle_EndCommunication: EndCommunication Return -_053D: - Message 32 +BattleCastle_WalkToCorridorSingleChallenge: + Message BattleCastle_Text_ThisWayPlease WaitABPress CloseMessage - ApplyMovement LOCALID_PLAYER, _05E4 - ApplyMovement VAR_LAST_TALKED, _0604 + ApplyMovement LOCALID_PLAYER, BattleCastle_Movement_PlayerWalkToCorridorSingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleCastle_Movement_AttendantWalkToCorridorSingleDoubleChallenge WaitMovement Return -_0558: - Message 32 +BattleCastle_WalkToCorridorDoubleChallenge: + Message BattleCastle_Text_ThisWayPlease WaitABPress CloseMessage - ApplyMovement LOCALID_PLAYER, _05E4 - ApplyMovement VAR_LAST_TALKED, _0604 + ApplyMovement LOCALID_PLAYER, BattleCastle_Movement_PlayerWalkToCorridorSingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleCastle_Movement_AttendantWalkToCorridorSingleDoubleChallenge WaitMovement Return -_0573: - MessageNoSkip 32 +BattleCastle_WalkToCorridorMultiChallenge: + MessageNoSkip BattleCastle_Text_ThisWayPlease WaitTime 10, VAR_RESULT ClearReceivedTempDataAllPlayers ScrCmd_135 137 CloseMessage - ApplyMovement LOCALID_PLAYER, _05F0 - ApplyMovement VAR_LAST_TALKED, _0610 + ApplyMovement LOCALID_PLAYER, BattleCastle_Movement_PlayerWalkToCorridorMultiChallenge + ApplyMovement VAR_LAST_TALKED, BattleCastle_Movement_AttendantWalkToCorridorMultiChallenge WaitMovement Return -_0599: - ApplyMovement LOCALID_PLAYER, _0624 - ApplyMovement VAR_LAST_TALKED, _0648 +BattleCastle_WalkBackInvisiblySingleChallenge: + ApplyMovement LOCALID_PLAYER, BattleCastle_Movement_PlayerWalkBackSingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleCastle_Movement_AttendantWalkBackSingleDoubleChallenge WaitMovement Return -_05AD: - ApplyMovement LOCALID_PLAYER, _0624 - ApplyMovement VAR_LAST_TALKED, _0648 +BattleCastle_WalkBackInvisiblyDoubleChallenge: + ApplyMovement LOCALID_PLAYER, BattleCastle_Movement_PlayerWalkBackSingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleCastle_Movement_AttendantWalkBackSingleDoubleChallenge WaitMovement Return -_05C1: - ApplyMovement LOCALID_PLAYER, _0634 - ApplyMovement VAR_LAST_TALKED, _0654 +BattleCastle_WalkBackInvisiblyMultiChallenge: + ApplyMovement LOCALID_PLAYER, BattleCastle_Movement_PlayerWalkBackMultiChallenge + ApplyMovement VAR_LAST_TALKED, BattleCastle_Movement_AttendantWalkBackMultiChallenge WaitMovement Return -_05D5: - SetVar VAR_UNK_0x40BC, 0 +BattleCastle_GriseousOrbCouldNotBeRemoved: + SetVar VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 0 Common_GriseousOrbCouldNotBeRemoved End .balign 4, 0 -_05E4: +BattleCastle_Movement_PlayerWalkToCorridorSingleDoubleChallenge: WalkNormalWest 6 SetInvisible EndMovement .balign 4, 0 -_05F0: +BattleCastle_Movement_PlayerWalkToCorridorMultiChallenge: WalkNormalWest 3 WalkNormalNorth WalkNormalWest 3 @@ -366,13 +367,13 @@ _05F0: EndMovement .balign 4, 0 -_0604: +BattleCastle_Movement_AttendantWalkToCorridorSingleDoubleChallenge: WalkNormalWest 5 SetInvisible EndMovement .balign 4, 0 -_0610: +BattleCastle_Movement_AttendantWalkToCorridorMultiChallenge: WalkNormalWest 2 WalkNormalNorth WalkNormalWest 3 @@ -380,14 +381,14 @@ _0610: EndMovement .balign 4, 0 -_0624: +BattleCastle_Movement_PlayerWalkBackSingleDoubleChallenge: WalkFasterEast 6 SetVisible FaceWest EndMovement .balign 4, 0 -_0634: +BattleCastle_Movement_PlayerWalkBackMultiChallenge: WalkFasterEast 6 WalkFasterSouth SetVisible @@ -395,60 +396,60 @@ _0634: EndMovement .balign 4, 0 -_0648: +BattleCastle_Movement_AttendantWalkBackSingleDoubleChallenge: WalkFasterEast 5 SetVisible EndMovement .balign 4, 0 -_0654: +BattleCastle_Movement_AttendantWalkBackMultiChallenge: WalkFasterSouth WalkFasterEast 5 SetVisible EndMovement -_0664: - Message 0 +BattleCastle_WelcomeToSingleDoubleChallenge: + Message BattleCastle_Text_WelcomeToSingleDoubleChallenge Return -_0669: - Message 3 +BattleCastle_WelcomeToMultiChallenge: + Message BattleCastle_Text_WelcomeToMultiChallenge Return -_066E: +BattleCastle_InitMenuSingleDoubleChallenge: InitLocalTextMenu 31, 9, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm 38, 0 - AddMenuEntryImm 39, 1 - Message 1 + AddMenuEntryImm BattleCastle_Text_SingleBattle, 0 + AddMenuEntryImm BattleCastle_Text_DoubleBattle, 1 + Message BattleCastle_Text_TakeWhichChallenge Return -_0686: +BattleCastle_InitMenuMultiChallenge: InitLocalTextMenu 31, 11, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm 40, 4 - Message 4 + AddMenuEntryImm BattleCastle_Text_TakeChallenge, 4 + Message BattleCastle_Text_AskTakeMultiChallenge Return -_069A: - Message 2 +BattleCastle_ExplainSingleDoubleChallenge: + Message BattleCastle_Text_ExplainSingleDoubleChallenge Return -_069F: - Message 5 +BattleCastle_ExplainMultiChallenge: + Message BattleCastle_Text_ExplainMultiChallenge Return -_06A4: +BattleCastle_OnFrameResumeChallenge: RecordHeapMemory SetVar VAR_MAP_LOCAL_3, 1 - SetVar VAR_UNK_0x40BC, 0 - Message 33 - Call _043C - Call _06CB - GoTo _049D + SetVar VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 0 + Message BattleCastle_Text_MustSaveBeforeResuming + Call BattleCastle_SetChallengeInProgress + Call BattleCastle_SaveGame + GoTo BattleCastle_WalkIntoCorridor End -_06CB: +BattleCastle_SaveGame: ShowSavingIcon TrySaveGame VAR_RESULT HideSavingIcon @@ -456,45 +457,45 @@ _06CB: WaitSE SEQ_SE_DP_SAVE Return -_06DD: - Message 34 +BattleCastle_OnFrameDidntSaveBeforeQuit: + Message BattleCastle_Text_DidntSaveBeforeQuit ScrCmd_2D5 VAR_BATTLE_CASTLE_CHALLENGE_TYPE - GoTo _0139 + GoTo BattleCastle_EndChallenge End -_06EC: - CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, _0728 - CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, _0728 - CallIfEq VAR_BATTLE_CASTLE_PRINT_STATE, 1, _072E - CallIfEq VAR_BATTLE_CASTLE_PRINT_STATE, 3, _0745 - GoTo _0139 +BattleCastle_OnFrameChallengeEndedCompletedRound: + CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleCastle_IncrementTrainerScoreRoundCompleted + CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleCastle_IncrementTrainerScoreRoundCompleted + CallIfEq VAR_BATTLE_CASTLE_PRINT_STATE, 1, BattleCastle_EarnedSilverPrint + CallIfEq VAR_BATTLE_CASTLE_PRINT_STATE, 3, BattleCastle_EarnedGoldPrint + GoTo BattleCastle_EndChallenge End -_0728: - IncrementTrainerScore TRAINER_SCORE_EVENT_UNK_39 +BattleCastle_IncrementTrainerScoreRoundCompleted: + IncrementTrainerScore TRAINER_SCORE_EVENT_BATTLE_CASTLE_ROUND_COMPLETED Return -_072E: - Message 35 +BattleCastle_EarnedSilverPrint: + Message BattleCastle_Text_PrintForVictory BufferPlayerName 0 - Message 37 + Message BattleCastle_Text_SinglePrintAdded PlayFanfare SEQ_FANFA4 WaitFanfare SetVar VAR_BATTLE_CASTLE_PRINT_STATE, 2 Return -_0745: - Message 35 +BattleCastle_EarnedGoldPrint: + Message BattleCastle_Text_PrintForVictory BufferPlayerName 0 - Message 36 + Message BattleCastle_Text_GoldPrintAdded PlayFanfare SEQ_FANFA4 WaitFanfare SetVar VAR_BATTLE_CASTLE_PRINT_STATE, 4 Common_CheckAllFrontierGoldPrintsObtained Return -_0760: - GoTo _0139 +BattleCastle_OnFrameChallengeEnded: + GoTo BattleCastle_EndChallenge End BattleCastle_UnusedMovement: @@ -509,32 +510,32 @@ BattleCastle_UnusedMovement2: WalkNormalNorth EndMovement -_0788: - NPCMessage 46 +BattleCastle_Artist: + NPCMessage BattleCastle_Text_NoDamageMoreCP End -_079B: - NPCMessage 47 +BattleCastle_Socialite: + NPCMessage BattleCastle_Text_HigherLevelOpponentsMoreCP End -_07AE: - NPCMessage 48 +BattleCastle_Waitress: + NPCMessage BattleCastle_Text_CheckOpponentsLineup End -_07C1: - NPCMessage 49 +BattleCastle_Collector: + NPCMessage BattleCastle_Text_IPineForMrDarach End -_07D4: - NPCMessage 50 +BattleCastle_Roughneck: + NPCMessage BattleCastle_Text_SpendCPToRankUp End -_07E7: - NPCMessage 51 +BattleCastle_Gentleman: + NPCMessage BattleCastle_Text_MatterOfGraveImportance End -_07FA: - NPCMessage 52 +BattleCastle_BlackBelt: + NPCMessage BattleCastle_Text_IWantToLiveInCastle End .balign 4, 0 diff --git a/res/field/scripts/scripts_battle_factory.s b/res/field/scripts/scripts_battle_factory.s index 40b8624a35..1d337a49e0 100644 --- a/res/field/scripts/scripts_battle_factory.s +++ b/res/field/scripts/scripts_battle_factory.s @@ -1,305 +1,306 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_factory.h" +#include "res/text/bank/menu_entries.h" #include "constants/battle_frontier.h" - ScriptEntry _0059 - ScriptEntry _05B0 - ScriptEntry _05E9 - ScriptEntry _05FA - ScriptEntry _066E - ScriptEntry _0075 - ScriptEntry _0698 - ScriptEntry _06AB - ScriptEntry _06BE - ScriptEntry _06D1 - ScriptEntry _06E4 - ScriptEntry _06F7 - ScriptEntry _070A - ScriptEntry _003A + ScriptEntry BattleFactory_SingleAttendant + ScriptEntry BattleFactory_OnFrameResumeChallenge + ScriptEntry BattleFactory_OnFrameDidntSaveBeforeQuit + ScriptEntry BattleFactory_OnFrameChallengeEndedCompletedRound + ScriptEntry BattleFactory_OnFrameChallengeEnded + ScriptEntry BattleFactory_MultiAttendant + ScriptEntry BattleFactory_PokemonBreederF + ScriptEntry BattleFactory_Sailor + ScriptEntry BattleFactory_Beauty + ScriptEntry BattleFactory_Youngster + ScriptEntry BattleFactory_Clown + ScriptEntry BattleFactory_Lady + ScriptEntry BattleFactory_Policeman + ScriptEntry BattleFactory_OnTransition ScriptEntryEnd -_003A: +BattleFactory_OnTransition: CheckTVInterviewEligible TV_PROGRAM_SEGMENT_BATTLE_FRONTIER_FRONTLINE_NEWS_MULTI, VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, 0, _0053 - ClearFlag FLAG_UNK_0x02C3 + GoToIfEq VAR_MAP_LOCAL_0, FALSE, BattleFactory_HideBattleFrontierReporter + ClearFlag FLAG_HIDE_BATTLE_FRONTIER_REPORTER End -_0053: - SetFlag FLAG_UNK_0x02C3 +BattleFactory_HideBattleFrontierReporter: + SetFlag FLAG_HIDE_BATTLE_FRONTIER_REPORTER End -_0059: +BattleFactory_SingleAttendant: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer SetVar VAR_MAP_LOCAL_3, 0 SetVar VAR_MAP_LOCAL_4, 0 - GoTo _0091 + GoTo BattleFactory_Attendant End -_0075: +BattleFactory_MultiAttendant: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer SetVar VAR_MAP_LOCAL_3, 0 SetVar VAR_MAP_LOCAL_4, 1 - GoTo _0091 + GoTo BattleFactory_Attendant End -_0091: +BattleFactory_Attendant: RecordHeapMemory - CallIfEq VAR_MAP_LOCAL_4, 0, _0570 - CallIfEq VAR_MAP_LOCAL_4, 1, _0575 - GoTo _00B7 + CallIfEq VAR_MAP_LOCAL_4, 0, BattleFactory_WelcomeToSingleDoubleChallenge + CallIfEq VAR_MAP_LOCAL_4, 1, BattleFactory_WelcomeToMultiChallenge + GoTo BattleFactory_SelectChallenge End -_00B7: - CallIfEq VAR_MAP_LOCAL_4, 0, _057A - CallIfEq VAR_MAP_LOCAL_4, 1, _0592 - AddMenuEntryImm 19, 2 - AddMenuEntryImm 20, 3 +BattleFactory_SelectChallenge: + CallIfEq VAR_MAP_LOCAL_4, 0, BattleFactory_InitMenuSingleDoubleChallenge + CallIfEq VAR_MAP_LOCAL_4, 1, BattleFactory_InitMenuMultiChallenge + AddMenuEntryImm BattleFactory_Text_Info, 2 + AddMenuEntryImm BattleFactory_Text_CancelChallenge, 3 ShowMenu - GoToIfEq VAR_RESULT, 0, _0152 - GoToIfEq VAR_RESULT, 1, _0160 - GoToIfEq VAR_RESULT, 2, _0117 - GoToIfEq VAR_RESULT, 4, _016E - GoTo _0139 + GoToIfEq VAR_RESULT, 0, BattleFactory_TryTakeSingleChallenge + GoToIfEq VAR_RESULT, 1, BattleFactory_TryTakeDoubleChallenge + GoToIfEq VAR_RESULT, 2, BattleFactory_ExplainChallenge + GoToIfEq VAR_RESULT, 4, BattleFactory_TryTakeMultiChallenge + GoTo BattleFactory_EndChallenge End -_0117: - CallIfEq VAR_MAP_LOCAL_4, 0, _05A6 - CallIfEq VAR_MAP_LOCAL_4, 1, _05AB - GoTo _00B7 +BattleFactory_ExplainChallenge: + CallIfEq VAR_MAP_LOCAL_4, 0, BattleFactory_ExplainSingleDoubleChallenge + CallIfEq VAR_MAP_LOCAL_4, 1, BattleFactory_ExplainMultiChallenge + GoTo BattleFactory_SelectChallenge End -_0139: - GoTo _0141 +BattleFactory_EndChallenge: + GoTo BattleFactory_HopeToSeeYouAgain End -_0141: - SetVar VAR_UNK_0x40B7, 0 - Message 6 +BattleFactory_HopeToSeeYouAgain: + SetVar VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 0 + Message BattleFactory_Text_HopeToSeeYouAgain WaitButton CloseMessage ReleaseAll End -_0152: +BattleFactory_TryTakeSingleChallenge: SetVar VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE - GoTo _017C + GoTo BattleFactory_SelectPokemon End -_0160: +BattleFactory_TryTakeDoubleChallenge: SetVar VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE - GoTo _017C + GoTo BattleFactory_SelectPokemon End -_016E: +BattleFactory_TryTakeMultiChallenge: SetVar VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI - GoTo _017C + GoTo BattleFactory_SelectPokemon End -_017C: - Message 7 +BattleFactory_SelectPokemon: + Message BattleFactory_Text_WhichChallengeLevel InitLocalTextMenu 31, 11, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm 21, 0 - AddMenuEntryImm 22, 1 - AddMenuEntryImm 23, 2 + AddMenuEntryImm BattleFactory_Text_Level50, 0 + AddMenuEntryImm BattleFactory_Text_OpenLevel, 1 + AddMenuEntryImm BattleFactory_Text_CancelLevel, 2 ShowMenu - GoToIfEq VAR_RESULT, 0, _01BA - GoToIfEq VAR_RESULT, 1, _01C8 - GoTo _0139 + GoToIfEq VAR_RESULT, 0, BattleFactory_SetLevel50 + GoToIfEq VAR_RESULT, 1, BattleFactory_SetOpenLevel + GoTo BattleFactory_EndChallenge End -_01BA: - SetVar VAR_UNK_0x40B9, 0 - GoTo _01D6 +BattleFactory_SetLevel50: + SetVar VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, 0 + GoTo BattleFactory_TryStartChallenge End -_01C8: - SetVar VAR_UNK_0x40B9, 1 - GoTo _01D6 +BattleFactory_SetOpenLevel: + SetVar VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, 1 + GoTo BattleFactory_TryStartChallenge End -_01D6: - GoTo _01DE +BattleFactory_TryStartChallenge: + GoTo BattleFactory_HealAndSaveBeforeChallenge End -_01DE: - CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, _0386 - CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, _0386 +BattleFactory_HealAndSaveBeforeChallenge: + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleFactory_SetChallengeInProgress + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleFactory_SetChallengeInProgress SetVar VAR_MAP_LOCAL_0, 0 HealParty Common_SaveGame SetVar VAR_RESULT, VAR_MAP_LOCAL_0 - GoToIfEq VAR_RESULT, 0, _0139 - GoToIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _022C - GoTo _038E + GoToIfEq VAR_RESULT, 0, BattleFactory_EndChallenge + GoToIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleFactory_BecomeLeaderOrJoinGroup + GoTo BattleFactory_WalkIntoCorridor End -_022C: - Message 24 +BattleFactory_BecomeLeaderOrJoinGroup: + Message BattleFactory_Text_BecomeLeaderOrJoinGroup InitGlobalTextMenu 30, 1, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm 13, 0 - AddMenuEntryImm 14, 1 - AddMenuEntryImm 5, 2 + AddMenuEntryImm MenuEntries_Text_JoinGroup, 0 + AddMenuEntryImm MenuEntries_Text_BecomeLeader, 1 + AddMenuEntryImm MenuEntries_Text_Exit, 2 ShowMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _0270 - GoToIfEq VAR_0x8008, 1, _02EC - GoTo _0139 + GoToIfEq VAR_0x8008, 0, BattleFactory_LaunchWiFiToJoinGroup + GoToIfEq VAR_0x8008, 1, BattleFactory_LaunchWiFiToBecomeLeader + GoTo BattleFactory_EndChallenge End -_0270: - Message 25 +BattleFactory_LaunchWiFiToJoinGroup: + Message BattleFactory_Text_NeedToLaunchWiFiComm ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _022C + GoToIfEq VAR_RESULT, MENU_NO, BattleFactory_BecomeLeaderOrJoinGroup CloseMessage - CallIfEq VAR_UNK_0x40B9, 0, _02C2 - CallIfEq VAR_UNK_0x40B9, 1, _02CE - GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, _02DA - GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, _02E2 - GoTo _0368 + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, 0, BattleFactory_StartBattleClientLevel50 + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, 1, BattleFactory_StartBattleClientOpenLevel + GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, BattleFactory_CancelJoiningGroup + GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, BattleFactory_ErrorJoiningGroup + GoTo BattleFactory_StartMultiChallenge End -_02C2: +BattleFactory_StartBattleClientLevel50: StartBattleClient 27, 0, 0, VAR_RESULT Return -_02CE: +BattleFactory_StartBattleClientOpenLevel: StartBattleClient 28, 0, 0, VAR_RESULT Return -_02DA: - GoTo _022C +BattleFactory_CancelJoiningGroup: + GoTo BattleFactory_BecomeLeaderOrJoinGroup End -_02E2: +BattleFactory_ErrorJoiningGroup: EndCommunication - GoTo _022C + GoTo BattleFactory_BecomeLeaderOrJoinGroup End -_02EC: - Message 25 +BattleFactory_LaunchWiFiToBecomeLeader: + Message BattleFactory_Text_NeedToLaunchWiFiComm ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _022C + GoToIfEq VAR_RESULT, MENU_NO, BattleFactory_BecomeLeaderOrJoinGroup CloseMessage - CallIfEq VAR_UNK_0x40B9, 0, _033E - CallIfEq VAR_UNK_0x40B9, 1, _034A - GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, _0356 - GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, _035E - GoTo _0368 + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, 0, BattleFactory_StartBattleServerLevel50 + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, 1, BattleFactory_StartBattleServerOpenLevel + GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, BattleFactory_CancelBecomingLeader + GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, BattleFactory_ErrorBecomingLeader + GoTo BattleFactory_StartMultiChallenge End -_033E: +BattleFactory_StartBattleServerLevel50: StartBattleServer 27, 0, 0, VAR_RESULT Return -_034A: +BattleFactory_StartBattleServerOpenLevel: StartBattleServer 28, 0, 0, VAR_RESULT Return -_0356: - GoTo _022C +BattleFactory_CancelBecomingLeader: + GoTo BattleFactory_BecomeLeaderOrJoinGroup End -_035E: +BattleFactory_ErrorBecomingLeader: EndCommunication - GoTo _022C + GoTo BattleFactory_BecomeLeaderOrJoinGroup End -_0368: - Message 26 - CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _0386 - Call _05D7 - GoTo _038E +BattleFactory_StartMultiChallenge: + Message BattleFactory_Text_MustSaveFirst + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleFactory_SetChallengeInProgress + Call BattleFactory_SaveGame + GoTo BattleFactory_WalkIntoCorridor End -_0386: - SetVar VAR_UNK_0x40B7, 0xFF +BattleFactory_SetChallengeInProgress: + SetVar VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 0xFF Return -_038E: - CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, _042E - CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, _0449 - CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _0464 +BattleFactory_WalkIntoCorridor: + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleFactory_WalkToCorridorSingleChallenge + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleFactory_WalkToCorridorDoubleChallenge + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleFactory_WalkToCorridorMultiChallenge PlaySE SEQ_SE_DP_KAIDAN2 - GoTo _03C1 + GoTo BattleFactory_StartChallenge End -_03C1: +BattleFactory_StartChallenge: FadeScreenOut WaitFadeScreen - CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, _048A - CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, _049E - CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _04B2 - IncrementGameRecord RECORD_UNK_058 + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleFactory_WalkBackInvisiblySingleChallenge + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleFactory_WalkBackInvisiblyDoubleChallenge + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleFactory_WalkBackInvisiblyMultiChallenge + IncrementGameRecord RECORD_TIMES_STARTED_BATTLE_FRONTIER_CHALLENGE CreateJournalEvent LOCATION_EVENT_BATTLE_FACTORY, 0, 0, 0, 0 WaitForTransition ScrCmd_2C4 3 - CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _042A + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleFactory_EndCommunication ReturnToField FadeScreenIn WaitFadeScreen AssertHeapMemory End -_042A: +BattleFactory_EndCommunication: EndCommunication Return -_042E: - Message 9 +BattleFactory_WalkToCorridorSingleChallenge: + Message BattleFactory_Text_ThisWayPlease WaitABPress CloseMessage - ApplyMovement LOCALID_PLAYER, _04C8 - ApplyMovement VAR_LAST_TALKED, _04F0 + ApplyMovement LOCALID_PLAYER, BattleFactory_Movement_PlayerWalkToCorridorSingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleFactory_Movement_AttendantWalkToCorridorSingleDoubleChallenge WaitMovement Return -_0449: - Message 9 +BattleFactory_WalkToCorridorDoubleChallenge: + Message BattleFactory_Text_ThisWayPlease WaitABPress CloseMessage - ApplyMovement LOCALID_PLAYER, _04C8 - ApplyMovement VAR_LAST_TALKED, _04F0 + ApplyMovement LOCALID_PLAYER, BattleFactory_Movement_PlayerWalkToCorridorSingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleFactory_Movement_AttendantWalkToCorridorSingleDoubleChallenge WaitMovement Return -_0464: - MessageNoSkip 9 +BattleFactory_WalkToCorridorMultiChallenge: + MessageNoSkip BattleFactory_Text_ThisWayPlease WaitTime 15, VAR_RESULT ClearReceivedTempDataAllPlayers ScrCmd_135 169 CloseMessage - ApplyMovement LOCALID_PLAYER, _04DC - ApplyMovement VAR_LAST_TALKED, _0504 + ApplyMovement LOCALID_PLAYER, BattleFactory_Movement_PlayerWalkToCorridorMultiChallenge + ApplyMovement VAR_LAST_TALKED, BattleFactory_Movement_AttendantWalkToCorridorMultiChallenge WaitMovement Return -_048A: - ApplyMovement LOCALID_PLAYER, _0518 - ApplyMovement VAR_LAST_TALKED, _0548 +BattleFactory_WalkBackInvisiblySingleChallenge: + ApplyMovement LOCALID_PLAYER, BattleFactory_Movement_PlayerWalkBackSingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleFactory_Movement_AttendantWalkBackSingleDoubleChallenge WaitMovement Return -_049E: - ApplyMovement LOCALID_PLAYER, _0518 - ApplyMovement VAR_LAST_TALKED, _0548 +BattleFactory_WalkBackInvisiblyDoubleChallenge: + ApplyMovement LOCALID_PLAYER, BattleFactory_Movement_PlayerWalkBackSingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleFactory_Movement_AttendantWalkBackSingleDoubleChallenge WaitMovement Return -_04B2: - ApplyMovement LOCALID_PLAYER, _0530 - ApplyMovement VAR_LAST_TALKED, _055C +BattleFactory_WalkBackInvisiblyMultiChallenge: + ApplyMovement LOCALID_PLAYER, BattleFactory_Movement_PlayerWalkBackMultiChallenge + ApplyMovement VAR_LAST_TALKED, BattleFactory_Movement_AttendantWalkBackMultiChallenge WaitMovement Return .balign 4, 0 -_04C8: +BattleFactory_Movement_PlayerWalkToCorridorSingleDoubleChallenge: WalkNormalNorth 3 WalkNormalEast WalkNormalNorth 4 @@ -307,7 +308,7 @@ _04C8: EndMovement .balign 4, 0 -_04DC: +BattleFactory_Movement_PlayerWalkToCorridorMultiChallenge: WalkNormalNorth 3 WalkNormalWest WalkNormalNorth 4 @@ -315,7 +316,7 @@ _04DC: EndMovement .balign 4, 0 -_04F0: +BattleFactory_Movement_AttendantWalkToCorridorSingleDoubleChallenge: WalkNormalNorth 2 WalkNormalEast WalkNormalNorth 4 @@ -323,7 +324,7 @@ _04F0: EndMovement .balign 4, 0 -_0504: +BattleFactory_Movement_AttendantWalkToCorridorMultiChallenge: WalkNormalNorth 2 WalkNormalWest WalkNormalNorth 4 @@ -331,7 +332,7 @@ _0504: EndMovement .balign 4, 0 -_0518: +BattleFactory_Movement_PlayerWalkBackSingleDoubleChallenge: WalkFasterSouth 3 WalkFasterWest WalkFasterSouth 4 @@ -340,7 +341,7 @@ _0518: EndMovement .balign 4, 0 -_0530: +BattleFactory_Movement_PlayerWalkBackMultiChallenge: WalkFasterSouth 3 WalkFasterEast WalkFasterSouth 4 @@ -349,7 +350,7 @@ _0530: EndMovement .balign 4, 0 -_0548: +BattleFactory_Movement_AttendantWalkBackSingleDoubleChallenge: WalkFasterSouth 2 WalkFasterWest WalkFasterSouth 4 @@ -357,55 +358,55 @@ _0548: EndMovement .balign 4, 0 -_055C: +BattleFactory_Movement_AttendantWalkBackMultiChallenge: WalkFasterSouth 2 WalkFasterEast WalkFasterSouth 4 SetVisible EndMovement -_0570: - Message 0 +BattleFactory_WelcomeToSingleDoubleChallenge: + Message BattleFactory_Text_WelcomeToSingleDoubleChallenge Return -_0575: - Message 3 +BattleFactory_WelcomeToMultiChallenge: + Message BattleFactory_Text_WelcomeToMultiChallenge Return -_057A: +BattleFactory_InitMenuSingleDoubleChallenge: InitLocalTextMenu 31, 9, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm 16, 0 - AddMenuEntryImm 17, 1 - Message 1 + AddMenuEntryImm BattleFactory_Text_SingleBattle, 0 + AddMenuEntryImm BattleFactory_Text_DoubleBattle, 1 + Message BattleFactory_Text_TakeWhichChallenge Return -_0592: +BattleFactory_InitMenuMultiChallenge: InitLocalTextMenu 31, 11, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm 18, 4 - Message 4 + AddMenuEntryImm BattleFactory_Text_TakeChallenge, 4 + Message BattleFactory_Text_AskTakeMultiChallenge Return -_05A6: - Message 2 +BattleFactory_ExplainSingleDoubleChallenge: + Message BattleFactory_Text_ExplainSingleDoubleChallenge Return -_05AB: - Message 5 +BattleFactory_ExplainMultiChallenge: + Message BattleFactory_Text_ExplainMultiChallenge Return -_05B0: +BattleFactory_OnFrameResumeChallenge: RecordHeapMemory SetVar VAR_MAP_LOCAL_3, 1 - SetVar VAR_UNK_0x40B7, 0 - Message 11 - Call _0386 - Call _05D7 - GoTo _038E + SetVar VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 0 + Message BattleFactory_Text_MustSaveBeforeResuming + Call BattleFactory_SetChallengeInProgress + Call BattleFactory_SaveGame + GoTo BattleFactory_WalkIntoCorridor End -_05D7: +BattleFactory_SaveGame: ShowSavingIcon TrySaveGame VAR_RESULT HideSavingIcon @@ -413,45 +414,45 @@ _05D7: WaitSE SEQ_SE_DP_SAVE Return -_05E9: - Message 12 - ScrCmd_2C5 VAR_BATTLE_FACTORY_CHALLENGE_TYPE, VAR_UNK_0x40B9 - GoTo _0139 +BattleFactory_OnFrameDidntSaveBeforeQuit: + Message BattleFactory_Text_DidntSaveBeforeQuit + ScrCmd_2C5 VAR_BATTLE_FACTORY_CHALLENGE_TYPE, VAR_BATTLE_FACTORY_CHALLENGE_LEVEL + GoTo BattleFactory_EndChallenge End -_05FA: - CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, _0636 - CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, _0636 - CallIfEq VAR_BATTLE_FACTORY_PRINT_STATE, 1, _063C - CallIfEq VAR_BATTLE_FACTORY_PRINT_STATE, 3, _0653 - GoTo _0139 +BattleFactory_OnFrameChallengeEndedCompletedRound: + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleFactory_IncrementTrainerScoreRoundCompleted + CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleFactory_IncrementTrainerScoreRoundCompleted + CallIfEq VAR_BATTLE_FACTORY_PRINT_STATE, 1, BattleFactory_EarnedSilverPrint + CallIfEq VAR_BATTLE_FACTORY_PRINT_STATE, 3, BattleFactory_EarnedGoldPrint + GoTo BattleFactory_EndChallenge End -_0636: - IncrementTrainerScore TRAINER_SCORE_EVENT_UNK_38 +BattleFactory_IncrementTrainerScoreRoundCompleted: + IncrementTrainerScore TRAINER_SCORE_EVENT_BATTLE_FACTORY_ROUND_COMPLETED Return -_063C: - Message 13 +BattleFactory_EarnedSilverPrint: + Message BattleFactory_Text_PrintForVictory BufferPlayerName 0 - Message 15 + Message BattleFactory_Text_SilverPrintAdded PlayFanfare SEQ_FANFA4 WaitFanfare SetVar VAR_BATTLE_FACTORY_PRINT_STATE, 2 Return -_0653: - Message 13 +BattleFactory_EarnedGoldPrint: + Message BattleFactory_Text_PrintForVictory BufferPlayerName 0 - Message 14 + Message BattleFactory_Text_GoldPrintAdded PlayFanfare SEQ_FANFA4 WaitFanfare SetVar VAR_BATTLE_FACTORY_PRINT_STATE, 4 Common_CheckAllFrontierGoldPrintsObtained Return -_066E: - GoTo _0139 +BattleFactory_OnFrameChallengeEnded: + GoTo BattleFactory_EndChallenge End .balign 4, 0 @@ -467,32 +468,32 @@ BattleFactory_UnusedMovement2: WalkNormalNorth EndMovement -_0698: - NPCMessage 27 +BattleFactory_PokemonBreederF: + NPCMessage BattleFactory_Text_StaffTellAboutNextTrainer End -_06AB: - NPCMessage 28 +BattleFactory_Sailor: + NPCMessage BattleFactory_Text_GetOpponentsLineup End -_06BE: - NPCMessage 29 +BattleFactory_Beauty: + NPCMessage BattleFactory_Text_MemorizeOpponentsMoves End -_06D1: - NPCMessage 30 +BattleFactory_Youngster: + NPCMessage BattleFactory_Text_IllTeachMyStyle End -_06E4: - NPCMessage 31 +BattleFactory_Clown: + NPCMessage BattleFactory_Text_ChallengeWithNothing End -_06F7: - NPCMessage 32 +BattleFactory_Lady: + NPCMessage BattleFactory_Text_AlreadySixFavorites End -_070A: - NPCMessage 33 +BattleFactory_Policeman: + NPCMessage BattleFactory_Text_WonMeOverWithPower End .balign 4, 0 diff --git a/res/field/scripts/scripts_battle_frontier.s b/res/field/scripts/scripts_battle_frontier.s index 650ecda3a9..717d4e49bd 100644 --- a/res/field/scripts/scripts_battle_frontier.s +++ b/res/field/scripts/scripts_battle_frontier.s @@ -1,157 +1,158 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_frontier.h" +#include "res/field/events/events_battle_frontier.h" - ScriptEntry _0460 - ScriptEntry _00DB - ScriptEntry _00EE - ScriptEntry _0101 - ScriptEntry _0114 - ScriptEntry _0127 - ScriptEntry _013A - ScriptEntry _014D - ScriptEntry _0160 - ScriptEntry _0173 - ScriptEntry _0186 - ScriptEntry _0199 - ScriptEntry _01AC - ScriptEntry _01BF - ScriptEntry _01D2 - ScriptEntry _01E5 - ScriptEntry _01F8 - ScriptEntry _020B - ScriptEntry _021E - ScriptEntry _0231 - ScriptEntry _0244 - ScriptEntry _0257 - ScriptEntry _026A - ScriptEntry _027E - ScriptEntry _02A6 - ScriptEntry _02BA - ScriptEntry _02D1 - ScriptEntry _02E8 - ScriptEntry _02FF - ScriptEntry _0316 - ScriptEntry _032D - ScriptEntry _033E - ScriptEntry _034F - ScriptEntry _0360 - ScriptEntry _03A0 - ScriptEntry _03E0 - ScriptEntry _0420 - ScriptEntry _009A + ScriptEntry BattleFrontier_Unused1 + ScriptEntry BattleFrontier_NinjaBoy + ScriptEntry BattleFrontier_BlackBelt + ScriptEntry BattleFrontier_Idol + ScriptEntry BattleFrontier_AceTrainerSnowF + ScriptEntry BattleFrontier_Twin + ScriptEntry BattleFrontier_ParasolLady + ScriptEntry BattleFrontier_ExpertM + ScriptEntry BattleFrontier_ExpertF + ScriptEntry BattleFrontier_Waitress + ScriptEntry BattleFrontier_Cowgirl + ScriptEntry BattleFrontier_Roughneck + ScriptEntry BattleFrontier_PokefanM + ScriptEntry BattleFrontier_Collector + ScriptEntry BattleFrontier_Gentleman + ScriptEntry BattleFrontier_AceTrainerM2 + ScriptEntry BattleFrontier_Picnicker + ScriptEntry BattleFrontier_PokemonBreederF + ScriptEntry BattleFrontier_AceTrainerM1 + ScriptEntry BattleFrontier_SchoolKidM + ScriptEntry BattleFrontier_Fisherman + ScriptEntry BattleFrontier_TuberM + ScriptEntry BattleFrontier_AttendantSouthwest + ScriptEntry BattleFrontier_Unused24 + ScriptEntry BattleFrontier_AttendantSoutheast + ScriptEntry BattleFrontier_SignBattleTower + ScriptEntry BattleFrontier_SignBattleHall + ScriptEntry BattleFrontier_SignBattleCastle + ScriptEntry BattleFrontier_SignBattleArcade + ScriptEntry BattleFrontier_SignBattleFactory + ScriptEntry BattleFrontier_StatueWest + ScriptEntry BattleFrontier_StatueEast + ScriptEntry BattleFrontier_ScaleModel + ScriptEntry BattleFrontier_TriggerEnterBattleHall + ScriptEntry BattleFrontier_TriggerEnterBattleCastle + ScriptEntry BattleFrontier_TriggerEnterBattleArcade + ScriptEntry BattleFrontier_TriggerEnterBattleFactory + ScriptEntry BattleFrontier_OnTransition ScriptEntryEnd -_009A: +BattleFrontier_OnTransition: SetFlag FLAG_HIDE_BATTLE_HALL_MAJOR_NPC CheckTVInterviewEligible TV_PROGRAM_SEGMENT_BATTLE_FRONTIER_FRONTLINE_NEWS_MULTI, VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, 0, _00D5 - ScrCmd_329 VAR_MAP_LOCAL_1, VAR_MAP_LOCAL_2, VAR_MAP_LOCAL_3, VAR_MAP_LOCAL_4 - SetObjectEventPos 29, VAR_MAP_LOCAL_1, VAR_MAP_LOCAL_2 - SetObjectEventDir 29, VAR_MAP_LOCAL_3 - SetObjectEventMovementType 29, VAR_MAP_LOCAL_4 - ClearFlag FLAG_UNK_0x02C3 + GoToIfEq VAR_MAP_LOCAL_0, FALSE, BattleFrontier_HideReporter + GetBattleFrontierReporterPosition VAR_MAP_LOCAL_1, VAR_MAP_LOCAL_2, VAR_MAP_LOCAL_3, VAR_MAP_LOCAL_4 + SetObjectEventPos LOCALID_REPORTER, VAR_MAP_LOCAL_1, VAR_MAP_LOCAL_2 + SetObjectEventDir LOCALID_REPORTER, VAR_MAP_LOCAL_3 + SetObjectEventMovementType LOCALID_REPORTER, VAR_MAP_LOCAL_4 + ClearFlag FLAG_HIDE_BATTLE_FRONTIER_REPORTER End -_00D5: - SetFlag FLAG_UNK_0x02C3 +BattleFrontier_HideReporter: + SetFlag FLAG_HIDE_BATTLE_FRONTIER_REPORTER End -_00DB: - NPCMessage 0 +BattleFrontier_NinjaBoy: + NPCMessage BattleFrontier_Text_HeightIsSymbolOfChallenge End -_00EE: - NPCMessage 1 +BattleFrontier_BlackBelt: + NPCMessage BattleFrontier_Text_TeamUpWithFriend End -_0101: - NPCMessage 2 +BattleFrontier_Idol: + NPCMessage BattleFrontier_Text_LearnAboutPokemon End -_0114: - NPCMessage 3 +BattleFrontier_AceTrainerSnowF: + NPCMessage BattleFrontier_Text_BattleWithWorldsBest End -_0127: - NPCMessage 4 +BattleFrontier_Twin: + NPCMessage BattleFrontier_Text_MostImportantIsLady End -_013A: - NPCMessage 5 +BattleFrontier_ParasolLady: + NPCMessage BattleFrontier_Text_PokemonAlwaysWithMe End -_014D: - NPCMessage 6 +BattleFrontier_ExpertM: + NPCMessage BattleFrontier_Text_StoryBehindEveryPokemon End -_0160: - NPCMessage 7 +BattleFrontier_ExpertF: + NPCMessage BattleFrontier_Text_BeenTogetherLongTime End -_0173: - NPCMessage 8 +BattleFrontier_Waitress: + NPCMessage BattleFrontier_Text_ExpectSoMuchFromMaid End -_0186: - NPCMessage 9 +BattleFrontier_Cowgirl: + NPCMessage BattleFrontier_Text_StrongIsWeak End -_0199: - NPCMessage 10 +BattleFrontier_Roughneck: + NPCMessage BattleFrontier_Text_ThoseWhoLoveBattling End -_01AC: - NPCMessage 11 +BattleFrontier_PokefanM: + NPCMessage BattleFrontier_Text_HowManyYears End -_01BF: - NPCMessage 12 +BattleFrontier_Collector: + NPCMessage BattleFrontier_Text_CommandInConfidence End -_01D2: - NPCMessage 13 +BattleFrontier_Gentleman: + NPCMessage BattleFrontier_Text_TreatEveryBattleAsLast End -_01E5: - NPCMessage 14 +BattleFrontier_AceTrainerM2: + NPCMessage BattleFrontier_Text_CantOverlookSingleDetail End -_01F8: - NPCMessage 15 +BattleFrontier_Picnicker: + NPCMessage BattleFrontier_Text_LookForWhoToBlame End -_020B: - NPCMessage 16 +BattleFrontier_PokemonBreederF: + NPCMessage BattleFrontier_Text_WinToChallengeTheBoss End -_021E: - NPCMessage 17 +BattleFrontier_AceTrainerM1: + NPCMessage BattleFrontier_Text_WayOfPokemonIsDeep End -_0231: - NPCMessage 18 +BattleFrontier_SchoolKidM: + NPCMessage BattleFrontier_Text_WinningWithRentalPokemon End -_0244: - NPCMessage 19 +BattleFrontier_Fisherman: + NPCMessage BattleFrontier_Text_MagikarpHasShotAtNo1 End -_0257: - NPCMessage 20 +BattleFrontier_TuberM: + NPCMessage BattleFrontier_Text_RideEbbsAndFlows End -_026A: +BattleFrontier_AttendantSouthwest: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 21 + Message BattleFrontier_Text_TradeBPForPrizes CloseMessageWithoutErasing PokeMartFrontier MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_DOWN ReleaseAll End -_027E: +BattleFrontier_Unused24: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer @@ -164,51 +165,51 @@ _027E: ReleaseAll End -_02A6: +BattleFrontier_AttendantSoutheast: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 23 + Message BattleFrontier_Text_TradeBPForPrizes2 CloseMessageWithoutErasing PokeMartFrontier MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_UP ReleaseAll End -_02BA: - ShowLandmarkSign 24 +BattleFrontier_SignBattleTower: + ShowLandmarkSign BattleFrontier_Text_SignBattleTower End -_02D1: - ShowLandmarkSign 25 +BattleFrontier_SignBattleHall: + ShowLandmarkSign BattleFrontier_Text_SignBattleHall End -_02E8: - ShowLandmarkSign 26 +BattleFrontier_SignBattleCastle: + ShowLandmarkSign BattleFrontier_Text_SignBattleCastle End -_02FF: - ShowLandmarkSign 27 +BattleFrontier_SignBattleArcade: + ShowLandmarkSign BattleFrontier_Text_SignBattleArcade End -_0316: - ShowLandmarkSign 28 +BattleFrontier_SignBattleFactory: + ShowLandmarkSign BattleFrontier_Text_SignBattleFactory End -_032D: - EventMessage 29 +BattleFrontier_StatueWest: + EventMessage BattleFrontier_Text_StatueRepresentsTrainer End -_033E: - EventMessage 30 +BattleFrontier_StatueEast: + EventMessage BattleFrontier_Text_TitleBoastfulOfCapture End -_034F: - EventMessage 31 +BattleFrontier_ScaleModel: + EventMessage BattleFrontier_Text_ScaleModelBattleFrontier End -_0360: +BattleFrontier_TriggerEnterBattleHall: LockAll - ApplyMovement LOCALID_PLAYER, _0398 + ApplyMovement LOCALID_PLAYER, BattleFrontier_Movement_PlayerEnterBattleHall WaitMovement PlaySE SEQ_SE_DP_KAIDAN2 FadeScreenOut @@ -219,13 +220,13 @@ _0360: End .balign 4, 0 -_0398: +BattleFrontier_Movement_PlayerEnterBattleHall: WalkFastWest 5 EndMovement -_03A0: +BattleFrontier_TriggerEnterBattleCastle: LockAll - ApplyMovement LOCALID_PLAYER, _03D8 + ApplyMovement LOCALID_PLAYER, BattleFrontier_Movement_PlayerEnterBattleCastle WaitMovement PlaySE SEQ_SE_DP_KAIDAN2 FadeScreenOut @@ -236,13 +237,13 @@ _03A0: End .balign 4, 0 -_03D8: +BattleFrontier_Movement_PlayerEnterBattleCastle: WalkFastWest 6 EndMovement -_03E0: +BattleFrontier_TriggerEnterBattleArcade: LockAll - ApplyMovement LOCALID_PLAYER, _0418 + ApplyMovement LOCALID_PLAYER, BattleFrontier_Movement_PlayerEnterBattleArcade WaitMovement PlaySE SEQ_SE_DP_KAIDAN2 FadeScreenOut @@ -253,13 +254,13 @@ _03E0: End .balign 4, 0 -_0418: +BattleFrontier_Movement_PlayerEnterBattleArcade: WalkFastEast 5 EndMovement -_0420: +BattleFrontier_TriggerEnterBattleFactory: LockAll - ApplyMovement LOCALID_PLAYER, _0458 + ApplyMovement LOCALID_PLAYER, BattleFrontier_Movement_PlayerEnterBattleFactory WaitMovement PlaySE SEQ_SE_DP_KAIDAN2 FadeScreenOut @@ -270,11 +271,11 @@ _0420: End .balign 4, 0 -_0458: +BattleFrontier_Movement_PlayerEnterBattleFactory: WalkFastEast 6 EndMovement -_0460: +BattleFrontier_Unused1: End .balign 4, 0 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 d40198a0de..badf6e6c26 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 @@ -1,295 +1,296 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_frontier_gate_to_fight_area.h" +#include "res/field/events/events_battle_frontier_gate_to_fight_area.h" - ScriptEntry _0038 - ScriptEntry _007C - ScriptEntry _0154 - ScriptEntry _019D - ScriptEntry _01E6 - ScriptEntry _022F - ScriptEntry _0278 - ScriptEntry _0358 - ScriptEntry _036B - ScriptEntry _037E - ScriptEntry _0391 - ScriptEntry _0032 + ScriptEntry BattleFrontierGateToFightArea_OnFrameFirstEntry + ScriptEntry BattleFrontierGateToFightArea_AttendantGeneral + ScriptEntry BattleFrontierGateToFightArea_AttendantBattleTower + ScriptEntry BattleFrontierGateToFightArea_AttendantBattleFactory + ScriptEntry BattleFrontierGateToFightArea_AttendantBattleHall + ScriptEntry BattleFrontierGateToFightArea_AttendantBattleCastle + ScriptEntry BattleFrontierGateToFightArea_AttendantBattleArcade + ScriptEntry BattleFrontierGateToFightArea_RuinManiac + ScriptEntry BattleFrontierGateToFightArea_ExpertM + ScriptEntry BattleFrontierGateToFightArea_PokemonBreederM + ScriptEntry BattleFrontierGateToFightArea_Beauty + ScriptEntry BattleFrontierGateToFightArea_OnTransition ScriptEntryEnd -_0032: +BattleFrontierGateToFightArea_OnTransition: SetFlag FLAG_FIRST_ARRIVAL_BATTLE_PARK End -_0038: +BattleFrontierGateToFightArea_OnFrameFirstEntry: LockAll - SetVar VAR_UNK_0x4113, 1 + SetVar VAR_BATTLE_FRONTIER_GATE_TO_FIGHT_AREA_STATE, 1 SetFlag FLAG_HIDE_JUBILIFE_TV_3F_GLOBAL_RANKING_ROOM_WORKER SetFlag FLAG_HIDE_JUBILIFE_TV_3F_GROUP_RANKING_ROOM_WORKER - Call _02C1 - Message 0 + Call BattleFrontierGateToFightArea_AttendantsFaceSouth + Message BattleFrontierGateToFightArea_Text_RightThisWay CloseMessage - Call _02F5 - Message 1 + Call BattleFrontierGateToFightArea_PlayerWalkToAttendant + Message BattleFrontierGateToFightArea_Text_BorrowVsRecorder BufferPlayerName 0 PlayFanfare SEQ_FANFA4 - Message 2 + Message BattleFrontierGateToFightArea_Text_VsRecorderWasUpgraded WaitFanfare - Message 3 - Call _0095 - Message 10 + Message BattleFrontierGateToFightArea_Text_AnyQuestions + Call BattleFrontierGateToFightArea_QuestionsMenu + Message BattleFrontierGateToFightArea_Text_EnjoyYourVisit WaitButton CloseMessage ReleaseAll End -_007C: +BattleFrontierGateToFightArea_AttendantGeneral: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 4 - Call _0095 - GoTo _0103 + Message BattleFrontierGateToFightArea_Text_ExplainWhichTopic + Call BattleFrontierGateToFightArea_QuestionsMenu + GoTo BattleFrontierGateToFightArea_EnjoyYourVisit End -_0095: +BattleFrontierGateToFightArea_QuestionsMenu: InitLocalTextMenu 31, 5, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm 11, 0 - AddMenuEntryImm 16, 1 - AddMenuEntryImm 12, 2 - AddMenuEntryImm 13, 3 - AddMenuEntryImm 14, 4 - AddMenuEntryImm 15, 5 + AddMenuEntryImm BattleFrontierGateToFightArea_Text_BattleFrontier, 0 + AddMenuEntryImm BattleFrontierGateToFightArea_Text_BasicRules, 1 + AddMenuEntryImm BattleFrontierGateToFightArea_Text_BattlePoints, 2 + AddMenuEntryImm BattleFrontierGateToFightArea_Text_ExchangeServiceCorner, 3 + AddMenuEntryImm BattleFrontierGateToFightArea_Text_PerformanceMonitor, 4 + AddMenuEntryImm BattleFrontierGateToFightArea_Text_Exit, 5 ShowMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _010E - GoToIfEq VAR_0x8008, 1, _0146 - GoToIfEq VAR_0x8008, 2, _011C - GoToIfEq VAR_0x8008, 3, _012A - GoToIfEq VAR_0x8008, 4, _0138 + GoToIfEq VAR_0x8008, 0, BattleFrontierGateToFightArea_ExplainBattleFrontier + GoToIfEq VAR_0x8008, 1, BattleFrontierGateToFightArea_ExplainBasicRules + GoToIfEq VAR_0x8008, 2, BattleFrontierGateToFightArea_ExplainBattlePoints + GoToIfEq VAR_0x8008, 3, BattleFrontierGateToFightArea_ExplainExchangeServiceCorner + GoToIfEq VAR_0x8008, 4, BattleFrontierGateToFightArea_ExplainPerformanceMonitor Return -_0103: - Message 10 +BattleFrontierGateToFightArea_EnjoyYourVisit: + Message BattleFrontierGateToFightArea_Text_EnjoyYourVisit WaitButton CloseMessage ReleaseAll End -_010E: - Message 5 - Message 4 - GoTo _0095 +BattleFrontierGateToFightArea_ExplainBattleFrontier: + Message BattleFrontierGateToFightArea_Text_ExplainBattleFrontier + Message BattleFrontierGateToFightArea_Text_ExplainWhichTopic + GoTo BattleFrontierGateToFightArea_QuestionsMenu End -_011C: - Message 7 - Message 4 - GoTo _0095 +BattleFrontierGateToFightArea_ExplainBattlePoints: + Message BattleFrontierGateToFightArea_Text_ExplainBattlePoints + Message BattleFrontierGateToFightArea_Text_ExplainWhichTopic + GoTo BattleFrontierGateToFightArea_QuestionsMenu End -_012A: - Message 8 - Message 4 - GoTo _0095 +BattleFrontierGateToFightArea_ExplainExchangeServiceCorner: + Message BattleFrontierGateToFightArea_Text_ExplainExchangeServiceCorner + Message BattleFrontierGateToFightArea_Text_ExplainWhichTopic + GoTo BattleFrontierGateToFightArea_QuestionsMenu End -_0138: - Message 9 - Message 4 - GoTo _0095 +BattleFrontierGateToFightArea_ExplainPerformanceMonitor: + Message BattleFrontierGateToFightArea_Text_ExplainPerformanceMonitor + Message BattleFrontierGateToFightArea_Text_ExplainWhichTopic + GoTo BattleFrontierGateToFightArea_QuestionsMenu End -_0146: - Message 6 - Message 4 - GoTo _0095 +BattleFrontierGateToFightArea_ExplainBasicRules: + Message BattleFrontierGateToFightArea_Text_ExplainBasicRules + Message BattleFrontierGateToFightArea_Text_ExplainWhichTopic + GoTo BattleFrontierGateToFightArea_QuestionsMenu End -_0154: +BattleFrontierGateToFightArea_AttendantBattleTower: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 17 + Message BattleFrontierGateToFightArea_Text_ShouldIExplainBattleTower ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _017F - GoToIfEq VAR_RESULT, MENU_NO, _018A + GoToIfEq VAR_RESULT, MENU_YES, BattleFrontierGateToFightArea_ExplainBattleTower + GoToIfEq VAR_RESULT, MENU_NO, BattleFrontierGateToFightArea_EnjoyVisitBattleTower End -_017F: - Message 18 - GoTo _018A +BattleFrontierGateToFightArea_ExplainBattleTower: + Message BattleFrontierGateToFightArea_Text_ExplainBattleTower + GoTo BattleFrontierGateToFightArea_EnjoyVisitBattleTower End -_018A: - Message 19 - GoTo _0195 +BattleFrontierGateToFightArea_EnjoyVisitBattleTower: + Message BattleFrontierGateToFightArea_Text_EnjoyVisitBattleTower + GoTo BattleFrontierGateToFightArea_AttendantBattleTowerEnd End -_0195: +BattleFrontierGateToFightArea_AttendantBattleTowerEnd: WaitButton CloseMessage ReleaseAll End -_019D: +BattleFrontierGateToFightArea_AttendantBattleFactory: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 20 + Message BattleFrontierGateToFightArea_Text_ShouldIExplainBattleFactory ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _01C8 - GoToIfEq VAR_RESULT, MENU_NO, _01D3 + GoToIfEq VAR_RESULT, MENU_YES, BattleFrontierGateToFightArea_ExplainBattleFactory + GoToIfEq VAR_RESULT, MENU_NO, BattleFrontierGateToFightArea_EnjoyVisitBattleFactory End -_01C8: - Message 21 - GoTo _01D3 +BattleFrontierGateToFightArea_ExplainBattleFactory: + Message BattleFrontierGateToFightArea_Text_ExplainBattleFactory + GoTo BattleFrontierGateToFightArea_EnjoyVisitBattleFactory End -_01D3: - Message 22 - GoTo _01DE +BattleFrontierGateToFightArea_EnjoyVisitBattleFactory: + Message BattleFrontierGateToFightArea_Text_EnjoyVisitBattleFactory + GoTo BattleFrontierGateToFightArea_AttendantBattleFactoryEnd End -_01DE: +BattleFrontierGateToFightArea_AttendantBattleFactoryEnd: WaitButton CloseMessage ReleaseAll End -_01E6: +BattleFrontierGateToFightArea_AttendantBattleHall: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 23 + Message BattleFrontierGateToFightArea_Text_ShouldIExplainBattleHall ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _0211 - GoToIfEq VAR_RESULT, MENU_NO, _021C + GoToIfEq VAR_RESULT, MENU_YES, BattleFrontierGateToFightArea_ExplainBattleHall + GoToIfEq VAR_RESULT, MENU_NO, BattleFrontierGateToFightArea_EnjoyVisitBattleHall End -_0211: - Message 24 - GoTo _021C +BattleFrontierGateToFightArea_ExplainBattleHall: + Message BattleFrontierGateToFightArea_Text_ExplainBattleHall + GoTo BattleFrontierGateToFightArea_EnjoyVisitBattleHall End -_021C: - Message 25 - GoTo _0227 +BattleFrontierGateToFightArea_EnjoyVisitBattleHall: + Message BattleFrontierGateToFightArea_Text_EnjoyVisitBattleHall + GoTo BattleFrontierGateToFightArea_AttendantBattleHallEnd End -_0227: +BattleFrontierGateToFightArea_AttendantBattleHallEnd: WaitButton CloseMessage ReleaseAll End -_022F: +BattleFrontierGateToFightArea_AttendantBattleCastle: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 26 + Message BattleFrontierGateToFightArea_Text_ShouldIExplainBattleCastle ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _025A - GoToIfEq VAR_RESULT, MENU_NO, _0265 + GoToIfEq VAR_RESULT, MENU_YES, BattleFrontierGateToFightArea_ExplainBattleCastle + GoToIfEq VAR_RESULT, MENU_NO, BattleFrontierGateToFightArea_EnjoyVisitBattleCastle End -_025A: - Message 27 - GoTo _0265 +BattleFrontierGateToFightArea_ExplainBattleCastle: + Message BattleFrontierGateToFightArea_Text_ExplainBattleCastle + GoTo BattleFrontierGateToFightArea_EnjoyVisitBattleCastle End -_0265: - Message 28 - GoTo _0270 +BattleFrontierGateToFightArea_EnjoyVisitBattleCastle: + Message BattleFrontierGateToFightArea_Text_EnjoyVisitBattleCastle + GoTo BattleFrontierGateToFightArea_AttendantBattleCastleEnd End -_0270: +BattleFrontierGateToFightArea_AttendantBattleCastleEnd: WaitButton CloseMessage ReleaseAll End -_0278: +BattleFrontierGateToFightArea_AttendantBattleArcade: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 29 + Message BattleFrontierGateToFightArea_Text_ShouldIExplainBattleArcade ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _02A3 - GoToIfEq VAR_RESULT, MENU_NO, _02AE + GoToIfEq VAR_RESULT, MENU_YES, BattleFrontierGateToFightArea_ExplainBattleArcade + GoToIfEq VAR_RESULT, MENU_NO, BattleFrontierGateToFightArea_EnjoyVisitBattleArcade End -_02A3: - Message 30 - GoTo _02AE +BattleFrontierGateToFightArea_ExplainBattleArcade: + Message BattleFrontierGateToFightArea_Text_ExplainBattleArcade + GoTo BattleFrontierGateToFightArea_EnjoyVisitBattleArcade End -_02AE: - Message 31 - GoTo _02B9 +BattleFrontierGateToFightArea_EnjoyVisitBattleArcade: + Message BattleFrontierGateToFightArea_Text_EnjoyVisitBattleArcade + GoTo BattleFrontierGateToFightArea_AttendantBattleArcadeEnd End -_02B9: +BattleFrontierGateToFightArea_AttendantBattleArcadeEnd: WaitButton CloseMessage ReleaseAll End -_02C1: - ApplyMovement 3, _0334 - ApplyMovement 4, _0334 - ApplyMovement 5, _0334 - ApplyMovement 6, _0334 - ApplyMovement 7, _0334 - ApplyMovement 8, _0334 +BattleFrontierGateToFightArea_AttendantsFaceSouth: + ApplyMovement LOCALID_ATTENDANT_BATTLE_CASTLE, BattleFrontierGateToFightArea_Movement_AttendantFaceSouth + ApplyMovement LOCALID_ATTENDANT_BATTLE_FACTORY, BattleFrontierGateToFightArea_Movement_AttendantFaceSouth + ApplyMovement LOCALID_ATTENDANT_GENERAL, BattleFrontierGateToFightArea_Movement_AttendantFaceSouth + ApplyMovement LOCALID_ATTENDANT_BATTLE_ARCADE, BattleFrontierGateToFightArea_Movement_AttendantFaceSouth + ApplyMovement LOCALID_ATTENDANT_BATTLE_HALL, BattleFrontierGateToFightArea_Movement_AttendantFaceSouth + ApplyMovement LOCALID_ATTENDANT_BATTLE_TOWER, BattleFrontierGateToFightArea_Movement_AttendantFaceSouth WaitMovement Return -_02F5: - ApplyMovement 3, _033C - ApplyMovement 4, _033C - ApplyMovement 5, _033C - ApplyMovement 6, _0344 - ApplyMovement 7, _0344 - ApplyMovement 8, _0344 - ApplyMovement LOCALID_PLAYER, _034C +BattleFrontierGateToFightArea_PlayerWalkToAttendant: + ApplyMovement LOCALID_ATTENDANT_BATTLE_CASTLE, BattleFrontierGateToFightArea_Movement_AttendantFaceEast + ApplyMovement LOCALID_ATTENDANT_BATTLE_FACTORY, BattleFrontierGateToFightArea_Movement_AttendantFaceEast + ApplyMovement LOCALID_ATTENDANT_GENERAL, BattleFrontierGateToFightArea_Movement_AttendantFaceEast + ApplyMovement LOCALID_ATTENDANT_BATTLE_ARCADE, BattleFrontierGateToFightArea_Movement_AttendantFaceWest + ApplyMovement LOCALID_ATTENDANT_BATTLE_HALL, BattleFrontierGateToFightArea_Movement_AttendantFaceWest + ApplyMovement LOCALID_ATTENDANT_BATTLE_TOWER, BattleFrontierGateToFightArea_Movement_AttendantFaceWest + ApplyMovement LOCALID_PLAYER, BattleFrontierGateToFightArea_Movement_PlayerWalkToAttendant WaitMovement Return .balign 4, 0 -_0334: +BattleFrontierGateToFightArea_Movement_AttendantFaceSouth: FaceSouth EndMovement .balign 4, 0 -_033C: +BattleFrontierGateToFightArea_Movement_AttendantFaceEast: FaceEast EndMovement .balign 4, 0 -_0344: +BattleFrontierGateToFightArea_Movement_AttendantFaceWest: FaceWest EndMovement .balign 4, 0 -_034C: +BattleFrontierGateToFightArea_Movement_PlayerWalkToAttendant: WalkNormalNorth 3 WalkOnSpotNormalWest EndMovement -_0358: - NPCMessage 32 +BattleFrontierGateToFightArea_RuinManiac: + NPCMessage BattleFrontierGateToFightArea_Text_FrontierUpAhead End -_036B: - NPCMessage 33 +BattleFrontierGateToFightArea_ExpertM: + NPCMessage BattleFrontierGateToFightArea_Text_NoAcronymFacilities End -_037E: - NPCMessage 34 +BattleFrontierGateToFightArea_PokemonBreederM: + NPCMessage BattleFrontierGateToFightArea_Text_VsRecorderIsNifty End -_0391: - NPCMessage 35 +BattleFrontierGateToFightArea_Beauty: + NPCMessage BattleFrontierGateToFightArea_Text_DreamToBattlePalmer End diff --git a/res/field/scripts/scripts_battle_hall.s b/res/field/scripts/scripts_battle_hall.s index b967a49965..362e4debb3 100644 --- a/res/field/scripts/scripts_battle_hall.s +++ b/res/field/scripts/scripts_battle_hall.s @@ -6,10 +6,10 @@ ScriptEntry BattleHall_SingleAttendant - ScriptEntry BattleHall_ResumeChallenge - ScriptEntry BattleHall_DidntSaveBeforeQuit - ScriptEntry BattleHall_ChallengeEndedBPEarned - ScriptEntry BattleHall_ChallengeEnded + ScriptEntry BattleHall_OnFrameResumeChallenge + ScriptEntry BattleHall_OnFrameDidntSaveBeforeQuit + ScriptEntry BattleHall_OnFrameChallengeEndedCompletedRound + ScriptEntry BattleHall_OnFrameChallengeEnded ScriptEntry BattleHall_MultiAttendant ScriptEntry BattleHall_Hiker ScriptEntry BattleHall_SnowpointNPC @@ -53,7 +53,7 @@ BattleHall_UpdateConditionalNPCs: Call BattleHall_UpdateReporter GetRandom VAR_MAP_LOCAL_7, 100 CallIfUnset FLAG_HIDE_BATTLE_HALL_MAJOR_NPC, BattleHall_HideMajorNPC - GoToIfLt VAR_MAP_LOCAL_7, 30, _00E5 + GoToIfLt VAR_MAP_LOCAL_7, 30, BattleHall_TryPickMajorNPC End BattleHall_HideMajorNPC: @@ -61,12 +61,12 @@ BattleHall_HideMajorNPC: SetFlag FLAG_HIDE_BATTLE_HALL_MAJOR_NPC Return -_00E5: - GoToIfUnset FLAG_UNK_0x0AC4, BattleHall_PickMajorNPC +BattleHall_TryPickMajorNPC: + GoToIfUnset FLAG_SET_BATTLE_HALL_MAJOR_NPC, BattleHall_PickMajorNPC End BattleHall_PickMajorNPC: - SetFlag FLAG_UNK_0x0AC4 + SetFlag FLAG_SET_BATTLE_HALL_MAJOR_NPC GetBattleHallTotalSinglesRecord VAR_MAP_LOCAL_8 GoToIfGe VAR_MAP_LOCAL_8, 10000, BattleHall_PickMajorNPCAfter10000Record GoToIfGe VAR_MAP_LOCAL_8, 1000, BattleHall_PickMajorNPCAfter1000Record @@ -95,22 +95,22 @@ BattleHall_ShowMajorNPC: End BattleHall_UpdateReporter: - CallIfUnset FLAG_BATTLE_HALL_HIDE_REPORTER, BattleHall_HideReporter + CallIfUnset FLAG_HIDE_BATTLE_HALL_REPORTER, BattleHall_RemoveReporter CheckTVInterviewEligible TV_PROGRAM_SEGMENT_BATTLE_FRONTIER_FRONTLINE_NEWS_SINGLE, VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, 0, BattleHall_SetHideReporterFlag + GoToIfEq VAR_MAP_LOCAL_0, FALSE, BattleHall_HideReporter ScrCmd_32A VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, 0, BattleHall_SetHideReporterFlag - ClearFlag FLAG_BATTLE_HALL_HIDE_REPORTER + GoToIfEq VAR_MAP_LOCAL_0, 0, BattleHall_HideReporter + ClearFlag FLAG_HIDE_BATTLE_HALL_REPORTER AddObject LOCALID_REPORTER Return -BattleHall_SetHideReporterFlag: - SetFlag FLAG_BATTLE_HALL_HIDE_REPORTER +BattleHall_HideReporter: + SetFlag FLAG_HIDE_BATTLE_HALL_REPORTER Return -BattleHall_HideReporter: +BattleHall_RemoveReporter: RemoveObject LOCALID_REPORTER - SetFlag FLAG_BATTLE_HALL_HIDE_REPORTER + SetFlag FLAG_HIDE_BATTLE_HALL_REPORTER Return BattleHall_OnTransition: @@ -119,7 +119,7 @@ BattleHall_OnTransition: CallIfEq VAR_MAP_LOCAL_0, GENDER_FEMALE, BattleHall_SetWinstonAsFan Call BattleHall_UpdateMajorNPC_GFX CheckTVInterviewEligible TV_PROGRAM_SEGMENT_BATTLE_FRONTIER_FRONTLINE_NEWS_SINGLE, VAR_MAP_LOCAL_0 - CallIfEq VAR_MAP_LOCAL_0, 0, BattleHall_SetHideReporterFlag + CallIfEq VAR_MAP_LOCAL_0, 0, BattleHall_HideReporter End BattleHall_UpdateMajorNPC_GFX: @@ -169,7 +169,7 @@ BattleHall_SingleAttendant: FacePlayer SetVar VAR_MAP_LOCAL_3, 0 SetVar VAR_MAP_LOCAL_4, 0 - GoTo BattleHall_PrintBattleHallWelcome + GoTo BattleHall_WelcomeToChallenge End BattleHall_MultiAttendant: @@ -178,40 +178,40 @@ BattleHall_MultiAttendant: FacePlayer SetVar VAR_MAP_LOCAL_3, 0 SetVar VAR_MAP_LOCAL_4, 1 - GoTo BattleHall_PrintBattleHallWelcome + GoTo BattleHall_WelcomeToChallenge End -BattleHall_PrintBattleHallWelcome: +BattleHall_WelcomeToChallenge: RecordHeapMemory - CallIfEq VAR_MAP_LOCAL_4, 0, BattleHall_PrintSingleChallengeWelcome - CallIfEq VAR_MAP_LOCAL_4, 1, BattleHall_PrintMultiChallengeWelcome - GoTo BattleHall_ShowChallengeSelectionMenu + CallIfEq VAR_MAP_LOCAL_4, 0, BattleHall_WelcomeToSingleDoubleChallenge + CallIfEq VAR_MAP_LOCAL_4, 1, BattleHall_WelcomeToMultiChallenge + GoTo BattleHall_SelectChallenge End -BattleHall_ShowChallengeSelectionMenu: - CallIfEq VAR_MAP_LOCAL_4, 0, BattleHall_GenerateSingleChallengeMenu - CallIfEq VAR_MAP_LOCAL_4, 1, BattleHall_GenerateMultiChallengeMenu +BattleHall_SelectChallenge: + CallIfEq VAR_MAP_LOCAL_4, 0, BattleHall_InitMenuSingleDoubleChallenge + CallIfEq VAR_MAP_LOCAL_4, 1, BattleHall_InitMenuMultiChallenge AddMenuEntryImm BattleHall_Text_Info, 2 AddMenuEntryImm BattleHall_Text_Cancel, 3 ShowMenu - GoToIfEq VAR_RESULT, 0, BattleHall_CheckSingleBattleEligibility - GoToIfEq VAR_RESULT, 1, BattleHall_CheckDoubleBattleEligibility - GoToIfEq VAR_RESULT, 2, BattleHall_PrintChallengeInfo - GoToIfEq VAR_RESULT, 4, BattleHall_CheckMultiBattleEligibility + GoToIfEq VAR_RESULT, 0, BattleHall_TryTakeSingleChallenge + GoToIfEq VAR_RESULT, 1, BattleHall_TryTakeDoubleChallenge + GoToIfEq VAR_RESULT, 2, BattleHall_ExplainChallenge + GoToIfEq VAR_RESULT, 4, BattleHall_TryTakeMultiChallenge GoTo BattleHall_EndChallenge End -BattleHall_PrintChallengeInfo: - CallIfEq VAR_MAP_LOCAL_4, 0, BattleHall_PrintSingleChallengeInfo - CallIfEq VAR_MAP_LOCAL_4, 1, BattleHall_PrintMultiChallengeInfo - GoTo BattleHall_ShowChallengeSelectionMenu +BattleHall_ExplainChallenge: + CallIfEq VAR_MAP_LOCAL_4, 0, BattleHall_ExplainSingleDoubleChallenge + CallIfEq VAR_MAP_LOCAL_4, 1, BattleHall_ExplainMultiChallenge + GoTo BattleHall_SelectChallenge End BattleHall_EndChallenge: - GoTo _0355 + GoTo BattleHall_HopeToSeeYouAgain End -_0355: +BattleHall_HopeToSeeYouAgain: SetVar VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 0 Message BattleHall_Text_HopeToSeeYouAgain WaitButton @@ -219,40 +219,40 @@ _0355: ReleaseAll End -BattleHall_CheckSingleBattleEligibility: +BattleHall_TryTakeSingleChallenge: SetVar VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE ScrCmd_2CC 0, 1, VAR_RESULT GoToIfEq VAR_RESULT, 0, BattleHall_PrintEligbilityRuleOnePokemon - GoTo BattleHall_SelectPokemonForChallenge + GoTo BattleHall_SelectPokemon End -BattleHall_CheckDoubleBattleEligibility: +BattleHall_TryTakeDoubleChallenge: SetVar VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE ScrCmd_2CC 0, 2, VAR_RESULT GoToIfEq VAR_RESULT, 0, BattleHall_PrintEligbilityRulesForTwoPokemon - GoTo BattleHall_SelectPokemonForChallenge + GoTo BattleHall_SelectPokemon End -BattleHall_CheckMultiBattleEligibility: +BattleHall_TryTakeMultiChallenge: SetVar VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI ScrCmd_2CC 0, 1, VAR_RESULT GoToIfEq VAR_RESULT, 0, BattleHall_PrintEligbilityRuleOnePokemon - GoTo BattleHall_SelectPokemonForChallenge + GoTo BattleHall_SelectPokemon End BattleHall_PrintEligbilityRuleOnePokemon: Message BattleHall_Text_NeedOneLvl30Pokemon - MessageSeenBanlistSpecies BattleHall_Text_BanList, 1 + MessageSeenBanlistSpecies BattleHall_Text_Banlist, 1 GoTo BattleHall_EndChallenge End BattleHall_PrintEligbilityRulesForTwoPokemon: Message BattleHall_Text_NeedTwoLvl30Pokemon - MessageSeenBanlistSpecies BattleHall_Text_BanList, 2 + MessageSeenBanlistSpecies BattleHall_Text_Banlist, 2 GoTo BattleHall_EndChallenge End -BattleHall_SelectPokemonForChallenge: +BattleHall_SelectPokemon: Message BattleHall_Text_ChoosePokemonToEnter CloseMessage FadeScreenOut @@ -270,14 +270,14 @@ BattleHall_SelectPokemonForChallenge: GetPartyMonSpecies VAR_MAP_LOCAL_2, VAR_MAP_LOCAL_1 GoToIfEq VAR_MAP_LOCAL_1, 0, BattleHall_EndChallenge ScrCmd_2CC 1, VAR_BATTLE_HALL_CHALLENGE_TYPE, VAR_RESULT - GoToIfEq VAR_RESULT, 0, BattleHall_HealAndSaveBeforeChallenge + GoToIfEq VAR_RESULT, 0, BattleHall_TryStartSingleDoubleChallenge ScrCmd_2CC 2, VAR_BATTLE_HALL_CHALLENGE_TYPE, VAR_RESULT BufferSpeciesNameFromVar 0, VAR_RESULT, 0, 0 - GoToIfEq VAR_RESULT, VAR_MAP_LOCAL_1, BattleHall_HealAndSaveBeforeChallenge - GoTo BattleHall_TryToDeleteOngoingStreak + GoToIfEq VAR_RESULT, VAR_MAP_LOCAL_1, BattleHall_TryStartSingleDoubleChallenge + GoTo BattleHall_AskDeleteOngoingStreak End -BattleHall_TryToDeleteOngoingStreak: +BattleHall_AskDeleteOngoingStreak: BufferSpeciesNameFromVar 1, VAR_MAP_LOCAL_1, 0, 0 Message BattleHall_Text_DeleteOngoingStreak InitGlobalTextListMenu 25, 13, 1, VAR_RESULT @@ -291,43 +291,43 @@ BattleHall_TryToDeleteOngoingStreak: BattleHall_DeleteOngoingStreak: ScrCmd_2CC 3, VAR_BATTLE_HALL_CHALLENGE_TYPE, VAR_RESULT + GoTo BattleHall_TryStartSingleDoubleChallenge + End + +BattleHall_TryStartSingleDoubleChallenge: GoTo BattleHall_HealAndSaveBeforeChallenge End BattleHall_HealAndSaveBeforeChallenge: - GoTo _04FC - End - -_04FC: - CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleHall_SetChallengeAsInProgress - CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleHall_SetChallengeAsInProgress + CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleHall_SetChallengeInProgress + CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleHall_SetChallengeInProgress SetVar VAR_MAP_LOCAL_0, 0 HealParty Common_SaveGame SetVar VAR_RESULT, VAR_MAP_LOCAL_0 GoToIfEq VAR_RESULT, 0, BattleHall_EndChallenge - GoToIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleHall_StartWifiCommunication + GoToIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleHall_BecomeLeaderOrJoinGroup GoTo BattleHall_WalkIntoCorridor End -BattleHall_StartWifiCommunication: +BattleHall_BecomeLeaderOrJoinGroup: Message BattleHall_Text_BecomeLeaderOrJoinGroup InitGlobalTextMenu 30, 1, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm MenuEntries_Text_BattleTower_JoinGroup, 0 - AddMenuEntryImm MenuEntries_Text_BattleTower_BecomeLeader, 1 + AddMenuEntryImm MenuEntries_Text_JoinGroup, 0 + AddMenuEntryImm MenuEntries_Text_BecomeLeader, 1 AddMenuEntryImm MenuEntries_Text_Exit, 2 ShowMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, BattleHall_LaunchWifiToJoinGroup - GoToIfEq VAR_0x8008, 1, BattleHall_LaunchWifiToBecomeLeader + GoToIfEq VAR_0x8008, 0, BattleHall_LaunchWiFiToJoinGroup + GoToIfEq VAR_0x8008, 1, BattleHall_LaunchWiFiToBecomeLeader GoTo BattleHall_EndChallenge End -BattleHall_LaunchWifiToJoinGroup: - Message BattleHall_Text_NeedToLaunchWifiComm +BattleHall_LaunchWiFiToJoinGroup: + Message BattleHall_Text_NeedToLaunchWiFiComm ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, BattleHall_StartWifiCommunication + GoToIfEq VAR_RESULT, MENU_NO, BattleHall_BecomeLeaderOrJoinGroup CloseMessage StartBattleClient 30, 0, 0, VAR_RESULT GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, BattleHall_CancelJoiningGroup @@ -336,18 +336,18 @@ BattleHall_LaunchWifiToJoinGroup: End BattleHall_CancelJoiningGroup: - GoTo BattleHall_StartWifiCommunication + GoTo BattleHall_BecomeLeaderOrJoinGroup End BattleHall_ErrorJoiningGroup: EndCommunication - GoTo BattleHall_StartWifiCommunication + GoTo BattleHall_BecomeLeaderOrJoinGroup End -BattleHall_LaunchWifiToBecomeLeader: - Message BattleHall_Text_NeedToLaunchWifiComm +BattleHall_LaunchWiFiToBecomeLeader: + Message BattleHall_Text_NeedToLaunchWiFiComm ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, BattleHall_StartWifiCommunication + GoToIfEq VAR_RESULT, MENU_NO, BattleHall_BecomeLeaderOrJoinGroup CloseMessage StartBattleServer 30, 0, 0, VAR_RESULT GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, BattleHall_CancelBecomingLeader @@ -356,114 +356,114 @@ BattleHall_LaunchWifiToBecomeLeader: End BattleHall_CancelBecomingLeader: - GoTo BattleHall_StartWifiCommunication + GoTo BattleHall_BecomeLeaderOrJoinGroup End BattleHall_ErrorBecomingLeader: EndCommunication - GoTo BattleHall_StartWifiCommunication + GoTo BattleHall_BecomeLeaderOrJoinGroup End BattleHall_StartMultiChallenge: ClearReceivedTempDataAllPlayers ScrCmd_135 108 - BattleHallCheckUsingSameSpeciesAsPartner VAR_MAP_LOCAL_1, VAR_RESULT - GoToIfEq VAR_RESULT, 1, BattleHall_MultiChallengeMustUseSamePokemon + CheckBattleHallPartnerUsesDifferentSpecies VAR_MAP_LOCAL_1, VAR_RESULT + GoToIfEq VAR_RESULT, TRUE, BattleHall_MultiChallengeMustUseSamePokemon ClearReceivedTempDataAllPlayers ScrCmd_135 110 Message BattleHall_Text_MustSaveFirst - CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleHall_SetChallengeAsInProgress + CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleHall_SetChallengeInProgress Call BattleHall_SaveGame GoTo BattleHall_WalkIntoCorridor End -BattleHall_SetChallengeAsInProgress: +BattleHall_SetChallengeInProgress: SetVar VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 0xFF Return BattleHall_MultiChallengeMustUseSamePokemon: - Call _068C + Call BattleHall_EndCommunicationDifferentPokemon Message BattleHall_Text_MultiChallengeMustUseSamePokemon GoTo BattleHall_EndChallenge End -_068C: +BattleHall_EndCommunicationDifferentPokemon: EndCommunication Return BattleHall_WalkIntoCorridor: - CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleHall_WalkToStartSingleBattle - CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleHall_WalkToStartDoubleBattle - CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleHall_WalkToStartMultiBattle + CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleHall_WalkToCorridorSingleChallenge + CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleHall_WalkToCorridorDoubleChallenge + CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleHall_WalkToCorridorMultiChallenge PlaySE SEQ_SE_DP_KAIDAN2 - GoTo BattleHall_SetupAndRunFrontierScript + GoTo BattleHall_StartChallenge End -BattleHall_SetupAndRunFrontierScript: +BattleHall_StartChallenge: FadeScreenOut WaitFadeScreen - CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, _078C - CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, _07A0 - CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _07B4 - IncrementGameRecord RECORD_UNK_058 + CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleHall_WalkBackInvisiblySingleChallenge + CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleHall_WalkBackInvisiblyDoubleChallenge + CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleHall_WalkBackInvisiblyMultiChallenge + IncrementGameRecord RECORD_TIMES_STARTED_BATTLE_FRONTIER_CHALLENGE CreateJournalEvent LOCATION_EVENT_BATTLE_HALL, 0, 0, 0, 0 WaitForTransition ScrCmd_2C4 9 - CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, _072C + CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleHall_EndCommunication ReturnToField FadeScreenIn WaitFadeScreen AssertHeapMemory End -_072C: +BattleHall_EndCommunication: EndCommunication Return -BattleHall_WalkToStartSingleBattle: +BattleHall_WalkToCorridorSingleChallenge: Message BattleHall_Text_ThisWayPlease WaitABPress CloseMessage - ApplyMovement LOCALID_PLAYER, Movement_PlayerStartChallenge - ApplyMovement VAR_LAST_TALKED, Movement_AttendantStartChallenge + ApplyMovement LOCALID_PLAYER, BattleHall_Movement_PlayerWalkToCorridorSingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleHall_Movement_AttendantWalkToCorridorSingleDoubleChallenge WaitMovement Return -BattleHall_WalkToStartDoubleBattle: +BattleHall_WalkToCorridorDoubleChallenge: Message BattleHall_Text_ThisWayPlease WaitABPress CloseMessage - ApplyMovement LOCALID_PLAYER, Movement_PlayerStartChallenge - ApplyMovement VAR_LAST_TALKED, Movement_AttendantStartChallenge + ApplyMovement LOCALID_PLAYER, BattleHall_Movement_PlayerWalkToCorridorSingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleHall_Movement_AttendantWalkToCorridorSingleDoubleChallenge WaitMovement Return -BattleHall_WalkToStartMultiBattle: - MessageNoSkip 9 +BattleHall_WalkToCorridorMultiChallenge: + MessageNoSkip BattleHall_Text_ThisWayPlease WaitTime 10, VAR_RESULT ClearReceivedTempDataAllPlayers ScrCmd_135 109 CloseMessage - ApplyMovement LOCALID_PLAYER, Movement_PlayerStartChallengeMulti - ApplyMovement VAR_LAST_TALKED, Movement_AttendantStartChallengeMulti + ApplyMovement LOCALID_PLAYER, BattleHall_Movement_PlayerWalkToCorridorMultiChallenge + ApplyMovement VAR_LAST_TALKED, BattleHall_Movement_AttendantWalkToCorridorMultiChallenge WaitMovement Return -_078C: - ApplyMovement LOCALID_PLAYER, _0824 - ApplyMovement VAR_LAST_TALKED, _0854 +BattleHall_WalkBackInvisiblySingleChallenge: + ApplyMovement LOCALID_PLAYER, BattleHall_Movement_PlayerWalkBackInvisiblySingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleHall_Movement_AttendantWalkBackInvisiblySingleDoubleChallenge WaitMovement Return -_07A0: - ApplyMovement LOCALID_PLAYER, _0824 - ApplyMovement VAR_LAST_TALKED, _0854 +BattleHall_WalkBackInvisiblyDoubleChallenge: + ApplyMovement LOCALID_PLAYER, BattleHall_Movement_PlayerWalkBackInvisiblySingleDoubleChallenge + ApplyMovement VAR_LAST_TALKED, BattleHall_Movement_AttendantWalkBackInvisiblySingleDoubleChallenge WaitMovement Return -_07B4: - ApplyMovement LOCALID_PLAYER, _0838 - ApplyMovement VAR_LAST_TALKED, _0864 +BattleHall_WalkBackInvisiblyMultiChallenge: + ApplyMovement LOCALID_PLAYER, BattleHall_Movement_PlayerWalkBackInvisiblyMultiChallenge + ApplyMovement VAR_LAST_TALKED, BattleHall_Movement_AttendantWalkBackInvisiblyMultiChallenge WaitMovement Return @@ -473,14 +473,14 @@ BattleHall_ShowGriseousOrbErrorAndExit: End .balign 4, 0 -Movement_PlayerStartChallenge: +BattleHall_Movement_PlayerWalkToCorridorSingleDoubleChallenge: WalkNormalWest 4 WalkNormalSouth 3 SetInvisible EndMovement .balign 4, 0 -Movement_PlayerStartChallengeMulti: +BattleHall_Movement_PlayerWalkToCorridorMultiChallenge: WalkNormalWest 2 WalkNormalNorth WalkNormalWest 2 @@ -489,14 +489,14 @@ Movement_PlayerStartChallengeMulti: EndMovement .balign 4, 0 -Movement_AttendantStartChallenge: +BattleHall_Movement_AttendantWalkToCorridorSingleDoubleChallenge: WalkNormalWest 3 WalkNormalSouth 3 SetInvisible EndMovement .balign 4, 0 -Movement_AttendantStartChallengeMulti: +BattleHall_Movement_AttendantWalkToCorridorMultiChallenge: WalkNormalWest WalkNormalNorth WalkNormalWest 2 @@ -505,7 +505,7 @@ Movement_AttendantStartChallengeMulti: EndMovement .balign 4, 0 -_0824: +BattleHall_Movement_PlayerWalkBackInvisiblySingleDoubleChallenge: WalkFasterEast 4 WalkFasterNorth 3 FaceWest @@ -513,7 +513,7 @@ _0824: EndMovement .balign 4, 0 -_0838: +BattleHall_Movement_PlayerWalkBackInvisiblyMultiChallenge: WalkFasterEast 2 WalkFasterSouth WalkFasterEast 2 @@ -523,28 +523,28 @@ _0838: EndMovement .balign 4, 0 -_0854: +BattleHall_Movement_AttendantWalkBackInvisiblySingleDoubleChallenge: WalkFasterNorth 3 WalkFasterEast 3 SetVisible EndMovement .balign 4, 0 -_0864: +BattleHall_Movement_AttendantWalkBackInvisiblyMultiChallenge: WalkFasterNorth 2 WalkFasterEast 3 SetVisible EndMovement -BattleHall_PrintSingleChallengeWelcome: - Message BattleHall_Text_WelcomeToSingleChallenge +BattleHall_WelcomeToSingleDoubleChallenge: + Message BattleHall_Text_WelcomeToSingleDoubleChallenge Return -BattleHall_PrintMultiChallengeWelcome: +BattleHall_WelcomeToMultiChallenge: Message BattleHall_Text_WelcomeToMultiChallenge Return -BattleHall_GenerateSingleChallengeMenu: +BattleHall_InitMenuSingleDoubleChallenge: InitLocalTextMenu 31, 9, 0, VAR_RESULT SetMenuXOriginToRight AddMenuEntryImm BattleHall_Text_SingleBattle, 0 @@ -552,27 +552,27 @@ BattleHall_GenerateSingleChallengeMenu: Message BattleHall_Text_SelectChallenge Return -BattleHall_GenerateMultiChallengeMenu: +BattleHall_InitMenuMultiChallenge: InitLocalTextMenu 31, 11, 0, VAR_RESULT SetMenuXOriginToRight AddMenuEntryImm BattleHall_Text_TakeChallenge, 4 Message BattleHall_Text_AcceptMultiChallenge Return -BattleHall_PrintSingleChallengeInfo: - Message BattleHall_Text_SingleChallengeInfo +BattleHall_ExplainSingleDoubleChallenge: + Message BattleHall_Text_ExplainSingleDoubleChallenge Return -BattleHall_PrintMultiChallengeInfo: - Message BattleHall_Text_MultiChallengeInfo +BattleHall_ExplainMultiChallenge: + Message BattleHall_Text_ExplainMultiChallenge Return -BattleHall_ResumeChallenge: +BattleHall_OnFrameResumeChallenge: RecordHeapMemory SetVar VAR_MAP_LOCAL_3, 1 SetVar VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 0 Message BattleHall_Text_MustSaveBeforeResuming - Call BattleHall_SetChallengeAsInProgress + Call BattleHall_SetChallengeInProgress Call BattleHall_SaveGame GoTo BattleHall_WalkIntoCorridor End @@ -585,26 +585,26 @@ BattleHall_SaveGame: WaitSE SEQ_SE_DP_SAVE Return -BattleHall_DidntSaveBeforeQuit: +BattleHall_OnFrameDidntSaveBeforeQuit: Message BattleHall_Text_DidntSaveBeforeQuit ScrCmd_2D1 VAR_BATTLE_HALL_CHALLENGE_TYPE GoTo BattleHall_EndChallenge End -BattleHall_ChallengeEndedBPEarned: - CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleHall_IncrementTrainerScore - CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleHall_IncrementTrainerScore - CallIfEq VAR_BATTLE_HALL_PRINT_STATE, 1, BattleHall_SilverPrintEarned - CallIfEq VAR_BATTLE_HALL_PRINT_STATE, 3, BattleHall_GoldPrintEarned +BattleHall_OnFrameChallengeEndedCompletedRound: + CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_SINGLE, BattleHall_IncrementTrainerScoreRoundCompleted + CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_DOUBLE, BattleHall_IncrementTrainerScoreRoundCompleted + CallIfEq VAR_BATTLE_HALL_PRINT_STATE, 1, BattleHall_EarnedSilverPrint + CallIfEq VAR_BATTLE_HALL_PRINT_STATE, 3, BattleHall_EarnedGoldPrint GoTo BattleHall_EndChallenge End -BattleHall_IncrementTrainerScore: +BattleHall_IncrementTrainerScoreRoundCompleted: IncrementTrainerScore TRAINER_SCORE_EVENT_BATTLE_HALL_ROUND_COMPLETED Return -BattleHall_SilverPrintEarned: - Message BattleHall_Text_YouveEarnedAPrint +BattleHall_EarnedSilverPrint: + Message BattleHall_Text_PrintForVictory BufferPlayerName 0 Message BattleHall_Text_SilverPrintAdded PlayFanfare SEQ_FANFA4 @@ -612,8 +612,8 @@ BattleHall_SilverPrintEarned: SetVar VAR_BATTLE_HALL_PRINT_STATE, 2 Return -BattleHall_GoldPrintEarned: - Message BattleHall_Text_YouveEarnedAPrint +BattleHall_EarnedGoldPrint: + Message BattleHall_Text_PrintForVictory BufferPlayerName 0 Message BattleHall_Text_GoldPrintAdded PlayFanfare SEQ_FANFA4 @@ -622,7 +622,7 @@ BattleHall_GoldPrintEarned: Common_CheckAllFrontierGoldPrintsObtained Return -BattleHall_ChallengeEnded: +BattleHall_OnFrameChallengeEnded: GoTo BattleHall_EndChallenge End @@ -651,7 +651,7 @@ BattleHall_Twin: End BattleHall_Pachirisu: - PokemonCryAndMessage SPECIES_PACHIRISU, BattleHall_Text_Pachirisu + PokemonCryAndMessage SPECIES_PACHIRISU, BattleHall_Text_PachirisuCry End BattleHall_ExpertM: @@ -684,7 +684,7 @@ BattleHall_RecordKeeper: GoToIfEq VAR_RESULT, 2, BattleHall_RecordKeeperNextMilestoneInfo GoToIfEq VAR_RESULT, 3, BattleHall_RecordKeeperAllMilestonesMet BufferPlayerName 0 - Message BattleHall_Text_StreakIsPresentlyX + Message BattleHall_Text_StreakRecordIsX Message BattleHall_Text_BPRewardForStreak PlayFanfare SEQ_PL_POINTGET3 Message BattleHall_Text_PlayerReceivedBP diff --git a/res/field/scripts/scripts_battle_tower.s b/res/field/scripts/scripts_battle_tower.s index 75ae423694..5ff4012e4e 100644 --- a/res/field/scripts/scripts_battle_tower.s +++ b/res/field/scripts/scripts_battle_tower.s @@ -1,87 +1,88 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_tower.h" #include "res/text/bank/menu_entries.h" +#include "res/field/events/events_battle_tower.h" #include "generated/goods.h" - ScriptEntry BattleTower_SingleDoubleBattleRoomAttendant - ScriptEntry BattleTower_MultiBattleRoomAttendant - ScriptEntry BattleTower_WiFiBattleRoomAttendant - ScriptEntry _0EBF - ScriptEntry _04EC - ScriptEntry _0597 - ScriptEntry _01AC - ScriptEntry _06F6 - ScriptEntry _13AD - ScriptEntry _1280 - ScriptEntry _129A - ScriptEntry _12B4 - ScriptEntry _12CE + ScriptEntry BattleTower_SingleAttendant + ScriptEntry BattleTower_MultiAttendant + ScriptEntry BattleTower_WiFiAttendant + ScriptEntry BattleTower_OnFrameChallengeEnded + ScriptEntry BattleTower_OnFrameResumeChallenge + ScriptEntry BattleTower_OnFrameDidntSaveBeforeQuit + ScriptEntry BattleTower_Teala + ScriptEntry BattleTower_OnFrameQuitBattleSalon + ScriptEntry BattleTower_Unused9 + ScriptEntry BattleTower_Unused10 + ScriptEntry BattleTower_Unused11 + ScriptEntry BattleTower_MachineWiFiResults + ScriptEntry BattleTower_MachineWiFiLeaders ScriptEntry BattleTower_ParasolLady ScriptEntry BattleTower_Jogger ScriptEntry BattleTower_Idol ScriptEntry BattleTower_RichBoy ScriptEntry BattleTower_Pikachu1 ScriptEntry BattleTower_Artist - ScriptEntry BattleTower_SchoolKid + ScriptEntry BattleTower_SchoolKidM1 ScriptEntry BattleTower_Pikachu2 - ScriptEntry _0062 - ScriptEntry _00F5 + ScriptEntry BattleTower_OnTransition + ScriptEntry BattleTower_OnResume ScriptEntry BattleTower_StatsJudge ScriptEntryEnd -_0062: - CallIfEq VAR_UNK_0x40D8, 1, BattleTower_ShowPoketch - CallIfEq VAR_UNK_0x40D8, 3, BattleTower_ShowPoketch - CallIfEq VAR_UNK_0x40D8, 0xFF, BattleTower_ShowPoketch +BattleTower_OnTransition: + CallIfEq VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1, BattleTower_ShowPoketch + CallIfEq VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 3, BattleTower_ShowPoketch + CallIfEq VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 0xFF, BattleTower_ShowPoketch CheckTVInterviewEligible TV_PROGRAM_SEGMENT_BATTLE_FRONTIER_FRONTLINE_NEWS_MULTI, VAR_MAP_LOCAL_0 - CallIfEq VAR_MAP_LOCAL_0, 0, _0144 - CallIfNe VAR_MAP_LOCAL_0, 0, _014A + CallIfEq VAR_MAP_LOCAL_0, FALSE, BattleTower_HideBattleFrontierReporter + CallIfNe VAR_MAP_LOCAL_0, FALSE, BattleTower_ShowBattleFrontierReporter ScrCmd_1E0 VAR_MAP_LOCAL_0 - GoToIfNe VAR_MAP_LOCAL_0, 0, _00DF - SetFlag FLAG_UNK_0x01E9 - GoTo _00C6 + GoToIfNe VAR_MAP_LOCAL_0, 0, BattleTower_ShowTealaTryShowReporter + SetFlag FLAG_HIDE_BATTLE_TOWER_TEALA + GoTo BattleTower_TryShowBattleTowerReporter End -_00C6: +BattleTower_TryShowBattleTowerReporter: CheckTVInterviewEligible TV_PROGRAM_SEGMENT_BATTLE_TOWER_CORNER, VAR_MAP_LOCAL_0 - GoToIfNe VAR_MAP_LOCAL_0, 0, _00EB - SetFlag FLAG_UNK_0x020E + GoToIfNe VAR_MAP_LOCAL_0, FALSE, BattleTower_ShowReporter + SetFlag FLAG_HIDE_BATTLE_TOWER_REPORTER End -_00DF: - ClearFlag FLAG_UNK_0x01E9 - GoTo _00C6 +BattleTower_ShowTealaTryShowReporter: + ClearFlag FLAG_HIDE_BATTLE_TOWER_TEALA + GoTo BattleTower_TryShowBattleTowerReporter End -_00EB: - ClearFlag FLAG_UNK_0x020E +BattleTower_ShowReporter: + ClearFlag FLAG_HIDE_BATTLE_TOWER_REPORTER End BattleTower_ShowPoketch: ShowPoketch Return -_00F5: - GoToIfNe VAR_UNK_0x40D8, 1, _013A +BattleTower_OnResume: + GoToIfNe VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1, BattleTower_OnResumeEnd ScrCmd_1E0 VAR_MAP_LOCAL_0 - GoToIfNe VAR_MAP_LOCAL_0, 0, _013C - GoToIfEq VAR_MAP_LOCAL_0, 1, _013C - GoToIfEq VAR_MAP_LOCAL_0, 2, _013C - GoToIfEq VAR_MAP_LOCAL_0, 3, _013C -_013A: + GoToIfNe VAR_MAP_LOCAL_0, 0, BattleTower_SetTealaDirectionWest + GoToIfEq VAR_MAP_LOCAL_0, 1, BattleTower_SetTealaDirectionWest + GoToIfEq VAR_MAP_LOCAL_0, 2, BattleTower_SetTealaDirectionWest + GoToIfEq VAR_MAP_LOCAL_0, 3, BattleTower_SetTealaDirectionWest +BattleTower_OnResumeEnd: End -_013C: - ScrCmd_18C 3, DIR_WEST +BattleTower_SetTealaDirectionWest: + ScrCmd_18C LOCALID_TEALA, DIR_WEST End -_0144: - SetFlag FLAG_UNK_0x02C3 +BattleTower_HideBattleFrontierReporter: + SetFlag FLAG_HIDE_BATTLE_FRONTIER_REPORTER Return -_014A: - ClearFlag FLAG_UNK_0x02C3 +BattleTower_ShowBattleFrontierReporter: + ClearFlag FLAG_HIDE_BATTLE_FRONTIER_REPORTER Return BattleTower_Unused: @@ -89,14 +90,14 @@ BattleTower_Unused: Return _0158: - SetVar VAR_UNK_0x40D8, 0xFF + SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 0xFF SetVar VAR_UNK_0x40DB, 1 SetVar VAR_UNK_0x40DC, 1 SetVar VAR_UNK_0x40D9, 1 Return _0172: - SetVar VAR_UNK_0x40D8, 0xFF + SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 0xFF SetVar VAR_UNK_0x40DB, 3 SetVar VAR_UNK_0x40DD, 1 SetVar VAR_UNK_0x40DE, 1 @@ -104,98 +105,98 @@ _0172: Return _0192: - SetVar VAR_UNK_0x40D8, 0xFF + SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 0xFF SetVar VAR_UNK_0x40DB, 1 SetVar VAR_UNK_0x40DC, 1 SetVar VAR_UNK_0x40D9, 2 Return -_01AC: +BattleTower_Teala: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer SetVar VAR_MAP_LOCAL_1, 0 ScrCmd_1DF VAR_MAP_LOCAL_2 - GoTo _01C6 + GoTo BattleTower_TryGiveTrophy End -_01C6: +BattleTower_TryGiveTrophy: SetVar VAR_0x8008, VAR_MAP_LOCAL_2 - GoToIfEq VAR_0x8008, 1, _0239 - GoToIfEq VAR_0x8008, 2, _024C - GoToIfEq VAR_0x8008, 3, _025F - GoToIfEq VAR_0x8008, 4, _022E - Message BattleTower_Text_WeHopeToSeeYouAgain2 - GoTo _020B + GoToIfEq VAR_0x8008, 1, BattleTower_GiveBronzeTrophy + GoToIfEq VAR_0x8008, 2, BattleTower_GiveSilverTrophy + GoToIfEq VAR_0x8008, 3, BattleTower_GiveGoldTrophy + GoToIfEq VAR_0x8008, 4, BattleTower_NoRoomForGoods + Message BattleTower_Text_HopeToSeeYouAgain2 + GoTo BattleTower_TealaEnd End -_020B: +BattleTower_TealaEnd: WaitABPress - GoToIfEq VAR_MAP_LOCAL_1, 1, _0220 + GoToIfEq VAR_MAP_LOCAL_1, 1, BattleTower_TealaClearCommunication CloseMessage ReleaseAll End -_0220: +BattleTower_TealaClearCommunication: Call BattleTower_ClearCommunication - GoTo BattleTower_Close + GoTo BattleTower_End End -_022E: - Message BattleTower_Text_RunOutOfRoomForDecorationGoods - GoTo _020B +BattleTower_NoRoomForGoods: + Message BattleTower_Text_NoRoomForGoods + GoTo BattleTower_TealaEnd End -_0239: +BattleTower_GiveBronzeTrophy: BufferNumber 0, 20 SetVar VAR_0x8004, UG_GOOD_BRONZE_TROPHY - GoTo _0272 + GoTo BattleTower_GiveTrophy End -_024C: +BattleTower_GiveSilverTrophy: BufferNumber 0, 50 SetVar VAR_0x8004, UG_GOOD_SILVER_TROPHY - GoTo _0272 + GoTo BattleTower_GiveTrophy End -_025F: +BattleTower_GiveGoldTrophy: BufferNumber 0, 100 SetVar VAR_0x8004, UG_GOOD_GOLD_TROPHY - GoTo _0272 + GoTo BattleTower_GiveTrophy End -_0272: - Message BattleTower_Text_CongratulationsOnAchievingWinStreak +BattleTower_GiveTrophy: + Message BattleTower_Text_TrophyForWinStreak SetVar VAR_0x8005, 1 Common_SendToUndergroundPCWithLinefeed - Message BattleTower_Text_WeHopeToSeeYouAgain2 - GoTo _020B + Message BattleTower_Text_HopeToSeeYouAgain2 + GoTo BattleTower_TealaEnd End -BattleTower_SingleDoubleBattleRoomAttendant: +BattleTower_SingleAttendant: LockAll PlaySE SEQ_SE_CONFIRM SetBattleTowerNull - Message BattleTower_Text_GuideToSingleDoubleBattleRooms - GoTo BattleTower_AskTakeBattleRoomChallenge + Message BattleTower_Text_WelcomeToSingleDoubleBattleRooms + GoTo BattleTower_AskTakeChallenge End -BattleTower_AskTakeBattleRoomChallenge: - Message BattleTower_Text_AskTakeBattleRoomChallenge - Call BattleTower_InitChoiceMenuBattleRoomChallenge +BattleTower_AskTakeChallenge: + Message BattleTower_Text_AskTakeChallenge + Call BattleTower_InitMenuTakeChallenge SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, BattleTower_TakeBattleRoomChallenge - GoToIfEq VAR_0x8008, 1, BattleTower_ExplainSingleDoubleBattleRoom - GoToIfEq VAR_0x8008, 2, BattleTower_WeHopeToSeeYouAgain - GoTo BattleTower_WeHopeToSeeYouAgain + GoToIfEq VAR_0x8008, 0, BattleTower_SelectChallenge + GoToIfEq VAR_0x8008, 1, BattleTower_ExplainSingleDoubleChallenge + GoToIfEq VAR_0x8008, 2, BattleTower_HopeToSeeYouAgain + GoTo BattleTower_HopeToSeeYouAgain End -BattleTower_ExplainSingleDoubleBattleRoom: - Message BattleTower_Text_ExplainSingleDoubleBattleRoom - GoTo BattleTower_AskTakeBattleRoomChallenge +BattleTower_ExplainSingleDoubleChallenge: + Message BattleTower_Text_ExplainSingleDoubleChallenge + GoTo BattleTower_AskTakeChallenge End -BattleTower_InitChoiceMenuBattleRoomChallenge: +BattleTower_InitMenuTakeChallenge: InitGlobalTextMenu 31, 11, 0, VAR_RESULT SetMenuXOriginToRight AddMenuEntryImm MenuEntries_Text_BattleTower_Challenge, 0 @@ -204,8 +205,8 @@ BattleTower_InitChoiceMenuBattleRoomChallenge: ShowMenu Return -BattleTower_TakeBattleRoomChallenge: - Message BattleTower_Text_AskSingleOrDoubleBattleRoom +BattleTower_SelectChallenge: + Message BattleTower_Text_SingleOrDoubleBattleRoom InitGlobalTextMenu 31, 11, 0, VAR_RESULT SetMenuXOriginToRight AddMenuEntryImm MenuEntries_Text_SingleBattle, 0 @@ -213,51 +214,51 @@ BattleTower_TakeBattleRoomChallenge: AddMenuEntryImm MenuEntries_Text_BattleTower_Cancel, 2 ShowMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, BattleTower_InitSingleBattleRoomChallenge - GoToIfEq VAR_0x8008, 1, BattleTower_InitDoubleBattleRoomChallenge - GoToIfEq VAR_0x8008, 2, BattleTower_WeHopeToSeeYouAgain - GoTo BattleTower_WeHopeToSeeYouAgain + GoToIfEq VAR_0x8008, 0, BattleTower_InitSingleChallenge + GoToIfEq VAR_0x8008, 1, BattleTower_InitDoubleChallenge + GoToIfEq VAR_0x8008, 2, BattleTower_HopeToSeeYouAgain + GoTo BattleTower_HopeToSeeYouAgain End -BattleTower_InitSingleBattleRoomChallenge: +BattleTower_InitSingleChallenge: InitBattleTower 0, BATTLE_TOWER_MODE_SINGLE - GoTo _0360 + GoTo BattleTower_CheckEnoughEligiblePokemonSingleChallenge End -_0360: +BattleTower_CheckEnoughEligiblePokemonSingleChallenge: CallBattleTowerFunction BT_FUNC_CHECK_ENOUGH_VALID_POKEMON, 0, VAR_RESULT - GoToIfEq VAR_RESULT, 1, BattleTower_SelectAndValidatePokemon - MessageSeenBanlistSpecies BattleTower_Text_NotEnoughEligiblePokemon, 3 + GoToIfEq VAR_RESULT, TRUE, BattleTower_SelectAndValidatePokemon + MessageSeenBanlistSpecies BattleTower_Text_Banlist, 3 GoTo BattleTower_WaitButton End -BattleTower_InitDoubleBattleRoomChallenge: +BattleTower_InitDoubleChallenge: InitBattleTower 0, BATTLE_TOWER_MODE_DOUBLE CallBattleTowerFunction BT_FUNC_CHECK_ENOUGH_VALID_POKEMON, 0, VAR_RESULT GoToIfEq VAR_RESULT, 1, BattleTower_SelectAndValidatePokemon - MessageSeenBanlistSpecies BattleTower_Text_NotEnoughEligiblePokemon, 4 + MessageSeenBanlistSpecies BattleTower_Text_Banlist, 4 GoTo BattleTower_WaitButton End BattleTower_SelectAndValidatePokemon: Message BattleTower_Text_SelectPokemonToEnter Call BattleTower_SelectPokemon - GoToIfEq VAR_RESULT, 0, BattleTower_WeHopeToSeeYouAgain + GoToIfEq VAR_RESULT, 0, BattleTower_HopeToSeeYouAgain CallBattleTowerFunction BT_FUNC_CHECK_DUPLICATE_SPECIES_AND_HELD_ITEMS, 0, VAR_RESULT SetVar VAR_0x8008, VAR_RESULT GoToIfEq VAR_0x8008, 1, BattleTower_SelectedTwoIdenticalSpecies GoToIfEq VAR_0x8008, 2, BattleTower_SelectedTwoIdenticalHeldItems CallBattleTowerFunction BT_FUNC_GET_SLOT_INDEX, 0, VAR_RESULT TryRevertPokemonForm VAR_RESULT, VAR_RESULT - GoToIfEq VAR_RESULT, 0xFF, _13CE + GoToIfEq VAR_RESULT, 0xFF, BattleTower_GriseousOrbCouldNotBeRemoved CallBattleTowerFunction BT_FUNC_GET_SLOT_INDEX, 1, VAR_RESULT TryRevertPokemonForm VAR_RESULT, VAR_RESULT - GoToIfEq VAR_RESULT, 0xFF, _13CE + GoToIfEq VAR_RESULT, 0xFF, BattleTower_GriseousOrbCouldNotBeRemoved CallBattleTowerFunction BT_FUNC_GET_SLOT_INDEX, 2, VAR_RESULT TryRevertPokemonForm VAR_RESULT, VAR_RESULT - GoToIfEq VAR_RESULT, 0xFF, _13CE + GoToIfEq VAR_RESULT, 0xFF, BattleTower_GriseousOrbCouldNotBeRemoved CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_RESULT - GoToIfEq VAR_RESULT, BATTLE_TOWER_MODE_WIFI, _09B3 + GoToIfEq VAR_RESULT, BATTLE_TOWER_MODE_WIFI, BattleTower_HealAndSaveBeforeWiFiChallenge GoTo BattleTower_HealAndSaveBeforeEnteringBattleRoom End @@ -266,12 +267,12 @@ BattleTower_HealAndSaveBeforeEnteringBattleRoom: CallBattleTowerFunction BT_FUNC_SET_COMMUNICATION_CLUB_ACCESSIBLE, 0, 0 HealParty Call BattleTower_SaveGame - GoToIfEq VAR_RESULT, 0, BattleTower_ClearCommunicationAndClose + GoToIfEq VAR_RESULT, 0, BattleTower_ClearCommunicationAndEnd CallBattleTowerFunction BT_FUNC_UNK_57, 0, VAR_RESULT CallBattleTowerFunction BT_FUNC_UNK_52, 0, 0 Message BattleTower_Text_ShowYouToBattleRoom WaitABPress - GoTo BattleTower_EnterRespectiveBattleRoom + GoTo BattleTower_EnterBattleRoom End BattleTower_SaveGame: @@ -281,12 +282,12 @@ BattleTower_SaveGame: BattleTower_SelectedTwoIdenticalSpecies: Message BattleTower_Text_PokemonMustAllBeDifferent - GoTo BattleTower_WeHopeToSeeYouAgain + GoTo BattleTower_HopeToSeeYouAgain End BattleTower_SelectedTwoIdenticalHeldItems: Message BattleTower_Text_ItemsMustAllBeDifferent - GoTo BattleTower_WeHopeToSeeYouAgain + GoTo BattleTower_HopeToSeeYouAgain End BattleTower_SelectPokemon: @@ -300,11 +301,11 @@ BattleTower_SelectPokemon: WaitFadeScreen Return -_04EC: +BattleTower_OnFrameResumeChallenge: LockAll - SetVar VAR_UNK_0x40D8, 0 + SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 0 CallBattleTowerFunction BT_FUNC_UNK_04, 0, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _0597 + GoToIfEq VAR_RESULT, 0, BattleTower_OnFrameDidntSaveBeforeQuit Message BattleTower_Text_SaveBeforeEntering InitBattleTower 1, 0xFFFF CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_RESULT @@ -314,7 +315,7 @@ _04EC: Call BattleTower_TrySaveGame Message BattleTower_Text_ShowYouToBattleRoom WaitABPress - GoTo BattleTower_EnterRespectiveBattleRoom + GoTo BattleTower_EnterBattleRoom End BattleTower_HealAndSaveBeforeEnteringMultiBattleRoom: @@ -325,36 +326,36 @@ BattleTower_HealAndSaveBeforeEnteringMultiBattleRoom: SetVar VAR_MAP_LOCAL_9, VAR_RESULT Message BattleTower_Text_DirectToMultiBattleRoom WaitABPress - GoTo BattleTower_EnterRespectiveBattleRoom + GoTo BattleTower_EnterBattleRoom End _0577: - SetVar VAR_UNK_0x40D8, 0xFF + SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 0xFF SetVar VAR_UNK_0x40DB, 2 SetVar VAR_UNK_0x40DD, 1 SetVar VAR_UNK_0x40DE, 2 SetVar VAR_UNK_0x40DF, 0 Return -_0597: +BattleTower_OnFrameDidntSaveBeforeQuit: LockAll - Message BattleTower_Text_DidntSaveBeforeQuitting + Message BattleTower_Text_DidntSaveBeforeQuit CallBattleTowerFunction BT_FUNC_UNK_14, 0, VAR_RESULT - GoToIfEq VAR_RESULT, 4, _05B9 - GoTo BattleTower_ClearCommunicationAndClose + GoToIfEq VAR_RESULT, 4, BattleTower_DidntSaveCheckDemoted + GoTo BattleTower_ClearCommunicationAndEnd End -_05B9: +BattleTower_DidntSaveCheckDemoted: CallBattleTowerFunction BT_FUNC_UNK_09, 0, VAR_RESULT - GoToIfEq VAR_RESULT, 0, BattleTower_ClearCommunicationAndClose + GoToIfEq VAR_RESULT, 0, BattleTower_ClearCommunicationAndEnd CallBattleTowerFunction BT_FUNC_UNK_10, 0, VAR_RESULT SetVar VAR_0x8000, VAR_RESULT BufferNumber 0, VAR_0x8000 Message BattleTower_Text_DemotedToRank - GoTo BattleTower_ClearCommunicationAndClose + GoTo BattleTower_ClearCommunicationAndEnd End -BattleTower_EnterRespectiveBattleRoom: +BattleTower_EnterBattleRoom: CloseMessage CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_RESULT SetVar VAR_0x8008, VAR_RESULT @@ -368,28 +369,28 @@ BattleTower_EnterRespectiveBattleRoom: BattleTower_EnterSingleDoubleBattleRoom: SetVar VAR_MAP_LOCAL_2, 0 SetVar VAR_MAP_LOCAL_3, 15 - Call BattleTower_DoBattleRoomEntranceAnimation + Call BattleTower_EnterBattleRoomAnimation GoTo BattleTower_WarpToElevator End BattleTower_EnterWiFiBattleRoom: SetVar VAR_MAP_LOCAL_2, 2 SetVar VAR_MAP_LOCAL_3, 19 - Call BattleTower_DoBattleRoomEntranceAnimation + Call BattleTower_EnterBattleRoomAnimation GoTo BattleTower_WarpToElevator End BattleTower_EnterMultiBattleRoom: SetVar VAR_MAP_LOCAL_2, 1 SetVar VAR_MAP_LOCAL_3, 11 - Call BattleTower_DoBattleRoomEntranceAnimation + Call BattleTower_EnterBattleRoomAnimation GoTo BattleTower_GoToWarpToElevator End BattleTower_EnterLinkMultiBattleRoom: SetVar VAR_MAP_LOCAL_2, 1 SetVar VAR_MAP_LOCAL_3, 11 - Call BattleTower_DoBattleRoomEntranceAnimation + Call BattleTower_EnterBattleRoomAnimation GoTo _06A0 End @@ -398,15 +399,15 @@ _06A0: GoTo BattleTower_WarpToElevator End -BattleTower_DoBattleRoomEntranceAnimation: - ApplyMovement VAR_MAP_LOCAL_2, _1248 - ApplyMovement LOCALID_PLAYER, _1260 +BattleTower_EnterBattleRoomAnimation: + ApplyMovement VAR_MAP_LOCAL_2, BattleTower_Movement_AttendantWalkToDoor + ApplyMovement LOCALID_PLAYER, BattleTower_Movement_PlayerWalkToDoor WaitMovement LoadDoorAnimation 0, 0, VAR_MAP_LOCAL_3, 2, ANIMATION_TAG_DOOR_1 PlayDoorOpenAnimation ANIMATION_TAG_DOOR_1 WaitForAnimation ANIMATION_TAG_DOOR_1 - ApplyMovement VAR_MAP_LOCAL_2, _1254 - ApplyMovement LOCALID_PLAYER, _126C + ApplyMovement VAR_MAP_LOCAL_2, BattleTower_Movement_AttendantEnterBattleRoom + ApplyMovement LOCALID_PLAYER, BattleTower_Movement_PlayerEnterBattleRoom WaitMovement PlayDoorCloseAnimation ANIMATION_TAG_DOOR_1 WaitForAnimation ANIMATION_TAG_DOOR_1 @@ -417,18 +418,18 @@ BattleTower_GoToWarpToElevator: GoTo BattleTower_WarpToElevator End -_06F6: +BattleTower_OnFrameQuitBattleSalon: LockAll - Call _0724 + Call BattleTower_ResetVarsClearCommunication CallBattleTowerFunction BT_FUNC_CHECK_IS_NULL, 0, VAR_RESULT - GoToIfEq VAR_RESULT, TRUE, BattleTower_WeHopeToSeeYouAgain + GoToIfEq VAR_RESULT, TRUE, BattleTower_HopeToSeeYouAgain Message BattleTower_Text_SavingDontTurnOffPower2 Call BattleTower_TrySaveGame - GoTo BattleTower_ClearCommunicationAndClose + GoTo BattleTower_ClearCommunicationAndEnd End -_0724: - Call _07B9 +BattleTower_ResetVarsClearCommunication: + Call BattleTower_ResetBattleTowerVars CallBattleTowerFunction BT_FUNC_CLEAR_COMMUNICATION_CLUB_ACCESSIBLE, 0, 0 Return @@ -441,7 +442,7 @@ BattleTower_TrySaveGame: Return BattleTower_WarpToElevator: - IncrementGameRecord RECORD_UNK_058 + IncrementGameRecord RECORD_TIMES_STARTED_BATTLE_FRONTIER_CHALLENGE CreateJournalEvent LOCATION_EVENT_BATTLE_TOWER, 0, 0, 0, 0 FadeScreenOut WaitFadeScreen @@ -451,16 +452,16 @@ BattleTower_WarpToElevator: ReleaseAll End -BattleTower_ClearCommunicationAndClose: +BattleTower_ClearCommunicationAndEnd: Call BattleTower_ClearCommunication -BattleTower_WeHopeToSeeYouAgain: - Message BattleTower_Text_WeHopeToSeeYouAgain +BattleTower_HopeToSeeYouAgain: + Message BattleTower_Text_HopeToSeeYouAgain BattleTower_WaitButton: WaitButton -BattleTower_Close: +BattleTower_End: CloseMessage - Call _07B5 - Call _07B9 + Call BattleTower_FreeBattleTower + Call BattleTower_ResetBattleTowerVars ReleaseAll End @@ -473,12 +474,12 @@ _07AB: CallBattleTowerFunction BT_FUNC_UNK_03, 0, 0 Return -_07B5: +BattleTower_FreeBattleTower: FreeBattleTower Return -_07B9: - SetVar VAR_UNK_0x40D8, 0 +BattleTower_ResetBattleTowerVars: + SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 0 SetVar VAR_UNK_0x40DB, 0 SetVar VAR_UNK_0x40DC, 0 SetVar VAR_UNK_0x40DD, 0 @@ -487,38 +488,38 @@ _07B9: SetVar VAR_UNK_0x40DF, 0 Return -BattleTower_WiFiBattleRoomAttendant: +BattleTower_WiFiAttendant: LockAll PlaySE SEQ_SE_CONFIRM SetBattleTowerNull CallBattleTowerFunction BT_FUNC_UNK_12, 0, VAR_RESULT - GoToIfEq VAR_RESULT, 1, _0922 - Message BattleTower_Text_GuideToWiFiBattleRooms - GoTo BattleTower_GoToWiFiChoiceMenu + GoToIfEq VAR_RESULT, 1, BattleTower_AskSendPreviousResults + Message BattleTower_Text_WelcomeToWiFiBattleRooms + GoTo BattleTower_GoToWiFiChallengeMenu End -BattleTower_GoToWiFiChoiceMenu: - GoTo BattleTower_GoToRegularOrExpandedWiFiChoiceMenu +BattleTower_GoToWiFiChallengeMenu: + GoTo BattleTower_CheckWhichWiFiChallengeMenu End -BattleTower_GoToRegularOrExpandedWiFiChoiceMenu: +BattleTower_CheckWhichWiFiChallengeMenu: CallBattleTowerFunction BT_FUNC_UNK_15, 0, VAR_RESULT - GoToIfEq VAR_RESULT, 1, BattleTower_AskTakeWiFiBattleRoomOrEarlierChallenge - GoTo BattleTower_AskTakeWiFiBattleRoomChallenge + GoToIfEq VAR_RESULT, 1, BattleTower_AskTakeWiFiOrEarlierChallenge + GoTo BattleTower_AskTakeWiFiChallenge End -BattleTower_AskTakeWiFiBattleRoomChallenge: - Message BattleTower_Text_AskTakeWifiBattleRoomChallenge - Call BattleTower_InitChoiceMenuWiFiBattleRoomChallenge +BattleTower_AskTakeWiFiChallenge: + Message BattleTower_Text_AskTakeWiFiChallenge + Call BattleTower_InitMenuWiFiChallenge SetVar VAR_0x8008, VAR_RESULT GoToIfEq VAR_0x8008, 0, BattleTower_InitWiFiChallengeMode GoToIfEq VAR_0x8008, 1, BattleTower_CheckLeaders GoToIfEq VAR_0x8008, 2, BattleTower_ExplainWiFiBattleRoom - GoToIfEq VAR_0x8008, 3, BattleTower_WeHopeToSeeYouAgain - GoTo BattleTower_WeHopeToSeeYouAgain + GoToIfEq VAR_0x8008, 3, BattleTower_HopeToSeeYouAgain + GoTo BattleTower_HopeToSeeYouAgain End -BattleTower_InitChoiceMenuWiFiBattleRoomChallenge: +BattleTower_InitMenuWiFiChallenge: InitGlobalTextMenu 31, 9, 0, VAR_RESULT SetMenuXOriginToRight AddMenuEntryImm MenuEntries_Text_BattleTower_Challenge, 0 @@ -530,22 +531,22 @@ BattleTower_InitChoiceMenuWiFiBattleRoomChallenge: BattleTower_ExplainWiFiBattleRoom: Message BattleTower_Text_ExplainWiFiBattleRoom - GoTo BattleTower_GoToRegularOrExpandedWiFiChoiceMenu + GoTo BattleTower_CheckWhichWiFiChallengeMenu End -BattleTower_AskTakeWiFiBattleRoomOrEarlierChallenge: - Message BattleTower_Text_AskTakeWifiBattleRoomChallenge - Call BattleTower_InitChoiceMenuWiFiBattleRoomOrEarlierChallenge +BattleTower_AskTakeWiFiOrEarlierChallenge: + Message BattleTower_Text_AskTakeWiFiChallenge + Call BattleTower_InitMenuWiFiOrEarlierChallenge SetVar VAR_0x8008, VAR_RESULT GoToIfEq VAR_0x8008, 0, BattleTower_InitWiFiChallengeMode GoToIfEq VAR_0x8008, 1, BattleTower_CheckLeaders GoToIfEq VAR_0x8008, 2, BattleTower_ChallengeEarlierRoom GoToIfEq VAR_0x8008, 3, BattleTower_ExplainWiFiBattleRoom - GoToIfEq VAR_0x8008, 4, BattleTower_WeHopeToSeeYouAgain - GoTo BattleTower_WeHopeToSeeYouAgain + GoToIfEq VAR_0x8008, 4, BattleTower_HopeToSeeYouAgain + GoTo BattleTower_HopeToSeeYouAgain End -BattleTower_InitChoiceMenuWiFiBattleRoomOrEarlierChallenge: +BattleTower_InitMenuWiFiOrEarlierChallenge: InitGlobalTextMenu 31, 7, 0, VAR_RESULT SetMenuXOriginToRight AddMenuEntryImm MenuEntries_Text_BattleTower_Challenge, 0 @@ -556,29 +557,29 @@ BattleTower_InitChoiceMenuWiFiBattleRoomOrEarlierChallenge: ShowMenu Return -_0922: +BattleTower_AskSendPreviousResults: Message BattleTower_Text_AskSendPreviousResults ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _0967 + GoToIfEq VAR_RESULT, MENU_NO, BattleTower_DontSendPreviousResults Call BattleTower_SaveGame - GoToIfEq VAR_RESULT, 0, BattleTower_WeHopeToSeeYouAgain - Call _096F - GoToIfNe VAR_RESULT, 0, BattleTower_WeHopeToSeeYouAgain + GoToIfEq VAR_RESULT, 0, BattleTower_HopeToSeeYouAgain + Call BattleTower_CallTrySendPreviousResults + GoToIfNe VAR_RESULT, 0, BattleTower_HopeToSeeYouAgain Message BattleTower_Text_ResultsWereSent - GoTo BattleTower_WeHopeToSeeYouAgain + GoTo BattleTower_HopeToSeeYouAgain End -_0967: - GoTo BattleTower_GoToWiFiChoiceMenu +BattleTower_DontSendPreviousResults: + GoTo BattleTower_GoToWiFiChallengeMenu End -_096F: +BattleTower_CallTrySendPreviousResults: CloseMessage SetVar VAR_MAP_LOCAL_1, 1 - Call _097F + Call BattleTower_TrySendPreviousResults Return -_097F: +BattleTower_TrySendPreviousResults: FadeScreenOut WaitFadeScreen ScrCmd_0B3 VAR_MAP_LOCAL_0 @@ -590,28 +591,28 @@ _097F: SetVar VAR_RESULT, VAR_MAP_LOCAL_1 Return -_09B3: +BattleTower_HealAndSaveBeforeWiFiChallenge: HealParty Call BattleTower_SaveGame - GoToIfEq VAR_RESULT, 0, BattleTower_ClearCommunicationAndClose + GoToIfEq VAR_RESULT, 0, BattleTower_ClearCommunicationAndEnd Call _0158 CallBattleTowerFunction BT_FUNC_SET_COMMUNICATION_CLUB_ACCESSIBLE, 0, 0 HealParty CloseMessage SetVar VAR_MAP_LOCAL_1, 0 - Call _097F - GoToIfNe VAR_RESULT, 0, BattleTower_ClearCommunicationAndClose + Call BattleTower_TrySendPreviousResults + GoToIfNe VAR_RESULT, 0, BattleTower_ClearCommunicationAndEnd GoTo _09FB End _09FB: Message BattleTower_Text_DirectYouToBattleRoom ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, BattleTower_EnterRespectiveBattleRoom - Message BattleTower_Text_AskSaveAndInterruptChallenge + GoToIfEq VAR_RESULT, MENU_YES, BattleTower_EnterBattleRoom + Message BattleTower_Text_SaveAndInterruptChallenge ShowYesNoMenu VAR_RESULT GoToIfEq VAR_RESULT, MENU_NO, _09FB - SetVar VAR_UNK_0x40D8, 2 + SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 2 CallBattleTowerFunction BT_FUNC_UNK_39, 0, 0 FreeBattleTower Message BattleTower_Text_SavingDontTurnOffPower2 @@ -626,61 +627,61 @@ _09FB: BattleTower_CheckLeaders: Call BattleTower_SaveGame - GoToIfEq VAR_RESULT, 0, BattleTower_WeHopeToSeeYouAgain + GoToIfEq VAR_RESULT, 0, BattleTower_HopeToSeeYouAgain CloseMessage SetVar VAR_MAP_LOCAL_1, 2 - Call _097F - GoToIfNe VAR_RESULT, 0, BattleTower_WeHopeToSeeYouAgain + Call BattleTower_TrySendPreviousResults + GoToIfNe VAR_RESULT, 0, BattleTower_HopeToSeeYouAgain ScrCmd_1E3 VAR_0x8004, VAR_0x8005 BufferNumber 0, VAR_0x8004 BufferVarPaddingDigits 1, VAR_0x8005, PADDING_MODE_ZEROES, 3 - Message BattleTower_Text_PleaseConfirmPastLeaderHistory + Message BattleTower_Text_ConfirmPastLeaderHistory WaitABPress - GoTo BattleTower_Close + GoTo BattleTower_End End BattleTower_InitWiFiChallengeMode: InitBattleTower 0, BATTLE_TOWER_MODE_WIFI - GoTo _0360 + GoTo BattleTower_CheckEnoughEligiblePokemonSingleChallenge End BattleTower_ChallengeEarlierRoom: InitBattleTower 0, BATTLE_TOWER_MODE_5 - GoTo _0360 + GoTo BattleTower_CheckEnoughEligiblePokemonSingleChallenge End -_0AC3: - ApplyMovement LOCALID_PLAYER, _1278 +BattleTower_PlayerFaceEast: + ApplyMovement LOCALID_PLAYER, BattleTower_Movement_PlayerFaceEast WaitMovement Return -BattleTower_MultiBattleRoomAttendant: +BattleTower_MultiAttendant: LockAll PlaySE SEQ_SE_CONFIRM SetBattleTowerNull - Message BattleTower_Text_GuideToMultiBattleRooms - GoTo BattleTower_AskTakeMultiBattleRoomChallenge + Message BattleTower_Text_WelcomeToMultiBattleRooms + GoTo BattleTower_AskTakeMultiChallenge End -BattleTower_AskTakeMultiBattleRoomChallenge: - Message BattleTower_Text_AskTakeMultiBattleRoomChallenge - Call BattleTower_InitChoiceMenuBattleRoomChallenge +BattleTower_AskTakeMultiChallenge: + Message BattleTower_Text_AskTakeMultiChallenge + Call BattleTower_InitMenuTakeChallenge SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, BattleTower_StartMultiBattleRoomChallenge + GoToIfEq VAR_0x8008, 0, BattleTower_TakeMultiChallenge GoToIfEq VAR_0x8008, 1, BattleTower_ExplainMultiBattleRoom - GoToIfEq VAR_0x8008, 2, BattleTower_WeHopeToSeeYouAgain - GoTo BattleTower_WeHopeToSeeYouAgain + GoToIfEq VAR_0x8008, 2, BattleTower_HopeToSeeYouAgain + GoTo BattleTower_HopeToSeeYouAgain End BattleTower_ExplainMultiBattleRoom: Message BattleTower_Text_ExplainMultiBattleRoom - GoTo BattleTower_AskTakeMultiBattleRoomChallenge + GoTo BattleTower_AskTakeMultiChallenge End -BattleTower_StartMultiBattleRoomChallenge: +BattleTower_TakeMultiChallenge: CallBattleTowerFunction BT_FUNC_CHECK_ENOUGH_VALID_POKEMON, 2, VAR_RESULT GoToIfEq VAR_RESULT, 1, BattleTower_AskCommunicateWithFriend - MessageSeenBanlistSpecies BattleTower_Text_NotEnoughEligiblePokemon, 2 + MessageSeenBanlistSpecies BattleTower_Text_Banlist, 2 GoTo BattleTower_WaitButton End @@ -694,100 +695,100 @@ BattleTower_AskCommunicateWithFriend: BattleTower_InitMultiChallengeMode: InitBattleTower 0, BATTLE_TOWER_MODE_MULTI SetVar VAR_MAP_LOCAL_1, 0 - GoTo BattleTower_SelectAndValidatePokemonForMultiBattleRoom + GoTo BattleTower_SelectAndValidatePokemonMultiChallenge End BattleTower_InitLinkMultiChallengeMode: InitBattleTower 0, BATTLE_TOWER_MODE_LINK_MULTI SetVar VAR_MAP_LOCAL_1, 1 - GoTo BattleTower_SelectAndValidatePokemonForMultiBattleRoom + GoTo BattleTower_SelectAndValidatePokemonMultiChallenge End -BattleTower_SelectAndValidatePokemonForMultiBattleRoom: +BattleTower_SelectAndValidatePokemonMultiChallenge: Message BattleTower_Text_SelectPokemonToEnter Call BattleTower_SelectPokemon - GoToIfEq VAR_RESULT, 0, BattleTower_WeHopeToSeeYouAgain + GoToIfEq VAR_RESULT, 0, BattleTower_HopeToSeeYouAgain CallBattleTowerFunction BT_FUNC_CHECK_DUPLICATE_SPECIES_AND_HELD_ITEMS, 0, VAR_RESULT SetVar VAR_0x8008, VAR_RESULT GoToIfEq VAR_0x8008, 1, BattleTower_SelectedTwoIdenticalSpecies GoToIfEq VAR_0x8008, 2, BattleTower_SelectedTwoIdenticalHeldItems CallBattleTowerFunction BT_FUNC_GET_SLOT_INDEX, 0, VAR_RESULT TryRevertPokemonForm VAR_RESULT, VAR_RESULT - GoToIfEq VAR_RESULT, 0xFF, _13CE + GoToIfEq VAR_RESULT, 0xFF, BattleTower_GriseousOrbCouldNotBeRemoved CallBattleTowerFunction BT_FUNC_GET_SLOT_INDEX, 1, VAR_RESULT TryRevertPokemonForm VAR_RESULT, VAR_RESULT - GoToIfEq VAR_RESULT, 0xFF, _13CE + GoToIfEq VAR_RESULT, 0xFF, BattleTower_GriseousOrbCouldNotBeRemoved GoToIfEq VAR_MAP_LOCAL_1, 1, BattleTower_HealAndSaveBeforeCommunicating Call _0172 CallBattleTowerFunction BT_FUNC_SET_COMMUNICATION_CLUB_ACCESSIBLE, 0, 0 HealParty Call BattleTower_SaveGame - GoToIfEq VAR_RESULT, 0, BattleTower_ClearCommunicationAndClose + GoToIfEq VAR_RESULT, 0, BattleTower_ClearCommunicationAndEnd CallBattleTowerFunction BT_FUNC_UNK_57, 0, VAR_RESULT CallBattleTowerFunction BT_FUNC_UNK_52, 0, 0 Message BattleTower_Text_ShowYouToBattleSalon - GoTo BattleTower_EnterRespectiveBattleRoom + GoTo BattleTower_EnterBattleRoom End BattleTower_HealAndSaveBeforeCommunicating: HealParty Call BattleTower_SaveGame - GoToIfEq VAR_RESULT, 0, BattleTower_ClearCommunicationAndClose - GoTo BattleTower_AskJoinGroupOrBecomeLeader + GoToIfEq VAR_RESULT, 0, BattleTower_ClearCommunicationAndEnd + GoTo BattleTower_BecomeLeaderOrJoinGroup End -BattleTower_AskJoinGroupOrBecomeLeader: - Message BattleTower_Text_OneBecomeLeaderOtherJoinGroup +BattleTower_BecomeLeaderOrJoinGroup: + Message BattleTower_Text_BecomeLeaderOrJoinGroup InitGlobalTextMenu 30, 1, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm MenuEntries_Text_BattleTower_JoinGroup, 0 - AddMenuEntryImm MenuEntries_Text_BattleTower_BecomeLeader, 1 + AddMenuEntryImm MenuEntries_Text_JoinGroup, 0 + AddMenuEntryImm MenuEntries_Text_BecomeLeader, 1 AddMenuEntryImm MenuEntries_Text_Exit, 2 ShowMenu SetVar VAR_0x8008, VAR_RESULT GoToIfEq VAR_0x8008, 0, BattleTower_JoinGroup GoToIfEq VAR_0x8008, 1, BattleTower_BecomeLeader - GoTo BattleTower_ClearCommunicationAndClose + GoTo BattleTower_ClearCommunicationAndEnd End BattleTower_JoinGroup: - Message BattleTower_Text_DSWirelessCommunicationWillBeLaunched + Message BattleTower_Text_LaunchWifiComm ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, BattleTower_AskJoinGroupOrBecomeLeader + GoToIfEq VAR_RESULT, MENU_NO, BattleTower_BecomeLeaderOrJoinGroup CloseMessage StartBattleClient 16, 0, 0, VAR_RESULT GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, BattleTower_CancelJoiningGroup - GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, BattleTower_EndCommunicationAfterErrorJoiningGroup + GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, BattleTower_ErrorJoiningGroup GoTo _0D5C End BattleTower_CancelJoiningGroup: - GoTo BattleTower_AskJoinGroupOrBecomeLeader + GoTo BattleTower_BecomeLeaderOrJoinGroup End -BattleTower_EndCommunicationAfterErrorJoiningGroup: +BattleTower_ErrorJoiningGroup: EndCommunication - GoTo BattleTower_AskJoinGroupOrBecomeLeader + GoTo BattleTower_BecomeLeaderOrJoinGroup End BattleTower_BecomeLeader: - Message BattleTower_Text_DSWirelessCommunicationWillBeLaunched + Message BattleTower_Text_LaunchWifiComm ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, BattleTower_AskJoinGroupOrBecomeLeader + GoToIfEq VAR_RESULT, MENU_NO, BattleTower_BecomeLeaderOrJoinGroup CloseMessage StartBattleServer 16, 0, 0, VAR_RESULT GoToIfEq VAR_RESULT, COMM_CLUB_RET_CANCEL, BattleTower_CancelBecomingLeader - GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, BattleTower_EndCommunicationAfterErrorBecomingLeader + GoToIfEq VAR_RESULT, COMM_CLUB_RET_ERROR, BattleTower_ErrorBecomingLeader GoTo _0D5C End BattleTower_CancelBecomingLeader: - GoTo BattleTower_AskJoinGroupOrBecomeLeader + GoTo BattleTower_BecomeLeaderOrJoinGroup End -BattleTower_EndCommunicationAfterErrorBecomingLeader: +BattleTower_ErrorBecomingLeader: EndCommunication - GoTo BattleTower_AskJoinGroupOrBecomeLeader + GoTo BattleTower_BecomeLeaderOrJoinGroup End _0D5C: @@ -802,9 +803,9 @@ _0D72: GoToIfEq VAR_RESULT, 0, _0D72 ScrCmd_1E2 0, VAR_MAP_LOCAL_0 SetVar VAR_0x8008, VAR_MAP_LOCAL_0 - GoToIfEq VAR_0x8008, 1, BattleTower_OtherPlayerAlsoChosePokemon1 - GoToIfEq VAR_0x8008, 2, BattleTower_OtherPlayerAlsoChosePokemon2 - GoToIfEq VAR_0x8008, 3, BattleTower_OtherPlayerChoseTheSame2Pokemon + GoToIfEq VAR_0x8008, 1, BattleTower_BothTrainerChosePokemon1 + GoToIfEq VAR_0x8008, 2, BattleTower_BothTrainerChosePokemon2 + GoToIfEq VAR_0x8008, 3, BattleTower_BothTrainerChosePokemon1And2 ClearReceivedTempDataAllPlayers ScrCmd_135 2 CallBattleTowerFunction BT_FUNC_UNK_57, 0, VAR_0x8004 @@ -814,33 +815,33 @@ _0D72: GoTo _0E58 End -BattleTower_OtherPlayerAlsoChosePokemon1: - Call _0E4E +BattleTower_BothTrainerChosePokemon1: + Call BattleTower_EndCommunicationSamePokemon CallBattleTowerFunction BT_FUNC_GET_SLOT_INDEX, 0, VAR_RESULT BufferPartyMonSpecies 0, VAR_RESULT Message BattleTower_Text_BothTrainersChoseThisPokemon - GoTo BattleTower_ClearCommunicationAndClose + GoTo BattleTower_ClearCommunicationAndEnd End -BattleTower_OtherPlayerAlsoChosePokemon2: - Call _0E4E +BattleTower_BothTrainerChosePokemon2: + Call BattleTower_EndCommunicationSamePokemon CallBattleTowerFunction BT_FUNC_GET_SLOT_INDEX, 1, VAR_RESULT BufferPartyMonSpecies 0, VAR_RESULT Message BattleTower_Text_BothTrainersChoseThisPokemon - GoTo BattleTower_ClearCommunicationAndClose + GoTo BattleTower_ClearCommunicationAndEnd End -BattleTower_OtherPlayerChoseTheSame2Pokemon: - Call _0E4E +BattleTower_BothTrainerChosePokemon1And2: + Call BattleTower_EndCommunicationSamePokemon CallBattleTowerFunction BT_FUNC_GET_SLOT_INDEX, 0, VAR_RESULT BufferPartyMonSpecies 0, VAR_RESULT CallBattleTowerFunction BT_FUNC_GET_SLOT_INDEX, 1, VAR_RESULT BufferPartyMonSpecies 1, VAR_RESULT Message BattleTower_Text_BothTrainersChoseThesePokemon - GoTo BattleTower_ClearCommunicationAndClose + GoTo BattleTower_ClearCommunicationAndEnd End -_0E4E: +BattleTower_EndCommunicationSamePokemon: ClearReceivedTempDataAllPlayers ScrCmd_135 8 EndCommunication @@ -857,7 +858,7 @@ _0E58: WaitTime 30, VAR_RESULT ClearReceivedTempDataAllPlayers ScrCmd_135 3 - GoTo BattleTower_EnterRespectiveBattleRoom + GoTo BattleTower_EnterBattleRoom End _0E8A: @@ -872,40 +873,40 @@ _0EA2: GoTo _0E58 End -_0EBF: +BattleTower_OnFrameChallengeEnded: LockAll FadeScreenIn WaitFadeScreen - Call _0724 + Call BattleTower_ResetVarsClearCommunication CallBattleTowerFunction BT_FUNC_CHECK_IS_NULL, 0, VAR_RESULT - GoToIfEq VAR_RESULT, TRUE, BattleTower_WeHopeToSeeYouAgain + GoToIfEq VAR_RESULT, TRUE, BattleTower_HopeToSeeYouAgain CallBattleTowerFunction BT_FUNC_HAS_DEFEATED_SEVEN_TRAINERS, 0, VAR_RESULT GoToIfEq VAR_RESULT, 1, _0F7E - GoTo _0F05 + GoTo BattleTower_ThanksForPlaying End -_0F05: - Message BattleTower_Text_ThankYouForPlaying +BattleTower_ThanksForPlaying: + Message BattleTower_Text_ThanksForPlaying CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_RESULT SetVar VAR_MAP_LOCAL_0, VAR_RESULT SetVar VAR_0x8008, VAR_MAP_LOCAL_0 - GoToIfEq VAR_0x8008, BATTLE_TOWER_MODE_5, _0F53 + GoToIfEq VAR_0x8008, BATTLE_TOWER_MODE_5, BattleTower_SaveAndEnd GoToIfEq VAR_0x8008, BATTLE_TOWER_MODE_WIFI, _11BA CallBattleTowerFunction BT_FUNC_UNK_49, 0, VAR_RESULT - CallIfEq VAR_RESULT, 1, _0F73 - GoTo _0F53 + CallIfEq VAR_RESULT, 1, BattleTower_RibbonsFor50WinStreak + GoTo BattleTower_SaveAndEnd End -_0F53: +BattleTower_SaveAndEnd: Message BattleTower_Text_SavingDontTurnOffPower2 Call BattleTower_TrySaveGame CloseMessage GoToIfEq VAR_MAP_LOCAL_0, 0, _118A - GoTo BattleTower_ClearCommunicationAndClose + GoTo BattleTower_ClearCommunicationAndEnd End -_0F73: - Message BattleTower_Text_CongratulationsOnAchievingYour50WinStreak +BattleTower_RibbonsFor50WinStreak: + Message BattleTower_Text_WonRibbonsFor50WinStreak PlayFanfare SEQ_FANFA1 WaitFanfare Return @@ -913,21 +914,21 @@ _0F73: _0F7E: CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_RESULT SetVar VAR_MAP_LOCAL_0, VAR_RESULT - GoToIfEq VAR_MAP_LOCAL_0, BATTLE_TOWER_MODE_5, _116C + GoToIfEq VAR_MAP_LOCAL_0, BATTLE_TOWER_MODE_5, BattleTower_BeatenAllSevenTrainersSave GoToIfEq VAR_MAP_LOCAL_0, BATTLE_TOWER_MODE_SINGLE, _1091 GoToIfEq VAR_MAP_LOCAL_0, BATTLE_TOWER_MODE_WIFI, _0FEA CallBattleTowerFunction BT_FUNC_UNK_49, 0, VAR_RESULT GoToIfNe VAR_RESULT, 0, _0FD6 - Call _1167 - GoTo _1177 + Call BattleTower_BeatenAllSevenTrainers + GoTo BattleTower_SaveGameClearCommunication End _0FD6: Message BattleTower_Text_BeatenAllSevenTrainers - Message BattleTower_Text_CongratulationsOnAchievingYour50WinStreak + Message BattleTower_Text_WonRibbonsFor50WinStreak PlayFanfare SEQ_FANFA1 WaitFanfare - GoTo _1177 + GoTo BattleTower_SaveGameClearCommunication End _0FEA: @@ -954,7 +955,7 @@ _102B: _1048: BufferNumber 0, VAR_MAP_LOCAL_0 - Message BattleTower_Text_CongratulationsOnAchievingRank + Message BattleTower_Text_RibbonsForAchievingRank PlayFanfare SEQ_FANFA1 WaitFanfare GoTo _11F5 @@ -981,7 +982,7 @@ _1091: End _10AE: - Call _1167 + Call BattleTower_BeatenAllSevenTrainers GoTo _10BC End @@ -989,13 +990,13 @@ _10BC: Message BattleTower_Text_SavingDontTurnOffPower Call BattleTower_TrySaveGame ScrCmd_1DF VAR_RESULT - GoToIfEq VAR_RESULT, 0, BattleTower_ClearCommunicationAndClose - Message BattleTower_Text_WeLookForwardToYourNextVisit + GoToIfEq VAR_RESULT, 0, BattleTower_ClearCommunicationAndEnd + Message BattleTower_Text_LookForwardToNextVisit CloseMessage SetVar VAR_MAP_LOCAL_2, VAR_RESULT SetVar VAR_MAP_LOCAL_1, 1 - Call _0AC3 - GoTo _01C6 + Call BattleTower_PlayerFaceEast + GoTo BattleTower_TryGiveTrophy End _10F5: @@ -1003,7 +1004,7 @@ _10F5: CallIfEq VAR_BATTLE_TOWER_PRINT_STATE, 3, _114C CallBattleTowerFunction BT_FUNC_UNK_48, 0, VAR_RESULT GoToIfEq VAR_RESULT, 0, _10BC - Message BattleTower_Text_CongratulationsOnDefeatingTowerTycoon + Message BattleTower_Text_RibbonsForDefeatingTycoon PlayFanfare SEQ_FANFA1 WaitFanfare GoTo _10BC @@ -1012,7 +1013,7 @@ _10F5: _1135: Message BattleTower_Text_CommemorativePrint BufferPlayerName 0 - Message BattleTower_Text_SilverPrintWasAddedToVsRecorder + Message BattleTower_Text_SilverPrintAdded PlayFanfare SEQ_FANFA4 WaitFanfare SetVar VAR_BATTLE_TOWER_PRINT_STATE, 2 @@ -1021,38 +1022,38 @@ _1135: _114C: Message BattleTower_Text_CommemorativePrint BufferPlayerName 0 - Message BattleTower_Text_GoldPrintWasAddedToVsRecorder + Message BattleTower_Text_GoldPrintAdded PlayFanfare SEQ_FANFA4 WaitFanfare SetVar VAR_BATTLE_TOWER_PRINT_STATE, 4 Common_CheckAllFrontierGoldPrintsObtained Return -_1167: +BattleTower_BeatenAllSevenTrainers: Message BattleTower_Text_BeatenAllSevenTrainers Return -_116C: +BattleTower_BeatenAllSevenTrainersSave: Message BattleTower_Text_BeatenAllSevenTrainers2 - GoTo _1177 + GoTo BattleTower_SaveGameClearCommunication End -_1177: +BattleTower_SaveGameClearCommunication: Message BattleTower_Text_SavingDontTurnOffPower Call BattleTower_TrySaveGame CloseMessage - GoTo BattleTower_ClearCommunicationAndClose + GoTo BattleTower_ClearCommunicationAndEnd End _118A: ScrCmd_1DF VAR_RESULT - GoToIfEq VAR_RESULT, 0, BattleTower_ClearCommunicationAndClose - Message BattleTower_Text_WeLookForwardToYourNextVisit + GoToIfEq VAR_RESULT, 0, BattleTower_ClearCommunicationAndEnd + Message BattleTower_Text_LookForwardToNextVisit CloseMessage SetVar VAR_MAP_LOCAL_2, VAR_RESULT SetVar VAR_MAP_LOCAL_1, 1 - Call _0AC3 - GoTo _01C6 + Call BattleTower_PlayerFaceEast + GoTo BattleTower_TryGiveTrophy End _11BA: @@ -1071,93 +1072,93 @@ _11D7: _11F5: CallBattleTowerFunction BT_FUNC_UNK_11, 1, 0 - GoTo _1205 + GoTo BattleTower_SaveTrySendResultsAndEnd End -_1205: +BattleTower_SaveTrySendResultsAndEnd: Call BattleTower_ClearCommunication Message BattleTower_Text_SavingDontTurnOffPower2 Call BattleTower_TrySaveGame Message BattleTower_Text_AskSendResults ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, BattleTower_WeHopeToSeeYouAgain - Call _096F - GoToIfNe VAR_RESULT, 0, BattleTower_WeHopeToSeeYouAgain + GoToIfEq VAR_RESULT, MENU_NO, BattleTower_HopeToSeeYouAgain + Call BattleTower_CallTrySendPreviousResults + GoToIfNe VAR_RESULT, 0, BattleTower_HopeToSeeYouAgain Message BattleTower_Text_ResultsWereSent - GoTo BattleTower_WeHopeToSeeYouAgain + GoTo BattleTower_HopeToSeeYouAgain End .balign 4, 0 -_1248: +BattleTower_Movement_AttendantWalkToDoor: Delay4 WalkNormalNorth 2 EndMovement .balign 4, 0 -_1254: +BattleTower_Movement_AttendantEnterBattleRoom: WalkNormalNorth SetInvisible EndMovement .balign 4, 0 -_1260: +BattleTower_Movement_PlayerWalkToDoor: Delay4 WalkNormalNorth 2 EndMovement .balign 4, 0 -_126C: +BattleTower_Movement_PlayerEnterBattleRoom: WalkNormalNorth 2 SetInvisible EndMovement .balign 4, 0 -_1278: +BattleTower_Movement_PlayerFaceEast: FaceEast EndMovement -_1280: +BattleTower_Unused10: PlaySE SEQ_SE_CONFIRM LockAll SetVar VAR_0x8000, 0 SetVar VAR_0x8001, 0 - Call _1304 + Call BattleTower_ResultsMachine End -_129A: +BattleTower_Unused11: PlaySE SEQ_SE_CONFIRM LockAll SetVar VAR_0x8000, 0 SetVar VAR_0x8001, 1 - Call _1304 + Call BattleTower_ResultsMachine End -_12B4: +BattleTower_MachineWiFiResults: PlaySE SEQ_SE_CONFIRM LockAll SetVar VAR_0x8000, 0 SetVar VAR_0x8001, 2 - Call _1304 + Call BattleTower_ResultsMachine End -_12CE: +BattleTower_MachineWiFiLeaders: PlaySE SEQ_SE_CONFIRM LockAll ScrCmd_1E4 VAR_RESULT - GoToIfEq VAR_RESULT, 0, _12F9 + GoToIfEq VAR_RESULT, 0, BattleTower_NoDataYet SetVar VAR_0x8000, 1 SetVar VAR_0x8001, 0 - Call _1304 + Call BattleTower_ResultsMachine End -_12F9: +BattleTower_NoDataYet: Message BattleTower_Text_NoDataYet WaitButton CloseMessage ReleaseAll End -_1304: +BattleTower_ResultsMachine: FadeScreenOut WaitFadeScreen ScrCmd_1D9 VAR_0x8000, VAR_0x8001 @@ -1172,15 +1173,15 @@ BattleTower_ParasolLady: End BattleTower_Jogger: - NPCMessage BattleTower_Text_WiFiBattleRoomsAreFullOfSurprises + NPCMessage BattleTower_Text_FullOfSurprises End BattleTower_Idol: - NPCMessage BattleTower_Text_TheyProfileYouOnTV + NPCMessage BattleTower_Text_ProfileOnTV End BattleTower_RichBoy: - NPCMessage BattleTower_Text_ITrainedMyLittleGuy + NPCMessage BattleTower_Text_TrainedLittleGuy End BattleTower_Pikachu1: @@ -1191,20 +1192,20 @@ BattleTower_Artist: NPCMessage BattleTower_Text_YouLookPowerful End -BattleTower_SchoolKid: - NPCMessage BattleTower_Text_ThereAreManyToughTrainers +BattleTower_SchoolKidM1: + NPCMessage BattleTower_Text_ManyToughTrainers End -_13AD: +BattleTower_Unused9: End BattleTower_Pikachu2: PokemonCryAndMessage SPECIES_PIKACHU, BattleTower_Text_PikachuPichuu End -_13CE: - Call _07B5 - Call _07B9 +BattleTower_GriseousOrbCouldNotBeRemoved: + Call BattleTower_FreeBattleTower + Call BattleTower_ResetBattleTowerVars Common_GriseousOrbCouldNotBeRemoved End @@ -1228,9 +1229,9 @@ BattleTower_ChoosePokemonToJudge: SetVar VAR_0x8000, VAR_RESULT FadeScreenIn WaitFadeScreen - GoToIfEq VAR_0x8000, 0xFF, BattleTower_CancelJudge + GoToIfEq VAR_0x8000, PARTY_SLOT_NONE, BattleTower_CancelJudge GetPartyMonSpecies VAR_0x8000, VAR_0x8004 - GoToIfEq VAR_0x8004, 0, BattleTower_CantJudgeAnEgg + GoToIfEq VAR_0x8004, SPECIES_NONE, BattleTower_CantJudgeAnEgg JudgeStats VAR_0x8000, VAR_0x8001, VAR_0x8002, VAR_0x8003 GoToIfLe VAR_0x8001, 90, BattleTower_DecentTotalIVs GoToIfLe VAR_0x8001, 120, BattleTower_AboveAverageTotalIVs @@ -1310,7 +1311,7 @@ BattleTower_JudgeEnd: End BattleTower_CancelJudge: - Message BattleTower_Text_OhYouDontNeedMeToJudge + Message BattleTower_Text_YouDontNeedMe WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_battle_tower_battle_room.s b/res/field/scripts/scripts_battle_tower_battle_room.s index 161f38edf3..7bbdc17b32 100644 --- a/res/field/scripts/scripts_battle_tower_battle_room.s +++ b/res/field/scripts/scripts_battle_tower_battle_room.s @@ -46,7 +46,7 @@ _0070: _007D: WaitTime 30, VAR_RESULT - SetVar VAR_UNK_0x40D8, 1 + SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1 CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_RESULT SetVar VAR_0x8008, VAR_RESULT GoToIfEq VAR_0x8008, BATTLE_TOWER_MODE_WIFI, _00D9 @@ -110,7 +110,7 @@ _019C: End _01AC: - SetVar VAR_UNK_0x40D8, 2 + SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 2 CallBattleTowerFunction BT_FUNC_UNK_39, 0, 0 FreeBattleTower Message 4 diff --git a/res/field/scripts/scripts_battle_tower_battle_salon.s b/res/field/scripts/scripts_battle_tower_battle_salon.s index 523c5b63ba..2a992015bd 100644 --- a/res/field/scripts/scripts_battle_tower_battle_salon.s +++ b/res/field/scripts/scripts_battle_tower_battle_salon.s @@ -118,7 +118,7 @@ BattleTowerBattleSalon_Attendant: BattleTowerBattleSalon_Quit: CloseMessage ReleaseAll - SetVar VAR_UNK_0x40D8, 3 + SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 3 FadeScreenOut WaitFadeScreen Warp MAP_HEADER_BATTLE_TOWER, 0, 11, 6, DIR_NORTH diff --git a/res/field/scripts/scripts_battle_tower_multi_battle_room.s b/res/field/scripts/scripts_battle_tower_multi_battle_room.s index 71eb423669..b047699fd6 100644 --- a/res/field/scripts/scripts_battle_tower_multi_battle_room.s +++ b/res/field/scripts/scripts_battle_tower_multi_battle_room.s @@ -59,7 +59,7 @@ BattleTowerMultiBattleRoom_EndChallenge: CallBattleTowerFunction BT_FUNC_GET_CHALLENGE_MODE, 0, VAR_RESULT GoToIfEq VAR_RESULT, BATTLE_TOWER_MODE_LINK_MULTI, BattleTowerMultiBattleRoom_EndLinkMultiChallenge WaitTime 30, VAR_RESULT - SetVar VAR_UNK_0x40D8, 1 + SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1 FadeScreenOut WaitFadeScreen Warp MAP_HEADER_BATTLE_TOWER, 0, 7, 6, DIR_NORTH @@ -70,7 +70,7 @@ BattleTowerMultiBattleRoom_EndChallenge: BattleTowerMultiBattleRoom_EndLinkMultiChallenge: WaitTime 30, VAR_RESULT - SetVar VAR_UNK_0x40D8, 1 + SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1 ClearReceivedTempDataAllPlayers ScrCmd_135 6 FadeScreenOut @@ -150,7 +150,7 @@ BattleTowerMultiBattleRoom_EndChallengeAndUpdateGameRecordsAndJournal: End BattleTowerMultiBattleRoom_SaveAndQuitMultiChallenge: - SetVar VAR_UNK_0x40D8, 2 + SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 2 CallBattleTowerFunction BT_FUNC_UNK_39, 0, 0 FreeBattleTower Message BattleTowerMultiBattleRoom_Text_ThanksForParticipating diff --git a/res/field/scripts/scripts_contests.s b/res/field/scripts/scripts_contests.s index 5616c282f7..2b3d4ea444 100644 --- a/res/field/scripts/scripts_contests.s +++ b/res/field/scripts/scripts_contests.s @@ -487,8 +487,8 @@ ContestRegistration_ReceptionistLinkContest_EstablishGroup: Message ContestRegistration_Text_OnePersonMustBeLeader InitGlobalTextMenu 30, 1, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm MenuEntries_Text_BattleTower_JoinGroup, ReceptionistLinkContest_EstablishGroupMenuItem_JoinGroup - AddMenuEntryImm MenuEntries_Text_BattleTower_BecomeLeader, ReceptionistLinkContest_EstablishGroupMenuItem_BecomeLeader + AddMenuEntryImm MenuEntries_Text_JoinGroup, ReceptionistLinkContest_EstablishGroupMenuItem_JoinGroup + AddMenuEntryImm MenuEntries_Text_BecomeLeader, ReceptionistLinkContest_EstablishGroupMenuItem_BecomeLeader AddMenuEntryImm MenuEntries_Text_Exit, ReceptionistLinkContest_EstablishGroupMenuItem_Exit ShowMenu SetVar VAR_0x8008, VAR_RESULT diff --git a/res/field/scripts/scripts_init_battle_arcade.s b/res/field/scripts/scripts_init_battle_arcade.s index 4b90992bd6..f35f04ea0a 100644 --- a/res/field/scripts/scripts_init_battle_arcade.s +++ b/res/field/scripts/scripts_init_battle_arcade.s @@ -6,10 +6,10 @@ InitScriptEntryEnd InitScriptFrameTable: - InitScriptGoToIfEqual VAR_UNK_0x40BF, 1, 4 - InitScriptGoToIfEqual VAR_UNK_0x40BF, 2, 2 - InitScriptGoToIfEqual VAR_UNK_0x40BF, 3, 5 - InitScriptGoToIfEqual VAR_UNK_0x40BF, 0xFF, 3 + InitScriptGoToIfEqual VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 1, 4 + InitScriptGoToIfEqual VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 2, 2 + InitScriptGoToIfEqual VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 3, 5 + InitScriptGoToIfEqual VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 0xFF, 3 InitScriptFrameTableEnd InitScriptEnd diff --git a/res/field/scripts/scripts_init_battle_castle.s b/res/field/scripts/scripts_init_battle_castle.s index 19accaaa32..8e3657847b 100644 --- a/res/field/scripts/scripts_init_battle_castle.s +++ b/res/field/scripts/scripts_init_battle_castle.s @@ -6,10 +6,10 @@ InitScriptEntryEnd InitScriptFrameTable: - InitScriptGoToIfEqual VAR_UNK_0x40BC, 1, 4 - InitScriptGoToIfEqual VAR_UNK_0x40BC, 2, 2 - InitScriptGoToIfEqual VAR_UNK_0x40BC, 3, 5 - InitScriptGoToIfEqual VAR_UNK_0x40BC, 0xFF, 3 + InitScriptGoToIfEqual VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 1, 4 + InitScriptGoToIfEqual VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 2, 2 + InitScriptGoToIfEqual VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 3, 5 + InitScriptGoToIfEqual VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 0xFF, 3 InitScriptFrameTableEnd InitScriptEnd diff --git a/res/field/scripts/scripts_init_battle_factory.s b/res/field/scripts/scripts_init_battle_factory.s index 1d417d902d..2190a0c4a7 100644 --- a/res/field/scripts/scripts_init_battle_factory.s +++ b/res/field/scripts/scripts_init_battle_factory.s @@ -6,10 +6,10 @@ InitScriptEntryEnd InitScriptFrameTable: - InitScriptGoToIfEqual VAR_UNK_0x40B7, 1, 4 - InitScriptGoToIfEqual VAR_UNK_0x40B7, 2, 2 - InitScriptGoToIfEqual VAR_UNK_0x40B7, 3, 5 - InitScriptGoToIfEqual VAR_UNK_0x40B7, 0xFF, 3 + InitScriptGoToIfEqual VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 1, 4 + InitScriptGoToIfEqual VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 2, 2 + InitScriptGoToIfEqual VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 3, 5 + InitScriptGoToIfEqual VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 0xFF, 3 InitScriptFrameTableEnd InitScriptEnd diff --git a/res/field/scripts/scripts_init_battle_frontier_gate_to_fight_area.s b/res/field/scripts/scripts_init_battle_frontier_gate_to_fight_area.s index 2096c87de3..30738217fb 100644 --- a/res/field/scripts/scripts_init_battle_frontier_gate_to_fight_area.s +++ b/res/field/scripts/scripts_init_battle_frontier_gate_to_fight_area.s @@ -6,7 +6,7 @@ InitScriptEntryEnd InitScriptFrameTable: - InitScriptGoToIfEqual VAR_UNK_0x4113, 0, 1 + InitScriptGoToIfEqual VAR_BATTLE_FRONTIER_GATE_TO_FIGHT_AREA_STATE, 0, 1 InitScriptFrameTableEnd InitScriptEnd diff --git a/res/field/scripts/scripts_init_battle_tower.s b/res/field/scripts/scripts_init_battle_tower.s index 5c19730acc..5d7225ccb8 100644 --- a/res/field/scripts/scripts_init_battle_tower.s +++ b/res/field/scripts/scripts_init_battle_tower.s @@ -7,10 +7,10 @@ InitScriptEntryEnd InitScriptFrameTable: - InitScriptGoToIfEqual VAR_UNK_0x40D8, 1, 4 - InitScriptGoToIfEqual VAR_UNK_0x40D8, 2, 5 - InitScriptGoToIfEqual VAR_UNK_0x40D8, 3, 8 - InitScriptGoToIfEqual VAR_UNK_0x40D8, 0xFF, 6 + InitScriptGoToIfEqual VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1, 4 + InitScriptGoToIfEqual VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 2, 5 + InitScriptGoToIfEqual VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 3, 8 + InitScriptGoToIfEqual VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 0xFF, 6 InitScriptFrameTableEnd InitScriptEnd diff --git a/res/field/scripts/scripts_init_new_game.s b/res/field/scripts/scripts_init_new_game.s index 68c7361a0c..645d62241c 100644 --- a/res/field/scripts/scripts_init_new_game.s +++ b/res/field/scripts/scripts_init_new_game.s @@ -79,7 +79,7 @@ _0006: SetFlag FLAG_HIDE_POKEMON_LEAGUE_NORTH_POKECENTER_1F_RIVAL SetFlag FLAG_HIDE_FLOAROMA_MEADOW_WORKS_KEY SetFlag FLAG_UNK_0x01CB - SetFlag FLAG_UNK_0x01E9 + SetFlag FLAG_HIDE_BATTLE_TOWER_TEALA SetFlag FLAG_UNK_0x0276 SetFlag FLAG_UNK_0x0277 SetFlag FLAG_HIDE_BATTLEGROUND_BUCK diff --git a/res/field/scripts/scripts_pokemon_center_b1f_attendants.s b/res/field/scripts/scripts_pokemon_center_b1f_attendants.s index 871ce17a46..a70e03c3f9 100644 --- a/res/field/scripts/scripts_pokemon_center_b1f_attendants.s +++ b/res/field/scripts/scripts_pokemon_center_b1f_attendants.s @@ -325,15 +325,15 @@ _043C: SetVar VAR_UNK_0x40DD, 0 SetVar VAR_UNK_0x40DE, 0 SetVar VAR_BATTLE_FACTORY_CHALLENGE_TYPE, 0 - SetVar VAR_UNK_0x40B9, 0 + SetVar VAR_BATTLE_FACTORY_CHALLENGE_LEVEL, 0 SetVar VAR_BATTLE_CASTLE_CHALLENGE_TYPE, 0 SetVar VAR_BATTLE_HALL_CHALLENGE_TYPE, 0 SetVar VAR_BATTLE_ARCADE_CHALLENGE_TYPE, 0 - SetVar VAR_UNK_0x40D8, 0 - SetVar VAR_UNK_0x40B7, 0 - SetVar VAR_UNK_0x40BC, 0 + SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 0 + SetVar VAR_BATTLE_FACTORY_LOBBY_LOAD_ACTION, 0 + SetVar VAR_BATTLE_CASTLE_LOBBY_LOAD_ACTION, 0 SetVar VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 0 - SetVar VAR_UNK_0x40BF, 0 + SetVar VAR_BATTLE_ARCADE_LOBBY_LOAD_ACTION, 0 Dummy1F9 VAR_BATTLE_FACTORY_CHALLENGE_TYPE End diff --git a/res/text/battle_arcade.json b/res/text/battle_arcade.json index 1835bf4492..9946e744f7 100644 --- a/res/text/battle_arcade.json +++ b/res/text/battle_arcade.json @@ -2,7 +2,7 @@ "key": 37979, "messages": [ { - "id": "pl_msg_00000313_00000", + "id": "BattleArcade_Text_WelcomeToSingleDoubleChallenge", "en_US": [ "Welcome to the Battle Arcade!\r", "I am your guide to the Single and\n", @@ -12,11 +12,11 @@ ] }, { - "id": "pl_msg_00000313_00001", + "id": "BattleArcade_Text_TakeWhichChallenge", "en_US": "Which challenge would you like to take?" }, { - "id": "pl_msg_00000313_00002", + "id": "BattleArcade_Text_ExplainSingleDoubleChallenge", "en_US": [ "At the Battle Arcade, you may take a\n", "Single or Double Battle challenge.\r", @@ -40,7 +40,7 @@ ] }, { - "id": "pl_msg_00000313_00003", + "id": "BattleArcade_Text_WelcomeToMultiChallenge", "en_US": [ "Welcome to the Battle Arcade!\r", "I am your guide to the Multi Battle\n", @@ -50,14 +50,14 @@ ] }, { - "id": "pl_msg_00000313_00004", + "id": "BattleArcade_Text_AskTakeMultiChallenge", "en_US": [ "Would you like to take the Battle\n", "Arcade Multi Battle challenge?" ] }, { - "id": "pl_msg_00000313_00005", + "id": "BattleArcade_Text_ExplainMultiChallenge", "en_US": [ "You may team up with a friend for a\n", "Multi Battle challenge.\r", @@ -78,18 +78,18 @@ ] }, { - "id": "pl_msg_00000313_00006", + "id": "BattleArcade_Text_HopeToSeeYouAgain", "en_US": "We hope to see you again!" }, { - "id": "pl_msg_00000313_00007", + "id": "BattleArcade_Text_SelectPokemonToEnter", "en_US": [ "Please select the Pokémon you wish\n", "to enter.\r" ] }, { - "id": "pl_msg_00000313_00008", + "id": "BattleArcade_Text_NotEnoughEligiblePokemon", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -98,25 +98,25 @@ ] }, { - "id": "pl_msg_00000313_00009", + "id": "BattleArcade_Text_Banlist", "en_US": "Also, Eggs are ineligible to enter.\r" }, { - "id": "pl_msg_00000313_00010", + "id": "BattleArcade_Text_Banlist1", "en_US": [ "Eggs and {STRVAR_1 0, 1, 0} are not allowed\n", "to enter.\r" ] }, { - "id": "pl_msg_00000313_00011", + "id": "BattleArcade_Text_Banlist2", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, and {STRVAR_1 0, 2, 0}\n", "are not allowed to enter.\r" ] }, { - "id": "pl_msg_00000313_00012", + "id": "BattleArcade_Text_Banlist3", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "and {STRVAR_1 0, 3, 0} are not allowed\f", @@ -124,7 +124,7 @@ ] }, { - "id": "pl_msg_00000313_00013", + "id": "BattleArcade_Text_Banlist4", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, and {STRVAR_1 0, 4, 0}\f", @@ -132,7 +132,7 @@ ] }, { - "id": "pl_msg_00000313_00014", + "id": "BattleArcade_Text_Banlist5", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0}, and\f", @@ -140,7 +140,7 @@ ] }, { - "id": "pl_msg_00000313_00015", + "id": "BattleArcade_Text_Banlist6", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -149,7 +149,7 @@ ] }, { - "id": "pl_msg_00000313_00016", + "id": "BattleArcade_Text_Banlist7", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -158,7 +158,7 @@ ] }, { - "id": "pl_msg_00000313_00017", + "id": "BattleArcade_Text_Banlist8", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -168,7 +168,7 @@ ] }, { - "id": "pl_msg_00000313_00018", + "id": "BattleArcade_Text_Banlist9", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -178,7 +178,7 @@ ] }, { - "id": "pl_msg_00000313_00019", + "id": "BattleArcade_Text_Banlist10", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -189,7 +189,7 @@ ] }, { - "id": "pl_msg_00000313_00020", + "id": "BattleArcade_Text_Banlist11", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -200,7 +200,7 @@ ] }, { - "id": "pl_msg_00000313_00021", + "id": "BattleArcade_Text_Banlist12", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -212,7 +212,7 @@ ] }, { - "id": "pl_msg_00000313_00022", + "id": "BattleArcade_Text_Banlist13", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -224,7 +224,7 @@ ] }, { - "id": "pl_msg_00000313_00023", + "id": "BattleArcade_Text_Banlist14", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -237,7 +237,7 @@ ] }, { - "id": "pl_msg_00000313_00024", + "id": "BattleArcade_Text_Banlist15", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -250,7 +250,7 @@ ] }, { - "id": "pl_msg_00000313_00025", + "id": "BattleArcade_Text_Banlist16", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -264,7 +264,7 @@ ] }, { - "id": "pl_msg_00000313_00026", + "id": "BattleArcade_Text_Banlist17", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -278,7 +278,7 @@ ] }, { - "id": "pl_msg_00000313_00027", + "id": "BattleArcade_Text_Banlist18", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -293,11 +293,11 @@ ] }, { - "id": "pl_msg_00000313_00028", + "id": "BattleArcade_Text_SeeMeWhenReady", "en_US": "Please come see me when you are ready.\r" }, { - "id": "pl_msg_00000313_00029", + "id": "BattleArcade_Text_BothTrainersChoseThisPokemon", "en_US": [ "Both Trainers have chosen the\n", "Pokémon {STRVAR_1 0, 0, 0}.\r", @@ -306,7 +306,7 @@ ] }, { - "id": "pl_msg_00000313_00030", + "id": "BattleArcade_Text_BothTrainersChoseThesePokemon", "en_US": [ "Both Trainers have chosen the Pokémon\n", "{STRVAR_1 0, 0, 0} and {STRVAR_1 0, 1, 0}.\r", @@ -315,15 +315,15 @@ ] }, { - "id": "pl_msg_00000313_00031", + "id": "BattleArcade_Text_Dummy31", "garbage": 32 }, { - "id": "pl_msg_00000313_00032", + "id": "BattleArcade_Text_ThisWayPlease", "en_US": "Right this way, please!" }, { - "id": "pl_msg_00000313_00033", + "id": "BattleArcade_Text_MustSaveBeforeResuming", "en_US": [ "We’ve missed you!\r", "You must save the game before you\n", @@ -331,7 +331,7 @@ ] }, { - "id": "pl_msg_00000313_00034", + "id": "BattleArcade_Text_DidntSaveBeforeQuit", "en_US": [ "Excuse me!\r", "You didn’t save before you quit your\n", @@ -341,7 +341,7 @@ ] }, { - "id": "pl_msg_00000313_00035", + "id": "BattleArcade_Text_PrintForVictory", "en_US": [ "Congratulations!\r", "In honor of your victory, we present\n", @@ -349,41 +349,41 @@ ] }, { - "id": "pl_msg_00000313_00036", + "id": "BattleArcade_Text_GoldPrintAdded", "en_US": [ "The Gold Print was added to\n", "{STRVAR_1 3, 0, 0}’s Vs. Recorder!\r" ] }, { - "id": "pl_msg_00000313_00037", + "id": "BattleArcade_Text_SilverPrintAdded", "en_US": [ "The Silver Print was added to\n", "{STRVAR_1 3, 0, 0}’s Vs. Recorder!\r" ] }, { - "id": "pl_msg_00000313_00038", + "id": "BattleArcade_Text_SingleBattle", "en_US": "SINGLE BATTLE" }, { - "id": "pl_msg_00000313_00039", + "id": "BattleArcade_Text_DoubleBattle", "en_US": "DOUBLE BATTLE" }, { - "id": "pl_msg_00000313_00040", + "id": "BattleArcade_Text_TakeChallenge", "en_US": "TAKE CHALLENGE" }, { - "id": "pl_msg_00000313_00041", + "id": "BattleArcade_Text_Info", "en_US": "INFO" }, { - "id": "pl_msg_00000313_00042", + "id": "BattleArcade_Text_Cancel", "en_US": "CANCEL" }, { - "id": "pl_msg_00000313_00043", + "id": "BattleArcade_Text_BecomeLeaderOrJoinGroup", "en_US": [ "One Trainer should select\n", "“BECOME LEADER.”\r", @@ -392,21 +392,21 @@ ] }, { - "id": "pl_msg_00000313_00044", + "id": "BattleArcade_Text_NeedToLaunchWiFiComm", "en_US": [ "We need to launch DS Wireless\n", "Communications." ] }, { - "id": "pl_msg_00000313_00045", + "id": "BattleArcade_Text_MustSaveFirst", "en_US": [ "You must save the game before I\n", "show you in. Please wait." ] }, { - "id": "pl_msg_00000313_00046", + "id": "BattleArcade_Text_RuleGameBoard", "en_US": [ "Those who rule the game board reign\n", "at the Battle Arcade!\r", @@ -415,7 +415,7 @@ ] }, { - "id": "pl_msg_00000313_00047", + "id": "BattleArcade_Text_ComesDownToLuck", "en_US": [ "It all comes down to luck here...\r", "My cute Pokémon...\n", @@ -423,14 +423,14 @@ ] }, { - "id": "pl_msg_00000313_00048", + "id": "BattleArcade_Text_NothingToDoAboutLuck", "en_US": [ "There’s nothing you can do about luck.\n", "It’s just there or not." ] }, { - "id": "pl_msg_00000313_00049", + "id": "BattleArcade_Text_DontBeAwestruck", "en_US": [ "Don’t be awestruck watching the\n", "motion of the game board.\r", @@ -439,7 +439,7 @@ ] }, { - "id": "pl_msg_00000313_00050", + "id": "BattleArcade_Text_PeculiarFashionSense", "en_US": [ "The Brain has a peculiar fashion sense.\n", "She flits around oddly, too.\r", @@ -450,7 +450,7 @@ ] }, { - "id": "pl_msg_00000313_00051", + "id": "BattleArcade_Text_StartBattlesWithTrickRoom", "en_US": [ "Yikes, they can even start battles\n", "with the move Trick Room in effect?\r", @@ -459,7 +459,7 @@ ] }, { - "id": "pl_msg_00000313_00052", + "id": "BattleArcade_Text_ThrilledByUnknownHand", "en_US": [ "Be thrilled by the unknown hand of\n", "luck!\r", @@ -469,7 +469,7 @@ ] }, { - "id": "pl_msg_00000313_00053", + "id": "BattleArcade_Text_BlamingGameBoardIsPitiful", "en_US": [ "Blaming the game board for losing\n", "is pitiful. It’s poor form.\r", @@ -478,7 +478,7 @@ ] }, { - "id": "pl_msg_00000313_00054", + "id": "BattleArcade_Text_FigureThisOneOut", "en_US": [ "Did you figure this one out?\r", "Poisoning or freezing events can be\n", @@ -488,7 +488,7 @@ ] }, { - "id": "pl_msg_00000313_00055", + "id": "BattleArcade_Text_GroundTypesArentAffected", "en_US": [ "If the game board triggers a\n", "paralyzing event here, Ground types\f", diff --git a/res/text/battle_castle.json b/res/text/battle_castle.json index 893e6bcf84..a026d3d38e 100644 --- a/res/text/battle_castle.json +++ b/res/text/battle_castle.json @@ -2,7 +2,7 @@ "key": 37955, "messages": [ { - "id": "pl_msg_00000312_00000", + "id": "BattleCastle_Text_WelcomeToSingleDoubleChallenge", "en_US": [ "Welcome to the Battle Castle!\r", "I am your guide to the Single and\n", @@ -12,11 +12,11 @@ ] }, { - "id": "pl_msg_00000312_00001", + "id": "BattleCastle_Text_TakeWhichChallenge", "en_US": "Which challenge would you like to take?" }, { - "id": "pl_msg_00000312_00002", + "id": "BattleCastle_Text_ExplainSingleDoubleChallenge", "en_US": [ "At the Battle Castle, you may take a\n", "Single or Double Battle challenge.\r", @@ -38,7 +38,7 @@ ] }, { - "id": "pl_msg_00000312_00003", + "id": "BattleCastle_Text_WelcomeToMultiChallenge", "en_US": [ "Welcome to the Battle Castle!\r", "I am your guide to the Multi Battle\n", @@ -48,14 +48,14 @@ ] }, { - "id": "pl_msg_00000312_00004", + "id": "BattleCastle_Text_AskTakeMultiChallenge", "en_US": [ "Would you like to take the Battle Castle\n", "Multi Battle challenge?" ] }, { - "id": "pl_msg_00000312_00005", + "id": "BattleCastle_Text_ExplainMultiChallenge", "en_US": [ "You may team up with a friend for a\n", "Multi Battle challenge.\r", @@ -77,18 +77,18 @@ ] }, { - "id": "pl_msg_00000312_00006", + "id": "BattleCastle_Text_HopeToSeeYouAgain", "en_US": "We hope to see you again!" }, { - "id": "pl_msg_00000312_00007", + "id": "BattleCastle_Text_SelectPokemonToEnter", "en_US": [ "Please select the Pokémon you wish\n", "to enter.\r" ] }, { - "id": "pl_msg_00000312_00008", + "id": "BattleCastle_Text_NotEnoughEligiblePokemon", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -97,25 +97,25 @@ ] }, { - "id": "pl_msg_00000312_00009", + "id": "BattleCastle_Text_Banlist", "en_US": "Also, Eggs are ineligible to enter.\r" }, { - "id": "pl_msg_00000312_00010", + "id": "BattleCastle_Text_Banlist1", "en_US": [ "Eggs and {STRVAR_1 0, 1, 0} are not allowed\n", "to enter.\r" ] }, { - "id": "pl_msg_00000312_00011", + "id": "BattleCastle_Text_Banlist2", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, and {STRVAR_1 0, 2, 0}\n", "are not allowed to enter.\r" ] }, { - "id": "pl_msg_00000312_00012", + "id": "BattleCastle_Text_Banlist3", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "and {STRVAR_1 0, 3, 0} are not allowed\f", @@ -123,7 +123,7 @@ ] }, { - "id": "pl_msg_00000312_00013", + "id": "BattleCastle_Text_Banlist4", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, and {STRVAR_1 0, 4, 0}\f", @@ -131,7 +131,7 @@ ] }, { - "id": "pl_msg_00000312_00014", + "id": "BattleCastle_Text_Banlist5", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0}, and\f", @@ -139,7 +139,7 @@ ] }, { - "id": "pl_msg_00000312_00015", + "id": "BattleCastle_Text_Banlist6", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -148,7 +148,7 @@ ] }, { - "id": "pl_msg_00000312_00016", + "id": "BattleCastle_Text_Banlist7", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -157,7 +157,7 @@ ] }, { - "id": "pl_msg_00000312_00017", + "id": "BattleCastle_Text_Banlist8", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -167,7 +167,7 @@ ] }, { - "id": "pl_msg_00000312_00018", + "id": "BattleCastle_Text_Banlist9", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -177,7 +177,7 @@ ] }, { - "id": "pl_msg_00000312_00019", + "id": "BattleCastle_Text_Banlist10", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -188,7 +188,7 @@ ] }, { - "id": "pl_msg_00000312_00020", + "id": "BattleCastle_Text_Banlist11", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -199,7 +199,7 @@ ] }, { - "id": "pl_msg_00000312_00021", + "id": "BattleCastle_Text_Banlist12", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -211,7 +211,7 @@ ] }, { - "id": "pl_msg_00000312_00022", + "id": "BattleCastle_Text_Banlist13", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -223,7 +223,7 @@ ] }, { - "id": "pl_msg_00000312_00023", + "id": "BattleCastle_Text_Banlist14", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -236,7 +236,7 @@ ] }, { - "id": "pl_msg_00000312_00024", + "id": "BattleCastle_Text_Banlist15", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -249,7 +249,7 @@ ] }, { - "id": "pl_msg_00000312_00025", + "id": "BattleCastle_Text_Banlist16", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -263,7 +263,7 @@ ] }, { - "id": "pl_msg_00000312_00026", + "id": "BattleCastle_Text_Banlist17", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -277,7 +277,7 @@ ] }, { - "id": "pl_msg_00000312_00027", + "id": "BattleCastle_Text_Banlist18", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -292,11 +292,11 @@ ] }, { - "id": "pl_msg_00000312_00028", + "id": "BattleCastle_Text_SeeMeWhenReady", "en_US": "Please come see me when you are ready.\r" }, { - "id": "pl_msg_00000312_00029", + "id": "BattleCastle_Text_BothTrainersChoseThisPokemon", "en_US": [ "Both Trainers have chosen the\n", "Pokémon {STRVAR_1 0, 0, 0}.\r", @@ -305,7 +305,7 @@ ] }, { - "id": "pl_msg_00000312_00030", + "id": "BattleCastle_Text_BothTrainersChoseThesePokemon", "en_US": [ "Both Trainers have chosen the Pokémon\n", "{STRVAR_1 0, 0, 0} and {STRVAR_1 0, 1, 0}.\r", @@ -314,15 +314,15 @@ ] }, { - "id": "pl_msg_00000312_00031", + "id": "BattleCastle_Text_Dummy31", "garbage": 32 }, { - "id": "pl_msg_00000312_00032", + "id": "BattleCastle_Text_ThisWayPlease", "en_US": "Right this way, please!" }, { - "id": "pl_msg_00000312_00033", + "id": "BattleCastle_Text_MustSaveBeforeResuming", "en_US": [ "We’ve missed you!\r", "You must save the game before you\n", @@ -330,7 +330,7 @@ ] }, { - "id": "pl_msg_00000312_00034", + "id": "BattleCastle_Text_DidntSaveBeforeQuit", "en_US": [ "Excuse me!\r", "You didn’t save before you quit your\n", @@ -340,7 +340,7 @@ ] }, { - "id": "pl_msg_00000312_00035", + "id": "BattleCastle_Text_PrintForVictory", "en_US": [ "Congratulations!\r", "In honor of your victory, we present\n", @@ -348,41 +348,41 @@ ] }, { - "id": "pl_msg_00000312_00036", + "id": "BattleCastle_Text_GoldPrintAdded", "en_US": [ "The Gold Print was added to\n", "{STRVAR_1 3, 0, 0}’s Vs. Recorder!\r" ] }, { - "id": "pl_msg_00000312_00037", + "id": "BattleCastle_Text_SinglePrintAdded", "en_US": [ "The Silver Print was added to\n", "{STRVAR_1 3, 0, 0}’s Vs. Recorder!\r" ] }, { - "id": "pl_msg_00000312_00038", + "id": "BattleCastle_Text_SingleBattle", "en_US": "SINGLE BATTLE" }, { - "id": "pl_msg_00000312_00039", + "id": "BattleCastle_Text_DoubleBattle", "en_US": "DOUBLE BATTLE" }, { - "id": "pl_msg_00000312_00040", + "id": "BattleCastle_Text_TakeChallenge", "en_US": "TAKE CHALLENGE" }, { - "id": "pl_msg_00000312_00041", + "id": "BattleCastle_Text_Info", "en_US": "INFO" }, { - "id": "pl_msg_00000312_00042", + "id": "BattleCastle_Text_Cancel", "en_US": "CANCEL" }, { - "id": "pl_msg_00000312_00043", + "id": "BattleCastle_Text_BecomeLeaderOrJoinGroup", "en_US": [ "One Trainer should select\n", "“BECOME LEADER.”\r", @@ -391,28 +391,28 @@ ] }, { - "id": "pl_msg_00000312_00044", + "id": "BattleCastle_Text_NeedToLaunchWiFiComm", "en_US": [ "We need to launch DS Wireless\n", "Communications." ] }, { - "id": "pl_msg_00000312_00045", + "id": "BattleCastle_Text_MustSaveFirst", "en_US": [ "You must save the game before I\n", "show you in. Please wait." ] }, { - "id": "pl_msg_00000312_00046", + "id": "BattleCastle_Text_NoDamageMoreCP", "en_US": [ "If your Pokémon win without taking\n", "damage, you earn more CP." ] }, { - "id": "pl_msg_00000312_00047", + "id": "BattleCastle_Text_HigherLevelOpponentsMoreCP", "en_US": [ "You can earn more CP by facing higher-\n", "level opponents.\r", @@ -421,7 +421,7 @@ ] }, { - "id": "pl_msg_00000312_00048", + "id": "BattleCastle_Text_CheckOpponentsLineup", "en_US": [ "Before every battle, you should check\n", "the opponent’s lineup.\r", @@ -436,14 +436,14 @@ ] }, { - "id": "pl_msg_00000312_00049", + "id": "BattleCastle_Text_IPineForMrDarach", "en_US": [ "Mr. Darach...\n", "Oh, how I pine for thee..." ] }, { - "id": "pl_msg_00000312_00050", + "id": "BattleCastle_Text_SpendCPToRankUp", "en_US": [ "At first, you can only use CP for\n", "restoring HP.\r", @@ -452,7 +452,7 @@ ] }, { - "id": "pl_msg_00000312_00051", + "id": "BattleCastle_Text_MatterOfGraveImportance", "en_US": [ "I have a matter of grave importance\n", "to share with you.\r", @@ -463,7 +463,7 @@ ] }, { - "id": "pl_msg_00000312_00052", + "id": "BattleCastle_Text_IWantToLiveInCastle", "en_US": [ "Like every man’s dream, I want to\n", "live in a castle!" diff --git a/res/text/battle_factory.json b/res/text/battle_factory.json index a8f50c7273..82083a0014 100644 --- a/res/text/battle_factory.json +++ b/res/text/battle_factory.json @@ -2,7 +2,7 @@ "key": 38003, "messages": [ { - "id": "pl_msg_00000310_00000", + "id": "BattleFactory_Text_WelcomeToSingleDoubleChallenge", "en_US": [ "Welcome to the Battle Factory!\r", "I am your guide to the Single and\n", @@ -12,11 +12,11 @@ ] }, { - "id": "pl_msg_00000310_00001", + "id": "BattleFactory_Text_TakeWhichChallenge", "en_US": "Which challenge would you like to take?" }, { - "id": "pl_msg_00000310_00002", + "id": "BattleFactory_Text_ExplainSingleDoubleChallenge", "en_US": [ "At the Battle Factory, you may take\n", "Single or Double Battle challenges\f", @@ -40,7 +40,7 @@ ] }, { - "id": "pl_msg_00000310_00003", + "id": "BattleFactory_Text_WelcomeToMultiChallenge", "en_US": [ "Welcome to the Battle Factory!\r", "I am your guide to the Multi Battle\n", @@ -50,14 +50,14 @@ ] }, { - "id": "pl_msg_00000310_00004", + "id": "BattleFactory_Text_AskTakeMultiChallenge", "en_US": [ "Would you like to take the Battle\n", "Factory Multi Battle challenge?" ] }, { - "id": "pl_msg_00000310_00005", + "id": "BattleFactory_Text_ExplainMultiChallenge", "en_US": [ "You may team up with a friend for a\n", "Multi Battle challenge using rental\f", @@ -80,33 +80,33 @@ ] }, { - "id": "pl_msg_00000310_00006", + "id": "BattleFactory_Text_HopeToSeeYouAgain", "en_US": "We hope to see you again!" }, { - "id": "pl_msg_00000310_00007", + "id": "BattleFactory_Text_WhichChallengeLevel", "en_US": [ "Which challenge level would you like to\n", "play? Level 50 or Open Level?" ] }, { - "id": "pl_msg_00000310_00008", + "id": "BattleFactory_Text_AskSaveGameFirst", "en_US": [ "You must save the game before I\n", "show you in. Is that OK?" ] }, { - "id": "pl_msg_00000310_00009", + "id": "BattleFactory_Text_ThisWayPlease", "en_US": "Right this way, please!" }, { - "id": "pl_msg_00000310_00010", + "id": "BattleFactory_Text_LookForwardToNextVisit", "en_US": "We look forward to your next visit.\r" }, { - "id": "pl_msg_00000310_00011", + "id": "BattleFactory_Text_MustSaveBeforeResuming", "en_US": [ "We’ve missed you!\r", "You must save the game before you\n", @@ -114,7 +114,7 @@ ] }, { - "id": "pl_msg_00000310_00012", + "id": "BattleFactory_Text_DidntSaveBeforeQuit", "en_US": [ "Excuse me!\r", "You didn’t save before you quit your\n", @@ -124,7 +124,7 @@ ] }, { - "id": "pl_msg_00000310_00013", + "id": "BattleFactory_Text_PrintForVictory", "en_US": [ "Congratulations!\r", "In honor of your victory, we present\n", @@ -132,53 +132,53 @@ ] }, { - "id": "pl_msg_00000310_00014", + "id": "BattleFactory_Text_GoldPrintAdded", "en_US": [ "The Gold Print was added to\n", "{STRVAR_1 3, 0, 0}’s Vs. Recorder!\r" ] }, { - "id": "pl_msg_00000310_00015", + "id": "BattleFactory_Text_SilverPrintAdded", "en_US": [ "The Silver Print was added to\n", "{STRVAR_1 3, 0, 0}’s Vs. Recorder!\r" ] }, { - "id": "pl_msg_00000310_00016", + "id": "BattleFactory_Text_SingleBattle", "en_US": "SINGLE BATTLE" }, { - "id": "pl_msg_00000310_00017", + "id": "BattleFactory_Text_DoubleBattle", "en_US": "DOUBLE BATTLE" }, { - "id": "pl_msg_00000310_00018", + "id": "BattleFactory_Text_TakeChallenge", "en_US": "TAKE CHALLENGE" }, { - "id": "pl_msg_00000310_00019", + "id": "BattleFactory_Text_Info", "en_US": "INFO" }, { - "id": "pl_msg_00000310_00020", + "id": "BattleFactory_Text_CancelChallenge", "en_US": "CANCEL" }, { - "id": "pl_msg_00000310_00021", + "id": "BattleFactory_Text_Level50", "en_US": "LEVEL 50" }, { - "id": "pl_msg_00000310_00022", + "id": "BattleFactory_Text_OpenLevel", "en_US": "OPEN LEVEL" }, { - "id": "pl_msg_00000310_00023", + "id": "BattleFactory_Text_CancelLevel", "en_US": "CANCEL" }, { - "id": "pl_msg_00000310_00024", + "id": "BattleFactory_Text_BecomeLeaderOrJoinGroup", "en_US": [ "One Trainer should select\n", "“BECOME LEADER.”\r", @@ -187,21 +187,21 @@ ] }, { - "id": "pl_msg_00000310_00025", + "id": "BattleFactory_Text_NeedToLaunchWiFiComm", "en_US": [ "We need to launch DS Wireless \n", "Communications." ] }, { - "id": "pl_msg_00000310_00026", + "id": "BattleFactory_Text_MustSaveFirst", "en_US": [ "You must save the game before I\n", "show you in. Please wait." ] }, { - "id": "pl_msg_00000310_00027", + "id": "BattleFactory_Text_StaffTellAboutNextTrainer", "en_US": [ "They’re very helpful here.\r", "The staff tell you about the next\n", @@ -209,7 +209,7 @@ ] }, { - "id": "pl_msg_00000310_00028", + "id": "BattleFactory_Text_GetOpponentsLineup", "en_US": [ "Want to hear my trick to choosing\n", "Pokémon?\r", @@ -218,7 +218,7 @@ ] }, { - "id": "pl_msg_00000310_00029", + "id": "BattleFactory_Text_MemorizeOpponentsMoves", "en_US": [ "Memorize what moves the opponent’s\n", "Pokémon used.\r", @@ -227,7 +227,7 @@ ] }, { - "id": "pl_msg_00000310_00030", + "id": "BattleFactory_Text_IllTeachMyStyle", "en_US": [ "I’ll teach you my style.\n", "My way of doing things.\r", @@ -240,7 +240,7 @@ ] }, { - "id": "pl_msg_00000310_00031", + "id": "BattleFactory_Text_ChallengeWithNothing", "en_US": [ "Howdy-do!\n", "Do you raise Pokémon?\r", @@ -257,7 +257,7 @@ ] }, { - "id": "pl_msg_00000310_00032", + "id": "BattleFactory_Text_AlreadySixFavorites", "en_US": [ "Oh, my goodness, what am I to do?\n", "I didn’t expect this to happen!\r", @@ -267,7 +267,7 @@ ] }, { - "id": "pl_msg_00000310_00033", + "id": "BattleFactory_Text_WonMeOverWithPower", "en_US": [ "There were some Pokémon I hated\n", "because they were so tough to battle.\r", diff --git a/res/text/battle_frontier.json b/res/text/battle_frontier.json index fa805660c9..3f0204af7f 100644 --- a/res/text/battle_frontier.json +++ b/res/text/battle_frontier.json @@ -2,21 +2,21 @@ "key": 52134, "messages": [ { - "id": "pl_msg_00000308_00000", + "id": "BattleFrontier_Text_HeightIsSymbolOfChallenge", "en_US": [ "Battle Tower... Its height is a symbol\n", "of its challenge to Trainers." ] }, { - "id": "pl_msg_00000308_00001", + "id": "BattleFrontier_Text_TeamUpWithFriend", "en_US": [ "All the places in the Battle Frontier\n", "let you team up with a friend!" ] }, { - "id": "pl_msg_00000308_00002", + "id": "BattleFrontier_Text_LearnAboutPokemon", "en_US": [ "I don’t think it’s good enough for an\n", "Idol to just be cute, sing, and dance.\r", @@ -25,14 +25,14 @@ ] }, { - "id": "pl_msg_00000308_00003", + "id": "BattleFrontier_Text_BattleWithWorldsBest", "en_US": [ "I get to battle with the world’s best\n", "in do-or-die situations here." ] }, { - "id": "pl_msg_00000308_00004", + "id": "BattleFrontier_Text_MostImportantIsLady", "en_US": [ "The most important person in the Battle\n", "Castle is a lady.\r", @@ -40,7 +40,7 @@ ] }, { - "id": "pl_msg_00000308_00005", + "id": "BattleFrontier_Text_PokemonAlwaysWithMe", "en_US": [ "What makes me the most happy being\n", "a Trainer?\r", @@ -49,14 +49,14 @@ ] }, { - "id": "pl_msg_00000308_00006", + "id": "BattleFrontier_Text_StoryBehindEveryPokemon", "en_US": [ "Behind every Pokémon, there is a\n", "story. Isn’t that right, dear?" ] }, { - "id": "pl_msg_00000308_00007", + "id": "BattleFrontier_Text_BeenTogetherLongTime", "en_US": [ "Like a Pokémon and Trainer, we have\n", "been together for a long time.\r", @@ -66,7 +66,7 @@ ] }, { - "id": "pl_msg_00000308_00008", + "id": "BattleFrontier_Text_ExpectSoMuchFromMaid", "en_US": [ "People expect so much from a maid.\n", "Cooking, cleaning, and laundry...\r", @@ -75,7 +75,7 @@ ] }, { - "id": "pl_msg_00000308_00009", + "id": "BattleFrontier_Text_StrongIsWeak", "en_US": [ "To be strong is to be weak.\n", "To be weak is to be strong.\r", @@ -84,7 +84,7 @@ ] }, { - "id": "pl_msg_00000308_00010", + "id": "BattleFrontier_Text_ThoseWhoLoveBattling", "en_US": [ "There are those who love battling from\n", "deep in the cockles of their hearts.\r", @@ -93,7 +93,7 @@ ] }, { - "id": "pl_msg_00000308_00011", + "id": "BattleFrontier_Text_HowManyYears", "en_US": [ "I wonder how many years it’s been since\n", "I first met a Pokémon?\r", @@ -102,7 +102,7 @@ ] }, { - "id": "pl_msg_00000308_00012", + "id": "BattleFrontier_Text_CommandInConfidence", "en_US": [ "Trainers can command Pokémon to\n", "use moves in battle with confidence.\r", @@ -115,7 +115,7 @@ ] }, { - "id": "pl_msg_00000308_00013", + "id": "BattleFrontier_Text_TreatEveryBattleAsLast", "en_US": [ "I treat every battle as if it were my\n", "last.\r", @@ -126,7 +126,7 @@ ] }, { - "id": "pl_msg_00000308_00014", + "id": "BattleFrontier_Text_CantOverlookSingleDetail", "en_US": [ "The Pokémon’s type!\r", "The moves to be learned!\r", @@ -136,7 +136,7 @@ ] }, { - "id": "pl_msg_00000308_00015", + "id": "BattleFrontier_Text_LookForWhoToBlame", "en_US": [ "You know, when I lose, the first thing\n", "I do is look for who to blame.\r", @@ -147,7 +147,7 @@ ] }, { - "id": "pl_msg_00000308_00016", + "id": "BattleFrontier_Text_WinToChallengeTheBoss", "en_US": [ "There are five facilities in the Battle\n", "Frontier.\r", @@ -158,14 +158,14 @@ ] }, { - "id": "pl_msg_00000308_00017", + "id": "BattleFrontier_Text_WayOfPokemonIsDeep", "en_US": [ "I know it’s no revelation now, but...\n", "The way of Pokémon is deep." ] }, { - "id": "pl_msg_00000308_00018", + "id": "BattleFrontier_Text_WinningWithRentalPokemon", "en_US": [ "At the Battle Factory, you have to\n", "keep winning with rental Pokémon.\r", @@ -174,7 +174,7 @@ ] }, { - "id": "pl_msg_00000308_00019", + "id": "BattleFrontier_Text_MagikarpHasShotAtNo1", "en_US": [ "The Battle Hall is where I want to be.\r", "Even the MAGIKARP I caught fishing\n", @@ -182,14 +182,14 @@ ] }, { - "id": "pl_msg_00000308_00020", + "id": "BattleFrontier_Text_RideEbbsAndFlows", "en_US": [ "My inflatable tube lets me ride out\n", "the ebbs and flows of life." ] }, { - "id": "pl_msg_00000308_00021", + "id": "BattleFrontier_Text_TradeBPForPrizes", "en_US": [ "Welcome to the Exchange Service\n", "Corner!\r", @@ -198,11 +198,11 @@ ] }, { - "id": "pl_msg_00000308_00022", + "id": "BattleFrontier_Text_Dummy22", "garbage": 25 }, { - "id": "pl_msg_00000308_00023", + "id": "BattleFrontier_Text_TradeBPForPrizes2", "en_US": [ "Welcome to the Exchange Service\n", "Corner!\r", @@ -211,56 +211,56 @@ ] }, { - "id": "pl_msg_00000308_00024", + "id": "BattleFrontier_Text_SignBattleTower", "en_US": [ "Battle Tower\n", "Never Lose! Keep Winning!" ] }, { - "id": "pl_msg_00000308_00025", + "id": "BattleFrontier_Text_SignBattleHall", "en_US": [ "Battle Hall\n", "Let Each Pokémon Seek No. 1" ] }, { - "id": "pl_msg_00000308_00026", + "id": "BattleFrontier_Text_SignBattleCastle", "en_US": [ "Battle Castle\n", "Manage Battles with Castle Points " ] }, { - "id": "pl_msg_00000308_00027", + "id": "BattleFrontier_Text_SignBattleArcade", "en_US": [ "Battle Arcade\n", "Where Events Sway Outcomes" ] }, { - "id": "pl_msg_00000308_00028", + "id": "BattleFrontier_Text_SignBattleFactory", "en_US": [ "Battle Factory\n", "Win Consecutively with Rental Pokémon" ] }, { - "id": "pl_msg_00000308_00029", + "id": "BattleFrontier_Text_StatueRepresentsTrainer", "en_US": [ "A Trainer who just caught a Pokémon.\n", "That’s what this statue represents." ] }, { - "id": "pl_msg_00000308_00030", + "id": "BattleFrontier_Text_TitleBoastfulOfCapture", "en_US": [ "“Boastful of Capture”...\n", "That seems to be the title." ] }, { - "id": "pl_msg_00000308_00031", + "id": "BattleFrontier_Text_ScaleModelBattleFrontier", "en_US": [ "This...!\n", "A scale model of the Battle Frontier." diff --git a/res/text/battle_frontier_gate_to_fight_area.json b/res/text/battle_frontier_gate_to_fight_area.json index d051ec3201..d86ed2b88f 100644 --- a/res/text/battle_frontier_gate_to_fight_area.json +++ b/res/text/battle_frontier_gate_to_fight_area.json @@ -2,7 +2,7 @@ "key": 5218, "messages": [ { - "id": "pl_msg_00000309_00000", + "id": "BattleFrontierGateToFightArea_Text_RightThisWay", "en_US": [ "Welcome to the Battle Frontier!\r", "This is your first visit?\n", @@ -10,7 +10,7 @@ ] }, { - "id": "pl_msg_00000309_00001", + "id": "BattleFrontierGateToFightArea_Text_BorrowVsRecorder", "en_US": [ "Oh! You have a Vs. Recorder!\n", "How nice!\r", @@ -24,14 +24,14 @@ ] }, { - "id": "pl_msg_00000309_00002", + "id": "BattleFrontierGateToFightArea_Text_VsRecorderWasUpgraded", "en_US": [ "{STRVAR_1 3, 0, 0}’s Vs. Recorder was\n", "upgraded." ] }, { - "id": "pl_msg_00000309_00003", + "id": "BattleFrontierGateToFightArea_Text_AnyQuestions", "en_US": [ "Our other staff will be pleased to\n", "explain how the individual facilities\f", @@ -41,11 +41,11 @@ ] }, { - "id": "pl_msg_00000309_00004", + "id": "BattleFrontierGateToFightArea_Text_ExplainWhichTopic", "en_US": "Which topic should I explain?" }, { - "id": "pl_msg_00000309_00005", + "id": "BattleFrontierGateToFightArea_Text_ExplainBattleFrontier", "en_US": [ "The Battle Frontier has five facilities\n", "dedicated to battling.\r", @@ -62,7 +62,7 @@ ] }, { - "id": "pl_msg_00000309_00006", + "id": "BattleFrontierGateToFightArea_Text_ExplainBasicRules", "en_US": [ "The battles at the five Battle Frontier\n", "facilities are held under special rules.\r", @@ -78,7 +78,7 @@ ] }, { - "id": "pl_msg_00000309_00007", + "id": "BattleFrontierGateToFightArea_Text_ExplainBattlePoints", "en_US": [ "Battle Points are usually referred to\n", "as BP.\r", @@ -92,7 +92,7 @@ ] }, { - "id": "pl_msg_00000309_00008", + "id": "BattleFrontierGateToFightArea_Text_ExplainExchangeServiceCorner", "en_US": [ "The Exchange Service Corner is the\n", "tent straight ahead past here.\r", @@ -102,7 +102,7 @@ ] }, { - "id": "pl_msg_00000309_00009", + "id": "BattleFrontierGateToFightArea_Text_ExplainPerformanceMonitor", "en_US": [ "The Performance Monitor shows Trainer\n", "data, such as the previous record and\f", @@ -112,35 +112,35 @@ ] }, { - "id": "pl_msg_00000309_00010", + "id": "BattleFrontierGateToFightArea_Text_EnjoyYourVisit", "en_US": "We hope you enjoy your visit!" }, { - "id": "pl_msg_00000309_00011", + "id": "BattleFrontierGateToFightArea_Text_BattleFrontier", "en_US": "BATTLE FRONTIER" }, { - "id": "pl_msg_00000309_00012", + "id": "BattleFrontierGateToFightArea_Text_BattlePoints", "en_US": "BATTLE POINTS" }, { - "id": "pl_msg_00000309_00013", + "id": "BattleFrontierGateToFightArea_Text_ExchangeServiceCorner", "en_US": "EXCHANGE SERVICE CORNER" }, { - "id": "pl_msg_00000309_00014", + "id": "BattleFrontierGateToFightArea_Text_PerformanceMonitor", "en_US": "PERFORMANCE MONITOR" }, { - "id": "pl_msg_00000309_00015", + "id": "BattleFrontierGateToFightArea_Text_Exit", "en_US": "EXIT" }, { - "id": "pl_msg_00000309_00016", + "id": "BattleFrontierGateToFightArea_Text_BasicRules", "en_US": "BASIC RULES" }, { - "id": "pl_msg_00000309_00017", + "id": "BattleFrontierGateToFightArea_Text_ShouldIExplainBattleTower", "en_US": [ "Welcome to the Battle Frontier!\r", "Should I explain how the Battle Tower\n", @@ -148,7 +148,7 @@ ] }, { - "id": "pl_msg_00000309_00018", + "id": "BattleFrontierGateToFightArea_Text_ExplainBattleTower", "en_US": [ "The Battle Tower is the building at the\n", "back of the Battle Frontier.\r", @@ -158,11 +158,11 @@ ] }, { - "id": "pl_msg_00000309_00019", + "id": "BattleFrontierGateToFightArea_Text_EnjoyVisitBattleTower", "en_US": "We hope you enjoy your visit!" }, { - "id": "pl_msg_00000309_00020", + "id": "BattleFrontierGateToFightArea_Text_ShouldIExplainBattleFactory", "en_US": [ "Welcome to the Battle Frontier!\r", "Should I explain how the Battle Factory\n", @@ -170,7 +170,7 @@ ] }, { - "id": "pl_msg_00000309_00021", + "id": "BattleFrontierGateToFightArea_Text_ExplainBattleFactory", "en_US": [ "The Battle Factory is at the upper-\n", "right corner of the Battle Frontier.\r", @@ -184,11 +184,11 @@ ] }, { - "id": "pl_msg_00000309_00022", + "id": "BattleFrontierGateToFightArea_Text_EnjoyVisitBattleFactory", "en_US": "We hope you enjoy your visit!" }, { - "id": "pl_msg_00000309_00023", + "id": "BattleFrontierGateToFightArea_Text_ShouldIExplainBattleHall", "en_US": [ "Welcome to the Battle Frontier!\r", "Should I explain how the Battle Hall\n", @@ -196,7 +196,7 @@ ] }, { - "id": "pl_msg_00000309_00024", + "id": "BattleFrontierGateToFightArea_Text_ExplainBattleHall", "en_US": [ "The Battle Hall is at the upper-left\n", "corner of the Battle Frontier.\r", @@ -207,11 +207,11 @@ ] }, { - "id": "pl_msg_00000309_00025", + "id": "BattleFrontierGateToFightArea_Text_EnjoyVisitBattleHall", "en_US": "We hope you enjoy your visit!" }, { - "id": "pl_msg_00000309_00026", + "id": "BattleFrontierGateToFightArea_Text_ShouldIExplainBattleCastle", "en_US": [ "Welcome to the Battle Frontier!\r", "Should I explain how the Battle Castle\n", @@ -219,7 +219,7 @@ ] }, { - "id": "pl_msg_00000309_00027", + "id": "BattleFrontierGateToFightArea_Text_ExplainBattleCastle", "en_US": [ "The Battle Castle is at the lower-left\n", "corner of the Battle Frontier.\r", @@ -232,11 +232,11 @@ ] }, { - "id": "pl_msg_00000309_00028", + "id": "BattleFrontierGateToFightArea_Text_EnjoyVisitBattleCastle", "en_US": "We hope you enjoy your visit!" }, { - "id": "pl_msg_00000309_00029", + "id": "BattleFrontierGateToFightArea_Text_ShouldIExplainBattleArcade", "en_US": [ "Welcome to the Battle Frontier!\r", "Should I explain how the Battle Arcade\n", @@ -244,7 +244,7 @@ ] }, { - "id": "pl_msg_00000309_00030", + "id": "BattleFrontierGateToFightArea_Text_ExplainBattleArcade", "en_US": [ "The Battle Arcade is at the lower-right\n", "corner of the Battle Frontier.\r", @@ -261,11 +261,11 @@ ] }, { - "id": "pl_msg_00000309_00031", + "id": "BattleFrontierGateToFightArea_Text_EnjoyVisitBattleArcade", "en_US": "We hope you enjoy your visit!" }, { - "id": "pl_msg_00000309_00032", + "id": "BattleFrontierGateToFightArea_Text_FrontierUpAhead", "en_US": [ "The Battle Frontier is up ahead!\r", "What kinds of Trainers will I see?\n", @@ -274,7 +274,7 @@ ] }, { - "id": "pl_msg_00000309_00033", + "id": "BattleFrontierGateToFightArea_Text_NoAcronymFacilities", "en_US": [ "The five facilities of the Battle\n", "Frontier are...\r", @@ -292,7 +292,7 @@ ] }, { - "id": "pl_msg_00000309_00034", + "id": "BattleFrontierGateToFightArea_Text_VsRecorderIsNifty", "en_US": [ "The Vs. Recorder is sure nifty!\r", "Touching the screen shows you how\n", @@ -300,7 +300,7 @@ ] }, { - "id": "pl_msg_00000309_00035", + "id": "BattleFrontierGateToFightArea_Text_DreamToBattlePalmer", "en_US": [ "My dream is to battle Palmer of the\n", "Battle Tower.\r", diff --git a/res/text/battle_hall.json b/res/text/battle_hall.json index 5aec029f20..89cf9497fb 100644 --- a/res/text/battle_hall.json +++ b/res/text/battle_hall.json @@ -2,7 +2,7 @@ "key": 5194, "messages": [ { - "id": "BattleHall_Text_WelcomeToSingleChallenge", + "id": "BattleHall_Text_WelcomeToSingleDoubleChallenge", "en_US": [ "Welcome to the Battle Hall!\r", "I am your guide to the Single and\n", @@ -16,7 +16,7 @@ "en_US": "Which challenge would you like to take?" }, { - "id": "BattleHall_Text_SingleChallengeInfo", + "id": "BattleHall_Text_ExplainSingleDoubleChallenge", "en_US": [ "At the Battle Hall, you may take Single\n", "or Double Battle challenges alone.\r", @@ -59,7 +59,7 @@ ] }, { - "id": "BattleHall_Text_MultiChallengeInfo", + "id": "BattleHall_Text_ExplainMultiChallenge", "en_US": [ "You may team up with a friend for a\n", "Multi Battle challenge using the\r", @@ -113,7 +113,7 @@ ] }, { - "id": "BattleHall_Text_YouveEarnedAPrint", + "id": "BattleHall_Text_PrintForVictory", "en_US": [ "Congratulations!\r", "In honor of your victory, we present\n", @@ -200,7 +200,7 @@ ] }, { - "id": "BattleHall_Text_NeedToLaunchWifiComm", + "id": "BattleHall_Text_NeedToLaunchWiFiComm", "en_US": [ "We need to launch DS Wireless\n", "Communications." @@ -247,25 +247,25 @@ ] }, { - "id": "BattleHall_Text_BanList", + "id": "BattleHall_Text_Banlist", "en_US": "Also, Eggs are ineligible to enter.\r" }, { - "id": "BattleHall_Text_BanList1", + "id": "BattleHall_Text_Banlist1", "en_US": [ "Eggs and {STRVAR_1 0, 1, 0} are not allowed\n", "to enter.\r" ] }, { - "id": "BattleHall_Text_BanList2", + "id": "BattleHall_Text_Banlist2", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, and {STRVAR_1 0, 2, 0}\n", "are not allowed to enter.\r" ] }, { - "id": "BattleHall_Text_BanList3", + "id": "BattleHall_Text_Banlist3", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "and {STRVAR_1 0, 3, 0} are not allowed\f", @@ -273,7 +273,7 @@ ] }, { - "id": "BattleHall_Text_BanList4", + "id": "BattleHall_Text_Banlist4", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, and {STRVAR_1 0, 4, 0}\f", @@ -281,7 +281,7 @@ ] }, { - "id": "BattleHall_Text_BanList5", + "id": "BattleHall_Text_Banlist5", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0}, and\f", @@ -289,7 +289,7 @@ ] }, { - "id": "BattleHall_Text_BanList6", + "id": "BattleHall_Text_Banlist6", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -298,7 +298,7 @@ ] }, { - "id": "BattleHall_Text_BanList7", + "id": "BattleHall_Text_Banlist7", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -307,7 +307,7 @@ ] }, { - "id": "BattleHall_Text_BanList8", + "id": "BattleHall_Text_Banlist8", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -317,7 +317,7 @@ ] }, { - "id": "BattleHall_Text_BanList9", + "id": "BattleHall_Text_Banlist9", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -327,7 +327,7 @@ ] }, { - "id": "BattleHall_Text_BanList10", + "id": "BattleHall_Text_Banlist10", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -338,7 +338,7 @@ ] }, { - "id": "BattleHall_Text_BanList11", + "id": "BattleHall_Text_Banlist11", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -349,7 +349,7 @@ ] }, { - "id": "BattleHall_Text_BanList12", + "id": "BattleHall_Text_Banlist12", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -361,7 +361,7 @@ ] }, { - "id": "BattleHall_Text_BanList13", + "id": "BattleHall_Text_Banlist13", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -373,7 +373,7 @@ ] }, { - "id": "BattleHall_Text_BanList14", + "id": "BattleHall_Text_Banlist14", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -386,7 +386,7 @@ ] }, { - "id": "BattleHall_Text_BanList15", + "id": "BattleHall_Text_Banlist15", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -399,7 +399,7 @@ ] }, { - "id": "BattleHall_Text_BanList16", + "id": "BattleHall_Text_Banlist16", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -413,7 +413,7 @@ ] }, { - "id": "BattleHall_Text_BanList17", + "id": "BattleHall_Text_Banlist17", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -427,7 +427,7 @@ ] }, { - "id": "BattleHall_Text_BanList18", + "id": "BattleHall_Text_Banlist18", "en_US": [ "Eggs, {STRVAR_1 0, 1, 0}, {STRVAR_1 0, 2, 0},\n", "{STRVAR_1 0, 3, 0}, {STRVAR_1 0, 4, 0},\f", @@ -492,7 +492,7 @@ ] }, { - "id": "BattleHall_Text_Pachirisu", + "id": "BattleHall_Text_PachirisuCry", "en_US": "PACHIRISU: Pachipachi pacchipachii!" }, { @@ -562,7 +562,7 @@ ] }, { - "id": "BattleHall_Text_StreakIsPresentlyX", + "id": "BattleHall_Text_StreakRecordIsX", "en_US": [ "When your total win-streak record hits\n", "certain figures, you will earn BP as\f", diff --git a/res/text/battle_tower.json b/res/text/battle_tower.json index 3fcd91bc81..79b199f5ee 100644 --- a/res/text/battle_tower.json +++ b/res/text/battle_tower.json @@ -2,7 +2,7 @@ "key": 9338, "messages": [ { - "id": "BattleTower_Text_GuideToSingleDoubleBattleRooms", + "id": "BattleTower_Text_WelcomeToSingleDoubleBattleRooms", "en_US": [ "Welcome to the Battle Tower!\r", "I am your guide to the Single\n", @@ -10,18 +10,18 @@ ] }, { - "id": "BattleTower_Text_AskTakeBattleRoomChallenge", + "id": "BattleTower_Text_AskTakeChallenge", "en_US": [ "Would you like to take the\n", "Battle Room challenge?" ] }, { - "id": "BattleTower_Text_WeHopeToSeeYouAgain", + "id": "BattleTower_Text_HopeToSeeYouAgain", "en_US": "We hope to see you again!" }, { - "id": "BattleTower_Text_ExplainSingleDoubleBattleRoom", + "id": "BattleTower_Text_ExplainSingleDoubleChallenge", "en_US": [ "The Battle Tower is a facility for Single\n", "or Double Battle challenges.\r", @@ -45,22 +45,22 @@ ] }, { - "id": "BattleTower_Text_AskSingleOrDoubleBattleRoom", + "id": "BattleTower_Text_SingleOrDoubleBattleRoom", "en_US": [ "Which Battle Room would you like?\n", "Single or Double?" ] }, { - "id": "BattleTower_Text_00005", + "id": "BattleTower_Text_Dummy5", "garbage": 192 }, { - "id": "BattleTower_Text_00006", + "id": "BattleTower_Text_Dummy6", "garbage": 258 }, { - "id": "BattleTower_Text_00007", + "id": "BattleTower_Text_Dummy7", "garbage": 32 }, { @@ -90,7 +90,7 @@ ] }, { - "id": "BattleTower_Text_BeatenTowerTycoonReceivedBP", + "id": "BattleTower_Text_BeatenTycoonReceivedBP", "en_US": [ "Congratulations!\n", "You’ve beaten the Tower Tycoon!\r", @@ -108,7 +108,7 @@ ] }, { - "id": "BattleTower_Text_WeHopeToSeeYouAgain2", + "id": "BattleTower_Text_HopeToSeeYouAgain2", "en_US": "We hope to see you again." }, { @@ -120,15 +120,15 @@ ] }, { - "id": "BattleTower_Text_00017", + "id": "BattleTower_Text_Dummy17", "garbage": 22 }, { - "id": "BattleTower_Text_00018", + "id": "BattleTower_Text_Dummy18", "garbage": 9 }, { - "id": "BattleTower_Text_DidntSaveBeforeQuitting", + "id": "BattleTower_Text_DidntSaveBeforeQuit", "en_US": [ "Excuse me!\r", "You didn’t save before you quit your\n", @@ -138,7 +138,7 @@ ] }, { - "id": "BattleTower_Text_GuideToMultiBattleRooms", + "id": "BattleTower_Text_WelcomeToMultiBattleRooms", "en_US": [ "Welcome to the Battle Tower!\r", "I am your guide to the Multi\n", @@ -146,14 +146,14 @@ ] }, { - "id": "BattleTower_Text_AskTakeMultiBattleRoomChallenge", + "id": "BattleTower_Text_AskTakeMultiChallenge", "en_US": [ "Would you like to take the Multi\n", "Battle Room challenge?" ] }, { - "id": "BattleTower_Text_00022", + "id": "BattleTower_Text_Dummy22", "garbage": 26 }, { @@ -186,11 +186,11 @@ ] }, { - "id": "BattleTower_Text_00024", + "id": "BattleTower_Text_Dummy24", "garbage": 259 }, { - "id": "BattleTower_Text_00025", + "id": "BattleTower_Text_Dummy25", "garbage": 32 }, { @@ -201,7 +201,7 @@ ] }, { - "id": "BattleTower_Text_OneBecomeLeaderOtherJoinGroup", + "id": "BattleTower_Text_BecomeLeaderOrJoinGroup", "en_US": [ "One Trainer should select\n", "“BECOME LEADER.”\r", @@ -210,19 +210,19 @@ ] }, { - "id": "BattleTower_Text_00028", + "id": "BattleTower_Text_Dummy28", "garbage": 26 }, { - "id": "BattleTower_Text_00029", + "id": "BattleTower_Text_Dummy29", "garbage": 15 }, { - "id": "BattleTower_Text_00030", + "id": "BattleTower_Text_Dummy30", "garbage": 17 }, { - "id": "BattleTower_Text_00031", + "id": "BattleTower_Text_Dummy31", "garbage": 21 }, { @@ -255,7 +255,7 @@ "en_US": "I will now show you to the Battle Salon.\r" }, { - "id": "BattleTower_Text_GuideToWiFiBattleRooms", + "id": "BattleTower_Text_WelcomeToWiFiBattleRooms", "en_US": [ "Welcome to the Battle Tower!\r", "I am your guide to the Wi-Fi Battle\n", @@ -263,7 +263,7 @@ ] }, { - "id": "BattleTower_Text_AskTakeWifiBattleRoomChallenge", + "id": "BattleTower_Text_AskTakeWiFiChallenge", "en_US": [ "Would you like to take the Wi-Fi\n", "Battle Room challenge?" @@ -300,35 +300,35 @@ ] }, { - "id": "BattleTower_Text_WeHopeToSeeYouAgain3", + "id": "BattleTower_Text_HopeToSeeYouAgain3", "en_US": "We hope to see you again!" }, { - "id": "BattleTower_Text_00040", + "id": "BattleTower_Text_Dummy40", "garbage": 32 }, { - "id": "BattleTower_Text_00041", + "id": "BattleTower_Text_Dummy41", "garbage": 262 }, { - "id": "BattleTower_Text_00042", + "id": "BattleTower_Text_Dummy42", "garbage": 26 }, { - "id": "BattleTower_Text_00043", + "id": "BattleTower_Text_Dummy43", "garbage": 15 }, { - "id": "BattleTower_Text_00044", + "id": "BattleTower_Text_Dummy44", "garbage": 17 }, { - "id": "BattleTower_Text_00045", + "id": "BattleTower_Text_Dummy45", "garbage": 55 }, { - "id": "BattleTower_Text_00046", + "id": "BattleTower_Text_Dummy46", "garbage": 29 }, { @@ -340,26 +340,26 @@ ] }, { - "id": "BattleTower_Text_AskSaveAndInterruptChallenge", + "id": "BattleTower_Text_SaveAndInterruptChallenge", "en_US": [ "Would you like to save and interrupt\n", "your challenge?" ] }, { - "id": "BattleTower_Text_00049", + "id": "BattleTower_Text_Dummy49", "garbage": 24 }, { - "id": "BattleTower_Text_00050", + "id": "BattleTower_Text_Dummy50", "garbage": 31 }, { - "id": "BattleTower_Text_00051", + "id": "BattleTower_Text_Dummy51", "garbage": 22 }, { - "id": "BattleTower_Text_PleaseConfirmPastLeaderHistory", + "id": "BattleTower_Text_ConfirmPastLeaderHistory", "en_US": [ "I’ve downloaded the Rank {STRVAR_1 51, 0, 0} Battle\n", "Room {STRVAR_1 52, 1, 0}’s past leader history.\r", @@ -368,7 +368,7 @@ ] }, { - "id": "BattleTower_Text_ThankYouForPlaying", + "id": "BattleTower_Text_ThanksForPlaying", "en_US": "Thank you for playing!\r" }, { @@ -400,7 +400,7 @@ ] }, { - "id": "BattleTower_Text_EarnedAndReceivedBP", + "id": "BattleTower_Text_ReceivedBP7WinStreak", "en_US": [ "For your 7-win streak, we present\n", "you with the BP you have earned!\r", @@ -409,7 +409,7 @@ ] }, { - "id": "BattleTower_Text_00059", + "id": "BattleTower_Text_Dummy59", "garbage": 26 }, { @@ -429,15 +429,15 @@ ] }, { - "id": "BattleTower_Text_00062", + "id": "BattleTower_Text_Dummy62", "garbage": 42 }, { - "id": "BattleTower_Text_00063", + "id": "BattleTower_Text_Dummy63", "garbage": 26 }, { - "id": "BattleTower_Text_00064", + "id": "BattleTower_Text_Dummy64", "garbage": 11 }, { @@ -448,15 +448,15 @@ ] }, { - "id": "BattleTower_Text_00066", + "id": "BattleTower_Text_Dummy66", "garbage": 33 }, { - "id": "BattleTower_Text_00067", + "id": "BattleTower_Text_Dummy67", "garbage": 26 }, { - "id": "BattleTower_Text_00068", + "id": "BattleTower_Text_Dummy68", "garbage": 27 }, { @@ -467,7 +467,7 @@ ] }, { - "id": "BattleTower_Text_CongratulationsOnAchievingRank", + "id": "BattleTower_Text_RibbonsForAchievingRank", "en_US": [ "Congratulations on achieving Rank {STRVAR_1 51, 0, 0}.\r", "Your winning Pokémon team has won\n", @@ -475,7 +475,7 @@ ] }, { - "id": "BattleTower_Text_CongratulationsOnAchievingConsecutiveWins", + "id": "BattleTower_Text_AwardForConsecutiveWins", "en_US": [ "Congratulations on achieving {STRVAR_1 52, 0, 0}\n", "consecutive wins!\r", @@ -488,7 +488,7 @@ "en_US": "{STRVAR_1 3, 0, 0} obtained {STRVAR_1 8, 1, 0}!" }, { - "id": "BattleTower_Text_CongratulationsOnAchievingYour50WinStreak", + "id": "BattleTower_Text_WonRibbonsFor50WinStreak", "en_US": [ "Congratulations on achieving your\n", "50-win streak.\r", @@ -506,7 +506,7 @@ ] }, { - "id": "BattleTower_Text_WiFiBattleRoomsAreFullOfSurprises", + "id": "BattleTower_Text_FullOfSurprises", "en_US": [ "The Wi-Fi Battle Rooms are full of\n", "surprises.\r", @@ -517,7 +517,7 @@ ] }, { - "id": "BattleTower_Text_TheyProfileYouOnTV", + "id": "BattleTower_Text_ProfileOnTV", "en_US": [ "They profile you on TV if you set\n", "a good record here.\r", @@ -526,7 +526,7 @@ ] }, { - "id": "BattleTower_Text_ITrainedMyLittleGuy", + "id": "BattleTower_Text_TrainedLittleGuy", "en_US": [ "I trained my little guy till we\n", "couldn’t take any more.\r", @@ -549,7 +549,7 @@ ] }, { - "id": "BattleTower_Text_ThereAreManyToughTrainers", + "id": "BattleTower_Text_ManyToughTrainers", "en_US": [ "There are so many tough Trainers\n", "around...\r", @@ -562,7 +562,7 @@ "en_US": "PIKACHU: Pichuu! Pichuu!" }, { - "id": "BattleTower_Text_CongratulationsOnAchievingA50WinStreak", + "id": "BattleTower_Text_RibbonsFor50WinStreak", "en_US": [ "Congratulations on achieving\n", "a 50-win streak!\r", @@ -571,7 +571,7 @@ ] }, { - "id": "BattleTower_Text_CongratulationsOnAdvancingToRank", + "id": "BattleTower_Text_RibbonsForAdvancingToRank", "en_US": [ "Congratulations on advancing to\n", "Rank {STRVAR_1 50, 0, 0}!\r", @@ -580,7 +580,7 @@ ] }, { - "id": "BattleTower_Text_CongratulationsOnDefeatingTowerTycoon", + "id": "BattleTower_Text_RibbonsForDefeatingTycoon", "en_US": [ "Congratulations on defeating\n", "the Tower Tycoon!\r", @@ -597,21 +597,21 @@ ] }, { - "id": "BattleTower_Text_GoldPrintWasAddedToVsRecorder", + "id": "BattleTower_Text_GoldPrintAdded", "en_US": [ "The Gold Print was added to\n", "{STRVAR_1 3, 0, 0}’s Vs. Recorder!\r" ] }, { - "id": "BattleTower_Text_SilverPrintWasAddedToVsRecorder", + "id": "BattleTower_Text_SilverPrintAdded", "en_US": [ "The Silver Print was added to\n", "{STRVAR_1 3, 0, 0}’s Vs. Recorder!\r" ] }, { - "id": "BattleTower_Text_CongratulationsOnAchievingWinStreak", + "id": "BattleTower_Text_TrophyForWinStreak", "en_US": [ "Congratulations on achieving your\n", "{STRVAR_1 52, 0, 0}-win streak!\r", @@ -620,7 +620,7 @@ ] }, { - "id": "BattleTower_Text_RunOutOfRoomForDecorationGoods", + "id": "BattleTower_Text_NoRoomForGoods", "en_US": [ "...Uh-oh... You’ve run out of room\n", "for decoration goods.\r", @@ -629,11 +629,11 @@ ] }, { - "id": "BattleTower_Text_00090", + "id": "BattleTower_Text_Dummy90", "garbage": 61 }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon", + "id": "BattleTower_Text_Banlist", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -646,7 +646,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon2", + "id": "BattleTower_Text_Banlist2", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -660,7 +660,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon3", + "id": "BattleTower_Text_Banlist3", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -674,7 +674,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon4", + "id": "BattleTower_Text_Banlist4", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -688,7 +688,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon5", + "id": "BattleTower_Text_Banlist5", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -703,7 +703,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon6", + "id": "BattleTower_Text_Banlist6", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -718,7 +718,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon7", + "id": "BattleTower_Text_Banlist7", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -734,7 +734,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon8", + "id": "BattleTower_Text_Banlist8", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -750,7 +750,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon9", + "id": "BattleTower_Text_Banlist9", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -767,7 +767,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon10", + "id": "BattleTower_Text_Banlist10", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -784,7 +784,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon11", + "id": "BattleTower_Text_Banlist11", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -802,7 +802,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon12", + "id": "BattleTower_Text_Banlist12", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -820,7 +820,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon13", + "id": "BattleTower_Text_Banlist13", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -839,7 +839,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon14", + "id": "BattleTower_Text_Banlist14", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -858,7 +858,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon15", + "id": "BattleTower_Text_Banlist15", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -878,7 +878,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon16", + "id": "BattleTower_Text_Banlist16", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -898,7 +898,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon17", + "id": "BattleTower_Text_Banlist17", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -919,7 +919,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon18", + "id": "BattleTower_Text_Banlist18", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -940,7 +940,7 @@ ] }, { - "id": "BattleTower_Text_NotEnoughEligiblePokemon19", + "id": "BattleTower_Text_Banlist19", "en_US": [ "Excuse me!\r", "You don’t have {STRVAR_1 50, 0, 0} eligible Pokémon.\r", @@ -976,14 +976,14 @@ ] }, { - "id": "BattleTower_Text_DSWirelessCommunicationWillBeLaunched", + "id": "BattleTower_Text_LaunchWifiComm", "en_US": [ "DS Wireless Communications will\n", "be launched." ] }, { - "id": "BattleTower_Text_WeLookForwardToYourNextVisit", + "id": "BattleTower_Text_LookForwardToNextVisit", "en_US": "We look forward to your next visit.\r" }, { @@ -1008,7 +1008,7 @@ ] }, { - "id": "BattleTower_Text_OhYouDontNeedMeToJudge", + "id": "BattleTower_Text_YouDontNeedMe", "en_US": [ "...Oh.\n", "You don’t need me to judge. I get it." diff --git a/res/text/menu_entries.json b/res/text/menu_entries.json index 7837ee8797..a07d590f1b 100644 --- a/res/text/menu_entries.json +++ b/res/text/menu_entries.json @@ -54,11 +54,11 @@ "en_US": "EXIT" }, { - "id": "MenuEntries_Text_BattleTower_JoinGroup", + "id": "MenuEntries_Text_JoinGroup", "en_US": "JOIN GROUP" }, { - "id": "MenuEntries_Text_BattleTower_BecomeLeader", + "id": "MenuEntries_Text_BecomeLeader", "en_US": "BECOME LEADER" }, { diff --git a/src/game_records.c b/src/game_records.c index d2741002c3..cd81928ad7 100644 --- a/src/game_records.c +++ b/src/game_records.c @@ -145,7 +145,7 @@ static u8 sUsesHighLimit[MAX_RECORDS] = { [RECORD_UNK_055] = FALSE, [RECORD_TIMES_STUCK_IN_DEEP_MUD] = FALSE, [RECORD_TIMES_BATTLED_AT_BATTLEGROUND] = TRUE, - [RECORD_UNK_058] = TRUE, + [RECORD_TIMES_STARTED_BATTLE_FRONTIER_CHALLENGE] = TRUE, [RECORD_UNK_059] = TRUE, [RECORD_BATTLE_FACTORY_VICTORIES] = TRUE, [RECORD_BATTLE_CASTLE_VICTORIES] = TRUE, @@ -296,10 +296,10 @@ static const u16 sTrainerScoreIncrements[MAX_TRAINER_SCORE_EVENTS] = { [TRAINER_SCORE_EVENT_UNDERGROUND_NEW_SECRET_BASE] = 3, [TRAINER_SCORE_EVENT_UNDERGROUND_ENTERED] = 1, [TRAINER_SCORE_EVENT_UNDERGROUND_100_STEPS] = 1, - [TRAINER_SCORE_EVENT_UNK_38] = 7, - [TRAINER_SCORE_EVENT_UNK_39] = 7, + [TRAINER_SCORE_EVENT_BATTLE_FACTORY_ROUND_COMPLETED] = 7, + [TRAINER_SCORE_EVENT_BATTLE_CASTLE_ROUND_COMPLETED] = 7, [TRAINER_SCORE_EVENT_BATTLE_HALL_ROUND_COMPLETED] = 7, - [TRAINER_SCORE_EVENT_UNK_41] = 7, + [TRAINER_SCORE_EVENT_BATTLE_ARCADE_ROUND_COMPLETED] = 7, [TRAINER_SCORE_EVENT_ALL_BATTLE_FRONTIER_GOLD_PRINTS] = 1000, [TRAINER_SCORE_EVENT_UNK_43] = 11, [TRAINER_SCORE_EVENT_UNK_44] = 20, diff --git a/src/scrcmd_battle_hall.c b/src/scrcmd_battle_hall.c index d42ef03261..42d3b8fe1b 100644 --- a/src/scrcmd_battle_hall.c +++ b/src/scrcmd_battle_hall.c @@ -59,8 +59,8 @@ enum BattleHallSelectionSubTask { static BOOL CheckPartyIsBattleHallEligible(u16 numPokemonNeeded, SaveData *saveData); -static void CheckSameSpeciesAsPartner(FieldTask *param0, u16 param1, u16 *param2); -static BOOL CheckSameSpeciesAsPartnerTask(FieldTask *param0); +static void CheckPartnerUsesDifferentSpecies(FieldTask *param0, u16 param1, u16 *param2); +static BOOL CheckPartnerUsesDifferentSpeciesTask(FieldTask *param0); static void SelectBattleHallChallengers(FieldTask *task, void **partySelect, u8 challengeType); static BOOL BattleHallSelectChallengersTask(FieldTask *task); @@ -192,16 +192,16 @@ BOOL ScrCmd_2D1(ScriptContext *ctx) return FALSE; } -BOOL ScrCmd_BattleHallCheckUsingSameSpeciesAsPartner(ScriptContext *ctx) +BOOL ScrCmd_CheckBattleHallPartnerUsesDifferentSpecies(ScriptContext *ctx) { u16 species = ScriptContext_GetVar(ctx); u16 *result = ScriptContext_GetVarPointer(ctx); - CheckSameSpeciesAsPartner(ctx->task, species, result); + CheckPartnerUsesDifferentSpecies(ctx->task, species, result); return TRUE; } -static void CheckSameSpeciesAsPartner(FieldTask *task, u16 species, u16 *speciesAreDifferent) +static void CheckPartnerUsesDifferentSpecies(FieldTask *task, u16 species, u16 *speciesAreDifferent) { BattleHallSameSpeciesCheck *taskEnv = Heap_Alloc(HEAP_ID_FIELD2, sizeof(BattleHallSameSpeciesCheck)); memset(taskEnv, 0, sizeof(BattleHallSameSpeciesCheck)); @@ -211,11 +211,11 @@ static void CheckSameSpeciesAsPartner(FieldTask *task, u16 species, u16 *species CommFieldCmd_Init(taskEnv); - FieldTask_InitCall(task, CheckSameSpeciesAsPartnerTask, taskEnv); + FieldTask_InitCall(task, CheckPartnerUsesDifferentSpeciesTask, taskEnv); return; } -static BOOL CheckSameSpeciesAsPartnerTask(FieldTask *task) +static BOOL CheckPartnerUsesDifferentSpeciesTask(FieldTask *task) { BattleHallSameSpeciesCheck *data = FieldTask_GetEnv(task); diff --git a/src/scrcmd_tv_broadcast.c b/src/scrcmd_tv_broadcast.c index 0241983d09..1c32b6848a 100644 --- a/src/scrcmd_tv_broadcast.c +++ b/src/scrcmd_tv_broadcast.c @@ -3,7 +3,9 @@ #include #include +#include "constants/map_object.h" #include "constants/tv_broadcast.h" +#include "generated/movement_types.h" #include "generated/trainer_score_events.h" #include "struct_decls/tv_broadcast.h" @@ -390,50 +392,50 @@ BOOL ScrCmd_GetCurrentSafariGameCaughtNum(ScriptContext *ctx) return FALSE; } -BOOL ScrCmd_329(ScriptContext *param0) +BOOL ScrCmd_GetBattleFrontierReporterPosition(ScriptContext *ctx) { TVBroadcast *broadcast; UnkStruct_0202E81C *v1; - u16 *v2 = ScriptContext_GetVarPointer(param0); - u16 *v3 = ScriptContext_GetVarPointer(param0); - u16 *v4 = ScriptContext_GetVarPointer(param0); - u16 *v5 = ScriptContext_GetVarPointer(param0); + u16 *x = ScriptContext_GetVarPointer(ctx); + u16 *z = ScriptContext_GetVarPointer(ctx); + u16 *dir = ScriptContext_GetVarPointer(ctx); + u16 *movementType = ScriptContext_GetVarPointer(ctx); - broadcast = SaveData_GetTVBroadcast(param0->fieldSystem->saveData); + broadcast = SaveData_GetTVBroadcast(ctx->fieldSystem->saveData); v1 = sub_0202E81C(broadcast); switch (v1->unk_01) { case 5: - *v2 = 25; - *v3 = 36; - *v4 = 0; - *v5 = 0xe; + *x = 25; + *z = 36; + *dir = DIR_NORTH; + *movementType = MOVEMENT_TYPE_LOOK_NORTH; break; case 4: - *v2 = 37; - *v3 = 61; - *v4 = 1; - *v5 = 0xf; + *x = 37; + *z = 61; + *dir = DIR_SOUTH; + *movementType = MOVEMENT_TYPE_LOOK_SOUTH; break; case 6: - *v2 = 59; - *v3 = 61; - *v4 = 1; - *v5 = 0xf; + *x = 59; + *z = 61; + *dir = DIR_SOUTH; + *movementType = MOVEMENT_TYPE_LOOK_SOUTH; break; case 2: case 3: - *v2 = 72; - *v3 = 36; - *v4 = 0; - *v5 = 0xe; + *x = 72; + *z = 36; + *dir = DIR_NORTH; + *movementType = MOVEMENT_TYPE_LOOK_NORTH; break; case 1: default: - *v2 = 47; - *v3 = 21; - *v4 = 0; - *v5 = 0xe; + *x = 47; + *z = 21; + *dir = DIR_NORTH; + *movementType = MOVEMENT_TYPE_LOOK_NORTH; break; }