diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 3f399f473b..707fb1d38a 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -595,9 +595,9 @@ .short \seqID .endm - .macro StopMusic dummy + .macro StopMusic .short SCRCMD_STOPMUSIC - .short \dummy + .short 0 // unused .endm // Plays the default music track based on the player's current location @@ -1207,10 +1207,10 @@ .short SCRCMD_WAITFADESCREEN .endm - .macro Warp mapID, dummy, x, z, direction + .macro Warp mapID, x, z, direction .short SCRCMD_WARP .short \mapID - .short \dummy + .short 0 // unused .short \x .short \z .short \direction @@ -2484,9 +2484,9 @@ .short \daycareSlot .endm - .macro BufferPartyMonNicknameReturnSpecies unused, partySlot, destVar + .macro BufferPartyMonNicknameReturnSpecies partySlot, destVar .short SCRCMD_BUFFERPARTYMONNICKNAMERETURNSPECIES - .short \unused + .short 0 // unused .short \partySlot .short \destVar .endm @@ -2661,7 +2661,7 @@ .short SCRCMD_GIVEJOURNAL .endm - .macro CreateJournalEvent eventType, eventParam, unused1, unused2, unused3 + .macro CreateJournalEvent eventType, eventParam=0, unused1=0, unused2=0, unused3=0 .short SCRCMD_CREATEJOURNALEVENT .short \eventType .short \eventParam @@ -3476,16 +3476,16 @@ .short SCRCMD_DUMMY242 .endm - .macro ChooseCustomMessageWord unused, resultVar, destVar + .macro ChooseCustomMessageWord resultVar, destVar .short SCRCMD_CHOOSECUSTOMMESSAGEWORD - .short \unused + .short 0 // unused .short \resultVar .short \destVar .endm - .macro ChooseTwoCustomMessageWords unused, resultVar, destVar1, destVar2 + .macro ChooseTwoCustomMessageWords resultVar, destVar1, destVar2 .short SCRCMD_CHOOSETWOCUSTOMMESSAGEWORDS - .short \unused + .short 0 // unused .short \resultVar .short \destVar1 .short \destVar2 diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index 3895251ec7..deef0a02f8 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -285,7 +285,7 @@ FLAG_CAUGHT_REGIGIGAS FLAG_RECEIVED_PASTORIA_CITY_MIDDLE_HOUSE_MACHO_BRACE FLAG_RECEIVED_IRON_ISLAND_HOUSE_METAL_COAT FLAG_CAUGHT_ARCEUS -FLAG_OBTAINED_LUNAR_WING +FLAG_MET_CRESSELIA FLAG_CAUGHT_HEATRAN FLAG_CAUGHT_GIRATINA FLAG_UNK_0x0122 @@ -300,9 +300,9 @@ FLAG_OBTAINED_ETERNA_FOREST_OUTSIDE_ACCESSORY_BIG_TREE FLAG_RECEIVED_ROUTE_206_CYCLING_ROAD_SOUTH_GATE_ACCESSORY_FLAG FLAG_WOKE_UP_CANALAVE_CITY_SAILOR_ELDRITCH_HOUSE_LITTLE_BOY FLAG_WROTE_ON_ROUTE_224_TABLET -FLAG_GAME_CORNER_RECEIVED_20_COINS_OLD_MAN -FLAG_GAME_CORNER_RECEIVED_50_COINS_FARMER -FLAG_GAME_CORNER_RECEIVED_TM64 +FLAG_RECEIVED_GAME_CORNER_20_COINS_OLD_MAN +FLAG_RECEIVED_GAME_CORNER_50_COINS_FARMER +FLAG_RECEIVED_GAME_CORNER_TM64 FLAG_RECEIVED_HEARTHOME_CITY_NORTHWEST_HOUSE_EEVEE FLAG_SPEAR_PILLAR_IS_DISTORTED FLAG_TALKED_TO_CANALAVE_CITY_SAILOR_ELDRITCH_HOUSE_LITTLE_BOY @@ -355,7 +355,7 @@ FLAG_TALKED_TO_GRAND_LAKE_ROUTE_213_NORTHWEST_HOUSE_PSYCHIC FLAG_VOLKNER_RETURNED_TO_GYM FLAG_UNK_0x0163 FLAG_TALKED_TO_POKEMON_MANSION_OFFICE_OLD_MAN_NATIONAL_DEX -FLAG_GAME_CORNER_SAVED_TM64 +FLAG_SAVED_GAME_CORNER_TM64 FLAG_STARTED_FIVE_MAID_KNOCKOUT_CHALLENGE FLAG_UNK_0x0167 FLAG_UNK_0x0168 diff --git a/include/battle_frontier_save.h b/include/battle_frontier_save.h new file mode 100644 index 0000000000..08ee4f532c --- /dev/null +++ b/include/battle_frontier_save.h @@ -0,0 +1,27 @@ +#ifndef POKEPLATINUM_BATTLE_FRONTIER_SAVE_H +#define POKEPLATINUM_BATTLE_FRONTIER_SAVE_H + +#include "constants/battle_frontier_stats.h" + +#include "struct_defs/battle_frontier.h" + +#include "battle_frontier_stats.h" +#include "savedata.h" + +#define BattleFrontierSave_GetStatAutoHostIdx(frontierSave, statIndex) BattleFrontierSave_GetStat(frontierSave, statIndex, BattleFrontierStats_GetHostFriendIdx(statIndex)) +#define BattleFrontierSave_SetStatAutoHostIdx(frontierSave, statIndex, newValue) BattleFrontierSave_SetStat(frontierSave, statIndex, BattleFrontierStats_GetHostFriendIdx(statIndex), newValue) +#define BattleFrontierSave_SetIfBetterAutoHostIdx(frontierSave, statIndex, newValue) BattleFrontierSave_SetIfBetter(frontierSave, statIndex, BattleFrontierStats_GetHostFriendIdx(statIndex), newValue) + +int BattleFrontierSave_Size(void); +void BattleFrontier_Init(BattleFrontierSave *frontier); +BattleFrontierSave *SaveData_GetBattleFrontier(SaveData *saveData); +u16 BattleFrontierSave_GetStat(BattleFrontierSave *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID); +u16 BattleFrontierSave_SetStat(BattleFrontierSave *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, u16 newValue); +void BattleFrontierSave_ClearAllWFCStats(BattleFrontierSave *frontier); +void BattleFrontierSave_ClearFriendStatsAndShift(BattleFrontierSave *frontier, int friendIdx); +void BattleFrontierSave_ClearFriendStats(BattleFrontierSave *frontier, int friendIndex, int unused); +u16 BattleFrontierSave_AddToStat(BattleFrontierSave *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, int addValue); +u16 BattleFrontierSave_SubtractFromStat(BattleFrontierSave *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, int subtractValue); +u16 BattleFrontierSave_SetIfBetter(BattleFrontierSave *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, u16 newValue); + +#endif // POKEPLATINUM_BATTLE_FRONTIER_SAVE_H diff --git a/include/battle_frontier_stats.h b/include/battle_frontier_stats.h index 06e796c3ca..3cc17a395c 100644 --- a/include/battle_frontier_stats.h +++ b/include/battle_frontier_stats.h @@ -3,20 +3,28 @@ #include "constants/battle_frontier_stats.h" -#include "struct_defs/battle_frontier.h" - #include "savedata.h" -int BattleFrontier_SaveSize(void); -void BattleFrontier_Init(BattleFrontier *frontier); -BattleFrontier *SaveData_GetBattleFrontier(SaveData *saveData); -u16 BattleFrontierStats_GetStat(BattleFrontier *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID); -u16 BattleFrontierStats_SetStat(BattleFrontier *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, u16 newValue); -void BattleFrontierStats_ClearAllWFCStats(BattleFrontier *frontier); -void BattleFrontierStats_ClearFriendStatsAndShift(BattleFrontier *frontier, int friendIdx); -void BattleFrontierStats_ClearFriendStats(BattleFrontier *frontier, int friendIndex, int unused); -u16 BattleFrontierStats_AddToStat(BattleFrontier *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, int addValue); -u16 BattleFrontierStats_SubtractFromStat(BattleFrontier *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, int subtractValue); -u16 BattleFrontierStats_SetIfBetter(BattleFrontier *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, u16 newValue); +enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryLatestStreakIdx(u8 isOpenLevel, u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryRecordStreakIdx(u8 isOpenLevel, u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryLatestTradeCountIndex(u8 isOpenLevel, u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryRecordTradeCountIndex(u8 isOpenLevel, u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetHallCurrentTypeRanksIndex(u8 challengeType, u8 pokemonType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetHallLatestStreakIndex(u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetHallCurrentStreakIndex(u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetHallLatestSpeciesIndex(u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetHallRecordStreakIndex(u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleRankIndex(u8 challengeType, u8 rankType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleLatestStreakIndex(u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleRecordStreakIndex(u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleLatestCPIndex(u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleSpentCPIndex(u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleRecordCPIndex(u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetArcadeLatestStreakIndex(u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetArcadeCurrentStreakIndex(u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetTowerLatestStreakIndex(u8 challengeType); +enum BattleFrontierStatsIndex BattleFrontierStats_GetTowerRecordStreakIndex(u8 challengeType); +int BattleFrontierStats_GetHostFriendIdx(u32 statIndex); +u8 sub_0205E6D8(SaveData *saveData); #endif // POKEPLATINUM_BATTLE_FRONTIER_STATS_H diff --git a/include/overlay104/ov104_0223B6F4.h b/include/overlay104/ov104_0223B6F4.h index d96c8fe142..7d5f6a916c 100644 --- a/include/overlay104/ov104_0223B6F4.h +++ b/include/overlay104/ov104_0223B6F4.h @@ -24,6 +24,6 @@ void ov104_0223BAB8(BattleCastle *battleCastle); u16 ov104_0223BB60(BattleCastle *battleCastle); void ov104_0223BB84(BgConfig *param0, BattleCastle *battleCastle, u32 param2); u16 ov104_0223BC24(u16 param0); -void ov104_0223BC2C(BattleFrontier *frontier, u8 challengeType, int castlePoints); +void ov104_0223BC2C(BattleFrontierSave *frontier, u8 challengeType, int castlePoints); #endif // POKEPLATINUM_OV104_0223B6F4_H diff --git a/include/struct_defs/battle_frontier.h b/include/struct_defs/battle_frontier.h index a42d4c62ef..01cd71c64d 100644 --- a/include/struct_defs/battle_frontier.h +++ b/include/struct_defs/battle_frontier.h @@ -22,7 +22,7 @@ typedef struct BattleFrontierStats { u16 wfcStats[MAX_FRIENDS][STATS_NUM_WFC_STATS]; } BattleFrontierStats; -typedef struct BattleFrontier { +typedef struct BattleFrontierSave { BattleFrontierStats stats; union { UnkStruct_0202D060 unk_8E0_val1; @@ -48,6 +48,6 @@ typedef struct BattleFrontier { struct { UnkStruct_020305B8 unk_00; } unk_1620; -} BattleFrontier; +} BattleFrontierSave; #endif // POKEPLATINUM_STRUCT_BATTLE_FRONTIER_H diff --git a/include/unk_0205DFC4.h b/include/unk_0205DFC4.h index 7d9581af91..915192f6ad 100644 --- a/include/unk_0205DFC4.h +++ b/include/unk_0205DFC4.h @@ -1,8 +1,6 @@ #ifndef POKEPLATINUM_UNK_0205DFC4_H #define POKEPLATINUM_UNK_0205DFC4_H -#include "constants/battle_frontier_stats.h" - #include "struct_decls/map_object.h" #include "field_task.h" @@ -16,26 +14,5 @@ u16 SaveData_GetFirstNonEggInParty(SaveData *saveData); BOOL HasAllLegendaryTitansInParty(SaveData *saveData); void MapObject_Shake(FieldTask *task, MapObject *mapObj, u16 times, u16 speed, u16 xOffset, u16 zOffset); void MapObject_Flicker(FieldTask *task, MapObject *mapObj, u16 times, u16 delay); -enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryLatestStreakIdx(u8 isOpenLevel, u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryRecordStreakIdx(u8 isOpenLevel, u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryLatestTradeCountIndex(u8 isOpenLevel, u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryRecordTradeCountIndex(u8 isOpenLevel, u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetHallCurrentTypeRanksIndex(u8 challengeType, u8 pokemonType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetHallLatestStreakIndex(u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetHallCurrentStreakIndex(u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetHallLatestSpeciesIndex(u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetHallRecordStreakIndex(u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleRankIndex(u8 challengeType, u8 rankType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleLatestStreakIndex(u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleRecordStreakIndex(u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleLatestCPIndex(u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleSpentCPIndex(u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleRecordCPIndex(u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetArcadeLatestStreakIndex(u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetArcadeCurrentStreakIndex(u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetTowerLatestStreakIndex(u8 challengeType); -enum BattleFrontierStatsIndex BattleFrontierStats_GetTowerRecordStreakIndex(u8 challengeType); -int BattleFrontierStats_GetHostFriendIdx(u32 statIndex); -u8 sub_0205E6D8(SaveData *saveData); #endif // POKEPLATINUM_UNK_0205DFC4_H diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 15f101aabb..cbc5d6bf80 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -146,7 +146,7 @@ Static main Object main.nef.p/src_battle_hall_save.c.o Object main.nef.p/src_unk_020302D0.c.o Object main.nef.p/src_unk_02030494.c.o - Object main.nef.p/src_battle_frontier_stats.c.o + Object main.nef.p/src_battle_frontier_save.c.o Object main.nef.p/src_battle_hall_win_records.c.o Object main.nef.p/src_unk_02030A80.c.o Object main.nef.p/src_unk_02030CE8.c.o @@ -248,6 +248,7 @@ Static main Object main.nef.p/src_field_message.c.o Object main.nef.p/src_map_tile_behavior.c.o Object main.nef.p/src_unk_0205DFC4.c.o + Object main.nef.p/src_battle_frontier_stats.c.o Object main.nef.p/src_player_avatar.c.o Object main.nef.p/src_unk_0205F180.c.o Object main.nef.p/src_map_object.c.o diff --git a/res/field/scripts/scripts_battle_arcade.s b/res/field/scripts/scripts_battle_arcade.s index a658d8a4d6..36d76b704d 100644 --- a/res/field/scripts/scripts_battle_arcade.s +++ b/res/field/scripts/scripts_battle_arcade.s @@ -289,7 +289,7 @@ BattleArcade_StartChallenge: 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 + CreateJournalEvent LOCATION_EVENT_BATTLE_ARCADE WaitForTransition ScrCmd_2C4 15 CallIfEq VAR_BATTLE_ARCADE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleArcade_EndCommunication diff --git a/res/field/scripts/scripts_battle_castle.s b/res/field/scripts/scripts_battle_castle.s index 931611e235..dfc0e6eba6 100644 --- a/res/field/scripts/scripts_battle_castle.s +++ b/res/field/scripts/scripts_battle_castle.s @@ -286,7 +286,7 @@ BattleCastle_StartChallenge: 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 + CreateJournalEvent LOCATION_EVENT_BATTLE_CASTLE WaitForTransition ScrCmd_2C4 11 CallIfEq VAR_BATTLE_CASTLE_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleCastle_EndCommunication diff --git a/res/field/scripts/scripts_battle_factory.s b/res/field/scripts/scripts_battle_factory.s index 0f37c703ad..1d6f8c7b7f 100644 --- a/res/field/scripts/scripts_battle_factory.s +++ b/res/field/scripts/scripts_battle_factory.s @@ -238,7 +238,7 @@ BattleFactory_StartChallenge: 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 + CreateJournalEvent LOCATION_EVENT_BATTLE_FACTORY WaitForTransition ScrCmd_2C4 3 CallIfEq VAR_BATTLE_FACTORY_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleFactory_EndCommunication diff --git a/res/field/scripts/scripts_battle_frontier.s b/res/field/scripts/scripts_battle_frontier.s index 2d4e6fd484..0b8d5b71ae 100644 --- a/res/field/scripts/scripts_battle_frontier.s +++ b/res/field/scripts/scripts_battle_frontier.s @@ -214,7 +214,7 @@ BattleFrontier_CoordEvent_EnterBattleHall: PlaySE SEQ_SE_DP_KAIDAN2 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_BATTLE_HALL, 0, 25, 9, DIR_WEST + Warp MAP_HEADER_BATTLE_HALL, 25, 9, DIR_WEST FadeScreenIn WaitFadeScreen End @@ -231,7 +231,7 @@ BattleFrontier_CoordEvent_EnterBattleCastle: PlaySE SEQ_SE_DP_KAIDAN2 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_BATTLE_CASTLE, 0, 21, 9, DIR_WEST + Warp MAP_HEADER_BATTLE_CASTLE, 21, 9, DIR_WEST FadeScreenIn WaitFadeScreen End @@ -248,7 +248,7 @@ BattleFrontier_CoordEvent_EnterBattleArcade: PlaySE SEQ_SE_DP_KAIDAN2 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_BATTLE_ARCADE, 0, 1, 6, DIR_EAST + Warp MAP_HEADER_BATTLE_ARCADE, 1, 6, DIR_EAST FadeScreenIn WaitFadeScreen End @@ -265,7 +265,7 @@ BattleFrontier_CoordEvent_EnterBattleFactory: PlaySE SEQ_SE_DP_KAIDAN2 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_BATTLE_FACTORY, 0, 1, 7, DIR_EAST + Warp MAP_HEADER_BATTLE_FACTORY, 1, 7, DIR_EAST FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_battle_hall.s b/res/field/scripts/scripts_battle_hall.s index f51fbe86bf..c899fb3c30 100644 --- a/res/field/scripts/scripts_battle_hall.s +++ b/res/field/scripts/scripts_battle_hall.s @@ -406,7 +406,7 @@ BattleHall_StartChallenge: 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 + CreateJournalEvent LOCATION_EVENT_BATTLE_HALL WaitForTransition ScrCmd_2C4 9 CallIfEq VAR_BATTLE_HALL_CHALLENGE_TYPE, FRONTIER_CHALLENGE_MULTI, BattleHall_EndCommunication diff --git a/res/field/scripts/scripts_battle_tower.s b/res/field/scripts/scripts_battle_tower.s index 1dbc205c6b..7aa1e735b4 100644 --- a/res/field/scripts/scripts_battle_tower.s +++ b/res/field/scripts/scripts_battle_tower.s @@ -443,10 +443,10 @@ BattleTower_TrySaveGame: BattleTower_WarpToElevator: IncrementGameRecord RECORD_TIMES_STARTED_BATTLE_FRONTIER_CHALLENGE - CreateJournalEvent LOCATION_EVENT_BATTLE_TOWER, 0, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_BATTLE_TOWER FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_BATTLE_TOWER_ELEVATOR, 0, 3, 6, DIR_NORTH + Warp MAP_HEADER_BATTLE_TOWER_ELEVATOR, 3, 6, DIR_NORTH FadeScreenIn WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_battle_tower_battle_room.s b/res/field/scripts/scripts_battle_tower_battle_room.s index 57773f9d87..8a9720d923 100644 --- a/res/field/scripts/scripts_battle_tower_battle_room.s +++ b/res/field/scripts/scripts_battle_tower_battle_room.s @@ -54,7 +54,7 @@ BattleTowerBattleRoom_WarpToLobbby: GoToIfEq VAR_0x8008, BATTLE_TOWER_MODE_5, BattleTowerBattleRoom_WarpToLobbbyWiFiAttendant FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_BATTLE_TOWER, 0, 11, 6, DIR_NORTH + Warp MAP_HEADER_BATTLE_TOWER, 11, 6, DIR_NORTH FadeScreenIn WaitFadeScreen ReleaseAll @@ -63,7 +63,7 @@ BattleTowerBattleRoom_WarpToLobbby: BattleTowerBattleRoom_WarpToLobbbyWiFiAttendant: FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_BATTLE_TOWER, 0, 15, 6, DIR_NORTH + Warp MAP_HEADER_BATTLE_TOWER, 15, 6, DIR_NORTH FadeScreenIn WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_battle_tower_battle_salon.s b/res/field/scripts/scripts_battle_tower_battle_salon.s index a5c3040f3c..11068da270 100644 --- a/res/field/scripts/scripts_battle_tower_battle_salon.s +++ b/res/field/scripts/scripts_battle_tower_battle_salon.s @@ -121,7 +121,7 @@ BattleTowerBattleSalon_Quit: SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 3 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_BATTLE_TOWER, 0, 11, 6, DIR_NORTH + Warp MAP_HEADER_BATTLE_TOWER, 11, 6, DIR_NORTH FadeScreenIn WaitFadeScreen End @@ -135,7 +135,7 @@ BattleTowerBattleSalon_OnFrame_EnterBattleRoom: SetVar VAR_BATTLE_TOWER_ELEVATOR_LOAD_ACTION, 2 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_BATTLE_TOWER_ELEVATOR, 0, 3, 6, DIR_NORTH + Warp MAP_HEADER_BATTLE_TOWER_ELEVATOR, 3, 6, DIR_NORTH FadeScreenIn WaitFadeScreen ReleaseAll @@ -339,7 +339,7 @@ BattleTowerBattleSalon_PartnerEnterBattleRoom: WaitMovement FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_BATTLE_TOWER_BATTLE_SALON, 0, 8, 4, DIR_NORTH + Warp MAP_HEADER_BATTLE_TOWER_BATTLE_SALON, 8, 4, DIR_NORTH FadeScreenIn WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_battle_tower_corridor.s b/res/field/scripts/scripts_battle_tower_corridor.s index ddf60127eb..358fb5790e 100644 --- a/res/field/scripts/scripts_battle_tower_corridor.s +++ b/res/field/scripts/scripts_battle_tower_corridor.s @@ -32,7 +32,7 @@ BattleTowerCorridorMulti_OnFrame_EnterBattleRoom: BattleTowerCorridor_WarpToBattleRoom: FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_BATTLE_TOWER_BATTLE_ROOM, 0, 7, 6, DIR_NORTH + Warp MAP_HEADER_BATTLE_TOWER_BATTLE_ROOM, 7, 6, DIR_NORTH FadeScreenIn WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_battle_tower_corridor_multi.s b/res/field/scripts/scripts_battle_tower_corridor_multi.s index 61371630a4..f44f1283fb 100644 --- a/res/field/scripts/scripts_battle_tower_corridor_multi.s +++ b/res/field/scripts/scripts_battle_tower_corridor_multi.s @@ -44,7 +44,7 @@ BattleTowerCorridorMulti_OnFrame_EnterBattleRoom: Call BattleTowerCorridorMulti_EnterBattleRoom FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 0, 7, 5, DIR_NORTH + Warp MAP_HEADER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 7, 5, DIR_NORTH FadeScreenIn WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_battle_tower_elevator.s b/res/field/scripts/scripts_battle_tower_elevator.s index 304164f3fe..0ce8ff096b 100644 --- a/res/field/scripts/scripts_battle_tower_elevator.s +++ b/res/field/scripts/scripts_battle_tower_elevator.s @@ -47,7 +47,7 @@ BattleTowerElevator_BattleRoomCheckWiFi: WaitForTransition ScrCmd_2C4 5 ReturnToField - Warp MAP_HEADER_BATTLE_TOWER, 0, 15, 6, DIR_NORTH + Warp MAP_HEADER_BATTLE_TOWER, 15, 6, DIR_NORTH End BattleTowerElevator_MultiBattleRoom: @@ -56,13 +56,13 @@ BattleTowerElevator_MultiBattleRoom: WaitForTransition ScrCmd_2C4 6 ReturnToField - Warp MAP_HEADER_BATTLE_TOWER, 0, 11, 6, DIR_NORTH + Warp MAP_HEADER_BATTLE_TOWER, 11, 6, DIR_NORTH End BattleTowerElevator_BattleSalon: FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_BATTLE_TOWER_BATTLE_SALON, 0, 8, 2, DIR_SOUTH + Warp MAP_HEADER_BATTLE_TOWER_BATTLE_SALON, 8, 2, DIR_SOUTH FadeScreenIn WaitFadeScreen ReleaseAll @@ -141,7 +141,7 @@ BattleTowerElevator_WiFiBattleRoom: WaitForTransition ScrCmd_2C4 5 ReturnToField - Warp MAP_HEADER_BATTLE_TOWER, 0, 19, 6, DIR_NORTH + Warp MAP_HEADER_BATTLE_TOWER, 19, 6, DIR_NORTH End .balign 4, 0 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 35bf32d106..664952b98b 100644 --- a/res/field/scripts/scripts_battle_tower_multi_battle_room.s +++ b/res/field/scripts/scripts_battle_tower_multi_battle_room.s @@ -62,7 +62,7 @@ BattleTowerMultiBattleRoom_WarpToLobby: SetVar VAR_BATTLE_TOWER_LOBBY_LOAD_ACTION, 1 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_BATTLE_TOWER, 0, 7, 6, DIR_NORTH + Warp MAP_HEADER_BATTLE_TOWER, 7, 6, DIR_NORTH FadeScreenIn WaitFadeScreen ReleaseAll @@ -78,7 +78,7 @@ BattleTowerMultiBattleRoom_EndCommunicationWarpToLobby: ClearReceivedTempDataAllPlayers ScrCmd_135 8 EndCommunication - Warp MAP_HEADER_BATTLE_TOWER, 0, 7, 6, DIR_NORTH + Warp MAP_HEADER_BATTLE_TOWER, 7, 6, DIR_NORTH FadeScreenIn WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_canalave_city_gym.s b/res/field/scripts/scripts_canalave_city_gym.s index aa7de9440b..62ea7f078e 100644 --- a/res/field/scripts/scripts_canalave_city_gym.s +++ b/res/field/scripts/scripts_canalave_city_gym.s @@ -17,7 +17,7 @@ CanalaveGym_Byron: LockAll FacePlayer GoToIfBadgeAcquired BADGE_ID_MINE, CanalaveGym_ByronAfterBadge - CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_CANALAVE_CITY_GYM, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_CANALAVE_CITY_GYM Message CanalaveGym_Text_ByronIntro CloseMessage StartTrainerBattle TRAINER_LEADER_BYRON @@ -37,7 +37,7 @@ CanalaveGym_Byron: SetTrainerFlag TRAINER_ACE_TRAINER_BREANNA SetTrainerFlag TRAINER_BLACK_BELT_RICKY SetTrainerFlag TRAINER_WORKER_GERARDO - CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_CANALAVE_CITY_GYM, TRAINER_LEADER_BYRON, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_CANALAVE_CITY_GYM, TRAINER_LEADER_BYRON ClearFlag FLAG_HIDE_CANALAVE_CITY_RIVAL_BRIDGE ClearFlag FLAG_HIDE_CANALAVE_CITY_RIVAL_LIBRARY ClearFlag FLAG_HIDE_CANALAVE_LIBRARY_RIVAL diff --git a/res/field/scripts/scripts_canalave_city_harbor_inn.s b/res/field/scripts/scripts_canalave_city_harbor_inn.s index 7baa62400d..143291c4a5 100644 --- a/res/field/scripts/scripts_canalave_city_harbor_inn.s +++ b/res/field/scripts/scripts_canalave_city_harbor_inn.s @@ -72,7 +72,7 @@ CanalaveCityHarborInn_OnFrame_Sleep: FadeScreenOut FADE_SCREEN_SPEED_SLOW WaitFadeScreen WaitTime 120, VAR_RESULT - Warp MAP_HEADER_NEWMOON_ISLAND, 0, 152, 277, DIR_SOUTH + Warp MAP_HEADER_NEWMOON_ISLAND, 152, 277, DIR_SOUTH FadeScreenIn FADE_SCREEN_SPEED_SLOW WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s b/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s index baff90cf9e..895dd97e28 100644 --- a/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s +++ b/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s @@ -70,7 +70,7 @@ CanalaveCitySailorEldritchHouse_ScaryDreamDarkPokemon: CanalaveCitySailorEldritchHouse_BoyThrashingInSleep: GoToIfUnset FLAG_TALKED_TO_CANALAVE_CITY_SAILOR_ELDRITCH_HOUSE_LITTLE_BOY, CanalaveCitySailorEldritchHouse_FirstTimeBoyThrashingInSleep - GoToIfUnset FLAG_OBTAINED_LUNAR_WING, CanalaveCitySailorEldritchHouse_ThrashingInSleep + GoToIfUnset FLAG_MET_CRESSELIA, CanalaveCitySailorEldritchHouse_ThrashingInSleep CheckItem ITEM_LUNAR_WING, 1, VAR_RESULT GoToIfEq VAR_RESULT, FALSE, CanalaveCitySailorEldritchHouse_ThrashingInSleep PlaySE SEQ_SE_CONFIRM diff --git a/res/field/scripts/scripts_common.s b/res/field/scripts/scripts_common.s index 7dfa63d533..ca870b4a60 100644 --- a/res/field/scripts/scripts_common.s +++ b/res/field/scripts/scripts_common.s @@ -1551,7 +1551,7 @@ CommonScript_AskUseAzureFlute: GetPlayerMapPos VAR_0x8004, VAR_0x8005 FadeScreenOut FADE_SCREEN_SPEED_SLOW, COLOR_WHITE WaitFadeScreen - Warp MAP_HEADER_HALL_OF_ORIGIN, 0, VAR_0x8004, VAR_0x8005, DIR_NORTH + Warp MAP_HEADER_HALL_OF_ORIGIN, VAR_0x8004, VAR_0x8005, DIR_NORTH FadeScreenIn FADE_SCREEN_SPEED_SLOW, COLOR_WHITE WaitFadeScreen Message CommonStrings_Text_GlowingStairwayAppeared @@ -1573,7 +1573,7 @@ CommonScript_DontUseAzureFlute: End CommonScript_SetCounterpartBGM: - StopMusic 0 + StopMusic GetPlayerGender VAR_RESULT CallIfEq VAR_RESULT, GENDER_MALE, CommonScript_SetTheGirlBGM CallIfEq VAR_RESULT, GENDER_FEMALE, CommonScript_SetTheBoyBGM @@ -1589,26 +1589,26 @@ CommonScript_SetTheBoyBGM: Return CommonScript_SetRivalBGM: - StopMusic 0 + StopMusic SetBGM SEQ_THE_RIV ReturnCommonScript End CommonScript_SetFollowMeBGM: - StopMusic 0 + StopMusic SetBGM SEQ_TSURETEKE ReturnCommonScript End CommonScript_SetLookerBGM: - StopMusic 0 + StopMusic SetBGM SEQ_PL_HANDSOME ReturnCommonScript End CommonScript_FadeToDefaultMusic: FadeOutBGM 0, 30 - StopMusic 0 + StopMusic PlayDefaultMusic ReturnCommonScript End diff --git a/res/field/scripts/scripts_contests.s b/res/field/scripts/scripts_contests.s index e89c2cb711..f588080e8b 100644 --- a/res/field/scripts/scripts_contests.s +++ b/res/field/scripts/scripts_contests.s @@ -650,7 +650,7 @@ Contests_StartPracticeContest: RunContestApplication GetContestInfo VAR_0x8004, VAR_0x8005, VAR_0x8007, VAR_MAP_LOCAL_2 SetVar VAR_ONGOING_CONTEST, FALSE - Warp MAP_HEADER_CONTEST_HALL_LOBBY, 0, 28, 3, DIR_SOUTH + Warp MAP_HEADER_CONTEST_HALL_LOBBY, 28, 3, DIR_SOUTH LockAll FadeScreenIn WaitFadeScreen @@ -680,7 +680,7 @@ Contest_DoContest: ClearFlag FLAG_HIDE_CONTEST_HALL_STAGE_CONTESTANT4 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_CONTEST_HALL_STAGE_ONGOING_CONTEST, 0, 29, 7, DIR_NORTH + Warp MAP_HEADER_CONTEST_HALL_STAGE_ONGOING_CONTEST, 29, 7, DIR_NORTH LockAutoScrollForLinkContests GetContestMode VAR_MAP_LOCAL_3 StopHBlank @@ -810,7 +810,7 @@ Contests_EndContest: EndContest VAR_MAP_LOCAL_2 SetVar VAR_ONGOING_CONTEST, FALSE GoToIfEq VAR_MAP_LOCAL_3, CONTEST_MODE_OFFICIAL, Contests_OfficialContestReturnToReceptionist - Warp MAP_HEADER_CONTEST_HALL_LOBBY, 0, 7, 3, DIR_SOUTH + Warp MAP_HEADER_CONTEST_HALL_LOBBY, 7, 3, DIR_SOUTH FadeScreenIn WaitFadeScreen SetVar VAR_RESULT, 7 @@ -820,7 +820,7 @@ Contests_EndContest: GoTo Contests_End Contests_OfficialContestReturnToReceptionist: - Warp MAP_HEADER_CONTEST_HALL_LOBBY, 0, 18, 3, DIR_SOUTH + Warp MAP_HEADER_CONTEST_HALL_LOBBY, 18, 3, DIR_SOUTH FadeScreenIn WaitFadeScreen SetVar VAR_RESULT, 19 diff --git a/res/field/scripts/scripts_day_care_common.s b/res/field/scripts/scripts_day_care_common.s index 9c6a68bdaa..0dd116ef01 100644 --- a/res/field/scripts/scripts_day_care_common.s +++ b/res/field/scripts/scripts_day_care_common.s @@ -149,7 +149,7 @@ DayCareCommon_TryRaiseSelectedSlot: GoToIfEq VAR_RESULT, SPECIES_NONE, DayCareCommon_CantRaiseEgg CountAliveMonsExcept VAR_RESULT, VAR_0x8000 GoToIfEq VAR_RESULT, 0, DayCareCommon_SelectedOnlyAlivePokemon - BufferPartyMonNicknameReturnSpecies 0, VAR_0x8000, VAR_0x8001 + BufferPartyMonNicknameReturnSpecies VAR_0x8000, VAR_0x8001 StorePartyMonIntoDaycare VAR_0x8000 SetFlag FLAG_STORED_POKEMON_AT_DAY_CARE GetDaycareState VAR_RESULT diff --git a/res/field/scripts/scripts_distortion_world_1f.s b/res/field/scripts/scripts_distortion_world_1f.s index 5fd6f2f58e..458bcb8fc6 100644 --- a/res/field/scripts/scripts_distortion_world_1f.s +++ b/res/field/scripts/scripts_distortion_world_1f.s @@ -33,7 +33,7 @@ DistortionWorld1F_ReturnToSpearPillar: SetPartyGiratinaForm GIRATINA_FORM_ALTERED FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_SPEAR_PILLAR_DISTORTED, 0, 31, 33, DIR_SOUTH + Warp MAP_HEADER_SPEAR_PILLAR_DISTORTED, 31, 33, DIR_SOUTH FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_distortion_world_b7f.s b/res/field/scripts/scripts_distortion_world_b7f.s index 803eefc3af..b0f9932178 100644 --- a/res/field/scripts/scripts_distortion_world_b7f.s +++ b/res/field/scripts/scripts_distortion_world_b7f.s @@ -20,7 +20,7 @@ DistortionWorldB7F_OnTransition: DistortionWorldB7F_CoordEvent_WarpToGiratinaRoom: FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_DISTORTION_WORLD_GIRATINA_ROOM, 0, 15, 25, DIR_NORTH + Warp MAP_HEADER_DISTORTION_WORLD_GIRATINA_ROOM, 15, 25, DIR_NORTH FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_distortion_world_giratina_room.s b/res/field/scripts/scripts_distortion_world_giratina_room.s index 8ab789de88..023832a583 100644 --- a/res/field/scripts/scripts_distortion_world_giratina_room.s +++ b/res/field/scripts/scripts_distortion_world_giratina_room.s @@ -50,7 +50,7 @@ DistortionWorldGiratinaRoom_GoToSendoffSpring: PlaySE SEQ_SE_PL_SYUWA FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_SENDOFF_SPRING, 0, 32, 17, DIR_SOUTH + Warp MAP_HEADER_SENDOFF_SPRING, 32, 17, DIR_SOUTH FadeScreenIn WaitFadeScreen End @@ -58,7 +58,7 @@ DistortionWorldGiratinaRoom_GoToSendoffSpring: DistortionWorldGiratinaRoom_CoordEvent_WarpToB7F: FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_DISTORTION_WORLD_B7F, 0, 89, 57, DIR_SOUTH + Warp MAP_HEADER_DISTORTION_WORLD_B7F, 89, 57, DIR_SOUTH FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_distortion_world_turnback_cave_room.s b/res/field/scripts/scripts_distortion_world_turnback_cave_room.s index ad2ea6a430..178a711808 100644 --- a/res/field/scripts/scripts_distortion_world_turnback_cave_room.s +++ b/res/field/scripts/scripts_distortion_world_turnback_cave_room.s @@ -28,7 +28,7 @@ DistortionWorldTurnbackCaveRoom_GoToTurnbackCave: SetPartyGiratinaForm GIRATINA_FORM_ALTERED FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_TURNBACK_CAVE_GIRATINA_ROOM, 0, 11, 15, DIR_SOUTH + Warp MAP_HEADER_TURNBACK_CAVE_GIRATINA_ROOM, 11, 15, DIR_SOUTH FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_eterna_city_gym.s b/res/field/scripts/scripts_eterna_city_gym.s index 53fe37b511..4e80869314 100644 --- a/res/field/scripts/scripts_eterna_city_gym.s +++ b/res/field/scripts/scripts_eterna_city_gym.s @@ -62,7 +62,7 @@ EternaGym_Gardenia: LockAll FacePlayer GoToIfBadgeAcquired BADGE_ID_FOREST, EternaGym_Gardenia_AlreadyHaveForestbadge - CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_ETERNA_CITY_GYM, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_ETERNA_CITY_GYM Message EternaGym_Text_GardeniaIntro CloseMessage StartTrainerBattle TRAINER_LEADER_GARDENIA @@ -80,7 +80,7 @@ EternaGym_Gardenia: SetTrainerFlag TRAINER_LASS_CAROLINE SetTrainerFlag TRAINER_BEAUTY_LINDSAY ClearFlag FLAG_HIDE_ETERNA_FOREST_GARDENIA - CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_ETERNA_CITY_GYM, TRAINER_LEADER_GARDENIA, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_ETERNA_CITY_GYM, TRAINER_LEADER_GARDENIA Message EternaGym_Text_GardeniaExplainForestBadge GoTo EternaGym_GardeniaGiveTM86 End diff --git a/res/field/scripts/scripts_field_moves.s b/res/field/scripts/scripts_field_moves.s index 4d65395885..69750f61d5 100644 --- a/res/field/scripts/scripts_field_moves.s +++ b/res/field/scripts/scripts_field_moves.s @@ -55,7 +55,7 @@ FieldMoves_UseCutFromField: WaitTime 7, VAR_RESULT RemoveObject VAR_LAST_TALKED GetCurrentMapID VAR_0x8004 - CreateJournalEvent LOCATION_EVENT_USED_CUT, VAR_0x8004, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_USED_CUT, VAR_0x8004 FieldMoves_WaitForCutAnimFromField: WaitTime 1, VAR_RESULT GoToIfEq VAR_0x8005, 0, FieldMoves_WaitForCutAnimFromField @@ -72,7 +72,7 @@ FieldMoves_UseCutFromMenu: WaitTime 7, VAR_RESULT RemoveObject VAR_LAST_TALKED GetCurrentMapID VAR_0x8004 - CreateJournalEvent LOCATION_EVENT_USED_CUT, VAR_0x8004, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_USED_CUT, VAR_0x8004 FieldMoves_WaitForCutAnimFromMenu: WaitTime 1, VAR_RESULT GoToIfEq VAR_0x8005, 0, FieldMoves_WaitForCutAnimFromMenu @@ -156,7 +156,7 @@ FieldMoves_UseRockSmashFromField: WaitTime 10, VAR_RESULT RemoveObject VAR_LAST_TALKED GetCurrentMapID VAR_0x8004 - CreateJournalEvent LOCATION_EVENT_USED_ROCK_SMASH, VAR_0x8004, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_USED_ROCK_SMASH, VAR_0x8004 FieldMoves_WaitForRockSmashAnimFromField: WaitTime 1, VAR_RESULT GoToIfEq VAR_0x8005, 0, FieldMoves_WaitForRockSmashAnimFromField @@ -173,7 +173,7 @@ FieldMoves_UseRockSmashFromMenu: WaitTime 10, VAR_RESULT RemoveObject VAR_LAST_TALKED GetCurrentMapID VAR_0x8004 - CreateJournalEvent LOCATION_EVENT_USED_ROCK_SMASH, VAR_0x8004, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_USED_ROCK_SMASH, VAR_0x8004 FieldMoves_WaitForRockSmashAnimFromMenu: WaitTime 1, VAR_RESULT GoToIfEq VAR_0x8005, 0, FieldMoves_WaitForRockSmashAnimFromMenu @@ -216,7 +216,7 @@ FieldMoves_UseStrengthFromField: WaitButton CloseMessage GetCurrentMapID VAR_0x8004 - CreateJournalEvent LOCATION_EVENT_USED_STRENGTH, VAR_0x8004, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_USED_STRENGTH, VAR_0x8004 GoTo FieldMoves_End End @@ -240,7 +240,7 @@ FieldMoves_UseStrengthFromMenu: WaitButton CloseMessage GetCurrentMapID VAR_0x8004 - CreateJournalEvent LOCATION_EVENT_USED_STRENGTH, VAR_0x8004, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_USED_STRENGTH, VAR_0x8004 GoTo FieldMoves_End3 FieldMoves_RockyWall: @@ -281,7 +281,7 @@ FieldMoves_UseRockClimbFromField: CloseMessage UseRockClimb VAR_0x8004 GetCurrentMapID VAR_0x8004 - CreateJournalEvent LOCATION_EVENT_USED_ROCK_CLIMB, VAR_0x8004, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_USED_ROCK_CLIMB, VAR_0x8004 GoTo FieldMoves_End2 End @@ -292,7 +292,7 @@ FieldMoves_UseRockClimbFromMenu: CloseMessage UseRockClimb VAR_0x8000 GetCurrentMapID VAR_0x8004 - CreateJournalEvent LOCATION_EVENT_USED_ROCK_CLIMB, VAR_0x8004, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_USED_ROCK_CLIMB, VAR_0x8004 ReleaseAll End @@ -322,7 +322,7 @@ FieldMoves_UseSurfFromField: CloseMessage UseSurf VAR_0x8004 GetCurrentMapID VAR_0x8004 - CreateJournalEvent LOCATION_EVENT_USED_SURF, VAR_0x8004, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_USED_SURF, VAR_0x8004 GoTo FieldMoves_End2 End @@ -335,7 +335,7 @@ FieldMoves_UseSurfFromMenu: UseSurf VAR_0x8000 LockObject LOCALID_PLAYER GetCurrentMapID VAR_0x8004 - CreateJournalEvent LOCATION_EVENT_USED_SURF, VAR_0x8004, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_USED_SURF, VAR_0x8004 ReleaseAll End @@ -366,7 +366,7 @@ FieldMoves_UseDefogFromField_Unused: CloseMessage PlayHMCutIn VAR_0x8004 GetCurrentMapID VAR_0x8004 - CreateJournalEvent LOCATION_EVENT_USED_DEFOG, VAR_0x8004, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_USED_DEFOG, VAR_0x8004 GetCurrentMapID VAR_0x8004 CallIfEq VAR_0x8004, MAP_HEADER_ROUTE_209_LOST_TOWER_5F, FieldMoves_SetFlagUsedDefog_Unused GoTo FieldMoves_End2 @@ -386,7 +386,7 @@ FieldMoves_UseDefogFromMenu: PlaySE SEQ_SE_DP_FBRADE ScrCmd_0C4 GetCurrentMapID VAR_0x8004 - CreateJournalEvent LOCATION_EVENT_USED_DEFOG, VAR_0x8004, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_USED_DEFOG, VAR_0x8004 GetCurrentMapID VAR_0x8004 CallIfEq VAR_0x8004, MAP_HEADER_ROUTE_209_LOST_TOWER_5F, FieldMoves_SetFlagUsedDefog_Unused GoTo FieldMoves_End3 @@ -443,7 +443,7 @@ FieldMoves_UseWaterfallFromField: CloseMessage UseWaterfall VAR_0x8004 GetCurrentMapID VAR_0x8004 - CreateJournalEvent LOCATION_EVENT_USED_WATERFALL, VAR_0x8004, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_USED_WATERFALL, VAR_0x8004 GoTo FieldMoves_End2 End @@ -456,7 +456,7 @@ FieldMoves_UseWaterfallFromMenu: UseWaterfall VAR_0x8000 LockObject LOCALID_PLAYER GetCurrentMapID VAR_0x8004 - CreateJournalEvent LOCATION_EVENT_USED_WATERFALL, VAR_0x8004, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_USED_WATERFALL, VAR_0x8004 ReleaseAll End diff --git a/res/field/scripts/scripts_floaroma_meadow.s b/res/field/scripts/scripts_floaroma_meadow.s index 5a41a1bbd1..ccdcd3b536 100644 --- a/res/field/scripts/scripts_floaroma_meadow.s +++ b/res/field/scripts/scripts_floaroma_meadow.s @@ -78,20 +78,20 @@ FloaromaMeadow_Movement_PokefanMWalkToPlayerX13: EndMovement FloaromaMeadow_GruntsNoticePlayer: - Message FloaromaMeadow_Text_EnoughArguingHandOverThatSweetHoney - Message FloaromaMeadow_Text_DoAsWeSayTeamGalacticWillHaveThatHoney + Message FloaromaMeadow_Text_HandOverThatHoney + Message FloaromaMeadow_Text_DoAsWeSay ApplyMovement LOCALID_GRUNT_M_WEST, FloaromaMeadow_Movement_GruntNoticePlayer ApplyMovement LOCALID_GRUNT_M_EAST, FloaromaMeadow_Movement_GruntNoticePlayer WaitMovement - Message FloaromaMeadow_Text_HeyThisKidIsAWitnessWhatllWeDo - Message FloaromaMeadow_Text_TheSolutionsSimpleWeEnsureTheBratStaysQuiet + Message FloaromaMeadow_Text_WhatllWeDo + Message FloaromaMeadow_Text_EnsureTheBratStaysQuiet CloseMessage Return FloaromaMeadow_DefeatedGrunt1: ApplyMovement LOCALID_GRUNT_M_WEST, FloaromaMeadow_Movement_GruntWestWalkOnSpotEast WaitMovement - Message FloaromaMeadow_Text_ThisIsSoLameTheyreGoingToDockMyPay + Message FloaromaMeadow_Text_ThisIsSoLame CloseMessage ApplyMovement LOCALID_GRUNT_M_WEST, FloaromaMeadow_Movement_GruntWestWalkOnSpotSouth WaitMovement @@ -100,7 +100,7 @@ FloaromaMeadow_DefeatedGrunt1: Return FloaromaMeadow_DefeatedGrunts: - Message FloaromaMeadow_Text_WereDoneForHereLetsGetBackToTheValleyWindworks + Message FloaromaMeadow_Text_LetsGetBackToWindworks CloseMessage FadeScreenOut WaitFadeScreen @@ -115,21 +115,21 @@ FloaromaMeadow_DefeatedGrunts: CallIfEq VAR_0x8004, 12, FloaromaMeadow_PokefanMWalkToPlayerX12 CallIfEq VAR_0x8004, 13, FloaromaMeadow_PokefanMWalkToPlayerX13 RemoveObject LOCALID_ITEM_WORKS_KEY - Message FloaromaMeadow_Text_ItsAWorksKeyItMustBeForTheValleyWindworks + Message FloaromaMeadow_Text_KeyMustBeForWindworks SetVar VAR_0x8004, ITEM_WORKS_KEY SetVar VAR_0x8005, 1 Common_GiveItemQuantity SetFlag FLAG_OBTAINED_FLOAROMA_MEADOW_WORKS_KEY - Message FloaromaMeadow_Text_INeedToThankYouThisSweetSweetHoneyGoOnTakeAWholeLot + Message FloaromaMeadow_Text_ThankYouTakeALot SetVar VAR_0x8004, ITEM_HONEY SetVar VAR_0x8005, 10 GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, FloaromaMeadow_CantGiveHoneyBagIsFull Common_GiveItemQuantity - Message FloaromaMeadow_Text_SlatherThatHoneyOnASweetSmellingTree + Message FloaromaMeadow_Text_SlatherHoneyOnATree GoTo FloaromaMeadow_DefeatedGruntsReturn FloaromaMeadow_CantGiveHoneyBagIsFull: - Message FloaromaMeadow_Text_OhTooBadSeemsToMeYourBagsFull + Message FloaromaMeadow_Text_YourBagsFull FloaromaMeadow_DefeatedGruntsReturn: SetFlag FLAG_DEFEATED_FLOAROMA_MEADOW_GRUNTS WaitButton @@ -158,7 +158,7 @@ FloaromaMeadow_PokefanM: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message FloaromaMeadow_Text_WouldYouLikeToBuySomeHoneyForAttractingPokemon + Message FloaromaMeadow_Text_BuySomeHoney ShowMoney 20, 2 GoTo FloaromaMeadow_ShowMenuHoney End @@ -178,14 +178,14 @@ FloaromaMeadow_ShowMenuHoney: End FloaromaMeadow_TryBuy1Honey: - GoToIfNotEnoughMoney 100, FloaromaMeadow_OopsyYouDontHaveEnoughMoney + GoToIfNotEnoughMoney 100, FloaromaMeadow_NotEnoughMoney SetVar VAR_0x8005, 1 SetVar VAR_0x8006, 100 GoTo FloaromaMeadow_TryGiveHoney End FloaromaMeadow_TryBuy10Honey: - GoToIfNotEnoughMoney 1000, FloaromaMeadow_OopsyYouDontHaveEnoughMoney + GoToIfNotEnoughMoney 1000, FloaromaMeadow_NotEnoughMoney SetVar VAR_0x8005, 10 SetVar VAR_0x8006, 1000 GoTo FloaromaMeadow_TryGiveHoney @@ -213,15 +213,15 @@ FloaromaMeadow_OopsyWellComeAgain: End FloaromaMeadow_CantBuyHoneyBagIsFull: - Message FloaromaMeadow_Text_OhTooBadSeemsToMeYourBagsFull + Message FloaromaMeadow_Text_YourBagsFull WaitButton HideMoney CloseMessage ReleaseAll End -FloaromaMeadow_OopsyYouDontHaveEnoughMoney: - Message FloaromaMeadow_Text_OopsyYouDontHaveEnoughMoney +FloaromaMeadow_NotEnoughMoney: + Message FloaromaMeadow_Text_NotEnoughMoney WaitButton HideMoney CloseMessage diff --git a/res/field/scripts/scripts_floaroma_meadow_house.s b/res/field/scripts/scripts_floaroma_meadow_house.s index f044af325a..e98eeab409 100644 --- a/res/field/scripts/scripts_floaroma_meadow_house.s +++ b/res/field/scripts/scripts_floaroma_meadow_house.s @@ -7,9 +7,9 @@ ScriptEntryEnd FloaromaMeadowHouse_Hiker: - NPCMessage FloaromaMeadowHouse_Text_TheFlowersThatGrowInTheFieldsHereAreSpecial + NPCMessage FloaromaMeadowHouse_Text_FlowersInTheFieldsAreSpecial End FloaromaMeadowHouse_NinjaBoy: - NPCMessage FloaromaMeadowHouse_Text_IfYouPutHoneyOnATreeCheckBackLaterToSeeIfItsRustlings + NPCMessage FloaromaMeadowHouse_Text_RustlingTreeOftenRarePokemon End diff --git a/res/field/scripts/scripts_floaroma_town.s b/res/field/scripts/scripts_floaroma_town.s index d6314fd7a5..df426950b2 100644 --- a/res/field/scripts/scripts_floaroma_town.s +++ b/res/field/scripts/scripts_floaroma_town.s @@ -23,11 +23,11 @@ FloaromaTown_Grunts: LockAll ApplyMovement LOCALID_GRUNT_M_WEST, FloaromaTown_Movement_WalkOnSpotEast WaitMovement - Message FloaromaTown_Text_ThisDoesntSeemAllThatCool + Message FloaromaTown_Text_ThisDoesntSeemCool CloseMessage ApplyMovement LOCALID_GRUNT_M_EAST, FloaromaTown_Movement_WalkOnSpotWest WaitMovement - Message FloaromaTown_Text_DontComplainThisIsAPrettyDecentAssignment + Message FloaromaTown_Text_DontComplain WaitButton CloseMessage ReleaseAll @@ -47,18 +47,18 @@ FloaromaTown_SchoolKidM: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfGe VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 2, FloaromaTown_BeingSurroundedByFlowersPutsMeInAnOddlyPleasantMood - Message FloaromaTown_Text_IWantedToGetSomeFlowersFromTheFloaromaMeadow + GoToIfGe VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 2, FloaromaTown_OddlyPleasantMood + Message FloaromaTown_Text_IWantedToGetFlowers ApplyMovement LOCALID_SCHOOL_KID_M, FloaromaTown_Movement_SchoolKidMFaceNorth WaitMovement - Message FloaromaTown_Text_ThoseGalacticGuysWentToTheMeadowPastTheseFlowersHere + Message FloaromaTown_Text_GalacticGuysWentToMeadow WaitButton CloseMessage ReleaseAll End -FloaromaTown_BeingSurroundedByFlowersPutsMeInAnOddlyPleasantMood: - Message FloaromaTown_Text_BeingSurroundedByFlowersPutsMeInAnOddlyPleasantMood +FloaromaTown_OddlyPleasantMood: + Message FloaromaTown_Text_OddlyPleasantMood WaitButton CloseMessage ReleaseAll @@ -75,15 +75,15 @@ FloaromaTown_LassWest: End FloaromaTown_PokemonBreederF: - NPCMessage FloaromaTown_Text_WelcomeToFloaromaTheTownOfFlowersFlowersAndMoreFlowers + NPCMessage FloaromaTown_Text_WelcomeToFloaroma End FloaromaTown_LassEast: - NPCMessage FloaromaTown_Text_TheBerriesYouPickCanBeUsedAsFoodForPokemon + NPCMessage FloaromaTown_Text_BerriesCanBeFoodForPokemon End FloaromaTown_Camper: - NPCMessage FloaromaTown_Text_IGotDrawnHereByTheSweetScentOfHoney + NPCMessage FloaromaTown_Text_DrawnHereByHoney End FloaromaTown_MapSignpost: @@ -91,11 +91,11 @@ FloaromaTown_MapSignpost: End FloaromaTown_SignboardFlowerShop: - ShowLandmarkSign FloaromaTown_Text_PickAPeckOfColorsFlowerShopFreeBerriesAvailable + ShowLandmarkSign FloaromaTown_Text_SignFlowerShop End FloaromaTown_SignboardFloaromaMeadow: - ShowLandmarkSign FloaromaTown_Text_FloaromaMeadowAheadHoneyAvailable + ShowLandmarkSign FloaromaTown_Text_SignFlowerMeadow End FloaromaTown_Beauty: @@ -103,12 +103,12 @@ FloaromaTown_Beauty: LockAll FacePlayer FindPartySlotWithFatefulEncounterSpecies VAR_RESULT, SPECIES_SHAYMIN - GoToIfEq VAR_RESULT, 0xFF, FloaromaTown_DoYouKnowAboutGracideaFlowers + GoToIfEq VAR_RESULT, 0xFF, FloaromaTown_DoYouKnowGracideaFlowers CheckPartyHasSpecies VAR_RESULT, SPECIES_SHAYMIN - GoToIfEq VAR_RESULT, FALSE, FloaromaTown_DoYouKnowAboutGracideaFlowers + GoToIfEq VAR_RESULT, FALSE, FloaromaTown_DoYouKnowGracideaFlowers CheckItem ITEM_GRACIDEA, 1, VAR_RESULT - GoToIfNe VAR_RESULT, FALSE, FloaromaTown_GracideaFlowersHaveBeenAroundALongTimeInThisRegion - Message FloaromaTown_Text_IfYouHaveAShayminThenYouAlsoShouldHaveSomeGracideaFlowers + GoToIfNe VAR_RESULT, FALSE, FloaromaTown_GracideaFlowersBeenAroundLongTime + Message FloaromaTown_Text_HaveGracideaFlowers SetVar VAR_0x8004, ITEM_GRACIDEA SetVar VAR_0x8005, 1 Common_GiveItemQuantityNoLineFeed @@ -116,13 +116,13 @@ FloaromaTown_Beauty: ReleaseAll End -FloaromaTown_DoYouKnowAboutGracideaFlowers: - Message FloaromaTown_Text_DoYouKnowAboutGracideaFlowers +FloaromaTown_DoYouKnowGracideaFlowers: + Message FloaromaTown_Text_DoYouKnowGracideaFlowers GoTo FloaromaTown_BeautyEnd End -FloaromaTown_GracideaFlowersHaveBeenAroundALongTimeInThisRegion: - Message FloaromaTown_Text_GracideaFlowersHaveBeenAroundALongTimeInThisRegion +FloaromaTown_GracideaFlowersBeenAroundLongTime: + Message FloaromaTown_Text_GracideaFlowersBeenAroundLongTime GoTo FloaromaTown_BeautyEnd End diff --git a/res/field/scripts/scripts_floaroma_town_middle_house.s b/res/field/scripts/scripts_floaroma_town_middle_house.s index 69350c708a..2d773db874 100644 --- a/res/field/scripts/scripts_floaroma_town_middle_house.s +++ b/res/field/scripts/scripts_floaroma_town_middle_house.s @@ -8,29 +8,29 @@ ScriptEntryEnd FloaromaTownMiddleHouse_PokemonBreederF: - NPCMessage FloaromaTownMiddleHouse_Text_FloaromaTownWasABarrenDesolateHillLongAgo + NPCMessage FloaromaTownMiddleHouse_Text_FloaromaTownWasBarren End FloaromaTownMiddleHouse_Twin: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_RECEIVED_FLOAROMA_TOWN_MIDDLE_HOUSE_TM88, FloaromaTownMiddleHouse_WhenAPokemonUsesPluckItEatsABerryHeldByItsFoe - Message FloaromaTownMiddleHouse_Text_DoYouThinkItsCuteHowPokemonPluckBerries + GoToIfSet FLAG_RECEIVED_FLOAROMA_TOWN_MIDDLE_HOUSE_TM88, FloaromaTownMiddleHouse_UsingPluckEatsBerry + Message FloaromaTownMiddleHouse_Text_CuteHowPokemonPluckBerries ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, FloaromaTownMiddleHouse_HeresTheTMForTheMovePluck - GoToIfEq VAR_RESULT, MENU_NO, FloaromaTownMiddleHouse_OhIGuessIJustLikeWeirdThings + GoToIfEq VAR_RESULT, MENU_YES, FloaromaTownMiddleHouse_HeresTMForPluck + GoToIfEq VAR_RESULT, MENU_NO, FloaromaTownMiddleHouse_IJustLikeWeirdThings End -FloaromaTownMiddleHouse_OhIGuessIJustLikeWeirdThings: - Message FloaromaTownMiddleHouse_Text_OhIGuessIJustLikeWeirdThings +FloaromaTownMiddleHouse_IJustLikeWeirdThings: + Message FloaromaTownMiddleHouse_Text_IJustLikeWeirdThings WaitButton CloseMessage ReleaseAll End -FloaromaTownMiddleHouse_HeresTheTMForTheMovePluck: - Message FloaromaTownMiddleHouse_Text_HeresTheTMForTheMovePluck +FloaromaTownMiddleHouse_HeresTMForPluck: + Message FloaromaTownMiddleHouse_Text_HeresTMForPluck SetVar VAR_0x8004, ITEM_TM88 SetVar VAR_0x8005, 1 GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, FloaromaTownMiddleHouse_BagIsFull @@ -40,8 +40,8 @@ FloaromaTownMiddleHouse_HeresTheTMForTheMovePluck: ReleaseAll End -FloaromaTownMiddleHouse_WhenAPokemonUsesPluckItEatsABerryHeldByItsFoe: - Message FloaromaTownMiddleHouse_Text_WhenAPokemonUsesPluckItEatsABerryHeldByItsFoe +FloaromaTownMiddleHouse_UsingPluckEatsBerry: + Message FloaromaTownMiddleHouse_Text_UsingPluckEatsBerry WaitButton CloseMessage ReleaseAll @@ -54,5 +54,5 @@ FloaromaTownMiddleHouse_BagIsFull: End FloaromaTownMiddleHouse_Clefairy: - PokemonCryAndMessage SPECIES_CLEFAIRY, FloaromaTownMiddleHouse_Text_ClefairyRii + PokemonCryAndMessage SPECIES_CLEFAIRY, FloaromaTownMiddleHouse_Text_ClefairyCry End diff --git a/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s b/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s index bed197bd78..0a5e9b143a 100644 --- a/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s @@ -14,26 +14,26 @@ FloaromaTownPokecenter1F_Nurse: End FloaromaTownPokecenter1F_PokefanM: - NPCMessage FloaromaTownPokecenter1F_Text_IfYouveGotPokemonWithYouItsSafeToGoOffTravelingAlone + NPCMessage FloaromaTownPokecenter1F_Text_WithPokemonSafeToTravelAlone End FloaromaTownPokecenter1F_BattleGirl: - NPCMessage FloaromaTownPokecenter1F_Text_IHadABattleTheOtherDayAndMyPokemonsHPGotLow + NPCMessage FloaromaTownPokecenter1F_Text_MyPokemonsHPGotLow End FloaromaTownPokecenter1F_AceTrainerF: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfGe VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 2, FloaromaTownPokecenter1F_ItsALongWayFromHereToEternaCity - Message FloaromaTownPokecenter1F_Text_ThereveBeenProblemsWithTheElectricPowerLately + GoToIfGe VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 2, FloaromaTownPokecenter1F_LongWayToEternaCity + Message FloaromaTownPokecenter1F_Text_ProblemsWithElectricPower WaitButton CloseMessage ReleaseAll End -FloaromaTownPokecenter1F_ItsALongWayFromHereToEternaCity: - Message FloaromaTownPokecenter1F_Text_ItsALongWayFromHereToEternaCity +FloaromaTownPokecenter1F_LongWayToEternaCity: + Message FloaromaTownPokecenter1F_Text_LongWayToEternaCity WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_floaroma_town_southeast_house.s b/res/field/scripts/scripts_floaroma_town_southeast_house.s index 13892e9516..aa428ad649 100644 --- a/res/field/scripts/scripts_floaroma_town_southeast_house.s +++ b/res/field/scripts/scripts_floaroma_town_southeast_house.s @@ -7,9 +7,9 @@ ScriptEntryEnd FloaromaTownSoutheastHouse_PokefanM: - NPCMessage FloaromaTownSoutheastHouse_Text_SomeKindsOfPokemonAppearOnlyIfTheyreAttractedByHoney + NPCMessage FloaromaTownSoutheastHouse_Text_SomePokemonAppearOnlyByHoney End FloaromaTownSoutheastHouse_PokefanF: - NPCMessage FloaromaTownSoutheastHouse_Text_PokemonHaveAnAcuteSenseOfSmell + NPCMessage FloaromaTownSoutheastHouse_Text_PokemonHaveAcuteSmell End diff --git a/res/field/scripts/scripts_flower_paradise.s b/res/field/scripts/scripts_flower_paradise.s index 65ffdde4d3..55d8fe2724 100644 --- a/res/field/scripts/scripts_flower_paradise.s +++ b/res/field/scripts/scripts_flower_paradise.s @@ -48,13 +48,13 @@ FlowerParadise_Shaymin: CheckWonBattle VAR_RESULT GoToIfEq VAR_RESULT, FALSE, FlowerParadise_BlackOut CheckDidNotCapture VAR_RESULT - GoToIfEq VAR_RESULT, TRUE, FlowerParadise_ShayminDisappearedAmongTheFlowers + GoToIfEq VAR_RESULT, TRUE, FlowerParadise_ShayminDisappearedAmongFlowers SetFlag FLAG_CAUGHT_SHAYMIN ReleaseAll End -FlowerParadise_ShayminDisappearedAmongTheFlowers: - Message FlowerParadise_Text_ShayminDisappearedAmongTheFlowers +FlowerParadise_ShayminDisappearedAmongFlowers: + Message FlowerParadise_Text_ShayminDisappearedAmongFlowers WaitButton CloseMessage ClearFlag FLAG_HIDE_FLOWER_PARADISE_SHAYMIN diff --git a/res/field/scripts/scripts_flower_shop.s b/res/field/scripts/scripts_flower_shop.s index 92a5a89654..9783ecb6e6 100644 --- a/res/field/scripts/scripts_flower_shop.s +++ b/res/field/scripts/scripts_flower_shop.s @@ -11,8 +11,8 @@ FlowerShop_PokemonBreederF: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_OBTAINED_FLOWER_SHOP_BERRY, FlowerShop_PleasePlantThatBerryInSoftEarthySoil - Message FlowerShop_Text_ASingleBerryWillGrowIntoAPlantThatMakesSeveralBerries + GoToIfSet FLAG_OBTAINED_FLOWER_SHOP_BERRY, FlowerShop_PlantBerryInSoil + Message FlowerShop_Text_BerryWillGrowIntoPlant GetRandom VAR_0x8004, 5 AddVar VAR_0x8004, ITEM_CHERI_BERRY /* Cheri, Chesto, Pecha, Rawst or Aspear */ SetVar VAR_0x8005, 1 @@ -23,8 +23,8 @@ FlowerShop_PokemonBreederF: ReleaseAll End -FlowerShop_PleasePlantThatBerryInSoftEarthySoil: - Message FlowerShop_Text_PleasePlantThatBerryInSoftEarthySoil +FlowerShop_PlantBerryInSoil: + Message FlowerShop_Text_PlantBerryInSoil WaitButton CloseMessage ReleaseAll @@ -40,8 +40,8 @@ FlowerShop_Lass: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_RECEIVED_FLOWER_SHOP_SPRAYDUCK, FlowerShop_UseThatSprayduckToWaterTheSoilWhereYouvePlantedBerries - Message FlowerShop_Text_TrainerPleaseWaterBerriesUsingThisSprayduckWateringCan + GoToIfSet FLAG_RECEIVED_FLOWER_SHOP_SPRAYDUCK, FlowerShop_UseSprayduckToWaterSoil + Message FlowerShop_Text_WaterBerriesUsingSprayduck SetVar VAR_0x8004, ITEM_SPRAYDUCK SetVar VAR_0x8005, 1 SetFlag FLAG_RECEIVED_FLOWER_SHOP_SPRAYDUCK @@ -50,8 +50,8 @@ FlowerShop_Lass: ReleaseAll End -FlowerShop_UseThatSprayduckToWaterTheSoilWhereYouvePlantedBerries: - Message FlowerShop_Text_UseThatSprayduckToWaterTheSoilWhereYouvePlantedBerries +FlowerShop_UseSprayduckToWaterSoil: + Message FlowerShop_Text_UseSprayduckToWaterSoil WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_foreign_building.s b/res/field/scripts/scripts_foreign_building.s index e5d9a8a821..adcfae4d99 100644 --- a/res/field/scripts/scripts_foreign_building.s +++ b/res/field/scripts/scripts_foreign_building.s @@ -22,19 +22,19 @@ ForeignBuilding_OldMan: End ForeignBuilding_NinjaBoy: - NPCMessage ForeignBuilding_Text_PeopleAndPokemonMakeEveryoneComeTogether + NPCMessage ForeignBuilding_Text_ItMakesEveryoneComeTogether End ForeignBuilding_OldWoman: - NPCMessage ForeignBuilding_Text_ThatPeopleAreLonelyIsOnlyNatural + NPCMessage ForeignBuilding_Text_ThatPeopleAreLonelyIsNatural End ForeignBuilding_AceTrainerF: - NPCMessage ForeignBuilding_Text_ThereAreWordsThatNotEveryoneCanDescribe + NPCMessage ForeignBuilding_Text_WordsThatNotEveryoneCanDescribe End ForeignBuilding_PokefanF: - NPCMessage ForeignBuilding_Text_ItsOnlyNaturalWeAreDifferent + NPCMessage ForeignBuilding_Text_OnlyNaturalWeAreDifferent End ForeignBuilding_ExpertM: diff --git a/res/field/scripts/scripts_fullmoon_island_forest.s b/res/field/scripts/scripts_fullmoon_island_forest.s index 93d79db8f1..2bb2ab20d4 100644 --- a/res/field/scripts/scripts_fullmoon_island_forest.s +++ b/res/field/scripts/scripts_fullmoon_island_forest.s @@ -29,7 +29,7 @@ FullmoonIslandForest_Cresselia: GoToIfEq VAR_ROAMING_CRESSELIA_STATE, ROAMER_STATE_RESET, FullmoonIslandForest_ResetCresseliaRoamingState ClearFlag FLAG_OBTAINED_FULLMOON_ISLAND_FOREST_LUNAR_WING AddObject LOCALID_ITEM_LUNAR_WING - SetFlag FLAG_OBTAINED_LUNAR_WING + SetFlag FLAG_MET_CRESSELIA Message FullmoonIslandForest_Text_SomethingSparkling WaitButton CloseMessage diff --git a/res/field/scripts/scripts_game_corner.s b/res/field/scripts/scripts_game_corner.s index 53f7929f7d..5ce78ff3c9 100644 --- a/res/field/scripts/scripts_game_corner.s +++ b/res/field/scripts/scripts_game_corner.s @@ -84,7 +84,7 @@ GameCorner_SlotMachine: GoToIfEq VAR_RESULT, FALSE, GameCorner_SlotMachine_NoCoinCase FadeScreenOut WaitFadeScreen - CreateJournalEvent LOCATION_EVENT_GAME_CORNER, 0, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_GAME_CORNER ScrCmd_267 LOCAL_VAR_SLOT_MACHINE_ID ReturnToField FadeScreenIn @@ -93,7 +93,7 @@ GameCorner_SlotMachine: End GameCorner_SlotMachine_NoCoinCase: - Message GameCorner_Text_YouCantPlayIfYouDontHaveACoinCase + Message GameCorner_Text_CantPlayWithoutCoinCase WaitButton CloseMessage ReleaseAll @@ -103,18 +103,18 @@ GameCorner_CoinsClerk: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message GameCorner_Text_WelcomeToTheVeilstoneGameCorner + Message GameCorner_Text_WelcomeToGameCorner CheckItem ITEM_COIN_CASE, 1, VAR_RESULT GoToIfEq VAR_RESULT, FALSE, GameCorner_CoinsClerk_NoCoinCase - GoToIfSet FLAG_GAME_CORNER_RECEIVED_TM64, GameCorner_CoinsClerk_ShowCoinsAndMoney - GoToIfSet FLAG_GAME_CORNER_SAVED_TM64, GameCorner_CoinsClerk_CheckIfCanGiveTM64 + GoToIfSet FLAG_RECEIVED_GAME_CORNER_TM64, GameCorner_CoinsClerk_ShowCoinsAndMoney + GoToIfSet FLAG_SAVED_GAME_CORNER_TM64, GameCorner_CoinsClerk_CheckIfCanGiveTM64 CheckBonusRoundStreak VAR_RESULT GoToIfEq VAR_RESULT, FALSE, GameCorner_CoinsClerk_ShowCoinsAndMoney GoTo GameCorner_CoinsClerk_CheckIfCanGiveTM64 End GameCorner_CoinsClerk_NoCoinCase: - Message GameCorner_Text_DidYouWantSomeCoins_NoCoinCase + Message GameCorner_Text_NoCoinCaseToHoldCoins WaitButton CloseMessage ReleaseAll @@ -124,7 +124,7 @@ GameCorner_CoinsClerk_ShowCoinsAndMoney: ShowCoins 20, 2 ShowMoney 20, 7 GameCorner_CoinsClerk_OpenCoinBuyMenu: - Message GameCorner_Text_DidYouWantSomeCoins_1000For50Coins + Message GameCorner_Text_1000For50Coins InitGlobalTextMenu 1, 1, 0, VAR_RESULT AddMenuEntryImm MenuEntries_Text_GameCorner_50Coins, 0 AddMenuEntryImm MenuEntries_Text_GameCorner_500Coins, 1 @@ -147,7 +147,7 @@ GameCorner_CoinsClerk_Buy50Coins: AddCoins 50 UpdateCoinDisplay WaitSE SEQ_SE_PL_COIN - Message GameCorner_Text_DidYouWantSomeCoins_ThankYouVeryMuchHereAreYourCoins + Message GameCorner_Text_HereAreYourCoins WaitTime 30, VAR_RESULT GoTo GameCorner_CoinsClerk_OpenCoinBuyMenu @@ -163,12 +163,12 @@ GameCorner_CoinsClerk_Buy500Coins: AddCoins 500 UpdateCoinDisplay WaitSE SEQ_SE_PL_COIN - Message GameCorner_Text_DidYouWantSomeCoins_ThankYouVeryMuchHereAreYourCoins + Message GameCorner_Text_HereAreYourCoins WaitTime 30, VAR_RESULT GoTo GameCorner_CoinsClerk_OpenCoinBuyMenu GameCorner_CoinsClerk_NotEnoughMoney: - Message GameCorner_Text_UmYouDontAppearToHaveEnoughMoney + Message GameCorner_Text_NotEnoughMoney WaitButton CloseMessage HideCoins @@ -177,7 +177,7 @@ GameCorner_CoinsClerk_NotEnoughMoney: End GameCorner_CoinsClerk_CoinCaseFull: - Message GameCorner_Text_OhYourCoinCaseIsFull + Message GameCorner_Text_CoinCaseIsFull WaitButton CloseMessage HideCoins @@ -186,7 +186,7 @@ GameCorner_CoinsClerk_CoinCaseFull: End GameCorner_CoinsClerk_Cancel: - Message GameCorner_Text_OhYouDontNeedCoinsThen + Message GameCorner_Text_PleaseComeAgain WaitButton CloseMessage HideCoins @@ -202,32 +202,32 @@ GameCorner_CoinsClerk_CheckIfCanGiveTM64: End GameCorner_CoinsClerk_TenStraightBonusRounds: - GoToIfSet FLAG_GAME_CORNER_SAVED_TM64, GameCorner_CoinsClerk_TenStraightBonusRounds_SavedTM - Message GameCorner_Text_TenStraightBonusRoundsOnTheSlots + GoToIfSet FLAG_SAVED_GAME_CORNER_TM64, GameCorner_CoinsClerk_TenStraightBonusRounds_SavedTM + Message GameCorner_Text_MementoForBonusRounds GoTo GameCorner_CoinsClerk_GiveTM64 End GameCorner_CoinsClerk_TenStraightBonusRounds_SavedTM: - Message GameCorner_Text_WeReStillAmazedByYourTenStraightBonusRounds + Message GameCorner_Text_StillAmazedTakeMemento GoTo GameCorner_CoinsClerk_GiveTM64 End GameCorner_CoinsClerk_GiveTM64: Common_GiveItemQuantity - SetFlag FLAG_GAME_CORNER_RECEIVED_TM64 - Message GameCorner_Text_PleaseKeepPlayingTheSlots + SetFlag FLAG_RECEIVED_GAME_CORNER_TM64 + Message GameCorner_Text_PleaseKeepPlayingSlots WaitButton CloseMessage ReleaseAll End GameCorner_CoinsClerk_SaveTM64: - SetFlag FLAG_GAME_CORNER_SAVED_TM64 + SetFlag FLAG_SAVED_GAME_CORNER_TM64 GoTo GameCorner_CoinsClerk_ShowCoinsAndMoney End GameCorner_LadyExplainSlotMachines: - NPCMessage GameCorner_Text_IllEplainHowTheSlotMachinesWorkAtThisGameCorner + NPCMessage GameCorner_Text_ExplainSlotMachines End GameCorner_OldMan20Coins: @@ -236,9 +236,9 @@ GameCorner_OldMan20Coins: FacePlayer CheckItem ITEM_COIN_CASE, 1, VAR_RESULT GoToIfEq VAR_RESULT, FALSE, GameCorner_OldMan20Coins_NoCoinCase - GoToIfSet FLAG_GAME_CORNER_RECEIVED_20_COINS_OLD_MAN, GameCorner_OldMan20Coins_LineUpClefairy + GoToIfSet FLAG_RECEIVED_GAME_CORNER_20_COINS_OLD_MAN, GameCorner_OldMan20Coins_LineUpClefairy GoToIfCannotAddCoins 20, GameCorner_OldMan20Coins_LineUpClefairy - SetFlag FLAG_GAME_CORNER_RECEIVED_20_COINS_OLD_MAN + SetFlag FLAG_RECEIVED_GAME_CORNER_20_COINS_OLD_MAN BufferPlayerName 0 Message GameCorner_Text_IveBeenWinningATonToday WaitButton @@ -250,7 +250,7 @@ GameCorner_OldMan20Coins: End GameCorner_OldMan20Coins_NoCoinCase: - Message GameCorner_Text_HeyKidIfYouWantToPlayHereYouNeedACoinCase + Message GameCorner_Text_ManNextDoorHadCoinCase WaitButton CloseMessage ReleaseAll @@ -269,11 +269,11 @@ GameCorner_Farmer: FacePlayer CheckItem ITEM_COIN_CASE, 1, VAR_RESULT GoToIfEq VAR_RESULT, FALSE, GameCorner_Farmer_NoCoinCase - GoToIfSet FLAG_GAME_CORNER_RECEIVED_50_COINS_FARMER, GameCorner_Farmer_CannotAddCoins + GoToIfSet FLAG_RECEIVED_GAME_CORNER_50_COINS_FARMER, GameCorner_Farmer_CannotAddCoins GoToIfCannotAddCoins 50, GameCorner_Farmer_CannotAddCoins - SetFlag FLAG_GAME_CORNER_RECEIVED_50_COINS_FARMER + SetFlag FLAG_RECEIVED_GAME_CORNER_50_COINS_FARMER BufferPlayerName 0 - Message GameCorner_Text_WooHooClefairyLookYeahahItsACarnival + Message GameCorner_Text_ItsACarnival WaitButton PlaySE SEQ_SE_PL_COIN AddCoins 50 @@ -283,14 +283,14 @@ GameCorner_Farmer: End GameCorner_Farmer_NoCoinCase: - Message GameCorner_Text_WooHooClefairyLookAtItItsDrivingMeBananas + Message GameCorner_Text_ItsDrivingMeBananas WaitButton CloseMessage ReleaseAll End GameCorner_Farmer_CannotAddCoins: - Message GameCorner_Text_WooHooClefairyItsAdorable + Message GameCorner_Text_ClefairyIsAdorable WaitButton CloseMessage ReleaseAll @@ -305,11 +305,11 @@ GameCorner_LadyPokeBalls: End GameCorner_Guitarist: - NPCMessage GameCorner_Text_AFriendInMyGroupScoredATonOfCoinsHere + NPCMessage GameCorner_Text_AFriendScoredTonOfCoins End GameCorner_MaylenesDad: - NPCMessage GameCorner_Text_SighNothingGoingMyWayToday + NPCMessage GameCorner_Text_NothingGoingMyWay End GameCorner_BgSignBonusRounds: diff --git a/res/field/scripts/scripts_hearthome_city.s b/res/field/scripts/scripts_hearthome_city.s index ed036ed514..c84be3677f 100644 --- a/res/field/scripts/scripts_hearthome_city.s +++ b/res/field/scripts/scripts_hearthome_city.s @@ -42,15 +42,15 @@ HearthomeCity_OnTransition: End HearthomeCity_PokefanM2: - NPCMessage HearthomeCity_Text_TheyFoundAnEggAtTheDayCare + NPCMessage HearthomeCity_Text_FoundAnEggAtDayCare End HearthomeCity_Hiker2: - NPCMessage HearthomeCity_Text_TheyFindEggsInJohtoToo + NPCMessage HearthomeCity_Text_EggsInJohtoToo End HearthomeCity_Hiker3: - NPCMessage HearthomeCity_Text_SometimesEggsAreFoundAtTheDayCare + NPCMessage HearthomeCity_Text_SometimesEggsAtDayCare End HearthomeCity_PokefanM1: @@ -58,7 +58,7 @@ HearthomeCity_PokefanM1: End HearthomeCity_PokemonBreederM1: - NPCMessage HearthomeCity_Text_AtTheLostTowerPeopleUnburdenThemselves + NPCMessage HearthomeCity_Text_PeopleUnburdenThemselves End HearthomeCity_BattleGirl1: @@ -66,11 +66,11 @@ HearthomeCity_BattleGirl1: End HearthomeCity_BattleGirl2: - NPCMessage HearthomeCity_Text_IUsedAFireStoneToEvolve + NPCMessage HearthomeCity_Text_UsedFireStoneToEvolve End HearthomeCity_Hiker1: - NPCMessage HearthomeCity_Text_IWentForAStrollWithPachirisu + NPCMessage HearthomeCity_Text_StrollWithPachirisu End HearthomeCity_Pachirisu: @@ -82,7 +82,7 @@ HearthomeCity_Fisherman: LockAll FacePlayer GoToIfSet FLAG_UNK_0x0001, HearthomeCity_ItMakesMeHappy - Message HearthomeCity_Text_MayIShowYouToTheContestHall + Message HearthomeCity_Text_ShowYouToContestHall ShowYesNoMenu VAR_RESULT GoToIfEq VAR_RESULT, MENU_NO, HearthomeCity_IDoApologize Message HearthomeCity_Text_PleaseFollowMe @@ -425,7 +425,7 @@ HearthomeCity_TalkToMeSomeOtherTime2: End HearthomeCity_PokemonBreederM2: - NPCMessage HearthomeCity_Text_WhatPokemonWillMyChildBefriend + NPCMessage HearthomeCity_Text_WhatWillMyChildBefriend End HearthomeCity_BabyInPram2: @@ -536,7 +536,7 @@ HearthomeCity_MapSignpost: End HearthomeCity_GymSignpost: - ShowScrollingSign HearthomeCity_Text_SignHearthomeCityPokemonGym + ShowScrollingSign HearthomeCity_Text_SignPokemonGym End HearthomeCity_SignboardPokemonContestHall: @@ -564,7 +564,7 @@ HearthomeCity_SignboardAmitySquareEastGate: End HearthomeCity_SignboardPoffinHouse: - ShowLandmarkSign HearthomeCity_Text_SignThePoffinHouse + ShowLandmarkSign HearthomeCity_Text_SignPoffinHouse End HearthomeCity_GymGuide: @@ -576,7 +576,7 @@ HearthomeCity_Artist: End HearthomeCity_BlackBelt2: - NPCMessage HearthomeCity_Text_IPutMyVsSeekerThroughALot + NPCMessage HearthomeCity_Text_UsedVsSeekerALot End .balign 4, 0 diff --git a/res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s b/res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s index f053fbf90c..ae42a83966 100644 --- a/res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s +++ b/res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s @@ -42,7 +42,7 @@ HearthomeCityDPGymLeaderRoom_FantinaSpinEast: HearthomeCityDPGymLeaderRoom_FantinaBattle: GoToIfBadgeAcquired BADGE_ID_RELIC, HearthomeCityDPGymLeaderRoom_FantinaPostBattle - CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_HEARTHOME_CITY_DP_GYM_LEADER_ROOM, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_HEARTHOME_CITY_DP_GYM_LEADER_ROOM Message HearthomeCityDPGymLeaderRoom_Text_Dummy0 CloseMessage StartTrainerBattle TRAINER_LEADER_FANTINA @@ -63,7 +63,7 @@ HearthomeCityDPGymLeaderRoom_FantinaBattle: SetTrainerFlag TRAINER_SCHOOL_KID_CHANCE SetTrainerFlag TRAINER_SCHOOL_KID_MACKENZIE SetTrainerFlag TRAINER_YOUNGSTER_DONNY - CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_HEARTHOME_CITY_DP_GYM_LEADER_ROOM, TRAINER_LEADER_FANTINA, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_HEARTHOME_CITY_DP_GYM_LEADER_ROOM, TRAINER_LEADER_FANTINA SetVar VAR_HEARTHOME_STATE, 1 SetFlag FLAG_HIDE_HEARTHOME_ROUTE_209_ROADBLOCK ClearFlag FLAG_HIDE_HEARTHOME_ROUTE_209_GATE_RIVAL diff --git a/res/field/scripts/scripts_hearthome_city_gym_entrance_room.s b/res/field/scripts/scripts_hearthome_city_gym_entrance_room.s index 9fa2f7baaa..4c2a098302 100644 --- a/res/field/scripts/scripts_hearthome_city_gym_entrance_room.s +++ b/res/field/scripts/scripts_hearthome_city_gym_entrance_room.s @@ -3,42 +3,42 @@ #include "res/field/events/events_hearthome_city_gym_entrance_room.h" - ScriptEntry EternaGym_GymGuide + ScriptEntry HearthomeGym_GymGuide ScriptEntry HearthomeGym_GymStatue - ScriptEntry HearthomeGym_GymGuide_InitialVisit + ScriptEntry HearthomeGym_OnFrame_FirstVisit ScriptEntryEnd -EternaGym_GymGuide: +HearthomeGym_GymGuide: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfBadgeAcquired BADGE_ID_RELIC, EternaGym_GymGuideAfterBadge + GoToIfBadgeAcquired BADGE_ID_RELIC, HearthomeGym_GymGuideAfterBadge Message HearthomeGym_Text_GymGuideHearLongSpielAgain ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, EternaGym_GymGuideExplanation - GoToIfEq VAR_RESULT, MENU_NO, EternaGym_GymGuideEncouragement + GoToIfEq VAR_RESULT, MENU_YES, HearthomeGym_GymGuideExplanation + GoToIfEq VAR_RESULT, MENU_NO, HearthomeGym_GymGuideEncouragement End -EternaGym_GymGuideExplanation: +HearthomeGym_GymGuideExplanation: Message HearthomeGym_Text_GymGuideExplanation - GoTo EternaGym_GymGuideEnd + GoTo HearthomeGym_GymGuideEnd End -EternaGym_GymGuideEncouragement: +HearthomeGym_GymGuideEncouragement: Message HearthomeGym_Text_GymGuideGoGetEm - GoTo EternaGym_GymGuideEnd + GoTo HearthomeGym_GymGuideEnd End -EternaGym_GymGuideEnd: +HearthomeGym_GymGuideEnd: WaitButton CloseMessage ReleaseAll End -EternaGym_GymGuideAfterBadge: +HearthomeGym_GymGuideAfterBadge: BufferPlayerName 0 Message HearthomeGym_Text_GymGuideAfterBadge - GoTo EternaGym_GymGuideEnd + GoTo HearthomeGym_GymGuideEnd End HearthomeGym_GymStatue: @@ -63,20 +63,20 @@ HearthomeGym_GymStatueAfterBadge: ReleaseAll End -HearthomeGym_GymGuide_InitialVisit: +HearthomeGym_OnFrame_FirstVisit: LockAll - ApplyMovement LOCALID_GYM_GUIDE, HearthomeGym_GymGuideMoveToPlayer + ApplyMovement LOCALID_GYM_GUIDE, HearthomeGym_Movement_GymGuideMoveToPlayer WaitMovement Message HearthomeGym_Text_GymGuideInitialVisit CloseMessage - ApplyMovement LOCALID_GYM_GUIDE, HearthomeGym_GymGuideReturnToPosition + ApplyMovement LOCALID_GYM_GUIDE, HearthomeGym_Movement_GymGuideReturnToPosition WaitMovement SetVar VAR_HAS_ENTERED_HEARTHOME_GYM_BEFORE, TRUE ReleaseAll End .balign 4, 0 -HearthomeGym_GymGuideMoveToPlayer: +HearthomeGym_Movement_GymGuideMoveToPlayer: EmoteExclamationMark Delay8 WalkNormalWest @@ -84,7 +84,7 @@ HearthomeGym_GymGuideMoveToPlayer: EndMovement .balign 4, 0 -HearthomeGym_GymGuideReturnToPosition: +HearthomeGym_Movement_GymGuideReturnToPosition: WalkNormalNorth WalkNormalEast WalkOnSpotNormalSouth diff --git a/res/field/scripts/scripts_hearthome_city_gym_leader_room.s b/res/field/scripts/scripts_hearthome_city_gym_leader_room.s index efcbb7c2b7..994739ad77 100644 --- a/res/field/scripts/scripts_hearthome_city_gym_leader_room.s +++ b/res/field/scripts/scripts_hearthome_city_gym_leader_room.s @@ -34,28 +34,28 @@ HearthomeGym_Fantina: End HearthomeGym_FantinaPrepareSpinFaceSouth: - ApplyMovement LOCALID_FANTINA, HearthomeGym_FantinaSpinFaceSouth + ApplyMovement LOCALID_FANTINA, HearthomeGym_Movement_FantinaSpinFaceSouth WaitMovement GoTo HearthomeGym_FantinaMain HearthomeGym_FantinaPrepareSpinFaceNorth: - ApplyMovement LOCALID_FANTINA, HearthomeGym_FantinaSpinFaceNorth + ApplyMovement LOCALID_FANTINA, HearthomeGym_Movement_FantinaSpinFaceNorth WaitMovement GoTo HearthomeGym_FantinaMain HearthomeGym_FantinaPrepareSpinFaceEast: - ApplyMovement LOCALID_FANTINA, HearthomeGym_FantinaSpinFaceEast + ApplyMovement LOCALID_FANTINA, HearthomeGym_Movement_FantinaSpinFaceEast WaitMovement GoTo HearthomeGym_FantinaMain HearthomeGym_FantinaPrepareSpinFaceWest: - ApplyMovement LOCALID_FANTINA, HearthomeGym_FantinaSpinFaceWest + ApplyMovement LOCALID_FANTINA, HearthomeGym_Movement_FantinaSpinFaceWest WaitMovement GoTo HearthomeGym_FantinaMain HearthomeGym_FantinaMain: GoToIfBadgeAcquired BADGE_ID_RELIC, HearthomeGym_FantinaAfterBadge - CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_HEARTHOME_CITY_GYM_LEADER_ROOM, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_HEARTHOME_CITY_GYM_LEADER_ROOM Message HearthomeGym_Text_FantinaIntro CloseMessage SetFlag FLAG_MAP_LOCAL @@ -78,7 +78,7 @@ HearthomeGym_FantinaMain: SetTrainerFlag TRAINER_SCHOOL_KID_CHANCE SetTrainerFlag TRAINER_SCHOOL_KID_MACKENZIE SetTrainerFlag TRAINER_YOUNGSTER_DONNY - CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_HEARTHOME_CITY_GYM_LEADER_ROOM, TRAINER_LEADER_FANTINA, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_HEARTHOME_CITY_GYM_LEADER_ROOM, TRAINER_LEADER_FANTINA SetVar VAR_HEARTHOME_STATE, 1 SetFlag FLAG_HIDE_HEARTHOME_ROUTE_209_ROADBLOCK ClearFlag FLAG_HIDE_HEARTHOME_ROUTE_209_GATE_RIVAL @@ -114,7 +114,7 @@ HearthomeGym_FantinaAfterBadge: End .balign 4, 0 -HearthomeGym_FantinaSpinFaceSouth: +HearthomeGym_Movement_FantinaSpinFaceSouth: FaceWest 4 FaceNorth 4 FaceEast 4 @@ -126,7 +126,7 @@ HearthomeGym_FantinaSpinFaceSouth: EndMovement .balign 4, 0 -HearthomeGym_FantinaSpinFaceNorth: +HearthomeGym_Movement_FantinaSpinFaceNorth: FaceEast 4 FaceSouth 4 FaceWest 4 @@ -138,7 +138,7 @@ HearthomeGym_FantinaSpinFaceNorth: EndMovement .balign 4, 0 -HearthomeGym_FantinaSpinFaceEast: +HearthomeGym_Movement_FantinaSpinFaceEast: FaceNorth 4 FaceWest 4 FaceSouth 4 @@ -150,7 +150,7 @@ HearthomeGym_FantinaSpinFaceEast: EndMovement .balign 4, 0 -HearthomeGym_FantinaSpinFaceWest: +HearthomeGym_Movement_FantinaSpinFaceWest: FaceNorth 4 FaceEast 4 FaceSouth 4 diff --git a/res/field/scripts/scripts_hearthome_city_northeast_house_elevator.s b/res/field/scripts/scripts_hearthome_city_northeast_house_elevator.s index d69d22b3e1..5ee62a39b1 100644 --- a/res/field/scripts/scripts_hearthome_city_northeast_house_elevator.s +++ b/res/field/scripts/scripts_hearthome_city_northeast_house_elevator.s @@ -1,12 +1,12 @@ #include "macros/scrcmd.inc" - ScriptEntry HearthomeCityNortheastHouseElevator_Init + ScriptEntry HearthomeCityNortheastHouseElevator_OnFrame_Init ScriptEntryEnd -HearthomeCityNortheastHouseElevator_Init: +HearthomeCityNortheastHouseElevator_OnFrame_Init: LockAll - ApplyMovement LOCALID_PLAYER, HearthomeCityNortheastHouseElevator_WalkIn + ApplyMovement LOCALID_PLAYER, HearthomeCityNortheastHouseElevator_Movement_PlayerWalkIn WaitMovement GetFloorsAbove VAR_ELEVATOR_FLOORS_ABOVE SetVar VAR_0x8008, VAR_ELEVATOR_FLOORS_ABOVE @@ -19,7 +19,7 @@ HearthomeCityNortheastHouseElevator_ElevatorUp: Call HearthomeCityNortheastHouseElevator_ElevatorAnimation FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_2F, 0, 18, 3, DIR_SOUTH + Warp MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_2F, 18, 3, DIR_SOUTH FadeScreenIn WaitFadeScreen End @@ -29,7 +29,7 @@ HearthomeCityNortheastHouseElevator_ElevatorDown: Call HearthomeCityNortheastHouseElevator_ElevatorAnimation FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_1F, 0, 18, 3, DIR_SOUTH + Warp MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_1F, 18, 3, DIR_SOUTH FadeScreenIn WaitFadeScreen End @@ -37,19 +37,19 @@ HearthomeCityNortheastHouseElevator_ElevatorDown: HearthomeCityNortheastHouseElevator_ElevatorAnimation: WaitSE SEQ_SE_CONFIRM PlayElevatorAnimation VAR_0x8004, 4 - ApplyMovement LOCALID_PLAYER, HearthomeCityNortheastHouseElevator_WalkOut + ApplyMovement LOCALID_PLAYER, HearthomeCityNortheastHouseElevator_Movement_PlayerWalkOut WaitMovement PlaySE SEQ_SE_DP_KAIDAN2 Return .balign 4, 0 -HearthomeCityNortheastHouseElevator_WalkIn: +HearthomeCityNortheastHouseElevator_Movement_PlayerWalkIn: WalkNormalNorth 2 WalkOnSpotNormalSouth EndMovement .balign 4, 0 -HearthomeCityNortheastHouseElevator_WalkOut: +HearthomeCityNortheastHouseElevator_Movement_PlayerWalkOut: WalkNormalSouth 2 WalkOnSpotNormalSouth EndMovement diff --git a/res/field/scripts/scripts_hearthome_city_northwest_house.s b/res/field/scripts/scripts_hearthome_city_northwest_house.s index 731a2f932b..f540ab64c5 100644 --- a/res/field/scripts/scripts_hearthome_city_northwest_house.s +++ b/res/field/scripts/scripts_hearthome_city_northwest_house.s @@ -82,7 +82,7 @@ HearthomeCityNorthwestHouse_DeclineEevee: HearthomeCityNorthwestHouse_AlreadyReceivedEevee: GetNationalDexEnabled VAR_RESULT GoToIfEq VAR_RESULT, TRUE, HearthomeCityNorthwestHouse_NowThatsANationalDex - Message HearthomeCityNorthwestHouse_Text_BillDevelopedTheBasicStorageSystem + Message HearthomeCityNorthwestHouse_Text_BillDevelopedStorageSystem WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s b/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s index 361e5c2446..f912fde6ac 100644 --- a/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s @@ -14,7 +14,7 @@ HearthomeCityPokecenter1F_Nurse: End HearthomeCityPokecenter1F_Youngster: - NPCMessage HearthomeCityPokecenter1F_Text_HaveYouCheckedTheGlobalTerminal + NPCMessage HearthomeCityPokecenter1F_Text_HaveYouCheckedGlobalTerminal End HearthomeCityPokecenter1F_Socialite: diff --git a/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s b/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s index 5551ec7f55..1e698556b4 100644 --- a/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s +++ b/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s @@ -24,7 +24,7 @@ HearthomeCityPokemonFanClub_Gentleman: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_RECEIVED_HEARTHOME_CITY_POKEMON_FAN_CLUB_POFFIN_CASE, HearthomeCityPokemonFanClub_WeAreTheNumberOneFanClub + GoToIfSet FLAG_RECEIVED_HEARTHOME_CITY_POKEMON_FAN_CLUB_POFFIN_CASE, HearthomeCityPokemonFanClub_WeAreNumberOneFanClub Message HearthomeCityPokemonFanClub_Text_IAmTheChairman SetVar VAR_0x8004, ITEM_POFFIN_CASE SetVar VAR_0x8005, 1 @@ -37,8 +37,8 @@ HearthomeCityPokemonFanClub_Gentleman: ReleaseAll End -HearthomeCityPokemonFanClub_WeAreTheNumberOneFanClub: - Message HearthomeCityPokemonFanClub_Text_WeAreTheNumberOneFanClub +HearthomeCityPokemonFanClub_WeAreNumberOneFanClub: + Message HearthomeCityPokemonFanClub_Text_WeAreNumberOneFanClub WaitButton CloseMessage ReleaseAll @@ -110,7 +110,7 @@ HearthomeCityPokemonFanClub_Friendship1To49: End HearthomeCityPokemonFanClub_Friendship0: - Message HearthomeCityPokemonFanClub_Text_ThisOneReallyHasntTakenTooKindlyToYou + Message HearthomeCityPokemonFanClub_Text_HasntTakenTooKindlyToYou WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_hearthome_city_southeast_house_1f.s b/res/field/scripts/scripts_hearthome_city_southeast_house_1f.s index ed7c54f937..e89bdb440f 100644 --- a/res/field/scripts/scripts_hearthome_city_southeast_house_1f.s +++ b/res/field/scripts/scripts_hearthome_city_southeast_house_1f.s @@ -13,7 +13,7 @@ HearthomeCitySoutheastHouse1F_MiddleAgedMan: End HearthomeCitySoutheastHouse1F_Lady: - NPCMessage HearthomeCitySoutheastHouse1F_Text_ICouldCaptivateTheWholeWorld + NPCMessage HearthomeCitySoutheastHouse1F_Text_CaptivateTheWholeWorld End HearthomeCitySoutheastHouse1F_Twin: diff --git a/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s b/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s index 6e4250245a..24e517dbf4 100644 --- a/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s +++ b/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s @@ -12,7 +12,7 @@ HearthomeCitySoutheastHouse2F_AceTrainerF: FacePlayer GoToIfSet FLAG_RECEIVED_HEARTHOME_CITY_SOUTHEAST_HOUSE_2F_SHELL_BELL, HearthomeCitySoutheastHouse2F_ExplainShellBell BufferItemName 0, ITEM_SHELL_BELL - Message HearthomeCitySoutheastHouse2F_Text_IHaveSomethingForYourPokemon + Message HearthomeCitySoutheastHouse2F_Text_SomethingForYourPokemon SetVar VAR_0x8004, ITEM_SHELL_BELL SetVar VAR_0x8005, 1 GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, HearthomeCitySoutheastHouse2F_BagIsFull @@ -24,7 +24,7 @@ HearthomeCitySoutheastHouse2F_AceTrainerF: HearthomeCitySoutheastHouse2F_ExplainShellBell: BufferItemName 0, ITEM_SHELL_BELL - Message HearthomeCitySoutheastHouse2F_Text_TheHolderRegainsHPWhenItInflictsDamage + Message HearthomeCitySoutheastHouse2F_Text_RegainHPWhenInflictingDamage WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_hearthome_city_southeast_house_elevator.s b/res/field/scripts/scripts_hearthome_city_southeast_house_elevator.s index 4de0744bae..c287ff5ac9 100644 --- a/res/field/scripts/scripts_hearthome_city_southeast_house_elevator.s +++ b/res/field/scripts/scripts_hearthome_city_southeast_house_elevator.s @@ -1,12 +1,12 @@ #include "macros/scrcmd.inc" - ScriptEntry HearthomeCitySoutheastHouseElevator_Init + ScriptEntry HearthomeCitySoutheastHouseElevator_OnFrame_Init ScriptEntryEnd -HearthomeCitySoutheastHouseElevator_Init: +HearthomeCitySoutheastHouseElevator_OnFrame_Init: LockAll - ApplyMovement LOCALID_PLAYER, HearthomeCitySoutheastHouseElevator_WalkIn + ApplyMovement LOCALID_PLAYER, HearthomeCitySoutheastHouseElevator_Movement_PlayerWalkIn WaitMovement GetFloorsAbove VAR_ELEVATOR_FLOORS_ABOVE SetVar VAR_0x8008, VAR_ELEVATOR_FLOORS_ABOVE @@ -19,7 +19,7 @@ HearthomeCitySoutheastHouseElevator_ElevatorUp: Call HearthomeCitySoutheastHouseElevator_ElevatorAnimation FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_2F, 0, 18, 3, DIR_SOUTH + Warp MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_2F, 18, 3, DIR_SOUTH FadeScreenIn WaitFadeScreen End @@ -29,7 +29,7 @@ HearthomeCitySoutheastHouseElevator_ElevatorDown: Call HearthomeCitySoutheastHouseElevator_ElevatorAnimation FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_1F, 0, 18, 3, DIR_SOUTH + Warp MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_1F, 18, 3, DIR_SOUTH FadeScreenIn WaitFadeScreen End @@ -37,19 +37,19 @@ HearthomeCitySoutheastHouseElevator_ElevatorDown: HearthomeCitySoutheastHouseElevator_ElevatorAnimation: WaitSE SEQ_SE_CONFIRM PlayElevatorAnimation VAR_0x8004, 4 - ApplyMovement LOCALID_PLAYER, HearthomeCitySoutheastHouseElevator_WalkOut + ApplyMovement LOCALID_PLAYER, HearthomeCitySoutheastHouseElevator_Movement_PlayerWalkOut WaitMovement PlaySE SEQ_SE_DP_KAIDAN2 Return .balign 4, 0 -HearthomeCitySoutheastHouseElevator_WalkIn: +HearthomeCitySoutheastHouseElevator_Movement_PlayerWalkIn: WalkNormalNorth 2 WalkOnSpotNormalSouth EndMovement .balign 4, 0 -HearthomeCitySoutheastHouseElevator_WalkOut: +HearthomeCitySoutheastHouseElevator_Movement_PlayerWalkOut: WalkNormalSouth 2 WalkOnSpotNormalSouth EndMovement diff --git a/res/field/scripts/scripts_iceberg_ruins.s b/res/field/scripts/scripts_iceberg_ruins.s index 11bb52f95e..6ce15e3df2 100644 --- a/res/field/scripts/scripts_iceberg_ruins.s +++ b/res/field/scripts/scripts_iceberg_ruins.s @@ -27,7 +27,7 @@ IcebergRuins_Statue: FacePlayer GoToIfEq VAR_ICEBERG_RUINS_STATE, RUINS_STATE_CAUGHT_REGI, IcebergRuins_CaughtRegiceStatueStoppedEmanatingPower GoToIfEq VAR_ICEBERG_RUINS_STATE, RUINS_STATE_DID_NOT_CATCH_REGI, IcebergRuins_DidNotCatchRegiceStatueStoppedEmanatingPower - GoToIfUnset FLAG_GAME_COMPLETED, IcebergRuins_ItsAStatueOfAPokemonBecomeStrongerYouMust + GoToIfUnset FLAG_GAME_COMPLETED, IcebergRuins_BecomeStrongerYouMust CheckPartyHasFatefulEncounterRegigigas VAR_RESULT GoToIfEq VAR_RESULT, 0, IcebergRuins_ItsAStatueOfAPokemon GoToIfEq VAR_ICEBERG_RUINS_STATE, RUINS_STATE_ACTIVATED_STATUE, IcebergRuins_EncounterRegice @@ -54,13 +54,13 @@ IcebergRuins_EncounterRegice: End IcebergRuins_CaughtRegiceStatueStoppedEmanatingPower: - Message IcebergRuins_Text_ThePokemonStatueHasStoppedEmanatingPower + Message IcebergRuins_Text_StatueStoppedEmanatingPower GoTo IcebergRuins_StatueEnd End IcebergRuins_DidNotCatchRegiceStatueStoppedEmanatingPower: SetVar VAR_ICEBERG_RUINS_STATE, RUINS_STATE_DID_NOT_CATCH_REGI - Message IcebergRuins_Text_ThePokemonStatueHasStoppedEmanatingPower + Message IcebergRuins_Text_StatueStoppedEmanatingPower GoTo IcebergRuins_StatueEnd End @@ -69,8 +69,8 @@ IcebergRuins_BlackOut: ReleaseAll End -IcebergRuins_ItsAStatueOfAPokemonBecomeStrongerYouMust: - Message IcebergRuins_Text_ItsAStatueOfAPokemonBecomeStrongerYouMust +IcebergRuins_BecomeStrongerYouMust: + Message IcebergRuins_Text_BecomeStrongerYouMust GoTo IcebergRuins_StatueEnd End diff --git a/res/field/scripts/scripts_iron_ruins.s b/res/field/scripts/scripts_iron_ruins.s index d925200341..cfe00d2430 100644 --- a/res/field/scripts/scripts_iron_ruins.s +++ b/res/field/scripts/scripts_iron_ruins.s @@ -27,7 +27,7 @@ IronRuins_Statue: FacePlayer GoToIfEq VAR_IRON_RUINS_STATE, RUINS_STATE_CAUGHT_REGI, IronRuins_CaughtRegisteelStatueStoppedEmanatingPower GoToIfEq VAR_IRON_RUINS_STATE, RUINS_STATE_DID_NOT_CATCH_REGI, IronRuins_DidNotCatchRegisteelStatueStoppedEmanatingPower - GoToIfUnset FLAG_GAME_COMPLETED, IronRuins_ItsAStatueOfAPokemonBecomeStrongerYouMust + GoToIfUnset FLAG_GAME_COMPLETED, IronRuins_BecomeStrongerYouMust CheckPartyHasFatefulEncounterRegigigas VAR_RESULT GoToIfEq VAR_RESULT, 0, IronRuins_ItsAStatueOfAPokemon GoToIfEq VAR_IRON_RUINS_STATE, RUINS_STATE_ACTIVATED_STATUE, IronRuins_EncounterRegisteel @@ -54,13 +54,13 @@ IronRuins_EncounterRegisteel: End IronRuins_CaughtRegisteelStatueStoppedEmanatingPower: - Message IronRuins_Text_ThePokemonStatueHasStoppedEmanatingPower + Message IronRuins_Text_StatueStoppedEmanatingPower GoTo IronRuins_StatueEnd End IronRuins_DidNotCatchRegisteelStatueStoppedEmanatingPower: SetVar VAR_IRON_RUINS_STATE, RUINS_STATE_DID_NOT_CATCH_REGI - Message IronRuins_Text_ThePokemonStatueHasStoppedEmanatingPower + Message IronRuins_Text_StatueStoppedEmanatingPower GoTo IronRuins_StatueEnd End @@ -69,8 +69,8 @@ IronRuins_BlackOut: ReleaseAll End -IronRuins_ItsAStatueOfAPokemonBecomeStrongerYouMust: - Message IronRuins_Text_ItsAStatueOfAPokemonBecomeStrongerYouMust +IronRuins_BecomeStrongerYouMust: + Message IronRuins_Text_BecomeStrongerYouMust GoTo IronRuins_StatueEnd End diff --git a/res/field/scripts/scripts_jubilife_city.s b/res/field/scripts/scripts_jubilife_city.s index 2912a9eaa0..22049d2a2e 100644 --- a/res/field/scripts/scripts_jubilife_city.s +++ b/res/field/scripts/scripts_jubilife_city.s @@ -111,40 +111,40 @@ JubilifeCity_MeetLookerWithDawn: BufferRivalName 1 Message JubilifeCity_Text_DawnFollowMe Call JubilifeCity_PlayerAndCounterpartWalkNorth - Message JubilifeCity_Text_DawnThatManWhatIsHeDoing + Message JubilifeCity_Text_DawnWhatIsHeDoing CloseMessage Call JubilifeCity_LookerWalkAround Message JubilifeCity_Text_DawnUm Call JubilifeCity_LookerNoticePlayerAndCounterpart - Message JubilifeCity_Text_DawnIWasJustMakingConversation - Call JubilifeCity_IsTheSayingDontBeAThiefFamiliarToYou + Message JubilifeCity_Text_DawnJustMakingConversation + Call JubilifeCity_IsSayingFamiliarToYou Call JubilifeCity_LookerGiveVSRecorderAndLeave - Message JubilifeCity_Text_DawnWorkingForTheInternationPoliceMustBeHard + Message JubilifeCity_Text_DawnInternationPoliceMustBeHard CloseMessage WaitTime 30, VAR_RESULT BufferPlayerName 0 Call JubilifeCity_CounterpartWalkToTrainersSchool - Message JubilifeCity_Text_DawnHereItIsItsTheTrainersSchool + Message JubilifeCity_Text_DawnHereIsTheTrainersSchool CloseMessage BufferRivalName 1 Call JubilifeCity_CounterpartWalkBackFromTrainersSchool - Message JubilifeCity_Text_DawnISawYourFriendRivalGoInEarlier + Message JubilifeCity_Text_DawnRivalWentInEarlier CloseMessage GoTo JubilifeCity_CounterpartLeave End JubilifeCity_DawnAtLeastFourPokemon: - Message JubilifeCity_Text_DawnWowYouveAlreadyGotNumPokemonWithYou + Message JubilifeCity_Text_DawnWowAlreadyGotXPokemon Return JubilifeCity_DawnLessThanFourPokemon: - Message JubilifeCity_Text_DawnIThinkYoudFeelALotSaferIfYouWereToCatchSomeMore + Message JubilifeCity_Text_DawnSaferIfYouCatchMore Return JubilifeCity_MeetLookerWithLucas: BufferCounterpartName 0 BufferPlayerName 1 - Message JubilifeCity_Text_LucasHowManyPokemonhaveYouCaught + Message JubilifeCity_Text_LucasHowManyPokemon GetPartyCount VAR_RESULT BufferNumber 0, VAR_RESULT CallIfGe VAR_RESULT, 4, JubilifeCity_LucasAtLeastFourPokemon @@ -153,34 +153,34 @@ JubilifeCity_MeetLookerWithLucas: BufferRivalName 1 Message JubilifeCity_Text_LucasFollowMe Call JubilifeCity_PlayerAndCounterpartWalkNorth - Message JubilifeCity_Text_LucasThatGuyWhatsHeDoing + Message JubilifeCity_Text_LucasWhatsHeDoing CloseMessage Call JubilifeCity_LookerWalkAround Message JubilifeCity_Text_LucasUhExcuse Call JubilifeCity_LookerNoticePlayerAndCounterpart - Message JubilifeCity_Text_LucasIWasJustMakingSmallTalk - Call JubilifeCity_IsTheSayingDontBeAThiefFamiliarToYou + Message JubilifeCity_Text_LucasJustMakingSmallTalk + Call JubilifeCity_IsSayingFamiliarToYou Call JubilifeCity_LookerGiveVSRecorderAndLeave - Message JubilifeCity_Text_LucasWorkingForTheInternationPoliceSoundsHard + Message JubilifeCity_Text_LucasInternationPoliceSoundsHard CloseMessage WaitTime 15, VAR_RESULT BufferPlayerName 0 Call JubilifeCity_CounterpartWalkToTrainersSchool - Message JubilifeCity_Text_LucasHereWeAreThisIsTheTrainersSchool + Message JubilifeCity_Text_LucasThisIsTheTrainersSchool CloseMessage BufferRivalName 1 Call JubilifeCity_CounterpartWalkBackFromTrainersSchool - Message JubilifeCity_Text_LucasYourPalRivalWentInEarier + Message JubilifeCity_Text_LucasRivalWentInEarier CloseMessage GoTo JubilifeCity_CounterpartLeave End JubilifeCity_LucasAtLeastFourPokemon: - Message JubilifeCity_Text_LucasWhoaYouAlreadyHaveNumPokemonWithYou + Message JubilifeCity_Text_LucasYouAlreadyHaveXPokemon Return JubilifeCity_LucasLessThanFourPokemon: - Message JubilifeCity_Text_LucasIThinkYouShouldCatchSomeMore + Message JubilifeCity_Text_LucasYouShouldCatchMore Return JubilifeCity_CounterpartLeave: @@ -238,16 +238,16 @@ JubilifeCity_LookerNoticePlayerAndCounterpart: WaitMovement Return -JubilifeCity_IsTheSayingDontBeAThiefFamiliarToYou: - Message JubilifeCity_Text_IKnowBetterNotToBelieveThat - Message JubilifeCity_Text_IsTheSayingDontBeAThiefFamiliarToYou +JubilifeCity_IsSayingFamiliarToYou: + Message JubilifeCity_Text_IKnowBetter + Message JubilifeCity_Text_IsSayingFamiliarToYou ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, JubilifeCity_TakingWhatBelongsToOthersIsWrong + GoToIfEq VAR_RESULT, MENU_YES, JubilifeCity_TakingFromOthersIsWrong GoToIfEq VAR_RESULT, MENU_NO, JubilifeCity_YouClaimToNotKnowIt End -JubilifeCity_TakingWhatBelongsToOthersIsWrong: - Message JubilifeCity_Text_TakingWhatBelongsToOthersIsWrong +JubilifeCity_TakingFromOthersIsWrong: + Message JubilifeCity_Text_TakingFromOthersIsWrong Return JubilifeCity_YouClaimToNotKnowIt: @@ -255,15 +255,15 @@ JubilifeCity_YouClaimToNotKnowIt: Return JubilifeCity_LookerGiveVSRecorderAndLeave: - Message JubilifeCity_Text_PerhapsYouCanMakeUseOfThis + Message JubilifeCity_Text_PerhapsYouCanUseThis SetVar VAR_0x8004, ITEM_VS_RECORDER SetVar VAR_0x8005, 1 Common_GiveItemQuantity - Message JubilifeCity_Text_ThatVsRecorderItIsANiftyDeviceForRecordingAMatch + Message JubilifeCity_Text_DeviceForRecordingAMatch CloseMessage ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkWestEastSouth WaitMovement - Message JubilifeCity_Text_YouMustInformMeOfAnyHappenings + Message JubilifeCity_Text_InformMeOfAnyHappenings CloseMessage ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWatchLookerLeave ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerWatchLookerLeave @@ -442,22 +442,22 @@ JubilifeCity_ExpertM2: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfBadgeAcquired BADGE_ID_COAL, JubilifeCity_HaveYouPaidAVisitToTheTVStation - Message JubilifeCity_Text_JubilifeCitysBuiltOnLandTheyCarvedOutOfAMountain + GoToIfBadgeAcquired BADGE_ID_COAL, JubilifeCity_HaveYouVisitedTVStation + Message JubilifeCity_Text_CarvedOutOfAMountain WaitButton CloseMessage ReleaseAll End -JubilifeCity_HaveYouPaidAVisitToTheTVStation: - Message JubilifeCity_Text_HaveYouPaidAVisitToTheTVStation +JubilifeCity_HaveYouVisitedTVStation: + Message JubilifeCity_Text_HaveYouVisitedTVStation WaitButton CloseMessage ReleaseAll End JubilifeCity_AceTrainerM3: - NPCMessage JubilifeCity_Text_PastHereIsTheGlobalTerminal + NPCMessage JubilifeCity_Text_PastHereIsGlobalTerminal End JubilifeCity_CoordEvent_GTSGreeterBlockPlayer: @@ -471,7 +471,7 @@ JubilifeCity_CoordEvent_GTSGreeterBlockPlayer: JubilifeCity_GTSGreeterBlockPlayerZ779: ApplyMovement LOCALID_ACE_TRAINER_M_3, JubilifeCity_Movement_GTSGreeterNoticePlayerZ779 WaitMovement - Message JubilifeCity_Text_TheGlobalTerminalIsOffLimitsIfYouDontHaveAGymBadge + Message JubilifeCity_Text_OffLimitsIfNoGymBadge CloseMessage ApplyMovement LOCALID_ACE_TRAINER_M_3, JubilifeCity_Movement_GTSGreeterWalkBackZ779 ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerStepBackEast @@ -482,7 +482,7 @@ JubilifeCity_GTSGreeterBlockPlayerZ779: JubilifeCity_GTSGreeterBlockPlayerZ780: ApplyMovement LOCALID_ACE_TRAINER_M_3, JubilifeCity_Movement_GTSGreeterNoticePlayerZ780 WaitMovement - Message JubilifeCity_Text_TheGlobalTerminalIsOffLimitsIfYouDontHaveAGymBadge + Message JubilifeCity_Text_OffLimitsIfNoGymBadge CloseMessage ApplyMovement LOCALID_ACE_TRAINER_M_3, JubilifeCity_Movement_GTSGreeterWalkBackZ780 ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerStepBackEast @@ -493,7 +493,7 @@ JubilifeCity_GTSGreeterBlockPlayerZ780: JubilifeCity_GTSGreeterBlockPlayerZ781: ApplyMovement LOCALID_ACE_TRAINER_M_3, JubilifeCity_Movement_GTSGreeterNoticePlayerZ781 WaitMovement - Message JubilifeCity_Text_TheGlobalTerminalIsOffLimitsIfYouDontHaveAGymBadge + Message JubilifeCity_Text_OffLimitsIfNoGymBadge CloseMessage ApplyMovement LOCALID_ACE_TRAINER_M_3, JubilifeCity_Movement_GTSGreeterWalkBackZ781 ApplyMovement LOCALID_PLAYER, JubilifeCity_Movement_PlayerStepBackEast @@ -609,13 +609,13 @@ JubilifeCity_LookerBlockPlayer: End JubilifeCity_LookerBlockPlayerMessage: - GoToIfUnset FLAG_TALKED_TO_TRAINERS_SCHOOL_RIVAL, JubilifeCity_HelloMyFriendHaveYouVisitedTheTrainersSchool + GoToIfUnset FLAG_TALKED_TO_TRAINERS_SCHOOL_RIVAL, JubilifeCity_HelloHaveYouVisitedTrainersSchool GoToIfUnset FLAG_OBTAINED_POKETCH, JubilifeCity_TellMeHaveYouNotObtainedAPoketch - Message JubilifeCity_Text_ItIsYouHaveYouNotObtainedAGymBadge + Message JubilifeCity_Text_HaveYouNotObtainedAGymBadge Return -JubilifeCity_HelloMyFriendHaveYouVisitedTheTrainersSchool: - Message JubilifeCity_Text_HelloMyFriendHaveYouVisitedTheTrainersSchool +JubilifeCity_HelloHaveYouVisitedTrainersSchool: + Message JubilifeCity_Text_HelloHaveYouVisitedTrainersSchool Return JubilifeCity_TellMeHaveYouNotObtainedAPoketch: @@ -623,13 +623,13 @@ JubilifeCity_TellMeHaveYouNotObtainedAPoketch: Return JubilifeCity_LookerMessageDidntObtainPoketch: - GoToIfUnset FLAG_TALKED_TO_TRAINERS_SCHOOL_RIVAL, JubilifeCity_ItIsYouHaveYouVisitedTheTrainersSchool + GoToIfUnset FLAG_TALKED_TO_TRAINERS_SCHOOL_RIVAL, JubilifeCity_ItIsYouHaveYouVisitedTrainersSchool GoToIfUnset FLAG_OBTAINED_POKETCH, JubilifeCity_ItIsYouHaveYouNotObtainedAPoketch - Message JubilifeCity_Text_ItIsYouHaveYouNotObtainedAGymBadge + Message JubilifeCity_Text_HaveYouNotObtainedAGymBadge Return -JubilifeCity_ItIsYouHaveYouVisitedTheTrainersSchool: - Message JubilifeCity_Text_ItIsYouHaveYouVisitedTheTrainersSchool +JubilifeCity_ItIsYouHaveYouVisitedTrainersSchool: + Message JubilifeCity_Text_ItIsYouHaveYouVisitedTrainersSchool Return JubilifeCity_ItIsYouHaveYouNotObtainedAPoketch: @@ -639,28 +639,28 @@ JubilifeCity_ItIsYouHaveYouNotObtainedAPoketch: JubilifeCity_LookerWalkBackZ757: ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkBackZ757 WaitMovement - GoTo JubilifeCity_Movement_LookerRelease + GoTo JubilifeCity_LookerEnd End JubilifeCity_LookerWalkBackZ758: ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkBackZ758 WaitMovement - GoTo JubilifeCity_Movement_LookerRelease + GoTo JubilifeCity_LookerEnd End JubilifeCity_LookerWalkBackZ759: ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkBackZ759 WaitMovement - GoTo JubilifeCity_Movement_LookerRelease + GoTo JubilifeCity_LookerEnd End JubilifeCity_LookerWalkBackZ760: ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkBackZ760 WaitMovement - GoTo JubilifeCity_Movement_LookerRelease + GoTo JubilifeCity_LookerEnd End -JubilifeCity_Movement_LookerRelease: +JubilifeCity_LookerEnd: ReleaseAll End @@ -752,7 +752,7 @@ JubilifeCity_Looker: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_OBTAINED_POKETCH, JubilifeCity_ItIsYouHaveYouNotObtainedAGymBadge + GoToIfSet FLAG_OBTAINED_POKETCH, JubilifeCity_HaveYouNotObtainedAGymBadge Call JubilifeCity_LookerMessageDidntObtainPoketch WaitABPress CloseMessage @@ -761,8 +761,8 @@ JubilifeCity_Looker: ReleaseAll End -JubilifeCity_ItIsYouHaveYouNotObtainedAGymBadge: - Message JubilifeCity_Text_ItIsYouHaveYouNotObtainedAGymBadge +JubilifeCity_HaveYouNotObtainedAGymBadge: + Message JubilifeCity_Text_HaveYouNotObtainedAGymBadge WaitABPress CloseMessage ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerFaceSouth @@ -772,20 +772,20 @@ JubilifeCity_ItIsYouHaveYouNotObtainedAGymBadge: JubilifeCity_CheckPalPad: CheckItem ITEM_PAL_PAD, 1, VAR_RESULT - GoToIfEq VAR_RESULT, TRUE, JubilifeCity_ISeeThatYouHaveObtainedItAPalPadForYourself - Message JubilifeCity_Text_TellMeHaveYouNotObtainedAPalPad + GoToIfEq VAR_RESULT, TRUE, JubilifeCity_YouObtainedPalPad + Message JubilifeCity_Text_HaveYouNotObtainedAPalPad CloseMessage ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkOnSpotWestEast WaitMovement - Message JubilifeCity_Text_IShallTakeMyInvestigationElsewhere + Message JubilifeCity_Text_TakeInvestigationElsewhere Return -JubilifeCity_ISeeThatYouHaveObtainedItAPalPadForYourself: - Message JubilifeCity_Text_ISeeThatYouHaveObtainedItAPalPadForYourself +JubilifeCity_YouObtainedPalPad: + Message JubilifeCity_Text_YouObtainedPalPad CloseMessage ApplyMovement LOCALID_LOOKER, JubilifeCity_Movement_LookerWalkOnSpotWestEast WaitMovement - Message JubilifeCity_Text_IShallTakeMyInvestigationElsewhere + Message JubilifeCity_Text_TakeInvestigationElsewhere Return .balign 4, 0 @@ -797,7 +797,7 @@ JubilifeCity_CoordEvent_TeamGalactic: LockAll ApplyMovement LOCALID_GRUNT_M_2, JubilifeCity_Movement_GruntWalkOnSpotEast WaitMovement - Message JubilifeCity_Text_HandOverAllYourResearchFindings + Message JubilifeCity_Text_HandOverResearchFindings CloseMessage GetPlayerMapPos VAR_0x8000, VAR_0x8001 GoToIfEq VAR_0x8000, 173, JubilifeCity_PlayerWalkToProfRowanX173 @@ -829,21 +829,21 @@ JubilifeCity_PlayerWalkToProfRowanX175: JubilifeCity_TeamGalacticBanter: BufferPlayerName 0 BufferCounterpartName 1 - Message JubilifeCity_Text_ThatsOreburghsGymBadgeISee + Message JubilifeCity_Text_ThatsOreburghsGymBadge ApplyMovement LOCALID_GRUNT_M_2, JubilifeCity_Movement_GruntWalkOnSpotEast WaitMovement - Message JubilifeCity_Text_OhProfessorOfRowanMustYouBeSoDifficult + Message JubilifeCity_Text_MustYouBeSoDifficult ApplyMovement LOCALID_PROF_ROWAN, JubilifeCity_Movement_ProfRowanWalkOnSpotWest WaitMovement Message JubilifeCity_Text_WhyMustYouBeSuchANuisance ApplyMovement LOCALID_PROF_ROWAN, JubilifeCity_Movement_ProfRowanWalkOnSpotSouth WaitMovement - Message JubilifeCity_Text_MyGoodnessYouCallYourselvesAdults + Message JubilifeCity_Text_YouCallYourselvesAdults ApplyMovement LOCALID_GRUNT_M_1, JubilifeCity_Movement_GruntWalkOnSpotFastEast ApplyMovement LOCALID_GRUNT_M_2, JubilifeCity_Movement_GruntWalkOnSpotFastEast WaitMovement - Message JubilifeCity_Text_WeWillMakeYouRegretInsultingTeamGalactic - Message JubilifeCity_Text_YouKidsGiveTheseThugsALessonInCivilityPlease + Message JubilifeCity_Text_RegretInsultingTeamGalactic + Message JubilifeCity_Text_GiveThugsALessonInCivility ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWalkOnSpotSouth WaitMovement GetPlayerGender VAR_RESULT @@ -890,12 +890,12 @@ JubilifeCity_TeamGalacticBattle: ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWalkToPlayerAfterGalacticBattle WaitMovement BufferPlayerName 0 - Message JubilifeCity_Text_ThatLotTheyCalledThemselvesTeamGalactic + Message JubilifeCity_Text_CalledThemselvesTeamGalactic ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartWalkOnSpotSouth2 WaitMovement GetPlayerGender VAR_RESULT - GoToIfEq VAR_RESULT, GENDER_MALE, JubilifeCity_DawnTheProfessorStudiesTheEvolutionOfPokemonToo - GoToIfEq VAR_RESULT, GENDER_FEMALE, JubilifeCity_LucasTheProfessorStudiesTheEvolutionOfPokemonToo + GoToIfEq VAR_RESULT, GENDER_MALE, JubilifeCity_DawnProfessorStudiesEvolutionOfPokemon + GoToIfEq VAR_RESULT, GENDER_FEMALE, JubilifeCity_LucasProfessorStudiesEvolutionOfPokemon End JubilifeCity_SetPlayerCounterpartPartnerTeam: @@ -925,23 +925,23 @@ JubilifeCity_SetLucasPartnerTeam: JubilifeCity_Return: Return -JubilifeCity_DawnTheProfessorStudiesTheEvolutionOfPokemonToo: +JubilifeCity_DawnProfessorStudiesEvolutionOfPokemon: BufferCounterpartName 0 BufferPlayerName 1 - Message JubilifeCity_Text_DawnTheProfessorStudiesTheEvolutionOfPokemonToo + Message JubilifeCity_Text_DawnProfessorStudiesEvolutionOfPokemon GoTo JubilifeCity_CounterpartAndProfRowanLeave End -JubilifeCity_LucasTheProfessorStudiesTheEvolutionOfPokemonToo: +JubilifeCity_LucasProfessorStudiesEvolutionOfPokemon: BufferCounterpartName 0 BufferPlayerName 1 - Message JubilifeCity_Text_LucasTheProfessorStudiesTheEvolutionOfPokemonToo + Message JubilifeCity_Text_LucasProfessorStudiesEvolutionOfPokemon GoTo JubilifeCity_CounterpartAndProfRowanLeave End JubilifeCity_CounterpartAndProfRowanLeave: BufferPlayerName 0 - Message JubilifeCity_Text_WhyDontYouCollectAllTheGymBadgesOfSinnoh + Message JubilifeCity_Text_CollectAllGymBadges CloseMessage ApplyMovement LOCALID_COUNTERPART, JubilifeCity_Movement_CounterpartLeaveAfterGalacticBattle ApplyMovement LOCALID_PROF_ROWAN, JubilifeCity_Movement_ProfRowanLeave @@ -969,7 +969,7 @@ JubilifeCity_CollectorJubilifeTV: WaitMovement Message JubilifeCity_Text_OhThatWasVeryGood Call JubilifeCity_GiveFashionCaseAndAccessories - Message JubilifeCity_Text_DressUpYourPokemonAndWatchTheirAppealGrow + Message JubilifeCity_Text_DressUpYourPokemon CloseMessage WaitTime 15, VAR_RESULT ApplyMovement LOCALID_COLLECTOR, JubilifeCity_Movement_CollectorLeave @@ -994,7 +994,7 @@ JubilifeCity_GiveFashionCaseAndAccessories: Call JubilifeCity_GiveRandomAccessoryFeatherOrMustache Call JubilifeCity_GiveRandomAccessoryFeatherOrMustache AddContestBackdrop 0 - SetVar VAR_MAP_LOCAL_1, 0x270F + SetVar VAR_MAP_LOCAL_1, 9999 Call JubilifeCity_GiveRandomContestBackdrop Call JubilifeCity_GiveRandomContestBackdrop Return @@ -1217,7 +1217,7 @@ JubilifeCity_SchoolKidM1: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message JubilifeCity_Text_CanYouTellMeWhatTypeOfPokemonYouLike + Message JubilifeCity_Text_CanYouTellTypePreference InitGlobalTextListMenu 29, 11, 0, VAR_RESULT, NO_EXIT_ON_B SetMenuXOriginToRight AddListMenuEntry MenuEntries_Text_TypePreferenceFire, 0 @@ -1225,23 +1225,23 @@ JubilifeCity_SchoolKidM1: AddListMenuEntry MenuEntries_Text_TypePreferenceGrass, 2 ShowListMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, JubilifeCity_TheFireTypeYouMustHaveAFieryPersonality - GoToIfEq VAR_0x8008, 1, JubilifeCity_APersonThatLikesTheWaterTypeMustBeSomewhatCool - Message JubilifeCity_Text_YouChoseTheGrassTypeNoWonderYouLookSoCalm + GoToIfEq VAR_0x8008, 0, JubilifeCity_FireMustHaveFieryPersonality + GoToIfEq VAR_0x8008, 1, JubilifeCity_WaterMustBeCool + Message JubilifeCity_Text_GrassNoWonderYouLookCalm WaitButton CloseMessage ReleaseAll End -JubilifeCity_TheFireTypeYouMustHaveAFieryPersonality: - Message JubilifeCity_Text_TheFireTypeYouMustHaveAFieryPersonality +JubilifeCity_FireMustHaveFieryPersonality: + Message JubilifeCity_Text_FireMustHaveFieryPersonality WaitButton CloseMessage ReleaseAll End -JubilifeCity_APersonThatLikesTheWaterTypeMustBeSomewhatCool: - Message JubilifeCity_Text_APersonThatLikesTheWaterTypeMustBeSomewhatCool +JubilifeCity_WaterMustBeCool: + Message JubilifeCity_Text_WaterMustBeCool WaitButton CloseMessage ReleaseAll @@ -1252,39 +1252,39 @@ JubilifeCity_Twin: End JubilifeCity_AceTrainerM1: - NPCMessage JubilifeCity_Text_HiyaWheredYouComeFrom + NPCMessage JubilifeCity_Text_WheredYouComeFrom End JubilifeCity_AceTrainerF: - NPCMessage JubilifeCity_Text_WhenYouWalkWithYourPokemonTheyGraduallyGrowFriendlier + NPCMessage JubilifeCity_Text_GraduallyGrowFriendlier End JubilifeCity_ExpertM1: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message JubilifeCity_Text_HelloTrainerDoYouKnowMuchAboutPokemon + Message JubilifeCity_Text_DoYouKnowMuchAboutPokemon ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, JubilifeCity_AhISeeYouAreKnowledgeable - GoToIfEq VAR_RESULT, MENU_NO, JubilifeCity_OhYoureNotKnowledgeable + GoToIfEq VAR_RESULT, MENU_YES, JubilifeCity_YouAreKnowledgeable + GoToIfEq VAR_RESULT, MENU_NO, JubilifeCity_YoureNotKnowledgeable End -JubilifeCity_AhISeeYouAreKnowledgeable: - Message JubilifeCity_Text_AhISeeYouAreKnowledgeable +JubilifeCity_YouAreKnowledgeable: + Message JubilifeCity_Text_YouAreKnowledgeable WaitButton CloseMessage ReleaseAll End -JubilifeCity_OhYoureNotKnowledgeable: - Message JubilifeCity_Text_OhYoureNotKnowledgeable +JubilifeCity_YoureNotKnowledgeable: + Message JubilifeCity_Text_YoureNotKnowledgeable WaitButton CloseMessage ReleaseAll End JubilifeCity_SchoolKidM2: - NPCMessage JubilifeCity_Text_AtMostYouCanHaveSixPokemonWithYou + NPCMessage JubilifeCity_Text_AtMostSixPokemonWithYou End JubilifeCity_MapSignpost: @@ -1292,23 +1292,23 @@ JubilifeCity_MapSignpost: End JubilifeCity_SignboardJubilifeCondominiums: - ShowLandmarkSign JubilifeCity_Text_JubilifeCondominiumsTenantsWanted + ShowLandmarkSign JubilifeCity_Text_SignJubilifeCondominiums End JubilifeCity_SignboardPoketchCompany: - ShowLandmarkSign JubilifeCity_Text_ThePoketchCompanyPokemonWatchesForTheWorld + ShowLandmarkSign JubilifeCity_Text_SignPoketchCompany End JubilifeCity_SignboardTrainersSchool: - ShowLandmarkSign JubilifeCity_Text_TrainersSchoolTheFirstStepForTrainers + ShowLandmarkSign JubilifeCity_Text_SignTrainersSchool End JubilifeCity_SignboardJubilifeTV: - ShowLandmarkSign JubilifeCity_Text_JubilifeTVTheFunAndGamesTVStation + ShowLandmarkSign JubilifeCity_Text_SignJubilifeTV End JubilifeCity_SignboardGlobalTerminal: - ShowLandmarkSign JubilifeCity_Text_TheGlobalTerminalYourGatewayToTheWholeWorld + ShowLandmarkSign JubilifeCity_Text_SignGlobalTerminal End JubilifeCity_CoordEvent_PoketchCampaign: @@ -1322,9 +1322,9 @@ JubilifeCity_CoordEvent_PoketchCampaign: CallIfEq VAR_0x8004, 174, JubilifeCity_PoketchCoPresidentWalkToPlayerX174 CallIfEq VAR_0x8004, 175, JubilifeCity_PoketchCoPresidentWalkToPlayerX175 CallIfEq VAR_0x8004, 176, JubilifeCity_PoketchCoPresidentWalkToPlayerX176 - Message JubilifeCity_Text_YouCallYourselfAPokemonTrainerAndYetYouHaveNoPoketch + Message JubilifeCity_Text_YouHaveNoPoketch SetVar VAR_POKETCH_CAMPAIGN_STATE, 2 - Message JubilifeCity_Text_AllYouHaveToDoIsFindThreeClownsInJubilifeCity + Message JubilifeCity_Text_FindThreeClowns WaitButton CloseMessage ReleaseAll @@ -1406,7 +1406,7 @@ JubilifeCity_PoketchCoPresident: SetVar VAR_0x8004, 0 Call JubilifeCity_SetObtainedCouponsCount GoToIfEq VAR_0x8004, 3, JubilifeCity_GivePoketch - Message JubilifeCity_Text_CollectACouponFromEachClownThenComeSeeMeOK + Message JubilifeCity_Text_CollectCouponFromEachClown WaitButton CloseMessage ReleaseAll @@ -1423,7 +1423,7 @@ JubilifeCity_IncreaseObtainedCouponsCount: Return JubilifeCity_GivePoketch: - Message JubilifeCity_Text_InReturnForTheseCouponsIPresentYouThisPokemonWatch + Message JubilifeCity_Text_PokemonWatchInReturnForCoupons RemoveItem ITEM_COUPON_1, 1, VAR_RESULT RemoveItem ITEM_COUPON_2, 1, VAR_RESULT RemoveItem ITEM_COUPON_3, 1, VAR_RESULT @@ -1437,7 +1437,7 @@ JubilifeCity_GivePoketch: Message JubilifeCity_Text_PlayerReceivedAPoketch PlayFanfare SEQ_FANFA4 WaitFanfare - Message JubilifeCity_Text_YouCanAddAppsToYourPoketch + Message JubilifeCity_Text_AddAppsToPoketch CloseMessage GetPlayerDir VAR_RESULT GoToIfEq VAR_RESULT, DIR_NORTH, JubilifeCity_PoketchCoPresidentLeaveNorthWestEast @@ -1498,7 +1498,7 @@ JubilifeCity_Clown1: LockAll FacePlayer GoToIfSet FLAG_OBTAINED_COUPON_1, JubilifeCity_Clown1ObtainedCoupon - Message JubilifeCity_Text_DoesAPokemonGrowByDefeatingOthersAndGainingExpPoints + Message JubilifeCity_Text_DoPokemonGrowByDefeatingOthers ShowYesNoMenu VAR_RESULT GoToIfEq VAR_RESULT, MENU_YES, JubilifeCity_Clown1CorrectAnswer GoToIfEq VAR_RESULT, MENU_NO, JubilifeCity_Clown1WrongAnswer @@ -1506,9 +1506,9 @@ JubilifeCity_Clown1: JubilifeCity_Clown1CorrectAnswer: PlaySE SEQ_SE_DP_PINPON - Message JubilifeCity_Text_DingDingYoureAbsolutelyCorrect1 - Message JubilifeCity_Text_PokemonGrowStrongerByDefeatingOtherPokemonInBattle - Message JubilifeCity_Text_HereYouGoYourPoketchCoupon1 + Message JubilifeCity_Text_AbsolutelyCorrect1 + Message JubilifeCity_Text_GrowStrongerByDefeatingOthers + Message JubilifeCity_Text_HeresPoketchCoupon1 SetVar VAR_0x8004, ITEM_COUPON_1 SetVar VAR_0x8005, 1 SetFlag FLAG_OBTAINED_COUPON_1 @@ -1519,7 +1519,7 @@ JubilifeCity_Clown1CorrectAnswer: JubilifeCity_Clown1WrongAnswer: PlaySE SEQ_SE_DP_BOX03 - Message JubilifeCity_Text_BzzzztThatsTheWrongAnswer1 + Message JubilifeCity_Text_WrongAnswer1 WaitButton CloseMessage ReleaseAll @@ -1537,7 +1537,7 @@ JubilifeCity_Clown2: LockAll FacePlayer GoToIfSet FLAG_OBTAINED_COUPON_2, JubilifeCity_Clown2ObtainedCoupon - Message JubilifeCity_Text_AskJustLikePokemonTypesTheMovesOfPokemonAlsoHaveTypes + Message JubilifeCity_Text_DoMovesHaveTypes ShowYesNoMenu VAR_RESULT GoToIfEq VAR_RESULT, MENU_YES, JubilifeCity_Clown2CorrectAnswer GoToIfEq VAR_RESULT, MENU_NO, JubilifeCity_Clown2WrongAnswer @@ -1545,9 +1545,9 @@ JubilifeCity_Clown2: JubilifeCity_Clown2CorrectAnswer: PlaySE SEQ_SE_DP_PINPON - Message JubilifeCity_Text_DingDingYoureAbsolutelyCorrect2 - Message JubilifeCity_Text_IfThePokemonsTypeMatchesItsMovesTypeThatMoveIsMadeMuchMorePowerful - Message JubilifeCity_Text_HereYouGoYourPoketchCoupon2 + Message JubilifeCity_Text_AbsolutelyCorrect2 + Message JubilifeCity_Text_IfPokemonMatchTypeMoveMorePowerful + Message JubilifeCity_Text_HeresPoketchCoupon2 SetVar VAR_0x8004, ITEM_COUPON_2 SetVar VAR_0x8005, 1 SetFlag FLAG_OBTAINED_COUPON_2 @@ -1558,14 +1558,14 @@ JubilifeCity_Clown2CorrectAnswer: JubilifeCity_Clown2WrongAnswer: PlaySE SEQ_SE_DP_BOX03 - Message JubilifeCity_Text_BzzzztThatsTheWrongAnswer2 + Message JubilifeCity_Text_WrongAnswer2 WaitButton CloseMessage ReleaseAll End JubilifeCity_Clown2ObtainedCoupon: - Message JubilifeCity_Text_IfThePokemonsTypeMatchesItsMovesTypeThatMoveIsMadeMuchMorePowerful2 + Message JubilifeCity_Text_IfPokemonMatchTypeMoveMorePowerful2 WaitButton CloseMessage ReleaseAll @@ -1585,9 +1585,9 @@ JubilifeCity_Clown3: JubilifeCity_Clown3CorrectAnswer: PlaySE SEQ_SE_DP_PINPON - Message JubilifeCity_Text_DingDingYoureAbsolutelyCorrect3 - Message JubilifeCity_Text_APokemonMayHoldASingleItem - Message JubilifeCity_Text_HereYouGoYourPoketchCoupon3 + Message JubilifeCity_Text_AbsolutelyCorrect3 + Message JubilifeCity_Text_PokemonMayHoldSingleItem + Message JubilifeCity_Text_HeresPoketchCoupon3 SetPosition LOCALID_POKETCH_CO_PRESIDENT, 174, 1, 771, DIR_SOUTH SetVar VAR_0x8004, ITEM_COUPON_3 SetVar VAR_0x8005, 1 @@ -1599,14 +1599,14 @@ JubilifeCity_Clown3CorrectAnswer: JubilifeCity_Clown3WrongAnswer: PlaySE SEQ_SE_DP_BOX03 - Message JubilifeCity_Text_BzzzztThatsTheWrongAnswer3 + Message JubilifeCity_Text_WrongAnswer3 WaitButton CloseMessage ReleaseAll End JubilifeCity_Clown3ObtainedCoupon: - Message JubilifeCity_Text_APokemonMayHoldASingleItem2 + Message JubilifeCity_Text_PokemonMayHoldSingleItem2 WaitButton CloseMessage ReleaseAll @@ -1620,11 +1620,11 @@ JubilifeCity_YouShouldStickAround: End JubilifeCity_KidWithNDS1: - NPCMessage JubilifeCity_Text_ImTradingPokemonWithMyBuddy + NPCMessage JubilifeCity_Text_ImTradingPokemon End JubilifeCity_KidWithNDS2: - NPCMessage JubilifeCity_TextIMadeMyPokemonHoldAnItemBeforeTradingIt + NPCMessage JubilifeCity_Text_IMadePokemonHoldItem End JubilifeCity_CoordEvent_LookerPalPad: diff --git a/res/field/scripts/scripts_jubilife_city_condominiums_1f.s b/res/field/scripts/scripts_jubilife_city_condominiums_1f.s index 45e8d97de3..90e2777c30 100644 --- a/res/field/scripts/scripts_jubilife_city_condominiums_1f.s +++ b/res/field/scripts/scripts_jubilife_city_condominiums_1f.s @@ -13,11 +13,11 @@ JubilifeCityCondominiums1F_ExpertF: End JubilifeCityCondominiums1F_Pikachu: - PokemonCryAndMessage SPECIES_PIKACHU, JubilifeCityCondominiums1F_Text_PiikaPi + PokemonCryAndMessage SPECIES_PIKACHU, JubilifeCityCondominiums1F_Text_PikachuCry End JubilifeCityCondominiums1F_Pachirisu: - PokemonCryAndMessage SPECIES_PACHIRISU, JubilifeCityCondominiums1F_Text_Pachipachii + PokemonCryAndMessage SPECIES_PACHIRISU, JubilifeCityCondominiums1F_Text_PachirisuCry End JubilifeCityCondominiums1F_Beauty: @@ -26,7 +26,7 @@ JubilifeCityCondominiums1F_Beauty: FacePlayer GoToIfSet FLAG_OBTAINED_QUICK_CLAW, JubilifeCityCondominiums1F_ObtainedQuickClaw BufferItemName 0, ITEM_QUICK_CLAW - Message JubilifeCityCondominiums1F_Text_YourPokemonIsQuiteAdorableTryMakingItHoldThis + Message JubilifeCityCondominiums1F_Text_MakePokemonHoldThis SetVar VAR_0x8004, ITEM_QUICK_CLAW SetVar VAR_0x8005, 1 GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, JubilifeCityCondominiums1F_BagIsFull @@ -43,7 +43,7 @@ JubilifeCityCondominiums1F_BagIsFull: End JubilifeCityCondominiums1F_ObtainedQuickClaw: - Message JubilifeCityCondominiums1F_Text_APokemonHoldingThatQuickClawCanSometimesAttackFirst + Message JubilifeCityCondominiums1F_Text_SometimesAttackFirst WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_city_condominiums_2f.s b/res/field/scripts/scripts_jubilife_city_condominiums_2f.s index 8e5651c160..b9afeabaec 100644 --- a/res/field/scripts/scripts_jubilife_city_condominiums_2f.s +++ b/res/field/scripts/scripts_jubilife_city_condominiums_2f.s @@ -7,9 +7,9 @@ ScriptEntryEnd JubilifeCityCondominiums2F_BugCatcher: - NPCMessage JubilifeCityCondominiums2F_Text_ILikeHowPokemonCanUseAttacks + NPCMessage JubilifeCityCondominiums2F_Text_ILikeHowPokemonAttack End JubilifeCityCondominiums2F_PokemonBreederM: - NPCMessage JubilifeCityCondominiums2F_Text_DidYouBuySomeHealBallsAtThePokeMart + NPCMessage JubilifeCityCondominiums2F_Text_DidYouBuyHealBalls End diff --git a/res/field/scripts/scripts_jubilife_city_condominiums_3f.s b/res/field/scripts/scripts_jubilife_city_condominiums_3f.s index 76fd7cb792..0d153fec1a 100644 --- a/res/field/scripts/scripts_jubilife_city_condominiums_3f.s +++ b/res/field/scripts/scripts_jubilife_city_condominiums_3f.s @@ -7,9 +7,9 @@ ScriptEntryEnd JubilifeCityCondominiums3F_Collector: - NPCMessage JubilifeCityCondominiums3F_Text_ICanTradePokemonAroundTheWorldUsingNintendoWFC + NPCMessage JubilifeCityCondominiums3F_Text_TradeAroundTheWorld End JubilifeCityCondominiums3F_Lass: - NPCMessage JubilifeCityCondominiums3F_Text_TheWorldYouCanReachWithNintendoWFC + NPCMessage JubilifeCityCondominiums3F_Text_TheWorldYouCanReach End diff --git a/res/field/scripts/scripts_jubilife_city_condominiums_4f.s b/res/field/scripts/scripts_jubilife_city_condominiums_4f.s index 8aa1e0d3c3..176f0e7cfe 100644 --- a/res/field/scripts/scripts_jubilife_city_condominiums_4f.s +++ b/res/field/scripts/scripts_jubilife_city_condominiums_4f.s @@ -10,7 +10,7 @@ JubilifeCityCondominiums4F_Beauty: LockAll FacePlayer GoToIfSet FLAG_OBTAINED_FOCUS_BAND, JubilifeCityCondominiums4F_ObtainedFocusBand - Message JubilifeCityCondominiums4F_Text_ForSomeoneLikeYouThisMightBePerfect + Message JubilifeCityCondominiums4F_Text_ThisMightBePerfect SetVar VAR_0x8004, ITEM_FOCUS_BAND SetVar VAR_0x8005, 1 GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, JubilifeCityCondominiums4F_BagIsFull @@ -21,7 +21,7 @@ JubilifeCityCondominiums4F_Beauty: End JubilifeCityCondominiums4F_ObtainedFocusBand: - Message JubilifeCityCondominiums4F_Text_ThereAreItemsThatAreUsefulOnlyWhenTheyreHeldByPokemon + Message JubilifeCityCondominiums4F_Text_SomeItemsOnlyUsefulWhenHeld WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s b/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s index 3c70105833..36c5539797 100644 --- a/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s @@ -14,15 +14,15 @@ JubilifeCityPokecenter1F_Nurse: End JubilifeCityPokecenter1F_Twin: - NPCMessage JubilifeCityPokecenter1F_Text_AllTypesHaveStrengthsAndWeaknesses + NPCMessage JubilifeCityPokecenter1F_Text_StrengthsAndWeaknesses End JubilifeCityPokecenter1F_SchoolKidM: - NPCMessage JubilifeCityPokecenter1F_Text_InTheUnionRoomUpstairsYouCanChatAndTradeWithOtherPeople + NPCMessage JubilifeCityPokecenter1F_Text_ChatAndTradeInUnionRoom End JubilifeCityPokecenter1F_TrainerF: - NPCMessage JubilifeCityPokecenter1F_Text_YouCanStillCatchAPokemonIfYouAlreadyHaveSixTravelingWithYou + NPCMessage JubilifeCityPokecenter1F_Text_CanStillCatchWithSixPokemon End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_south_house_1f.s b/res/field/scripts/scripts_jubilife_city_south_house_1f.s index c230468ce0..dc698b33c9 100644 --- a/res/field/scripts/scripts_jubilife_city_south_house_1f.s +++ b/res/field/scripts/scripts_jubilife_city_south_house_1f.s @@ -8,7 +8,7 @@ ScriptEntryEnd JubilifeCitySouthHouse1F_AceTrainerM: - NPCMessage JubilifeCitySouthHouse1F_PokemonAreWonderfulDeeplyMysteriousCreatures + NPCMessage JubilifeCitySouthHouse1F_DeeplyMysteriousCreatures End JubilifeCitySouthHouse1F_Lass: @@ -16,7 +16,7 @@ JubilifeCitySouthHouse1F_Lass: End JubilifeCitySouthHouse1F_Pachirisu: - PokemonCryAndMessage SPECIES_PACHIRISU, JubilifeCitySouthHouse1F_PachirisuKukkuuh + PokemonCryAndMessage SPECIES_PACHIRISU, JubilifeCitySouthHouse1F_PachirisuCry End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_south_house_2f.s b/res/field/scripts/scripts_jubilife_city_south_house_2f.s index cbdd29869c..26e26efab8 100644 --- a/res/field/scripts/scripts_jubilife_city_south_house_2f.s +++ b/res/field/scripts/scripts_jubilife_city_south_house_2f.s @@ -8,15 +8,15 @@ ScriptEntryEnd JubilifeCitySouthHouse2F_Youngster: - NPCMessage JubilifeCitySouthHouse2F_SomeKindsOfPokemonEvolveWhenTheyGetStrongerFromBattling + NPCMessage JubilifeCitySouthHouse2F_EvolveWhenStrongerFromBattling End JubilifeCitySouthHouse2F_PokefanF: - NPCMessage JubilifeCitySouthHouse2F_EvolutionMakesPokemonJustThatMuchMoreFascinating + NPCMessage JubilifeCitySouthHouse2F_EvolutionMakesMoreFascinating End JubilifeCitySouthHouse2F_PokemonBreederF: - NPCMessage JubilifeCitySouthHouse2F_DidntProfRowanConductResearchWithProfOak + NPCMessage JubilifeCitySouthHouse2F_ConductResearchWithProfOak End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_south_house_3f.s b/res/field/scripts/scripts_jubilife_city_south_house_3f.s index 8887e5c872..0aaae83256 100644 --- a/res/field/scripts/scripts_jubilife_city_south_house_3f.s +++ b/res/field/scripts/scripts_jubilife_city_south_house_3f.s @@ -6,7 +6,7 @@ ScriptEntryEnd JubilifeCitySouthHouse3F_PokefanM: - NPCMessage JubilifeCitySouthHouse3F_WhenIGiveMyPokemonNicknamesItsLikeTheyreMyVeryOwn + NPCMessage JubilifeCitySouthHouse3F_ItsLikeTheyreMyOwn End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s b/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s index 2c9c0dcfdd..375b65dcb7 100644 --- a/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s +++ b/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s @@ -8,15 +8,15 @@ ScriptEntryEnd JubilifeCitySouthwestHouse1F_Youngster: - NPCMessage JubilifeCitySouthwestHouse1F_Text_IGotMyPikachuThroughATradeFromSomeone + NPCMessage JubilifeCitySouthwestHouse1F_Text_GotPikachuThroughTrade End JubilifeCitySouthwestHouse1F_Pikachu: - PokemonCryAndMessage SPECIES_PIKACHU, JubilifeCitySouthwestHouse1F_Text_PikachuPikapikapikaaah + PokemonCryAndMessage SPECIES_PIKACHU, JubilifeCitySouthwestHouse1F_Text_PikachuCry End JubilifeCitySouthwestHouse1F_MiddleAgedMan: - NPCMessage JubilifeCitySouthwestHouse1F_Text_IfEveryoneAroundTheWorldHadPokemon + NPCMessage JubilifeCitySouthwestHouse1F_Text_IfEveryoneHadPokemon End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s b/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s index 790bbad7ad..4a7d91b723 100644 --- a/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s +++ b/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s @@ -13,15 +13,15 @@ JubilifeCitySouthwestHouse2F_AceTrainerM: End JubilifeCitySouthwestHouse2F_Beauty: - NPCMessage JubilifeCitySouthwestHouse2F_Text_ILikeLookAtPokemonIGetFromFriendInTrade + NPCMessage JubilifeCitySouthwestHouse2F_Text_ILikeLookAtPokemon End JubilifeCitySouthwestHouse2F_Collector: - NPCMessage JubilifeCitySouthwestHouse2F_Text_YouCanTradePokemonWithPeopleAroundTheWorldOnNintendoWFC + NPCMessage JubilifeCitySouthwestHouse2F_Text_TradePAroundTheWorld End JubilifeCitySouthwestHouse2F_Lass: - NPCMessage JubilifeCitySouthwestHouse2F_Text_WhenYouConnectWithPeopleOnNintendoWFCItsHardToBe + NPCMessage JubilifeCitySouthwestHouse2F_Text_WorldsBigOrSmall End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_tv_1f.s b/res/field/scripts/scripts_jubilife_tv_1f.s index 0b7b9e2885..bb2ed365c8 100644 --- a/res/field/scripts/scripts_jubilife_tv_1f.s +++ b/res/field/scripts/scripts_jubilife_tv_1f.s @@ -20,7 +20,7 @@ JubilifeTV1F_Dummy1: End JubilifeTV1F_GymGuide: - NPCMessage JubilifeTV1F_Text_WhyDontYouTryDressingUpYourPokemonNow + NPCMessage JubilifeTV1F_Text_TryDressingUpPokemon End JubilifeTV1F_Dummy3: @@ -31,29 +31,29 @@ JubilifeTV1F_AceTrainerSnowF: LockAll FacePlayer GoToIfNe VAR_LOTTERY_PRIZE_ITEM, 0, JubilifeTV1F_GiveStoredLotteryPrize - GoToIfSet FLAG_OBTAINED_LOTTERY_PRIZE, JubilifeTV1F_YouveAlreadyDrawnALotoTicketToday + GoToIfSet FLAG_OBTAINED_LOTTERY_PRIZE, JubilifeTV1F_AlreadyDrawnTicketToday GoToIfSet FLAG_CHECKED_LUCKY_NUMBER, JubilifeTV1F_AskCheckLuckyNumberAgain - Message JubilifeTV1F_Text_ThisIsThePokemonLotteryCorner + Message JubilifeTV1F_Text_ThisIsLotteryCorner ShowYesNoMenu VAR_RESULT GoToIfEq VAR_RESULT, MENU_YES, JubilifeTV1F_CheckTodaysLuckyNumber - GoTo JubilifeTV1F_OhISeePleaseDoVisitUsAgain + GoTo JubilifeTV1F_PleaseVisitAgain JubilifeTV1F_AskCheckLuckyNumberAgain: - Message JubilifeTV1F_Text_WouldYouLikeToCheckTodaysLuckyNumberAgain + Message JubilifeTV1F_Text_CheckLuckyNumberAgain ShowYesNoMenu VAR_RESULT GoToIfEq VAR_RESULT, MENU_YES, JubilifeTV1F_CheckTodaysLuckyNumber - GoTo JubilifeTV1F_OhISeePleaseDoVisitUsAgain + GoTo JubilifeTV1F_PleaseVisitAgain End -JubilifeTV1F_YouveAlreadyDrawnALotoTicketToday: - Message JubilifeTV1F_Text_YouveAlreadyDrawnALotoTicketToday +JubilifeTV1F_AlreadyDrawnTicketToday: + Message JubilifeTV1F_Text_AlreadyDrawnTicketToday WaitButton CloseMessage ReleaseAll End -JubilifeTV1F_OhISeePleaseDoVisitUsAgain: - Message JubilifeTV1F_Text_OhISeePleaseDoVisitUsAgain +JubilifeTV1F_PleaseVisitAgain: + Message JubilifeTV1F_Text_PleaseVisitAgain WaitButton CloseMessage ReleaseAll @@ -61,17 +61,17 @@ JubilifeTV1F_OhISeePleaseDoVisitUsAgain: JubilifeTV1F_CheckTodaysLuckyNumber: SetFlag FLAG_CHECKED_LUCKY_NUMBER - Message JubilifeTV1F_Text_FirstIllLookUpTodaysPokemonLotteryCornerLuckyNumber + Message JubilifeTV1F_Text_LookUpTodaysLuckyNumber GetJubilifeLotteryTrainerID VAR_0x8000 BufferVarPaddingDigits 0, VAR_0x8000, PADDING_MODE_ZEROES, 5 - Message JubilifeTV1F_Text_YourLotoTicketNumberIsNum + Message JubilifeTV1F_Text_YourLotoTicketNumberIsX CheckForJubilifeLotteryWinner VAR_0x8001, VAR_0x8002, VAR_0x8003, VAR_0x8000 GoToIfEq VAR_0x8002, 0, JubilifeTV1F_NoMatch GoToIfEq VAR_0x8003, FALSE, JubilifeTV1F_MatchedTeamsPokemon GoTo JubilifeTV1F_MatchedPCBoxedPokemon JubilifeTV1F_NoMatch: - Message JubilifeTV1F_Text_ImSorryYouDidntGetAMatch + Message JubilifeTV1F_Text_YouDidntGetAMatch WaitButton CloseMessage ReleaseAll @@ -79,12 +79,12 @@ JubilifeTV1F_NoMatch: JubilifeTV1F_MatchedTeamsPokemon: BufferPartyMonNickname 0, VAR_0x8001 - Message JubilifeTV1F_Text_CongratulationsTheIDOfYourTeamsPokemonMatchesYourLotoTicketNumber + Message JubilifeTV1F_Text_IDOfTeamPokemonMatchesTicketNumber GoTo JubilifeTV1F_CheckMatchedDigits JubilifeTV1F_MatchedPCBoxedPokemon: BufferMonNicknameFromPC 0, VAR_0x8001 - Message JubilifeTV1F_Text_CongratulationsTheIDOfYourPCBoxedPokemonMatchesYourLotoTicketNumber + Message JubilifeTV1F_Text_IDOfBoxedPokemonMatchesTicketNumber GoTo JubilifeTV1F_CheckMatchedDigits JubilifeTV1F_CheckMatchedDigits: @@ -97,24 +97,24 @@ JubilifeTV1F_CheckMatchedDigits: End JubilifeTV1F_LastDigitMatched: - Message JubilifeTV1F_Text_TheLastDigitMatchedSoYouWinTheFourthPrize + Message JubilifeTV1F_Text_LastDigitMatchedWinFourthPrize GoTo JubilifeTV1F_SetLotteryPrize End JubilifeTV1F_LastTwoDigitsMatched: - Message JubilifeTV1F_Text_TheLastTwoDigitsMatchedSoYouWinTheThirdPrize + Message JubilifeTV1F_Text_LastTwoDigitsMatchedWinThirdPrize GoTo JubilifeTV1F_SetLotteryPrize JubilifeTV1F_LastThreeDigitsMatched: - Message JubilifeTV1F_Text_TheLastThreeDigitsMatchedSoYouWinTheSecondPrize + Message JubilifeTV1F_Text_LastThreeDigitsMatchedWinSecondPrize GoTo JubilifeTV1F_SetLotteryPrize JubilifeTV1F_LastFourDigitsMatched: - Message JubilifeTV1F_Text_TheLastFourDigitsMatchedSoYouWinTheFirstPrize + Message JubilifeTV1F_Text_LastFourDigitsMatchedWinFirstPrize GoTo JubilifeTV1F_SetLotteryPrize JubilifeTV1F_LastFiveDigitsMatched: - Message JubilifeTV1F_Text_OhMyGoodnessAllFiveDigitsMatchedYouveWonTheJackpotPrize + Message JubilifeTV1F_Text_AllDigitsMatchedWinJackpot GoTo JubilifeTV1F_SetLotteryPrize JubilifeTV1F_SetLotteryPrize: @@ -150,13 +150,13 @@ JubilifeTV1F_SetJackpotPrize: JubilifeTV1F_GiveLotteryPrize: SetVar VAR_0x8004, VAR_0x8003 SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, JubilifeTV1F_OhYouSeemToHaveNoRoomForThis + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, JubilifeTV1F_NoRoomForThis Common_GiveItemQuantity GoTo JubilifeTV1F_PleaseDoVisitAgain -JubilifeTV1F_OhYouSeemToHaveNoRoomForThis: +JubilifeTV1F_NoRoomForThis: SetVar VAR_LOTTERY_PRIZE_ITEM, VAR_0x8002 - Message JubilifeTV1F_Text_OhYouSeemToHaveNoRoomForThis + Message JubilifeTV1F_Text_NoRoomForThis WaitButton CloseMessage ReleaseAll @@ -164,7 +164,7 @@ JubilifeTV1F_OhYouSeemToHaveNoRoomForThis: JubilifeTV1F_GiveStoredLotteryPrize: BufferPlayerName 0 - Message JubilifeTV1F_Text_ThisIsThePrizeWeveBeenHoldingForYou + Message JubilifeTV1F_Text_ThisIsPrizeWeveBeenHolding SetVar VAR_0x8002, VAR_LOTTERY_PRIZE_ITEM GoTo JubilifeTV1F_SetLotteryPrize @@ -178,18 +178,18 @@ JubilifeTV1F_PleaseDoVisitAgain: End JubilifeTV1F_Beauty: - NPCMessage JubilifeTV1F_Text_TheyKeepTrackOfOfficialRecordsHere + NPCMessage JubilifeTV1F_Text_TheyKeepTrackOfRecords End JubilifeTV1F_MiddleAgedMan: - NPCMessage JubilifeTV1F_Text_ImGoingToGetCommercialsShownOnTV + NPCMessage JubilifeTV1F_Text_CommercialsShownOnTV End JubilifeTV1F_Dummy7: End JubilifeTV1F_AceTrainerM: - NPCMessage JubilifeTV1F_Text_TheTVStationInterviewsAllSortsOfTrainersForItsShows + NPCMessage JubilifeTV1F_Text_InterviewsAllSortsOfTrainers End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_tv_2f.s b/res/field/scripts/scripts_jubilife_tv_2f.s index 915a3720e7..f9877c0e48 100644 --- a/res/field/scripts/scripts_jubilife_tv_2f.s +++ b/res/field/scripts/scripts_jubilife_tv_2f.s @@ -10,30 +10,30 @@ JubilifeTV2F_OnTransition: CheckTVInterviewEligible TV_PROGRAM_SEGMENT_RIGHT_ON_PHOTO_CORNER, VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, 0, JubilifeTV2F_SetFlagHideJubilifeTV2FReporter + GoToIfEq VAR_MAP_LOCAL_0, 0, JubilifeTV2F_SetFlagHideReporter ClearFlag FLAG_HIDE_JUBILIFE_TV_2F_REPORTER End -JubilifeTV2F_SetFlagHideJubilifeTV2FReporter: +JubilifeTV2F_SetFlagHideReporter: SetFlag FLAG_HIDE_JUBILIFE_TV_2F_REPORTER End JubilifeTV2F_Idol: - NPCMessage JubilifeTV2F_Text_WhatAccessoriesWillGoWellWithMyDressToday + NPCMessage JubilifeTV2F_Text_WhatAccessoriesWillGoWell End JubilifeTV2F_GymGuide: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet VAR_OBTAINED_ACCESSORY_STARTER_MASK, JubilifeTV2F_IHopeYouGetIntoCollectingAccessoriesForYourPokemon + GoToIfSet VAR_OBTAINED_ACCESSORY_STARTER_MASK, JubilifeTV2F_IHopeYouCollectAccessories GetPlayerStarterSpecies VAR_RESULT CallIfEq VAR_RESULT, SPECIES_TURTWIG, JubilifeTV2F_SetAccessoryTurtwigMask CallIfEq VAR_RESULT, SPECIES_CHIMCHAR, JubilifeTV2F_SetAccessoryChimcharMask CallIfEq VAR_RESULT, SPECIES_PIPLUP, JubilifeTV2F_SetAccessoryPiplupMask SetVar VAR_ACCESSORY_STARTER_MASK, VAR_0x8004 BufferAccessoryNameWithArticle 0, VAR_0x8004 - Message JubilifeTV2F_Text_SoAGiftForOurFutureStar + Message JubilifeTV2F_Text_GiftForFutureStar SetVar VAR_0x8005, 1 Common_GiveAccessoryWaitForConfirm SetFlag VAR_OBTAINED_ACCESSORY_STARTER_MASK @@ -41,9 +41,9 @@ JubilifeTV2F_GymGuide: ReleaseAll End -JubilifeTV2F_IHopeYouGetIntoCollectingAccessoriesForYourPokemon: +JubilifeTV2F_IHopeYouCollectAccessories: BufferAccessoryName 0, VAR_ACCESSORY_STARTER_MASK - Message JubilifeTV2F_Text_IHopeYouGetIntoCollectingAccessoriesForYourPokemon + Message JubilifeTV2F_Text_IHopeYouCollectAccessories WaitButton CloseMessage ReleaseAll @@ -62,7 +62,7 @@ JubilifeTV2F_SetAccessoryPiplupMask: Return JubilifeTV2F_Roughneck: - NPCMessage JubilifeTV2F_Text_TheRoomAtTheBackIsOurDreamyFittingRoom + NPCMessage JubilifeTV2F_Text_FittingRoomAtTheBack End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s index 4e3246f6fa..49e715007d 100644 --- a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s +++ b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s @@ -34,34 +34,34 @@ _006F: Return JubilifeTV2FGallery_AskDressUpPokemon: - Message JubilifeTV2FGallery_Text_DressUpYourPokemonYouWillDoThisWontYou + Message JubilifeTV2FGallery_Text_DressUpYourPokemon GoTo JubilifeTV2FGallery_YesNoDressUpPokemon JubilifeTV2FGallery_AskDressUpPokemonChangePhoto: - Message JubilifeTV2FGallery_Text_WouldYouLikeToDressUpAPokemonDearie + Message JubilifeTV2FGallery_Text_WouldYouLikeToDressUp GoTo JubilifeTV2FGallery_YesNoDressUpPokemon -JubilifeTV2FGallery_ShouldIExplainToYouHowToDressUpYourPokemon: - Message JubilifeTV2FGallery_Text_ShouldIExplainToYouHowToDressUpYourPokemon +JubilifeTV2FGallery_ShouldIExplainDressUp: + Message JubilifeTV2FGallery_Text_ShouldIExplainDressUp ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, JubilifeTV2FGallery_JustChooseTheAccessoriesAndPutThemOnYourPokemon + GoToIfEq VAR_RESULT, MENU_YES, JubilifeTV2FGallery_ExplainDressUp GoToIfEq VAR_RESULT, MENU_NO, JubilifeTV2FGallery_SetPokemonForDressUp End -JubilifeTV2FGallery_JustChooseTheAccessoriesAndPutThemOnYourPokemon: - Message JubilifeTV2FGallery_Text_JustChooseTheAccessoriesAndPutThemOnYourPokemon +JubilifeTV2FGallery_ExplainDressUp: + Message JubilifeTV2FGallery_Text_ExplainDressUp GoTo JubilifeTV2FGallery_YesNoDressUpPokemonAfterExplanation JubilifeTV2FGallery_YesNoDressUpPokemon: ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, JubilifeTV2FGallery_ShouldIExplainToYouHowToDressUpYourPokemon - GoToIfEq VAR_RESULT, MENU_NO, JubilifeTV2FGallery_OhYouSillyThingWheresYourSenseOfAdventure + GoToIfEq VAR_RESULT, MENU_YES, JubilifeTV2FGallery_ShouldIExplainDressUp + GoToIfEq VAR_RESULT, MENU_NO, JubilifeTV2FGallery_WheresYourSenseOfAdventure End JubilifeTV2FGallery_YesNoDressUpPokemonAfterExplanation: ShowYesNoMenu VAR_RESULT GoToIfEq VAR_RESULT, MENU_YES, JubilifeTV2FGallery_SetPokemonForDressUp - GoToIfEq VAR_RESULT, MENU_NO, JubilifeTV2FGallery_OhYouSillyThingWheresYourSenseOfAdventure + GoToIfEq VAR_RESULT, MENU_NO, JubilifeTV2FGallery_WheresYourSenseOfAdventure End JubilifeTV2FGallery_SetPokemonForDressUp: @@ -72,10 +72,10 @@ JubilifeTV2FGallery_SetPokemonForDressUp: JubilifeTV2FGallery_SetOnlyPokemonForDressUp: SetVar VAR_MAP_LOCAL_2, 0 - GoTo JubilifeTV2FGallery_TehehehIHopeYouWillDressItUpAdorably + GoTo JubilifeTV2FGallery_DressItUpAdorably JubilifeTV2FGallery_ChoosePokemonForDressUp: - Message JubilifeTV2FGallery_Text_OohIWonderWhichPokemonYoullDressUp + Message JubilifeTV2FGallery_Text_DressUpWhichPokemon CloseMessage FadeScreenOut WaitFadeScreen @@ -84,13 +84,13 @@ JubilifeTV2FGallery_ChoosePokemonForDressUp: ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_MAP_LOCAL_2, 0xFF, JubilifeTV2FGallery_OhYouSillyThingWheresYourSenseOfAdventure + GoToIfEq VAR_MAP_LOCAL_2, 0xFF, JubilifeTV2FGallery_WheresYourSenseOfAdventure GetPartyMonSpecies VAR_MAP_LOCAL_2, VAR_RESULT - GoToIfEq VAR_RESULT, SPECIES_NONE, JubilifeTV2FGallery_OohNonNonNonThatsAnEgg - GoTo JubilifeTV2FGallery_TehehehIHopeYouWillDressItUpAdorably + GoToIfEq VAR_RESULT, SPECIES_NONE, JubilifeTV2FGallery_ThatsAnEgg + GoTo JubilifeTV2FGallery_DressItUpAdorably -JubilifeTV2FGallery_TehehehIHopeYouWillDressItUpAdorably: - Message JubilifeTV2FGallery_Text_TehehehIHopeYouWillDressItUpAdorably +JubilifeTV2FGallery_DressItUpAdorably: + Message JubilifeTV2FGallery_Text_DressItUpAdorably CloseMessage GetPlayerDir VAR_0x8006 GoToIfEq VAR_0x8006, DIR_NORTH, JubilifeTV2FGallery_EnterDressingRoomNorth @@ -156,40 +156,40 @@ JubilifeTV2FGallery_ExitDressingRoomEast: GoTo JubilifeTV2FGallery_CheckDressUpPokemonResult JubilifeTV2FGallery_CheckDressUpPokemonResult: - GoToIfEq VAR_0x8005, 0, JubilifeTV2FGallery_OhYouCameOutWithoutDoingAnythingHowDisappointing + GoToIfEq VAR_0x8005, 0, JubilifeTV2FGallery_CameOutWithoutDoingAnything SetVar VAR_MAP_LOCAL_1, 1 - Message JubilifeTV2FGallery_Text_OohNiceWorkOhButItNeedsToHaveATitle + Message JubilifeTV2FGallery_Text_ItNeedsATitle WaitButton CloseMessage GoTo JubilifeTV2FGallery_SetDressUpPhotoTitle -JubilifeTV2FGallery_OhYouSillyThingWheresYourSenseOfAdventure: - Message JubilifeTV2FGallery_Text_OhYouSillyThingWheresYourSenseOfAdventure +JubilifeTV2FGallery_WheresYourSenseOfAdventure: + Message JubilifeTV2FGallery_Text_WheresYourSenseOfAdventure WaitButton CloseMessage ReleaseAll End -JubilifeTV2FGallery_OohNonNonNonThatsAnEgg: - Message JubilifeTV2FGallery_Text_OohNonNonNonThatsAnEgg +JubilifeTV2FGallery_ThatsAnEgg: + Message JubilifeTV2FGallery_Text_ThatsAnEgg GoTo JubilifeTV2FGallery_ChoosePokemonForDressUp JubilifeTV2FGallery_SetDressUpPhotoTitle: FadeScreenOut WaitFadeScreen - ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8004 + ChooseCustomMessageWord VAR_RESULT, VAR_0x8004 ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, 0, JubilifeTV2FGallery_OhNonNonNonItWillBeForlornWithoutATitle + GoToIfEq VAR_RESULT, 0, JubilifeTV2FGallery_ForlornWithoutATitle SetDressUpPhotoTitle VAR_0x8004 IncrementGameRecord RECORD_TIMES_DRESSED_UP_POKEMON Dummy316 BufferCustomMessageWord 0, VAR_0x8004 - Message JubilifeTV2FGallery_Text_OohYesYesIGetItNow + Message JubilifeTV2FGallery_Text_IGetItNow ApplyMovement LOCALID_HIKER, JubilifeTV2FGallery_Movement_HikerFaceEast WaitMovement - Message JubilifeTV2FGallery_Text_IPutYourPhotoUpRightHere + Message JubilifeTV2FGallery_Text_IPutPhotoRightHere WaitButton CloseMessage ApplyMovement LOCALID_HIKER, JubilifeTV2FGallery_Movement_HikerFaceSouth @@ -197,14 +197,14 @@ JubilifeTV2FGallery_SetDressUpPhotoTitle: ReleaseAll End -JubilifeTV2FGallery_OhNonNonNonItWillBeForlornWithoutATitle: - Message JubilifeTV2FGallery_Text_OhNonNonNonItWillBeForlornWithoutATitle +JubilifeTV2FGallery_ForlornWithoutATitle: + Message JubilifeTV2FGallery_Text_ForlornWithoutATitle WaitButton CloseMessage GoTo JubilifeTV2FGallery_SetDressUpPhotoTitle -JubilifeTV2FGallery_OhYouCameOutWithoutDoingAnythingHowDisappointing: - Message JubilifeTV2FGallery_Text_OhYouCameOutWithoutDoingAnythingHowDisappointing +JubilifeTV2FGallery_CameOutWithoutDoingAnything: + Message JubilifeTV2FGallery_Text_CameOutWithoutDoingAnything WaitButton CloseMessage ReleaseAll @@ -288,7 +288,7 @@ JubilifeTV2FGallery_Frame0: PlaySE SEQ_SE_CONFIRM LockAll DressUpPhotoHasData 0, VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_FrameForHoldingPortrait FadeScreenOut WaitFadeScreen ShowDressUpPhoto 0, VAR_RESULT @@ -302,7 +302,7 @@ JubilifeTV2FGallery_Frame1: PlaySE SEQ_SE_CONFIRM LockAll DressUpPhotoHasData 1, VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_FrameForHoldingPortrait FadeScreenOut WaitFadeScreen ShowDressUpPhoto 1, VAR_RESULT @@ -316,7 +316,7 @@ JubilifeTV2FGallery_Frame2: PlaySE SEQ_SE_CONFIRM LockAll DressUpPhotoHasData 2, VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_FrameForHoldingPortrait FadeScreenOut WaitFadeScreen ShowDressUpPhoto 2, VAR_RESULT @@ -330,7 +330,7 @@ JubilifeTV2FGallery_Frame3: PlaySE SEQ_SE_CONFIRM LockAll DressUpPhotoHasData 3, VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_FrameForHoldingPortrait FadeScreenOut WaitFadeScreen ShowDressUpPhoto 3, VAR_RESULT @@ -344,7 +344,7 @@ JubilifeTV2FGallery_Frame4: PlaySE SEQ_SE_CONFIRM LockAll DressUpPhotoHasData 4, VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_FrameForHoldingPortrait FadeScreenOut WaitFadeScreen ShowDressUpPhoto 4, VAR_RESULT @@ -358,7 +358,7 @@ JubilifeTV2FGallery_Frame5: PlaySE SEQ_SE_CONFIRM LockAll DressUpPhotoHasData 5, VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_FrameForHoldingPortrait FadeScreenOut WaitFadeScreen ShowDressUpPhoto 5, VAR_RESULT @@ -372,7 +372,7 @@ JubilifeTV2FGallery_Frame6: PlaySE SEQ_SE_CONFIRM LockAll DressUpPhotoHasData 6, VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_FrameForHoldingPortrait FadeScreenOut WaitFadeScreen ShowDressUpPhoto 6, VAR_RESULT @@ -386,7 +386,7 @@ JubilifeTV2FGallery_Frame7: PlaySE SEQ_SE_CONFIRM LockAll DressUpPhotoHasData 7, VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_FrameForHoldingPortrait FadeScreenOut WaitFadeScreen ShowDressUpPhoto 7, VAR_RESULT @@ -400,7 +400,7 @@ JubilifeTV2FGallery_Frame8: PlaySE SEQ_SE_CONFIRM LockAll DressUpPhotoHasData 8, VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_FrameForHoldingPortrait FadeScreenOut WaitFadeScreen ShowDressUpPhoto 8, VAR_RESULT @@ -414,7 +414,7 @@ JubilifeTV2FGallery_Frame9: PlaySE SEQ_SE_CONFIRM LockAll DressUpPhotoHasData 9, VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_FrameForHoldingPortrait FadeScreenOut WaitFadeScreen ShowDressUpPhoto 9, VAR_RESULT @@ -428,7 +428,7 @@ JubilifeTV2FGallery_Frame10: PlaySE SEQ_SE_CONFIRM LockAll DressUpPhotoHasData 10, VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto + GoToIfEq VAR_RESULT, FALSE, JubilifeTV2FGallery_FrameForHoldingPortrait FadeScreenOut WaitFadeScreen ShowDressUpPhoto 10, VAR_RESULT @@ -438,17 +438,17 @@ JubilifeTV2FGallery_Frame10: ReleaseAll End -JubilifeTV2FGallery_ItsAFrameForHoldingAPokemonPortraitPhoto: - Message JubilifeTV2FGallery_Text_ItsAFrameForHoldingAPokemonPortraitPhoto +JubilifeTV2FGallery_FrameForHoldingPortrait: + Message JubilifeTV2FGallery_Text_FrameForHoldingPortrait WaitButton CloseMessage ReleaseAll End JubilifeTV2FGallery_PokemonBreederM: - NPCMessage JubilifeTV2FGallery_Text_TheyDisplayPhotosFromTrainersYouBeenMixinRecordsWithRight + NPCMessage JubilifeTV2FGallery_Text_DisplayTrainersMixedRecordsWith End JubilifeTV2FGallery_Twin: - NPCMessage JubilifeTV2FGallery_Text_SomeoneGaveMeANewBackdropWhenIWentToTheGlobalTerminal + NPCMessage JubilifeTV2FGallery_Text_SomeoneGaveNewBackdrop End diff --git a/res/field/scripts/scripts_jubilife_tv_3f.s b/res/field/scripts/scripts_jubilife_tv_3f.s index edce1f70f5..e1dca16f61 100644 --- a/res/field/scripts/scripts_jubilife_tv_3f.s +++ b/res/field/scripts/scripts_jubilife_tv_3f.s @@ -15,12 +15,12 @@ JubilifeTV3F_Beauty1: FacePlayer ApplyMovement LOCALID_BEAUTY_1, JubilifeTV3F_Movement_BeautyFaceEastGroupRankingRoom WaitMovement - Message JubilifeTV3F_Text_TheRoomClosestToTheStairsIsTheGroupRankingRoom + Message JubilifeTV3F_Text_ClosestToStairsIsGroupRankingRoom CloseMessage WaitTime 8, VAR_RESULT ApplyMovement LOCALID_BEAUTY_1, JubilifeTV3F_Movement_BeautyFaceWestGlobalRankingRoom WaitMovement - Message JubilifeTV3F_Text_TheRoomOnTheOppositeSideIsTheGlobalRankingRoom + Message JubilifeTV3F_Text_OppositeSideIsGlobalRankingRoom WaitButton CloseMessage ReleaseAll @@ -37,7 +37,7 @@ JubilifeTV3F_Movement_BeautyFaceWestGlobalRankingRoom: EndMovement JubilifeTV3F_Beauty2: - NPCMessage JubilifeTV3F_Text_TheMoreTradesIMakeTheBetterMyOddsOfWinningThePokemonLottery + NPCMessage JubilifeTV3F_Text_BetterOddsOfWinningLottery End JubilifeTV3F_GymGuide1: @@ -48,38 +48,38 @@ JubilifeTV3F_GymGuide2: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message JubilifeTV3F_Text_WillYouTellMeYourOpinionOnTV + Message JubilifeTV3F_Text_TellMeYourOpinionOnTV ShowYesNoMenu VAR_RESULT GoToIfEq VAR_RESULT, MENU_YES, JubilifeTV3F_ChooseCustomMessageWords - GoTo JubilifeTV3F_OhAllRightICanUnderstandHowBusyItMustGetForYou + GoTo JubilifeTV3F_OhAllRight JubilifeTV3F_ChooseCustomMessageWords: FadeScreenOut WaitFadeScreen CloseMessage - ChooseTwoCustomMessageWords 0, VAR_RESULT, VAR_0x8000, VAR_0x8001 + ChooseTwoCustomMessageWords VAR_RESULT, VAR_0x8000, VAR_0x8001 ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, FALSE, JubilifeTV3F_OhAllRightICanUnderstandHowBusyItMustGetForYou - Message JubilifeTV3F_Text_MovingRightAlongWhatFeedbackCanYouGiveMeAboutTV + GoToIfEq VAR_RESULT, FALSE, JubilifeTV3F_OhAllRight + Message JubilifeTV3F_Text_WhatFeedbackCanYouGive FadeScreenOut WaitFadeScreen CloseMessage - ChooseTwoCustomMessageWords 0, VAR_RESULT, VAR_0x8002, VAR_0x8003 + ChooseTwoCustomMessageWords VAR_RESULT, VAR_0x8002, VAR_0x8003 ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, FALSE, JubilifeTV3F_OhAllRightICanUnderstandHowBusyItMustGetForYou + GoToIfEq VAR_RESULT, FALSE, JubilifeTV3F_OhAllRight GetWallpaperFromCustomMessageWords VAR_RESULT, VAR_0x8000, VAR_0x8001, VAR_0x8002, VAR_0x8003 GoToIfEq VAR_RESULT, 0xFF, JubilifeTV3F_CheckIsMysteryGiftPhrase GoToIfEq VAR_RESULT, 0, JubilifeTV3F_CheckIsMysteryGiftPhrase - GoTo JubilifeTV3F_IThinkICanSwingADealToGetYouANewWallpaperForYourPCBoxes + GoTo JubilifeTV3F_DealForNewPCBoxesWallpaper JubilifeTV3F_CheckIsMysteryGiftPhrase: CheckIsMysteryGiftPhrase VAR_RESULT, VAR_0x8000, VAR_0x8001, VAR_0x8002, VAR_0x8003 GoToIfEq VAR_RESULT, FALSE, JubilifeTV3F_ThanksForAnsweringMyQuestion - GoTo JubilifeTV3F_IThinkICanSwingADealSoYouCanReceiveAMysteryGift + GoTo JubilifeTV3F_DealForMysteryGift JubilifeTV3F_ThanksForAnsweringMyQuestion: Message JubilifeTV3F_Text_ThanksForAnsweringMyQuestion @@ -88,22 +88,22 @@ JubilifeTV3F_ThanksForAnsweringMyQuestion: ReleaseAll End -JubilifeTV3F_OhAllRightICanUnderstandHowBusyItMustGetForYou: - Message JubilifeTV3F_Text_OhAllRightICanUnderstandHowBusyItMustGetForYou +JubilifeTV3F_OhAllRight: + Message JubilifeTV3F_Text_OhAllRight WaitButton CloseMessage ReleaseAll End -JubilifeTV3F_IThinkICanSwingADealToGetYouANewWallpaperForYourPCBoxes: - Message JubilifeTV3F_Text_IThinkICanSwingADealToGetYouANewWallpaperForYourPCBoxes +JubilifeTV3F_DealForNewPCBoxesWallpaper: + Message JubilifeTV3F_Text_DealForNewPCBoxesWallpaper WaitButton CloseMessage ReleaseAll End -JubilifeTV3F_IThinkICanSwingADealSoYouCanReceiveAMysteryGift: - Message JubilifeTV3F_Text_IThinkICanSwingADealSoYouCanReceiveAMysteryGift +JubilifeTV3F_DealForMysteryGift: + Message JubilifeTV3F_Text_DealForMysteryGift WaitButton UnlockMysteryGift CloseMessage diff --git a/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s b/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s index 3f8f1d0f4f..fbf150e10f 100644 --- a/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s +++ b/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s @@ -33,17 +33,17 @@ JubilifeTV3FGlobalRankingRoom_RecordMachineContests: End JubilifeTV3FGlobalRankingRoom_AceTrainerF: - NPCMessage JubilifeTV3FGlobalRankingRoom_Text_SomeoneBrokeMyPokemonCatchingRecord + NPCMessage JubilifeTV3FGlobalRankingRoom_Text_SomeoneBrokeMyCatchingRecord End JubilifeTV3FGlobalRankingRoom_Collector: - NPCMessage JubilifeTV3FGlobalRankingRoom_Text_IBetItdFeelGreatIfICouldBeNumberOneHere + NPCMessage JubilifeTV3FGlobalRankingRoom_Text_NumberOneWouldFeelGreat End JubilifeTV3FGlobalRankingRoom_Fisherman: - NPCMessage JubilifeTV3FGlobalRankingRoom_Text_ImTryingForTheWorldRecordAtPokemonFishing + NPCMessage JubilifeTV3FGlobalRankingRoom_Text_ImTryingForRecordAtFishing End JubilifeTV3FGlobalRankingRoom_Worker: - NPCMessage JubilifeTV3FGlobalRankingRoom_Text_SorryImStillFineTuningThisThingyHere + NPCMessage JubilifeTV3FGlobalRankingRoom_Text_ImStillFineTuningThisThingy End diff --git a/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s b/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s index 7020291889..e5d399076e 100644 --- a/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s +++ b/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s @@ -32,7 +32,7 @@ JubilifeTV3FGroupRankingRoom_RecordMachineContests: End JubilifeTV3FGroupRankingRoom_Youngster: - NPCMessage JubilifeTV3FGroupRankingRoom_Text_YouCanSeeTheRankingsOfPeopleInYourGroupHere + NPCMessage JubilifeTV3FGroupRankingRoom_Text_SeeRankingsInGroupHere End JubilifeTV3FGroupRankingRoom_BattleGirl: @@ -40,7 +40,7 @@ JubilifeTV3FGroupRankingRoom_BattleGirl: End JubilifeTV3FGroupRankingRoom_Worker: - NPCMessage JubilifeTV3FGroupRankingRoom_Text_SorryImStillFineTuningThisThingyHere + NPCMessage JubilifeTV3FGroupRankingRoom_Text_ImStillFineTuningThisThingy End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_tv_4f.s b/res/field/scripts/scripts_jubilife_tv_4f.s index 6b54fa97b0..f8428f458d 100644 --- a/res/field/scripts/scripts_jubilife_tv_4f.s +++ b/res/field/scripts/scripts_jubilife_tv_4f.s @@ -12,11 +12,11 @@ JubilifeTV4F_MiddleAgedMan: End JubilifeTV4F_Receptionist: - NPCMessage JubilifeTV4F_Text_ParticipationForAllIsOurTVNetworksMotto + NPCMessage JubilifeTV4F_Text_TVNetworksMotto End JubilifeTV4F_PokemonBreederF: - NPCMessage JubilifeTV4F_Text_WerePromotingTheThemeSmilesAreDreamy + NPCMessage JubilifeTV4F_Text_ThemeSmilesAreDreamy End .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_tv_elevator.s b/res/field/scripts/scripts_jubilife_tv_elevator.s index 8b9824168a..662ada8236 100644 --- a/res/field/scripts/scripts_jubilife_tv_elevator.s +++ b/res/field/scripts/scripts_jubilife_tv_elevator.s @@ -1,12 +1,13 @@ #include "macros/scrcmd.inc" +#include "res/field/events/events_jubilife_tv_elevator.h" #include "res/text/bank/jubilife_tv_elevator.h" #include "res/text/bank/menu_entries.h" - ScriptEntry JubilifeTVElevator_TalkElevatorOperator + ScriptEntry JubilifeTVElevator_Receptionist ScriptEntryEnd -JubilifeTVElevator_TalkElevatorOperator: +JubilifeTVElevator_Receptionist: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer @@ -117,7 +118,7 @@ JubilifeTVElevator_GoingDownMessage: JubilifeTVElevator_ElevatorAnimation: SetVar VAR_ELEVATOR_FLOORS_ABOVE, -1 CloseMessage - ApplyMovement 0, JubilifeTVElevator_LookDown + ApplyMovement LOCALID_RECEPTIONIST, JubilifeTVElevator_Movement_ReceptionistLookDown WaitMovement WaitSE SEQ_SE_CONFIRM PlayElevatorAnimation VAR_0x8004, 4 @@ -149,6 +150,6 @@ JubilifeTVElevator_SelectNoFloor: End .balign 4, 0 -JubilifeTVElevator_LookDown: +JubilifeTVElevator_Movement_ReceptionistLookDown: WalkOnSpotNormalSouth EndMovement diff --git a/res/field/scripts/scripts_lake_verity.s b/res/field/scripts/scripts_lake_verity.s index 5e9cf2e7a5..cfdd321bed 100644 --- a/res/field/scripts/scripts_lake_verity.s +++ b/res/field/scripts/scripts_lake_verity.s @@ -59,10 +59,10 @@ LakeVerity_Unused: LakeVerity_ProfRowan: PlaySE SEQ_SE_CONFIRM LockAll - GoToIfSet FLAG_TEAM_GALACTIC_LEFT_LAKE_VERITY, LakeVerity_INeedYouToGoToLakeAcuity + GoToIfSet FLAG_TEAM_GALACTIC_LEFT_LAKE_VERITY, LakeVerity_GoToLakeAcuity ApplyMovement LOCALID_PROF_ROWAN, LakeVerity_Movement_RowanWalkOnSpotEast WaitMovement - Message LakeVerity_Text_HowDareYouMisguidedThugs + Message LakeVerity_Text_HowDareYou FacePlayer GetPlayerGender VAR_RESULT GoToIfEq VAR_RESULT, GENDER_MALE, LakeVerity_DawnNeedsYourHelp @@ -72,26 +72,26 @@ LakeVerity_ProfRowan: LakeVerity_DawnNeedsYourHelp: BufferPlayerName 0 Message LakeVerity_Text_DawnNeedsYourHelp - GoTo LakeVerity_CloseMessageCounterpartNeedsYourHelp + GoTo LakeVerity_CounterpartNeedsYourHelpEnd End LakeVerity_LucasNeedsYourHelp: BufferPlayerName 0 Message LakeVerity_Text_LucasNeedsYourHelp - GoTo LakeVerity_CloseMessageCounterpartNeedsYourHelp + GoTo LakeVerity_CounterpartNeedsYourHelpEnd End -LakeVerity_CloseMessageCounterpartNeedsYourHelp: +LakeVerity_CounterpartNeedsYourHelpEnd: WaitButton CloseMessage ReleaseAll End -LakeVerity_INeedYouToGoToLakeAcuity: +LakeVerity_GoToLakeAcuity: FacePlayer BufferPlayerName 0 BufferRivalName 1 - Message LakeVerity_Text_INeedYouToGoToLakeAcuity + Message LakeVerity_Text_GoToLakeAcuity WaitButton CloseMessage ReleaseAll @@ -101,7 +101,7 @@ LakeVerity_Counterpart: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_TEAM_GALACTIC_LEFT_LAKE_VERITY, LakeVerity_CounterpartWhatsTeamGalacticUpTo + GoToIfSet FLAG_TEAM_GALACTIC_LEFT_LAKE_VERITY, LakeVerity_CounterpartWhatsGalacticUpTo GetPlayerGender VAR_RESULT GoToIfEq VAR_RESULT, GENDER_MALE, LakeVerity_DawnICouldntBeatThisPerson GoTo LakeVerity_LucasILostToHerButJustBarely @@ -110,40 +110,40 @@ LakeVerity_Counterpart: LakeVerity_DawnICouldntBeatThisPerson: BufferPlayerName 0 Message LakeVerity_Text_DawnICouldntBeatThisPerson - GoTo LakeVerity_CloseMessageCounterpartLostToMars + GoTo LakeVerity_CounterpartLostToMarsEnd End LakeVerity_LucasILostToHerButJustBarely: BufferPlayerName 0 Message LakeVerity_Text_LucasILostToHerButJustBarely - GoTo LakeVerity_CloseMessageCounterpartLostToMars + GoTo LakeVerity_CounterpartLostToMarsEnd End -LakeVerity_CloseMessageCounterpartLostToMars: +LakeVerity_CounterpartLostToMarsEnd: WaitButton CloseMessage ReleaseAll End -LakeVerity_CounterpartWhatsTeamGalacticUpTo: +LakeVerity_CounterpartWhatsGalacticUpTo: GetPlayerGender VAR_RESULT GoToIfEq VAR_RESULT, GENDER_MALE, LakeVerity_DawnWhatIsTeamGalacticUpTo - GoTo LakeVerity_LucasWhatsTeamGalacticUpTo + GoTo LakeVerity_LucasWhatsGalacticUpTo End LakeVerity_DawnWhatIsTeamGalacticUpTo: BufferPlayerName 0 Message LakeVerity_Text_DawnWhatIsTeamGalacticUpTo - GoTo LakeVerity_CloseMessageWhatsTeamGalacticUpTo + GoTo LakeVerity_CounterpartWhatsGalacticUpToEnd End -LakeVerity_LucasWhatsTeamGalacticUpTo: +LakeVerity_LucasWhatsGalacticUpTo: BufferPlayerName 0 - Message LakeVerity_Text_LucasWhatsTeamGalacticUpTo - GoTo LakeVerity_CloseMessageWhatsTeamGalacticUpTo + Message LakeVerity_Text_LucasWhatsGalacticUpTo + GoTo LakeVerity_CounterpartWhatsGalacticUpToEnd End -LakeVerity_CloseMessageWhatsTeamGalacticUpTo: +LakeVerity_CounterpartWhatsGalacticUpToEnd: WaitButton CloseMessage ReleaseAll @@ -159,23 +159,23 @@ LakeVerity_OnFrame_ProfRowanNoticePlayer: ApplyMovement LOCALID_PROF_ROWAN, LakeVerity_Movement_RowanNoticePlayer WaitMovement GetPlayerGender VAR_RESULT - GoToIfEq VAR_RESULT, GENDER_MALE, LakeVerity_WhatTimingYouveGotToHelpDawn - GoTo LakeVerity_WhatTimingYouveGotToHelpLucas + GoToIfEq VAR_RESULT, GENDER_MALE, LakeVerity_YouveGotToHelpDawn + GoTo LakeVerity_YouveGotToHelpLucas End -LakeVerity_WhatTimingYouveGotToHelpDawn: +LakeVerity_YouveGotToHelpDawn: BufferPlayerName 0 - Message LakeVerity_Text_WhatTimingYouveGotToHelpDawn - GoTo LakeVerity_CloseMessageYouveGotToHelpCounterpart + Message LakeVerity_Text_YouveGotToHelpDawn + GoTo LakeVerity_YouveGotToHelpCounterpartEnd End -LakeVerity_WhatTimingYouveGotToHelpLucas: +LakeVerity_YouveGotToHelpLucas: BufferPlayerName 0 - Message LakeVerity_Text_WhatTimingYouveGotToHelpLucas - GoTo LakeVerity_CloseMessageYouveGotToHelpCounterpart + Message LakeVerity_Text_YouveGotToHelpLucas + GoTo LakeVerity_YouveGotToHelpCounterpartEnd End -LakeVerity_CloseMessageYouveGotToHelpCounterpart: +LakeVerity_YouveGotToHelpCounterpartEnd: SetVar VAR_LAKE_VERITY_PROF_ROWAN_STATE, 1 WaitButton CloseMessage @@ -260,7 +260,7 @@ LakeVerity_Movement_PlayerFaceWest: EndMovement LakeVerity_GruntM: - EventMessage LakeVerity_Text_OuchWhatsWithThisOldTimer + EventMessage LakeVerity_Text_WhatsWithThisOldTimer End .balign 4, 0 diff --git a/res/field/scripts/scripts_lake_verity_low_water.s b/res/field/scripts/scripts_lake_verity_low_water.s index 4ebf76eed2..917bd932f2 100644 --- a/res/field/scripts/scripts_lake_verity_low_water.s +++ b/res/field/scripts/scripts_lake_verity_low_water.s @@ -51,7 +51,7 @@ LakeVerityLowWater_OnFrame_Cyrus: ApplyFreeCameraMovement LakeVerityLowWater_Movement_PanToCyrus WaitMovement WaitTime 15, VAR_RESULT - Message LakeVerityLowWater_Text_IWillMakeTimeAndSpaceMine + Message LakeVerityLowWater_Text_MakeTimeAndSpaceMine CloseMessage WaitTime 30, VAR_RESULT ApplyMovement LOCALID_CYRUS, LakeVerityLowWater_Movement_CyrusWalkToPlayer @@ -79,7 +79,7 @@ LakeVerityLowWater_OnFrame_Cyrus: WaitMovement WaitTime 30, VAR_RESULT BufferPlayerName 1 - Message LakeVerityLowWater_Text_LetsCatchThatLegendaryPokemon + Message LakeVerityLowWater_Text_LetsCatchThatLegendary PlayCry SPECIES_MESPRIT Message LakeVerityLowWater_Text_LegendaryCry WaitCry @@ -92,7 +92,7 @@ LakeVerityLowWater_OnFrame_Cyrus: WaitMovement BufferRivalName 0 BufferPlayerName 1 - Message LakeVerityLowWater_Text_ThatWasTheLegendaryPokemonCrying + Message LakeVerityLowWater_Text_ThatWasTheLegendaryCrying CloseMessage ApplyMovement LOCALID_RIVAL, LakeVerityLowWater_Movement_RivalExclamationMark WaitMovement @@ -383,7 +383,7 @@ LakeVerityLowWater_ProfRowan: GoToIfSet FLAG_TALKED_TO_LAKE_VERITY_LOW_WATER_PROF_ROWAN, LakeVerityLowWater_RowanHowWasLakeValor SetFlag FLAG_TALKED_TO_LAKE_VERITY_LOW_WATER_PROF_ROWAN BufferPlayerName 0 - Message LakeVerityLowWater_Text_RowanNoLegendaryPokemonHowWasLakeValor + Message LakeVerityLowWater_Text_RowanNoLegendaryHowWasLakeValor WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s b/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s index c8130c2e71..7cc7bf11ae 100644 --- a/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s +++ b/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s @@ -8,7 +8,7 @@ ScriptEntryEnd MtCoronet1FNorthRoom1_GruntF: - NPCMessage MtCoronet1FNorthRoom1_Text_TheresNoWayOfGettingToThePeakOfMtCoronetFromThisSide + NPCMessage MtCoronet1FNorthRoom1_Text_NoWayToPeakFromThisSide End MtCoronet1FNorthRoom1_GruntM: @@ -16,10 +16,10 @@ MtCoronet1FNorthRoom1_GruntM: LockAll ApplyMovement LOCALID_GRUNT_M_1, MtCoronet1FNorthRoom1_Movement_GruntM1WalkOnSpotSouth WaitMovement - Message MtCoronet1FNorthRoom1_Text_TheFogIsSoThickAheadICantEvenSeeMyOwnHand + Message MtCoronet1FNorthRoom1_Text_FogIsSoThick ApplyMovement LOCALID_GRUNT_M_2, MtCoronet1FNorthRoom1_Movement_GruntM2WalkOnSpotNorth WaitMovement - Message MtCoronet1FNorthRoom1_Text_HahThePokemonTheyGaveMeCantUseDefogEither + Message MtCoronet1FNorthRoom1_Text_MyPokemonCantUseDefog CloseMessage ApplyMovement LOCALID_GRUNT_M_1, MtCoronet1FNorthRoom1_Movement_GruntMWalkOnSpotWest ApplyMovement LOCALID_GRUNT_M_2, MtCoronet1FNorthRoom1_Movement_GruntMWalkOnSpotWest diff --git a/res/field/scripts/scripts_mt_coronet_1f_south.s b/res/field/scripts/scripts_mt_coronet_1f_south.s index 0a6456613e..e13a1c56b7 100644 --- a/res/field/scripts/scripts_mt_coronet_1f_south.s +++ b/res/field/scripts/scripts_mt_coronet_1f_south.s @@ -11,7 +11,7 @@ MtCoronet1FSouth_CoordEvent_Cyrus: ApplyMovement LOCALID_PLAYER, MtCoronet1FSouth_Movement_PlayerWatchCyrusWalkToPlayer ApplyMovement LOCALID_CYRUS, MtCoronet1FSouth_Movement_CyrusWalkToPlayer WaitMovement - Message MtCoronet1FSouth_Text_AccordingToOneTheoryMtCoronetIsWhereTheSinnohRegionBegan + Message MtCoronet1FSouth_Text_MtCoronetIsWhereSinnohBegan CloseMessage ApplyMovement LOCALID_CYRUS, MtCoronet1FSouth_Movement_CyrusWalkOnSpotNorth ApplyMovement LOCALID_PLAYER, MtCoronet1FSouth_Movement_PlayerWalkOnSpotNorthEast diff --git a/res/field/scripts/scripts_mt_coronet_2f.s b/res/field/scripts/scripts_mt_coronet_2f.s index f80dc25b91..991523b414 100644 --- a/res/field/scripts/scripts_mt_coronet_2f.s +++ b/res/field/scripts/scripts_mt_coronet_2f.s @@ -10,11 +10,11 @@ ScriptEntryEnd MtCoronet2F_CavePainting: - EventMessage MtCoronet2F_Text_ThereAppearsToBeACavePaintingFromAnAncientTime + EventMessage MtCoronet2F_Text_CavePaintingFromAncientTime End MtCoronet2F_CavePaintingShards: - NPCMessage MtCoronet2F_Text_ShardsAreAllThatRemainOfTheAncientCavePainting + NPCMessage MtCoronet2F_Text_ShardsAreAllThatRemain End MtCoronet2F_CoordEvent_Looker: @@ -32,25 +32,25 @@ MtCoronet2F_CoordEvent_Looker: CallIfEq VAR_0x8005, 24, MtCoronet2F_LookerWalkToPlayerZ24 CallIfEq VAR_0x8005, 25, MtCoronet2F_LookerWalkToPlayerZ25 CallIfEq VAR_0x8005, 26, MtCoronet2F_LookerWalkToPlayerZ26 - Message MtCoronet2F_Text_ObserveIfYouWillThatHole + Message MtCoronet2F_Text_ObserveThatHole ApplyMovement LOCALID_LOOKER, MtCoronet2F_Movement_LookerWalkOnSpotSouth WaitMovement - Message MtCoronet2F_Text_AreYouTrainerEnoughToAdvanceShowMeIfYouWill + Message MtCoronet2F_Text_AreYouEnoughToAdvance ApplyMovement LOCALID_LOOKER, MtCoronet2F_Movement_LookerWalkOnSpotWest WaitMovement - Message MtCoronet2F_Text_YouAreFarSuperiorToMeAllICanDoNowIsGiveYouThis + Message MtCoronet2F_Text_YouAreFarSuperiorToMe SetVar VAR_0x8004, ITEM_BLACK_FLUTE SetVar VAR_0x8005, 1 GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, MtCoronet2F_BagIsFull Common_GiveItemQuantity - Call MtCoronet2F_PleaseYouMustStopTeamGalactic + Call MtCoronet2F_YouMustStopTeamGalactic Common_FadeToDefaultMusic4 ReleaseAll End -MtCoronet2F_PleaseYouMustStopTeamGalactic: +MtCoronet2F_YouMustStopTeamGalactic: SetFlag FLAG_RECEIVED_MT_CORONET_2F_BLACK_FLUTE - Message MtCoronet2F_Text_PleaseYouMustStopTeamGalactic + Message MtCoronet2F_Text_YouMustStopTeamGalactic WaitButton CloseMessage Return @@ -133,19 +133,19 @@ MtCoronet2F_Looker: LockAll FacePlayer GoToIfUnset FLAG_RECEIVED_MT_CORONET_2F_BLACK_FLUTE, MtCoronet2F_TryAgainGiveBlackFlute - Message MtCoronet2F_Text_PleaseYouMustStopTeamGalactic + Message MtCoronet2F_Text_YouMustStopTeamGalactic WaitButton CloseMessage ReleaseAll End MtCoronet2F_TryAgainGiveBlackFlute: - Message MtCoronet2F_Text_PleaseStopTeamGalacticAllICanDoNowIsGiveYouThis + Message MtCoronet2F_Text_AllICanDoIsGiveThis SetVar VAR_0x8004, ITEM_BLACK_FLUTE SetVar VAR_0x8005, 1 GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, MtCoronet2F_BagIsFullAgain Common_GiveItemQuantity - Call MtCoronet2F_PleaseYouMustStopTeamGalactic + Call MtCoronet2F_YouMustStopTeamGalactic ReleaseAll End diff --git a/res/field/scripts/scripts_newmoon_island_forest.s b/res/field/scripts/scripts_newmoon_island_forest.s index d79f148b71..b3e677538b 100644 --- a/res/field/scripts/scripts_newmoon_island_forest.s +++ b/res/field/scripts/scripts_newmoon_island_forest.s @@ -77,7 +77,7 @@ NewmoonIslandForest_ReturnToHarborInn: FadeScreenOut FADE_SCREEN_SPEED_SLOW WaitFadeScreen WaitTime 120, VAR_RESULT - Warp MAP_HEADER_CANALAVE_CITY_HARBOR_INN, 0, 8, 6, DIR_SOUTH + Warp MAP_HEADER_CANALAVE_CITY_HARBOR_INN, 8, 6, DIR_SOUTH FadeScreenIn FADE_SCREEN_SPEED_SLOW WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_old_chateau.s b/res/field/scripts/scripts_old_chateau.s index f202df36d2..3697d41942 100644 --- a/res/field/scripts/scripts_old_chateau.s +++ b/res/field/scripts/scripts_old_chateau.s @@ -11,7 +11,7 @@ OldChateau_OnTransition: End OldChateau_Statue: - EventMessage OldChateau_Text_ItAppearsAsIfItIsGlaring + EventMessage OldChateau_Text_ItAppearsGlaring End .balign 4, 0 diff --git a/res/field/scripts/scripts_old_chateau_back_middle_west_room.s b/res/field/scripts/scripts_old_chateau_back_middle_west_room.s index f49d6ce315..c03dc402d1 100644 --- a/res/field/scripts/scripts_old_chateau_back_middle_west_room.s +++ b/res/field/scripts/scripts_old_chateau_back_middle_west_room.s @@ -8,11 +8,11 @@ OldChateauBackMiddleWestRoom_TV: PlaySE SEQ_SE_CONFIRM LockAll - GoToIfSet FLAG_CAUGHT_OLD_CHATEAU_ROTOM, OldChateauBackMiddleWestRoom_TheTVHasAnOddlyMalevolentFeel - GoToIfSet FLAG_BATTLED_OLD_CHATEAU_ROTOM, OldChateauBackMiddleWestRoom_TheTVHasAnOddlyMalevolentFeel + GoToIfSet FLAG_CAUGHT_OLD_CHATEAU_ROTOM, OldChateauBackMiddleWestRoom_TVHasMalevolentFeel + GoToIfSet FLAG_BATTLED_OLD_CHATEAU_ROTOM, OldChateauBackMiddleWestRoom_TVHasMalevolentFeel GetTimeOfDay VAR_RESULT - GoToIfLt VAR_RESULT, TIMEOFDAY_NIGHT, OldChateauBackMiddleWestRoom_TheTVHasAnOddlyMalevolentFeel - Message OldChateauBackMiddleWestRoom_Text_ThereAppearsToBeAPokemonWantToThumpTheTV + GoToIfLt VAR_RESULT, TIMEOFDAY_NIGHT, OldChateauBackMiddleWestRoom_TVHasMalevolentFeel + Message OldChateauBackMiddleWestRoom_Text_WantToThumpTheTV ShowYesNoMenu VAR_RESULT GoToIfEq VAR_RESULT, MENU_NO, OldChateauBackMiddleWestRoom_End BufferPlayerName 0 @@ -25,13 +25,13 @@ OldChateauBackMiddleWestRoom_TV: CheckWonBattle VAR_RESULT GoToIfEq VAR_RESULT, FALSE, OldChateauBackMiddleWestRoom_BlackOut CheckDidNotCapture VAR_RESULT - GoToIfEq VAR_RESULT, TRUE, OldChateauBackMiddleWestRoom_RotomDisappearedIntoTheTVSet + GoToIfEq VAR_RESULT, TRUE, OldChateauBackMiddleWestRoom_RotomDisappearedIntoTV SetFlag FLAG_CAUGHT_OLD_CHATEAU_ROTOM ReleaseAll End -OldChateauBackMiddleWestRoom_RotomDisappearedIntoTheTVSet: - Message OldChateauBackMiddleWestRoom_Text_RotomDisappearedIntoTheTVSet +OldChateauBackMiddleWestRoom_RotomDisappearedIntoTV: + Message OldChateauBackMiddleWestRoom_Text_RotomDisappearedIntoTV WaitButton CloseMessage ReleaseAll @@ -42,8 +42,8 @@ OldChateauBackMiddleWestRoom_End: ReleaseAll End -OldChateauBackMiddleWestRoom_TheTVHasAnOddlyMalevolentFeel: - Message OldChateauBackMiddleWestRoom_Text_TheTVHasAnOddlyMalevolentFeel +OldChateauBackMiddleWestRoom_TVHasMalevolentFeel: + Message OldChateauBackMiddleWestRoom_Text_TVHasMalevolentFeel WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city.s b/res/field/scripts/scripts_oreburgh_city.s index ab5d45dd2d..1616803bd4 100644 --- a/res/field/scripts/scripts_oreburgh_city.s +++ b/res/field/scripts/scripts_oreburgh_city.s @@ -18,8 +18,8 @@ ScriptEntry OreburghCity_Camper ScriptEntry OreburghCity_MapSignpost ScriptEntry OreburghCity_GymSignpost - ScriptEntry OreburghCity_ScrollingSignpostOreburghMiningMuseum - ScriptEntry OreburghCity_ScrollingSignpostOreburghMine + ScriptEntry OreburghCity_SignboardOreburghMiningMuseum + ScriptEntry OreburghCity_SignboardOreburghMine ScriptEntry OreburghCity_Machop1 ScriptEntry OreburghCity_BattleGirl2 ScriptEntry OreburghCity_Machop3 @@ -30,19 +30,19 @@ OreburghCity_Rival: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_TALKED_TO_OREBURGH_CITY_RIVAL, OreburghCity_IToldYouTheGymLeaderWentDownToTheOreburghMine + GoToIfSet FLAG_TALKED_TO_OREBURGH_CITY_RIVAL, OreburghCity_GymLeaderWentDownToTheMine BufferRivalName 0 BufferPlayerName 1 - Message OreburghCity_Text_TheGymLeadersGoneOffToTheCoalMine + Message OreburghCity_Text_GymLeadersGoneOffToTheMine WaitButton SetFlag FLAG_TALKED_TO_OREBURGH_CITY_RIVAL CloseMessage ReleaseAll End -OreburghCity_IToldYouTheGymLeaderWentDownToTheOreburghMine: +OreburghCity_GymLeaderWentDownToTheMine: BufferRivalName 0 - Message OreburghCity_Text_IToldYouTheGymLeaderWentDownToTheOreburghMine + Message OreburghCity_Text_GymLeaderWentDownToTheMine WaitButton CloseMessage ReleaseAll @@ -54,7 +54,7 @@ OreburghCity_Youngster: FacePlayer GoToIfBadgeAcquired BADGE_ID_COAL, OreburghCity_CanISeeYourTrainerCase GoToIfSet FLAG_ROARK_RETURNED_TO_OREBURGH_GYM, OreburghCity_TheGymLeadersWaitingForYou - Message OreburghCity_Text_IsThatGuyInFrontOfTheGymYourFriend + Message OreburghCity_Text_IsThatGuyYourFriend WaitButton CloseMessage ReleaseAll @@ -129,11 +129,11 @@ OreburghCity_NextStopTheEternaGymBadge: Common_SetRivalBGM BufferRivalName 0 BufferPlayerName 1 - Message OreburghCity_Text_EternaCityIsTheNextPlaceWithAGymThatGivesAwayBadgesRight + Message OreburghCity_Text_EternaCityNextPlaceWithAGym CloseMessage ApplyMovement LOCALID_RIVAL, OreburghCity_Movement_RivalWalkOnSpotEast WaitMovement - Message OreburghCity_Text_IWentToRoute207ButYouCantGoThereWithoutABicycle + Message OreburghCity_Text_CantGoToRoute207WithoutBicycle ApplyMovement LOCALID_RIVAL, OreburghCity_Movement_RivalWalkOnSpotWest WaitMovement Message OreburghCity_Text_NextStopTheEternaGymBadge @@ -262,29 +262,29 @@ OreburghCity_Movement_RivalWalkOnSpotWest: EndMovement OreburghCity_Hiker: - NPCMessage OreburghCity_Text_UpAheadTheresAHugeMountainThatTowersAboveEverything + NPCMessage OreburghCity_Text_UpAheadTheresAHugeMountain End OreburghCity_Worker1: - NPCMessage OreburghCity_Text_TheseVentsExchangeTheHotAirDownBelowWithTheFreshAirOutside + NPCMessage OreburghCity_Text_TheseVentsExchangeAirDownBelow End OreburghCity_Worker2: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_RECEIVED_OREBURGH_CITY_SUPER_POTION, OreburghCity_FeelingHaleAndHeartyPutsASmileOnMyFace + GoToIfSet FLAG_RECEIVED_OREBURGH_CITY_SUPER_POTION, OreburghCity_PutsASmileOnMyFace Message OreburghCity_Text_HereTakeOneOfThese SetVar VAR_0x8004, ITEM_SUPER_POTION SetVar VAR_0x8005, 1 GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, OreburghCity_BagIsFull Common_GiveItemQuantity SetFlag FLAG_RECEIVED_OREBURGH_CITY_SUPER_POTION - GoTo OreburghCity_FeelingHaleAndHeartyPutsASmileOnMyFace + GoTo OreburghCity_PutsASmileOnMyFace End -OreburghCity_FeelingHaleAndHeartyPutsASmileOnMyFace: - Message OreburghCity_Text_FeelingHaleAndHeartyPutsASmileOnMyFace +OreburghCity_PutsASmileOnMyFace: + Message OreburghCity_Text_PutsASmileOnMyFace WaitButton CloseMessage ReleaseAll @@ -297,11 +297,11 @@ OreburghCity_BagIsFull: End OreburghCity_Worker3: - NPCMessage OreburghCity_Text_ThisPileOfDirtySandIsCalledASlagHeap + NPCMessage OreburghCity_Text_ThisPileIsCalledASlagHeap End OreburghCity_Worker4: - NPCMessage OreburghCity_Text_ChopChopMachopChopChopAwayOnRocks + NPCMessage OreburghCity_Text_ChopChopAwayOnRocks End OreburghCity_CoordEvent_Youngster: @@ -317,32 +317,32 @@ OreburghCity_YoungsterWalkToPlayerZ748: ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWalkOnSpotSouth ApplyMovement LOCALID_YOUNGSTER, OreburghCity_Movement_YoungsterWalkToPlayerZ748 WaitMovement - GoTo OreburghCity_IllTakeYouToThePokemonGym + GoTo OreburghCity_IllTakeYouToTheGym End OreburghCity_YoungsterWalkToPlayerZ749: ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWalkOnSpotSouth ApplyMovement LOCALID_YOUNGSTER, OreburghCity_Movement_YoungsterWalkToPlayerZ749 WaitMovement - GoTo OreburghCity_IllTakeYouToThePokemonGym + GoTo OreburghCity_IllTakeYouToTheGym End OreburghCity_YoungsterWalkToPlayerZ750: ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWalkOnSpotSouth ApplyMovement LOCALID_YOUNGSTER, OreburghCity_Movement_YoungsterWalkToPlayerZ750 WaitMovement - GoTo OreburghCity_IllTakeYouToThePokemonGym + GoTo OreburghCity_IllTakeYouToTheGym End OreburghCity_YoungsterWalkToPlayerZ751: ApplyMovement LOCALID_PLAYER, OreburghCity_Movement_PlayerWalkOnSpotSouth ApplyMovement LOCALID_YOUNGSTER, OreburghCity_Movement_YoungsterWalkToPlayerZ751 WaitMovement - GoTo OreburghCity_IllTakeYouToThePokemonGym + GoTo OreburghCity_IllTakeYouToTheGym End -OreburghCity_IllTakeYouToThePokemonGym: - Message OreburghCity_Text_IllTakeYouToThePokemonGym +OreburghCity_IllTakeYouToTheGym: + Message OreburghCity_Text_IllTakeYouToTheGym CloseMessage Common_SetFollowMeBGM GetPlayerMapPos VAR_0x8004, VAR_0x8005 @@ -483,22 +483,22 @@ OreburghCity_Movement_YoungsterWalkToPlayerZ751: EndMovement OreburghCity_BattleGirl1: - NPCMessage OreburghCity_Text_TMsAreSingleUseOnlyButHMsCanBeUsedOverAndOver + NPCMessage OreburghCity_Text_TMsSingleUseHMsOverAndOver End OreburghCity_SchoolKidF: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_ROARK_RETURNED_TO_OREBURGH_GYM, OreburghCity_TheGymLeaderIsYoungButHesTheMinesSafetySupervisor - Message OreburghCity_Text_TheGymLeaderWentOffToWorkInTheMine + GoToIfSet FLAG_ROARK_RETURNED_TO_OREBURGH_GYM, OreburghCity_GymLeaderIsSafetySupervisor + Message OreburghCity_Text_GymLeaderWentOffToWork WaitButton CloseMessage ReleaseAll End -OreburghCity_TheGymLeaderIsYoungButHesTheMinesSafetySupervisor: - Message OreburghCity_Text_TheGymLeaderIsYoungButHesTheMinesSafetySupervisor +OreburghCity_GymLeaderIsSafetySupervisor: + Message OreburghCity_Text_GymLeaderIsSafetySupervisor WaitButton CloseMessage ReleaseAll @@ -513,7 +513,7 @@ OreburghCity_PokefanF: End OreburghCity_Camper: - NPCMessage OreburghCity_Text_WhenIRunAroundWithMyRunningShoesOnImTheCenterOfAttention + NPCMessage OreburghCity_Text_ImTheCenterOfAttention End OreburghCity_MapSignpost: @@ -521,19 +521,19 @@ OreburghCity_MapSignpost: End OreburghCity_GymSignpost: - ShowScrollingSign OreburghCity_Text_OreburgCityPokemonGymCallMeRoarkTheRock + ShowScrollingSign OreburghCity_Text_SignPokemonGym End -OreburghCity_ScrollingSignpostOreburghMiningMuseum: - ShowLandmarkSign OreburghCity_Text_OreburghMiningMuseumCoalMiningAndYou +OreburghCity_SignboardOreburghMiningMuseum: + ShowLandmarkSign OreburghCity_Text_SignOreburghMiningMuseum End -OreburghCity_ScrollingSignpostOreburghMine: - ShowLandmarkSign OreburghCity_Text_OreburghMineBewareOfBusyPokemon +OreburghCity_SignboardOreburghMine: + ShowLandmarkSign OreburghCity_Text_SignOreburghMine End OreburghCity_Machop1: - PokemonCryAndMessage SPECIES_MACHOP, OreburghCity_Text_MachopMachoChopo + PokemonCryAndMessage SPECIES_MACHOP, OreburghCity_Text_MachopCryMachoChopo End OreburghCity_BattleGirl2: @@ -541,11 +541,11 @@ OreburghCity_BattleGirl2: End OreburghCity_Machop3: - PokemonCryAndMessage SPECIES_MACHOP, OreburghCity_Text_MachopPigyooh + PokemonCryAndMessage SPECIES_MACHOP, OreburghCity_Text_MachopCryPigyooh End OreburghCity_Machop2: - PokemonCryAndMessage SPECIES_MACHOP, OreburghCity_Text_MachopGwoohGogogooh + PokemonCryAndMessage SPECIES_MACHOP, OreburghCity_Text_MachopCryGwoohGogogooh End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_east_house_1f.s b/res/field/scripts/scripts_oreburgh_city_east_house_1f.s index f2ceefd00c..7958ee4a4b 100644 --- a/res/field/scripts/scripts_oreburgh_city_east_house_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_east_house_1f.s @@ -8,15 +8,15 @@ ScriptEntryEnd OreburghCityEastHouse1F_PokefanM: - NPCMessage OreburghCityEastHouse1F_Text_WhyNotTryTrainingInTheOreburghMine + NPCMessage OreburghCityEastHouse1F_Text_TrainInOreburghMine End OreburghCityEastHouse1F_Hiker: - NPCMessage OreburghCityEastHouse1F_Text_IAlwaysHaveARottenTimeTryingToDecideWhichMovesMyPokemonShouldLearn + NPCMessage OreburghCityEastHouse1F_Text_IAlwaysHaveARottenTime End OreburghCityEastHouse1F_AceTrainerM: - NPCMessage OreburghCityEastHouse1F_Text_YouRemindMeSoMuchOfTheTimeIGotMyFirstPokemon + NPCMessage OreburghCityEastHouse1F_Text_RemindMeOfTimeIGotMyPokemon End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_east_house_2f.s b/res/field/scripts/scripts_oreburgh_city_east_house_2f.s index 20f06f2db6..ad7ec5c848 100644 --- a/res/field/scripts/scripts_oreburgh_city_east_house_2f.s +++ b/res/field/scripts/scripts_oreburgh_city_east_house_2f.s @@ -9,25 +9,25 @@ ScriptEntryEnd OreburghCityEastHouse2F_Gentleman: - NPCMessage OreburghCityEastHouse2F_Text_TheOreburghMineIsOperatedWithTheUtmostCare + NPCMessage OreburghCityEastHouse2F_Text_OperatedWithUtmostCare End OreburghCityEastHouse2F_Youngster: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_RECEIVED_OREBURGH_CITY_EAST_HOUSE_2F_GREAT_BALL, OreburghCityEastHouse2F_YouKnowHowPokemonStayInsideTheirPokeBalls - Message OreburghCityEastHouse2F_Text_HereIWantYouToHaveThis + GoToIfSet FLAG_RECEIVED_OREBURGH_CITY_EAST_HOUSE_2F_GREAT_BALL, OreburghCityEastHouse2F_IThinkAboutBestPokeBalls + Message OreburghCityEastHouse2F_Text_HereHaveThis SetVar VAR_0x8004, ITEM_GREAT_BALL SetVar VAR_0x8005, 1 GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, OreburghCityEastHouse2F_BagIsFull Common_GiveItemQuantity SetFlag FLAG_RECEIVED_OREBURGH_CITY_EAST_HOUSE_2F_GREAT_BALL - GoTo OreburghCityEastHouse2F_YouKnowHowPokemonStayInsideTheirPokeBalls + GoTo OreburghCityEastHouse2F_IThinkAboutBestPokeBalls End -OreburghCityEastHouse2F_YouKnowHowPokemonStayInsideTheirPokeBalls: - Message OreburghCityEastHouse2F_Text_YouKnowHowPokemonStayInsideTheirPokeBalls +OreburghCityEastHouse2F_IThinkAboutBestPokeBalls: + Message OreburghCityEastHouse2F_Text_IThinkAboutBestPokeBalls WaitButton CloseMessage ReleaseAll @@ -43,7 +43,7 @@ OreburghCityEastHouse2F_Dummy3: End OreburghCityEastHouse2F_ScientistM: - NPCMessage OreburghCityEastHouse2F_Text_CoalIsCarriedOutOfTheOreburghMineOnAFullyAutomatedSystem + NPCMessage OreburghCityEastHouse2F_Text_FullyAutomatedSystem End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_east_house_3f.s b/res/field/scripts/scripts_oreburgh_city_east_house_3f.s index 9960ad9de0..6e86ecae7a 100644 --- a/res/field/scripts/scripts_oreburgh_city_east_house_3f.s +++ b/res/field/scripts/scripts_oreburgh_city_east_house_3f.s @@ -7,9 +7,9 @@ ScriptEntryEnd OreburghCityEastHouse3F_ScientistM: - NPCMessage OreburghCityEastHouse3F_Text_TheCoalMineHeresFullyAutomated + NPCMessage OreburghCityEastHouse3F_Text_MineIsFullyAutomated End OreburghCityEastHouse3F_AceTrainerM: - NPCMessage OreburghCityEastHouse3F_Text_YouRemindMeSoMuchOfTheTimeIGotMyFirstPokemon + NPCMessage OreburghCityEastHouse3F_Text_RemindMeOfFirstPokemon End diff --git a/res/field/scripts/scripts_oreburgh_city_gym.s b/res/field/scripts/scripts_oreburgh_city_gym.s index a2b89dab69..01a5d72ecb 100644 --- a/res/field/scripts/scripts_oreburgh_city_gym.s +++ b/res/field/scripts/scripts_oreburgh_city_gym.s @@ -12,7 +12,7 @@ OreburghGym_Roark: LockAll FacePlayer GoToIfBadgeAcquired BADGE_ID_COAL, OreburghGym_AlreadyHaveCoalBadge - CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_OREBURGH_CITY_GYM, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_OREBURGH_CITY_GYM Message OreburghGym_Text_RoarkIntro CloseMessage StartTrainerBattle TRAINER_LEADER_ROARK @@ -33,7 +33,7 @@ OreburghGym_Roark: SetVar VAR_GTS_ACCESS_STATE, 1 SetVar VAR_JUBILIFE_LOOKER_PAL_PAD_STATE, 1 SetVar VAR_OREBURGH_STATE, 2 - CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_OREBURGH_CITY_GYM, TRAINER_LEADER_ROARK, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_OREBURGH_CITY_GYM, TRAINER_LEADER_ROARK SetVar VAR_JUBILIFE_CITY_STATE, 3 ClearFlag FLAG_HIDE_JUBILIFE_CITY_COUNTERPART ClearFlag FLAG_HIDE_JUBILIFE_ROWAN diff --git a/res/field/scripts/scripts_oreburgh_city_mart.s b/res/field/scripts/scripts_oreburgh_city_mart.s index 86fccd65a8..4ce3655f0b 100644 --- a/res/field/scripts/scripts_oreburgh_city_mart.s +++ b/res/field/scripts/scripts_oreburgh_city_mart.s @@ -21,5 +21,5 @@ OreburghCityMart_Hiker: End OreburghCityMart_Collector: - NPCMessage OreburghCityMart_Text_TwoStaffOfferDifferentMerchandise + NPCMessage OreburghCityMart_Text_StaffOfferDifferentMerchandise End diff --git a/res/field/scripts/scripts_oreburgh_city_middle_house.s b/res/field/scripts/scripts_oreburgh_city_middle_house.s index dabc6fa245..cc23e82959 100644 --- a/res/field/scripts/scripts_oreburgh_city_middle_house.s +++ b/res/field/scripts/scripts_oreburgh_city_middle_house.s @@ -7,7 +7,7 @@ ScriptEntryEnd OreburghCityMiddleHouse_SchoolKidF: - NPCMessage OreburghCityMiddleHouse_Text_RoarkIsAUserOfRockTypePokemon + NPCMessage OreburghCityMiddleHouse_Text_RoarkUsesRockTypePokemon End OreburghCityMiddleHouse_Hiker: diff --git a/res/field/scripts/scripts_oreburgh_city_north_house_1f.s b/res/field/scripts/scripts_oreburgh_city_north_house_1f.s index a302537d1f..61029d1a20 100644 --- a/res/field/scripts/scripts_oreburgh_city_north_house_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_north_house_1f.s @@ -12,11 +12,11 @@ OreburghCityNorthHouse1F_SchoolKidF: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_TRADED_FOR_KAZZA_ABRA, OreburghCityNorthHouse1F_ThanksToPokemonIGotToBeFriendsWithYou - Message OreburghCityNorthHouse1F_Text_WouldYouBeWillingToTradeYourMachopForMyAbra + GoToIfSet FLAG_TRADED_FOR_KAZZA_ABRA, OreburghCityNorthHouse1F_ThanksToPokemonWereFriends + Message OreburghCityNorthHouse1F_Text_AskTradeMachopForAbra ShowYesNoMenu VAR_RESULT GoToIfEq VAR_RESULT, MENU_YES, OreburghCityNorthHouse1F_TryTrade - GoTo OreburghCityNorthHouse1F_IfYouChangeYourMindIllBeRightHereWaiting + GoTo OreburghCityNorthHouse1F_IllBeWaiting OreburghCityNorthHouse1F_TryTrade: CloseMessage @@ -25,12 +25,12 @@ OreburghCityNorthHouse1F_TryTrade: SelectPokemonToTrade FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, 0xFF, OreburghCityNorthHouse1F_IfYouChangeYourMindIllBeRightHereWaiting + GoToIfEq VAR_RESULT, 0xFF, OreburghCityNorthHouse1F_IllBeWaiting InitNPCTrade NPC_TRADE_KAZZA_ABRA SetVar VAR_0x8004, VAR_RESULT GetPartyMonSpecies VAR_0x8004, VAR_0x8005 GetNPCTradeRequestedSpecies VAR_RESULT - GoToIfNe VAR_0x8005, VAR_RESULT, OreburghCityNorthHouse1F_WhatIAskedForWasAMachop + GoToIfNe VAR_0x8005, VAR_RESULT, OreburghCityNorthHouse1F_AskedForMachop StartNPCTrade VAR_0x8004 FinishNPCTrade SetFlag FLAG_TRADED_FOR_KAZZA_ABRA @@ -40,32 +40,32 @@ OreburghCityNorthHouse1F_TryTrade: ReleaseAll End -OreburghCityNorthHouse1F_WhatIAskedForWasAMachop: +OreburghCityNorthHouse1F_AskedForMachop: FinishNPCTrade - Message OreburghCityNorthHouse1F_Text_WhatIAskedForWasAMachop + Message OreburghCityNorthHouse1F_Text_AskedForMachop WaitButton CloseMessage ReleaseAll End -OreburghCityNorthHouse1F_IfYouChangeYourMindIllBeRightHereWaiting: - Message OreburghCityNorthHouse1F_Text_IfYouChangeYourMindIllBeRightHereWaiting +OreburghCityNorthHouse1F_IllBeWaiting: + Message OreburghCityNorthHouse1F_Text_IllBeWaiting WaitButton CloseMessage ReleaseAll End -OreburghCityNorthHouse1F_ThanksToPokemonIGotToBeFriendsWithYou: - Message OreburghCityNorthHouse1F_Text_ThanksToPokemonIGotToBeFriendsWithYou +OreburghCityNorthHouse1F_ThanksToPokemonWereFriends: + Message OreburghCityNorthHouse1F_Text_ThanksToPokemonWereFriends WaitButton CloseMessage ReleaseAll End OreburghCityNorthHouse1F_ExpertF: - NPCMessage OreburghCityNorthHouse1F_Text_APokemonObtainedInATradeGrowsQuickly + NPCMessage OreburghCityNorthHouse1F_Text_PokemonFromTradeGrowsQuickly End OreburghCityNorthHouse1F_PokemonBreederM: - NPCMessage OreburghCityNorthHouse1F_Text_WhenYouTradeAPokemonTheItemItsHoldingIsTradedAsWell + NPCMessage OreburghCityNorthHouse1F_Text_ItemIsTradedAsWell End diff --git a/res/field/scripts/scripts_oreburgh_city_north_house_2f.s b/res/field/scripts/scripts_oreburgh_city_north_house_2f.s index 7317ef7fa3..43d4bf838a 100644 --- a/res/field/scripts/scripts_oreburgh_city_north_house_2f.s +++ b/res/field/scripts/scripts_oreburgh_city_north_house_2f.s @@ -8,21 +8,21 @@ ScriptEntryEnd OreburghCityNorthHouse2F_Guitarist: - NPCMessage OreburghCityNorthHouse2F_Text_AllPokemonHaveASpecialPowerCalledAnAbility + NPCMessage OreburghCityNorthHouse2F_Text_SpecialPowerCalledAbility End OreburghCityNorthHouse2F_PokemonBreederF: - NPCMessage OreburghCityNorthHouse2F_Text_MyFavoritePokemonAbilityIsMyPachirisusPickup + NPCMessage OreburghCityNorthHouse2F_Text_FavoriteAbilityIsPickup End OreburghCityNorthHouse2F_Collector: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_RECEIVED_OREBURGH_CITY_NORTH_HOUSE_2F_HEAL_BALL, OreburghCityNorthHouse2F_YeahThereAreSoManyKindsOfPokemonOutInTheWorld + GoToIfSet FLAG_RECEIVED_OREBURGH_CITY_NORTH_HOUSE_2F_HEAL_BALL, OreburghCityNorthHouse2F_SoManyKindsOfPokemon CheckPartyHasSpecies VAR_RESULT, SPECIES_GEODUDE - GoToIfEq VAR_RESULT, FALSE, OreburghCityNorthHouse2F_HowAboutShowingMeAPokemonCalledGeodude - Message OreburghCityNorthHouse2F_Text_ThatsAGeodudeThisIsATokenOfMyThanks + GoToIfEq VAR_RESULT, FALSE, OreburghCityNorthHouse2F_ShowMeGeodude + Message OreburghCityNorthHouse2F_Text_TokenOfMyThanks SetVar VAR_0x8004, ITEM_HEAL_BALL SetVar VAR_0x8005, 1 GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, OreburghCityNorthHouse2F_BagIsFull @@ -38,15 +38,15 @@ OreburghCityNorthHouse2F_BagIsFull: ReleaseAll End -OreburghCityNorthHouse2F_HowAboutShowingMeAPokemonCalledGeodude: - Message OreburghCityNorthHouse2F_Text_HowAboutShowingMeAPokemonCalledGeodude +OreburghCityNorthHouse2F_ShowMeGeodude: + Message OreburghCityNorthHouse2F_Text_ShowMeGeodude WaitButton CloseMessage ReleaseAll End -OreburghCityNorthHouse2F_YeahThereAreSoManyKindsOfPokemonOutInTheWorld: - Message OreburghCityNorthHouse2F_Text_YeahThereAreSoManyKindsOfPokemonOutInTheWorld +OreburghCityNorthHouse2F_SoManyKindsOfPokemon: + Message OreburghCityNorthHouse2F_Text_SoManyKindsOfPokemon WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city_north_house_3f.s b/res/field/scripts/scripts_oreburgh_city_north_house_3f.s index 6c2f7139ea..c5378b9ded 100644 --- a/res/field/scripts/scripts_oreburgh_city_north_house_3f.s +++ b/res/field/scripts/scripts_oreburgh_city_north_house_3f.s @@ -8,7 +8,7 @@ ScriptEntryEnd OreburghCityNorthHouse3F_PokefanF: - NPCMessage OreburghCityNorthHouse3F_Text_DuringTheDaytimeEveryoneGoesOffToTheMine + NPCMessage OreburghCityNorthHouse3F_Text_EveryoneGoesToTheMine End OreburghCityNorthHouse3F_Worker: @@ -16,7 +16,7 @@ OreburghCityNorthHouse3F_Worker: End OreburghCityNorthHouse3F_Twin: - NPCMessage OreburghCityNorthHouse3F_Text_EveryoneIncludingLotsOfPokemonDugTheBigUndergroundMaze + NPCMessage OreburghCityNorthHouse3F_Text_EveryoneDugUndergroundMaze End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s index bf4e1545bc..d15f8489a2 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s @@ -8,15 +8,15 @@ ScriptEntryEnd OreburghCityNorthwestHouse1F_BreederM: - NPCMessage OreburghCityNorthwestHouse1F_Text_ThereAreEightGymLeadersInTheSinnohRegion + NPCMessage OreburghCityNorthwestHouse1F_Text_EightGymLeadersInSinnoh End OreburghCityNorthwestHouse1F_Youngster: - NPCMessage OreburghCityNorthwestHouse1F_Text_AGymLeaderIsntLikeJustAnyTrainerYouMeet + NPCMessage OreburghCityNorthwestHouse1F_Text_GymLeaderUnlikeAnyTrainer End OreburghCityNorthwestHouse1F_PokefanF: - NPCMessage OreburghCityNorthwestHouse1F_Text_RoarkLetsUsTrainOurPokemonInTheMine + NPCMessage OreburghCityNorthwestHouse1F_Text_RoarkLetsUsTrainInTheMine End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s index 34f8db91b8..3b450d8a70 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s @@ -9,20 +9,20 @@ ScriptEntryEnd OreburghCityNorthwestHouse2F_Worker: - NPCMessage OreburghCityNorthwestHouse2F_Text_GivingNicknamesToPokemonIsTheWayToGo + NPCMessage OreburghCityNorthwestHouse2F_Text_GivingNicknamesIsTheWayToGo End OreburghCityNorthwestHouse2F_SchoolKidF: - NPCMessage OreburghCityNorthwestHouse2F_Text_ButHeNamedOurPsyduckYellowJustBecauseOfItsColor + NPCMessage OreburghCityNorthwestHouse2F_Text_HeNamedPsyduckYellow End OreburghCityNorthwestHouse2F_Lass: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_RECEIVED_OREBURGH_CITY_NORTHWEST_HOUSE_2F_DUSK_BALL, OreburghCityNorthwestHouse2F_TheDuskBallIsAPokeBallDesignedForUseInDarkness + GoToIfSet FLAG_RECEIVED_OREBURGH_CITY_NORTHWEST_HOUSE_2F_DUSK_BALL, OreburghCityNorthwestHouse2F_DuskBallIsDesignedForDarkness BufferItemName 0, ITEM_DUSK_BALL - Message OreburghCityNorthwestHouse2F_Text_HereTakeThisIfYoudLike + Message OreburghCityNorthwestHouse2F_Text_HereTakeThis SetVar VAR_0x8004, ITEM_DUSK_BALL SetVar VAR_0x8005, 1 GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, OreburghCityNorthwestHouse2F_BagIsFull @@ -38,15 +38,15 @@ OreburghCityNorthwestHouse2F_BagIsFull: ReleaseAll End -OreburghCityNorthwestHouse2F_TheDuskBallIsAPokeBallDesignedForUseInDarkness: - Message OreburghCityNorthwestHouse2F_Text_TheDuskBallIsAPokeBallDesignedForUseInDarkness +OreburghCityNorthwestHouse2F_DuskBallIsDesignedForDarkness: + Message OreburghCityNorthwestHouse2F_Text_DuskBallIsDesignedForDarkness WaitButton CloseMessage ReleaseAll End OreburghCityNorthwestHouse2F_Psyduck: - PokemonCryAndMessage SPECIES_PSYDUCK, OreburghCityNorthwestHouse2F_Text_YellowDuuuck + PokemonCryAndMessage SPECIES_PSYDUCK, OreburghCityNorthwestHouse2F_Text_YellowPsyduckCry End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s index d8b2efd4eb..c675c589d9 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s @@ -10,9 +10,9 @@ OreburghCityNorthwestHouse3F_Lass: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_RECEIVED_OREBURGH_CITY_NORTHWEST_HOUSE_3F_HARD_STONE, OreburghCityNorthwestHouse3F_ThatItemIntensifiesThePowerOfRockTypeMoves + GoToIfSet FLAG_RECEIVED_OREBURGH_CITY_NORTHWEST_HOUSE_3F_HARD_STONE, OreburghCityNorthwestHouse3F_IntensifiesPowerOfRockTypeMoves BufferItemName 0, ITEM_HARD_STONE - Message OreburghCityNorthwestHouse3F_Text_IfYoudLikeLetOneHoldThisItem + Message OreburghCityNorthwestHouse3F_Text_LetOneHoldThisItem SetVar VAR_0x8004, ITEM_HARD_STONE SetVar VAR_0x8005, 1 GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, OreburghCityNorthwestHouse3F_BagIsFull @@ -22,9 +22,9 @@ OreburghCityNorthwestHouse3F_Lass: ReleaseAll End -OreburghCityNorthwestHouse3F_ThatItemIntensifiesThePowerOfRockTypeMoves: +OreburghCityNorthwestHouse3F_IntensifiesPowerOfRockTypeMoves: BufferItemName 0, ITEM_HARD_STONE - Message OreburghCityNorthwestHouse3F_Text_ThatItemIntensifiesThePowerOfRockTypeMoves + Message OreburghCityNorthwestHouse3F_Text_IntensifiesPowerOfRockTypeMoves WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s index cc3b0b2961..dcf0df36dc 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s @@ -8,15 +8,15 @@ ScriptEntryEnd OreburghCityNorthwestHouse4F_SchoolKidM: - NPCMessage OreburghCityNorthwestHouse4F_Text_HahahaImGonnaSwipeYourFlag + NPCMessage OreburghCityNorthwestHouse4F_Text_ImGonnaSwipeYourFlag End OreburghCityNorthwestHouse4F_NinjaBoy: - NPCMessage OreburghCityNorthwestHouse4F_Text_ISetSomeNastyTrapsCatchMeIfYouCan + NPCMessage OreburghCityNorthwestHouse4F_Text_CatchMeIfYouCan End OreburghCityNorthwestHouse4F_PokefanF: - NPCMessage OreburghCityNorthwestHouse4F_Text_ThanksToTheGymLeaderWeCanPlayUnderground + NPCMessage OreburghCityNorthwestHouse4F_Text_WeCanPlayUnderground End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s b/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s index 2cdeea96ec..177c1f1315 100644 --- a/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s @@ -18,28 +18,28 @@ OreburghCityPokecenter1F_Nurse: End OreburghCityPokecenter1F_NinjaBoy: - NPCMessage OreburghCityPokecenter1F_Text_YayIGotAPalPadAtThePokemonWiFiClubDownstairs + NPCMessage OreburghCityPokecenter1F_Text_IGotAPalPadDownstairs End OreburghCityPokecenter1F_AceTrainerF: - NPCMessage OreburghCityPokecenter1F_Text_SwitchOnThePCAtAnyPokemonCenter + NPCMessage OreburghCityPokecenter1F_Text_SwitchOnThePC End OreburghCityPokecenter1F_Psychic: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_CHOSE_UNION_ROOM_APPEARANCE, OreburghCityPokecenter1F_HowAboutTellingMeWhatKindOfTrainerYouLike - Message OreburghCityPokecenter1F_Text_WhatIsYourFavoriteKindOfTrainerCanYouTellMe - GoTo OreburghCityPokecenter1F_WhichKindOfTrainerWouldYouLikeToBe + GoToIfSet FLAG_CHOSE_UNION_ROOM_APPEARANCE, OreburghCityPokecenter1F_WhatKindOfTrainerDoYouLike + Message OreburghCityPokecenter1F_Text_TellMeFavoriteKindOfTrainer + GoTo OreburghCityPokecenter1F_BeWhichKindOfTrainer -OreburghCityPokecenter1F_HowAboutTellingMeWhatKindOfTrainerYouLike: +OreburghCityPokecenter1F_WhatKindOfTrainerDoYouLike: BufferTrainerClassFromAppearance 0 - Message OreburghCityPokecenter1F_Text_HowAboutTellingMeWhatKindOfTrainerYouLike - GoTo OreburghCityPokecenter1F_WhichKindOfTrainerWouldYouLikeToBe + Message OreburghCityPokecenter1F_Text_WhatKindOfTrainerDoYouLike + GoTo OreburghCityPokecenter1F_BeWhichKindOfTrainer -OreburghCityPokecenter1F_WhichKindOfTrainerWouldYouLikeToBe: - Message OreburghCityPokecenter1F_Text_WhichKindOfTrainerWouldYouLikeToBe +OreburghCityPokecenter1F_BeWhichKindOfTrainer: + Message OreburghCityPokecenter1F_Text_BeWhichKindOfTrainer LoadTrainerAppearances InitGlobalTextMenu 1, 1, 0, VAR_RESULT AddMenuEntryImm MenuEntries_Text_TrainerAppearanceVariant1, 0 @@ -50,18 +50,18 @@ OreburghCityPokecenter1F_WhichKindOfTrainerWouldYouLikeToBe: ShowMenu SetVar VAR_0x8004, VAR_RESULT SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 4, OreburghCityPokecenter1F_OKThenIllJustTalkToYouLater - GoToIfEq VAR_0x8008, -2, OreburghCityPokecenter1F_OKThenIllJustTalkToYouLater + GoToIfEq VAR_0x8008, 4, OreburghCityPokecenter1F_IllJustTalkToYouLater + GoToIfEq VAR_0x8008, -2, OreburghCityPokecenter1F_IllJustTalkToYouLater GetTrainerInfoTrainerClass VAR_0x8004, VAR_0x8005 BufferTrainerClassNameWithArticle 0, VAR_0x8005 CapitalizeFirstLetter 0 - Message OreburghCityPokecenter1F_Text_AskThisIsTheKindOfTrainerYouWantToBe + Message OreburghCityPokecenter1F_Text_IsThisWhatYouWantToBe ShowYesNoMenu VAR_RESULT GoToIfEq VAR_RESULT, MENU_YES, OreburghCityPokecenter1F_SetTrainerClass - GoTo OreburghCityPokecenter1F_WhichKindOfTrainerWouldYouLikeToBe + GoTo OreburghCityPokecenter1F_BeWhichKindOfTrainer -OreburghCityPokecenter1F_OKThenIllJustTalkToYouLater: - Message OreburghCityPokecenter1F_Text_OKThenIllJustTalkToYouLater +OreburghCityPokecenter1F_IllJustTalkToYouLater: + Message OreburghCityPokecenter1F_Text_IllJustTalkToYouLater WaitButton CloseMessage ReleaseAll @@ -69,32 +69,32 @@ OreburghCityPokecenter1F_OKThenIllJustTalkToYouLater: OreburghCityPokecenter1F_SetTrainerClass: BufferTrainerClassNameWithArticle 0, VAR_0x8005 - Message OreburghCityPokecenter1F_Text_ISeeSoThisIsTheKindOfTrainerYouLike + Message OreburghCityPokecenter1F_Text_SoThisIsWhatYouLike SetFlag FLAG_CHOSE_UNION_ROOM_APPEARANCE CalculateTrainerInfoAppearance VAR_0x8004, VAR_0x8005 SetTrainerInfoAppearance VAR_0x8005 - GoTo OreburghCityPokecenter1F_OKThenIllJustTalkToYouLater + GoTo OreburghCityPokecenter1F_IllJustTalkToYouLater OreburghCityPokecenter1F_Gentleman: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_GAME_COMPLETED, OreburghCityPokecenter1F_WhatOrWhoIsThisTeamGalactic - Message OreburghCityPokecenter1F_Text_WhatOrWhoIsThisTeamGalacticItsAMystery + GoToIfSet FLAG_GAME_COMPLETED, OreburghCityPokecenter1F_WhatOrWhoIsTeamGalactic + Message OreburghCityPokecenter1F_Text_TeamGalacticIsAMystery WaitButton CloseMessage ReleaseAll End -OreburghCityPokecenter1F_WhatOrWhoIsThisTeamGalactic: - Message OreburghCityPokecenter1F_Text_WhatOrWhoIsThisTeamGalactic +OreburghCityPokecenter1F_WhatOrWhoIsTeamGalactic: + Message OreburghCityPokecenter1F_Text_WhatOrWhoIsTeamGalactic WaitButton CloseMessage ReleaseAll End OreburghCityPokecenter1F_KidWithNDSWest: - NPCMessage OreburghCityPokecenter1F_Text_NowYouCanCaptureItAsABattleVideoUsingAVsRecorder + NPCMessage OreburghCityPokecenter1F_Text_CaptureBattleVideoUsingVsRecorder End OreburghCityPokecenter1F_KidWithNDSEast: diff --git a/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s b/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s index 92428940c1..b9f15b8310 100644 --- a/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s @@ -6,7 +6,7 @@ ScriptEntryEnd OreburghCityPokecenterB1F_BattleGirl: - NPCMessage OreburghCityPokecenterB1F_Text_IWantToBecomeFriendsWithAnExperiencedTrainerIReallyAdmire + NPCMessage OreburghCityPokecenterB1F_Text_IWantToBecomeFriends End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_south_house.s b/res/field/scripts/scripts_oreburgh_city_south_house.s index 9f328533d2..8fbd12522a 100644 --- a/res/field/scripts/scripts_oreburgh_city_south_house.s +++ b/res/field/scripts/scripts_oreburgh_city_south_house.s @@ -6,7 +6,7 @@ ScriptEntryEnd OreburghCitySouthHouse_Worker: - NPCMessage OreburghCitySouthHouse_Text_YoureTakingATourOfOurCoalMine + NPCMessage OreburghCitySouthHouse_Text_ItsAlwaysGoodToLearn End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_city_west_house.s b/res/field/scripts/scripts_oreburgh_city_west_house.s index 1c3d4fb9cc..29a8ba98ab 100644 --- a/res/field/scripts/scripts_oreburgh_city_west_house.s +++ b/res/field/scripts/scripts_oreburgh_city_west_house.s @@ -8,15 +8,15 @@ ScriptEntryEnd OreburghCityWestHouse_Youngster: - NPCMessage OreburghCityWestHouse_Text_HaveYouEverSeenOrHeardAboutDifferentlyColoredPokemon + NPCMessage OreburghCityWestHouse_Text_HaveYouSeenDifferentlyColoredPokemon End OreburghCityWestHouse_PokefanF: - NPCMessage OreburghCityWestHouse_Text_YouKnowHowPokemonHaveDifferentNaturesLikeWeHavePersonalities + NPCMessage OreburghCityWestHouse_Text_PokemonHaveDifferentNatures End OreburghCityWestHouse_Pikachu: - PokemonCryAndMessage SPECIES_PIKACHU, OreburghCityWestHouse_Text_PikachuPikaaah + PokemonCryAndMessage SPECIES_PIKACHU, OreburghCityWestHouse_Text_PikachuCry End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_gate_1f.s b/res/field/scripts/scripts_oreburgh_gate_1f.s index 65e88e9ae3..edf9a9e830 100644 --- a/res/field/scripts/scripts_oreburgh_gate_1f.s +++ b/res/field/scripts/scripts_oreburgh_gate_1f.s @@ -18,23 +18,23 @@ OreburghGate1F_Hiker: FacePlayer CheckBadgeAcquired BADGE_ID_COAL, VAR_RESULT GoToIfEq VAR_RESULT, FALSE, OreburghGate1F_HikerGiveHM - Message OreburghGate1F_Text_NowYouCanUseTheHiddenMoveRockSmashOnSmallBoulders + Message OreburghGate1F_Text_NowYouCanUseRockSmash WaitButton CloseMessage ReleaseAll End OreburghGate1F_HikerGiveHM: - GoToIfSet FLAG_RECEIVED_HM06, OreburghGate1F_ThatHiddenMachineContainsRockSmash - Message OreburghGate1F_Text_SoLetMeMakeAGiftOfThisHiddenMachineToYou + GoToIfSet FLAG_RECEIVED_HM06, OreburghGate1F_ThatHMContainsRockSmash + Message OreburghGate1F_Text_MakeAGiftOfThisHM SetVar VAR_0x8004, ITEM_HM06 SetVar VAR_0x8005, 1 Common_GiveItemQuantity Call OreburghGate1F_SetFlagReceivedHM06 - GoTo OreburghGate1F_ThatHiddenMachineContainsRockSmash + GoTo OreburghGate1F_ThatHMContainsRockSmash -OreburghGate1F_ThatHiddenMachineContainsRockSmash: - Message OreburghGate1F_Text_ThatHiddenMachineContainsRockSmash +OreburghGate1F_ThatHMContainsRockSmash: + Message OreburghGate1F_Text_ThatHMContainsRockSmash WaitButton CloseMessage ReleaseAll @@ -50,12 +50,12 @@ OreburghGate1F_CoordEvent_Hiker: ApplyMovement LOCALID_HIKER, OreburghGate1F_Movement_HikerWalkToPlayer ApplyMovement LOCALID_PLAYER, OreburghGate1F_Movement_PlayerFaceHiker WaitMovement - Message OreburghGate1F_Text_SoLetMeMakeAGiftOfThisHiddenMachineToYou + Message OreburghGate1F_Text_MakeAGiftOfThisHM SetVar VAR_0x8004, ITEM_HM06 SetVar VAR_0x8005, 1 Common_GiveItemQuantity Call OreburghGate1F_SetFlagReceivedHM06 - Message OreburghGate1F_Text_ThatHiddenMachineContainsRockSmash + Message OreburghGate1F_Text_ThatHMContainsRockSmash WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_oreburgh_gate_b1f.s b/res/field/scripts/scripts_oreburgh_gate_b1f.s index f0688f367d..2b63685124 100644 --- a/res/field/scripts/scripts_oreburgh_gate_b1f.s +++ b/res/field/scripts/scripts_oreburgh_gate_b1f.s @@ -6,7 +6,7 @@ ScriptEntryEnd OreburghGateB1F_CyclistF: - NPCMessage OreburghGateB1F_Text_DoYouSeeThoseBumpsOnTheGround + NPCMessage OreburghGateB1F_Text_DoYouSeeThoseBumps End .balign 4, 0 diff --git a/res/field/scripts/scripts_oreburgh_mine_b1f.s b/res/field/scripts/scripts_oreburgh_mine_b1f.s index a61f647e7b..c87eadec6b 100644 --- a/res/field/scripts/scripts_oreburgh_mine_b1f.s +++ b/res/field/scripts/scripts_oreburgh_mine_b1f.s @@ -20,11 +20,11 @@ OreburghMineB1F_ShowHiker: Return OreburghMineB1F_Worker: - NPCMessage OreburghMineB1F_Text_EveryoneThatWorksInTheCoalMineKeepsTheirOwnPokemonWithThem + NPCMessage OreburghMineB1F_Text_EveryoneKeepsTheirOwnPokemon End OreburghMineB1F_Twin: - NPCMessage OreburghMineB1F_Text_IFoundWhatIThoughtWereSomeRocksThenTheyStartedMoving + NPCMessage OreburghMineB1F_Text_SomeRocksStartedMoving End OreburghMineB1F_Hiker: @@ -32,16 +32,16 @@ OreburghMineB1F_Hiker: LockAll FacePlayer GoToIfSet FLAG_COULDNT_RECEIVE_OREBURGH_MINE_B1F_FLAME_PLATE, OreburghMineB1F_TryGiveFlamePlateAgain - Message OreburghMineB1F_Text_IFoundSomethingVeryInterestingSoonAfterArrivalYouMayHaveItIfYoudLike + Message OreburghMineB1F_Text_IFoundSomethingInteresting GoTo OreburghMineB1F_TryGiveFlamePlate End OreburghMineB1F_TryGiveFlamePlate: SetVar VAR_0x8004, ITEM_FLAME_PLATE SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, OreburghMineB1F_OhYouHaveAnOveradundanceOfThings + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, OreburghMineB1F_YouHaveAnOveradundance Common_GiveItemQuantity - Message OreburghMineB1F_Text_ImToldThatPlateWasCreatedAtTheSameTimeAsSinnoh + Message OreburghMineB1F_Text_CreatedAtSameTimeAsSinnoh CloseMessage GetPlayerMapPos VAR_0x8004, VAR_0x8005 GoToIfEq VAR_0x8005, 3, OreburghMineB1F_HikerLeaveZ3 @@ -74,9 +74,9 @@ OreburghMineB1F_RemoveHiker: ReleaseAll End -OreburghMineB1F_OhYouHaveAnOveradundanceOfThings: +OreburghMineB1F_YouHaveAnOveradundance: SetFlag FLAG_COULDNT_RECEIVE_OREBURGH_MINE_B1F_FLAME_PLATE - Message OreburghMineB1F_Text_OhYouHaveAnOveradundanceOfThings + Message OreburghMineB1F_Text_YouHaveAnOveradundance GoTo OreburghMineB1F_HikerEnd End @@ -87,7 +87,7 @@ OreburghMineB1F_HikerEnd: End OreburghMineB1F_TryGiveFlamePlateAgain: - Message OreburghMineB1F_Text_AboutThatVeryInterestingThingIFoundYouMayHaveItIfYoudLike + Message OreburghMineB1F_Text_YouMayHaveItIfYoudLike GoTo OreburghMineB1F_TryGiveFlamePlate End diff --git a/res/field/scripts/scripts_oreburgh_mine_b2f.s b/res/field/scripts/scripts_oreburgh_mine_b2f.s index 3fc283b90e..4ce011e7cf 100644 --- a/res/field/scripts/scripts_oreburgh_mine_b2f.s +++ b/res/field/scripts/scripts_oreburgh_mine_b2f.s @@ -27,7 +27,7 @@ OreburghMineB2F_RoarkTurnBackEast: GoTo OreburghMineB2F_RoarkUseRockSmash OreburghMineB2F_RoarkUseRockSmash: - Message OreburghMineB2F_Text_OKStandBackAndWatchThis + Message OreburghMineB2F_Text_StandBackAndWatch CloseMessage StartDestroyObstacleAnimation 2, VAR_0x8005 WaitTime 10, VAR_RESULT @@ -36,12 +36,12 @@ OreburghMineB2F_WaitRockSmash: WaitTime 1, VAR_RESULT GoToIfEq VAR_0x8005, 0, OreburghMineB2F_WaitRockSmash FacePlayer - Message OreburghMineB2F_Text_FallenBouldersNeedToBeSmashedSoTheyreOutOfTheWay + Message OreburghMineB2F_Text_BouldersNeedToBeSmashed CloseMessage GoTo OreburghMineB2F_RoarkLeave OreburghMineB2F_Unused2: - ApplyMovement 0, OreburghMineB2F_Movement_Unused + ApplyMovement LOCALID_ROARK, OreburghMineB2F_Movement_Unused ApplyMovement LOCALID_PLAYER, OreburghMineB2F_Movement_Unused3 WaitMovement GoTo OreburghMineB2F_RemoveRoark @@ -90,17 +90,17 @@ OreburghMineB2F_Movement_Unused3: EndMovement OreburghMineB2F_Machop1: - PokemonCryAndMessage SPECIES_MACHOP, OreburghMineB2F_Text_MachopMaaacho + PokemonCryAndMessage SPECIES_MACHOP, OreburghMineB2F_Text_MachopCryMaaacho End OreburghMineB2F_Machop3: - PokemonCryAndMessage SPECIES_MACHOP, OreburghMineB2F_Text_MachopChopChop + PokemonCryAndMessage SPECIES_MACHOP, OreburghMineB2F_Text_MachopCryChopChop End OreburghMineB2F_Machop2: - PokemonCryAndMessage SPECIES_MACHOP, OreburghMineB2F_Text_MachopChopmacho + PokemonCryAndMessage SPECIES_MACHOP, OreburghMineB2F_Text_MachopCryChopmacho End OreburghMineB2F_Worker: - NPCMessage OreburghMineB2F_Text_IMetTheseMachopOnRoute207 + NPCMessage OreburghMineB2F_Text_IMetMachopOnRoute207 End diff --git a/res/field/scripts/scripts_pal_park.s b/res/field/scripts/scripts_pal_park.s index c2ab251b3e..3ef5e92eed 100644 --- a/res/field/scripts/scripts_pal_park.s +++ b/res/field/scripts/scripts_pal_park.s @@ -152,7 +152,7 @@ PalPark_ClearFlagAndWarpOut: ClearInCatchingShowFlag FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_PAL_PARK_LOBBY, 0, 7, 7, DIR_SOUTH + Warp MAP_HEADER_PAL_PARK_LOBBY, 7, 7, DIR_SOUTH FadeScreenIn WaitFadeScreen Return diff --git a/res/field/scripts/scripts_pal_park_lobby.s b/res/field/scripts/scripts_pal_park_lobby.s index d626fc60ed..fa8e1220f2 100644 --- a/res/field/scripts/scripts_pal_park_lobby.s +++ b/res/field/scripts/scripts_pal_park_lobby.s @@ -163,7 +163,7 @@ PalParkLobby_WalkInAndWarp: PlaySE SEQ_SE_DP_KAIDAN2 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_PAL_PARK, 0, 24, 47, DIR_NORTH + Warp MAP_HEADER_PAL_PARK, 24, 47, DIR_NORTH FadeScreenIn WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_pastoria_city_gym.s b/res/field/scripts/scripts_pastoria_city_gym.s index ca29eeb85b..49ca6edb09 100644 --- a/res/field/scripts/scripts_pastoria_city_gym.s +++ b/res/field/scripts/scripts_pastoria_city_gym.s @@ -44,7 +44,7 @@ PastoriaGym_Wake: LockAll FacePlayer GoToIfBadgeAcquired BADGE_ID_FEN, PastoriaGym_WakeAlreadyHaveFenBadge - CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_PASTORIA_CITY_GYM, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_PASTORIA_CITY_GYM Message PastoriaGym_Text_WakeIntro CloseMessage StartTrainerBattle TRAINER_LEADER_WAKE @@ -66,7 +66,7 @@ PastoriaGym_Wake: SetVar VAR_PASTORIA_STATE, 3 SetFlag FLAG_HIDE_PASTORIA_CITY_GRUNT_M SetFlag FLAG_BLOCK_PASTORIA_CITY_CROAGUNK_EVENT - CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_PASTORIA_CITY_GYM, TRAINER_LEADER_WAKE, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_PASTORIA_CITY_GYM, TRAINER_LEADER_WAKE Message PastoriaGym_Text_WakeExplainFenBadge GoTo PastoriaGym_WakeTryGiveTm55 End diff --git a/res/field/scripts/scripts_pastoria_city_observatory_gate_1f.s b/res/field/scripts/scripts_pastoria_city_observatory_gate_1f.s index a0096d805a..cbb477d6ec 100644 --- a/res/field/scripts/scripts_pastoria_city_observatory_gate_1f.s +++ b/res/field/scripts/scripts_pastoria_city_observatory_gate_1f.s @@ -70,7 +70,7 @@ PastoriaCityObservatoryGate1F_StartSafariGame: PlaySE SEQ_SE_DP_KAIDAN2 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_GREAT_MARSH_6, 0, 68, 116, DIR_NORTH + Warp MAP_HEADER_GREAT_MARSH_6, 68, 116, DIR_NORTH FadeScreenIn WaitFadeScreen End @@ -179,7 +179,7 @@ PastoriaCityObservatoryGate1F_ReturnToGreatMarsh: WaitMovement FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_GREAT_MARSH_6, 0, 68, 116, DIR_NORTH + Warp MAP_HEADER_GREAT_MARSH_6, 68, 116, DIR_NORTH FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_pokemon_center_b1f_common.s b/res/field/scripts/scripts_pokemon_center_b1f_common.s index d303c2fdae..2ce9bb1106 100644 --- a/res/field/scripts/scripts_pokemon_center_b1f_common.s +++ b/res/field/scripts/scripts_pokemon_center_b1f_common.s @@ -410,7 +410,7 @@ PokemonCenterB1FCommon_GoToWiFiPlaza: SetVar VAR_MAP_LOCAL_3, 0 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_WIFI_PLAZA_ENTRANCE, 0, 20, 11, DIR_NORTH + Warp MAP_HEADER_WIFI_PLAZA_ENTRANCE, 20, 11, DIR_NORTH FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_pokemon_center_daily_trainers.s b/res/field/scripts/scripts_pokemon_center_daily_trainers.s index 8bdbd628ff..fdad79f5c9 100644 --- a/res/field/scripts/scripts_pokemon_center_daily_trainers.s +++ b/res/field/scripts/scripts_pokemon_center_daily_trainers.s @@ -340,7 +340,7 @@ PokemonCenterDailyTrainers_GraceIntroMessageOreburgh: Return PokemonCenterDailyTrainers_GraceIntroMessagePastoria: - Message PokemonCenterDailyTrainers_Text_GracePastiora_Intro + Message PokemonCenterDailyTrainers_Text_GracePastoria_Intro Return PokemonCenterDailyTrainers_GraceIntroMessageSnowpoint: @@ -485,7 +485,7 @@ PokemonCenterDailyTrainers_GraceBattleAcceptedMessageOreburgh: Return PokemonCenterDailyTrainers_GraceBattleAcceptedMessagePastoria: - Message PokemonCenterDailyTrainers_Text_GracePastiora_BattleAccepted + Message PokemonCenterDailyTrainers_Text_GracePastoria_BattleAccepted Return PokemonCenterDailyTrainers_GraceBattleAcceptedMessageSnowpoint: @@ -551,7 +551,7 @@ PokemonCenterDailyTrainers_LeeBattleAcceptedHearthome: Return PokemonCenterDailyTrainers_LeeBattleAcceptedPastoria: - Message PokemonCenterDailyTrainers_Text_LeePastiora_BattleAccepted + Message PokemonCenterDailyTrainers_Text_LeePastoria_BattleAccepted Return PokemonCenterDailyTrainers_LeeBattleAcceptedCelestic: @@ -623,7 +623,7 @@ PokemonCenterDailyTrainers_ArturoBattleAcceptedCanalave: Return PokemonCenterDailyTrainers_ArturoBattleAcceptedPastoria: - Message PokemonCenterDailyTrainers_Text_ArturoPastiora_BattleAccepted + Message PokemonCenterDailyTrainers_Text_ArturoPastoria_BattleAccepted Return PokemonCenterDailyTrainers_ArturoBattleAcceptedSunyshore: @@ -642,7 +642,7 @@ PokemonCenterDailyTrainers_GraceBattleDeclinedOreburgh: Return PokemonCenterDailyTrainers_GraceBattleDeclinedPastoria: - Message PokemonCenterDailyTrainers_Text_GracePastiora_BattleDeclined + Message PokemonCenterDailyTrainers_Text_GracePastoria_BattleDeclined Return PokemonCenterDailyTrainers_GraceBattleDeclinedSnowpoint: @@ -701,7 +701,7 @@ PokemonCenterDailyTrainers_LeeBattleDeclinedHearthome: Return PokemonCenterDailyTrainers_LeeBattleDeclinedPastoria: - Message PokemonCenterDailyTrainers_Text_LeePastiora_BattleDeclined + Message PokemonCenterDailyTrainers_Text_LeePastoria_BattleDeclined Return PokemonCenterDailyTrainers_LeeBattleDeclinedCelestic: @@ -767,7 +767,7 @@ PokemonCenterDailyTrainers_ArturoBattleDeclinedCanalave: Return PokemonCenterDailyTrainers_ArturoBattleDeclinedPastoria: - Message PokemonCenterDailyTrainers_Text_ArturoPastiora_BattleDeclined + Message PokemonCenterDailyTrainers_Text_ArturoPastoria_BattleDeclined Return PokemonCenterDailyTrainers_ArturoBattleDeclinedSunyshore: @@ -787,7 +787,7 @@ PokemonCenterDailyTrainers_GracePostBattleMessageOreburgh: Return PokemonCenterDailyTrainers_GracePostBattleMessagePastoria: - Message PokemonCenterDailyTrainers_Text_GracePastiora_PostBattle + Message PokemonCenterDailyTrainers_Text_GracePastoria_PostBattle Return PokemonCenterDailyTrainers_GracePostBattleMessageSnowpoint: @@ -853,7 +853,7 @@ PokemonCenterDailyTrainers_LeePostBattleMessageHearthome: Return PokemonCenterDailyTrainers_LeePostBattleMessagePastoria: - Message PokemonCenterDailyTrainers_Text_LeePastiora_PostBattle + Message PokemonCenterDailyTrainers_Text_LeePastoria_PostBattle Return PokemonCenterDailyTrainers_LeePostBattleMessageCelestic: @@ -925,7 +925,7 @@ PokemonCenterDailyTrainers_ArturoPostBattleMessageCanalave: Return PokemonCenterDailyTrainers_ArturoPostBattleMessagePastoria: - Message PokemonCenterDailyTrainers_Text_ArturoPastiora_PostBattle + Message PokemonCenterDailyTrainers_Text_ArturoPastoria_PostBattle Return PokemonCenterDailyTrainers_ArturoPostBattleMessageSunyshore: diff --git a/res/field/scripts/scripts_pokemon_league_aaron_room.s b/res/field/scripts/scripts_pokemon_league_aaron_room.s index 1ee3b0c0ca..e3744fc37c 100644 --- a/res/field/scripts/scripts_pokemon_league_aaron_room.s +++ b/res/field/scripts/scripts_pokemon_league_aaron_room.s @@ -39,11 +39,11 @@ PokemonLeagueAaronRoom_StartAaronRematchBattle: Return PokemonLeagueAaronRoom_CreateJournalEventDefeatedAaron: - CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_AARON, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_AARON Return PokemonLeagueAaronRoom_CreateJournalEventDefeatedRematchAaron: - CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_AARON_REMATCH, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_AARON_REMATCH Return PokemonLeagueAaronRoom_BlackOut: diff --git a/res/field/scripts/scripts_pokemon_league_bertha_room.s b/res/field/scripts/scripts_pokemon_league_bertha_room.s index 6168df4292..90fa977abd 100644 --- a/res/field/scripts/scripts_pokemon_league_bertha_room.s +++ b/res/field/scripts/scripts_pokemon_league_bertha_room.s @@ -39,11 +39,11 @@ PokemonLeagueBerthaRoom_StartBerthaRematchBattle: Return PokemonLeagueBerthaRoom_CreateJournalEventDefeatedBertha: - CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_BERTHA, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_BERTHA Return PokemonLeagueBerthaRoom_CreateJournalEventDefeatedRematchBertha: - CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_BERTHA_REMATCH, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_BERTHA_REMATCH Return PokemonLeagueBerthaRoom_BlackOut: diff --git a/res/field/scripts/scripts_pokemon_league_champion_room.s b/res/field/scripts/scripts_pokemon_league_champion_room.s index 0b735bda19..213121cd79 100644 --- a/res/field/scripts/scripts_pokemon_league_champion_room.s +++ b/res/field/scripts/scripts_pokemon_league_champion_room.s @@ -45,7 +45,7 @@ PokemonLeagueChampionRoom_OnFrame: PlaySE SEQ_SE_DP_KAIDAN2 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_POKEMON_LEAGUE_HALLWAY_TO_HALL_OF_FAME, 0, 5, 23, DIR_NORTH + Warp MAP_HEADER_POKEMON_LEAGUE_HALLWAY_TO_HALL_OF_FAME, 5, 23, DIR_NORTH FadeScreenIn WaitFadeScreen ReleaseAll @@ -68,11 +68,11 @@ PokemonLeagueChampionRoom_StartCynthiaRematchBattle: Return PokemonLeagueChampionRoom_CreateJournalEventDefeatedCynthia: - CreateJournalEvent LOCATION_EVENT_BEAT_CHAMPION, TRAINER_CHAMPION_CYNTHIA, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_CHAMPION, TRAINER_CHAMPION_CYNTHIA Return PokemonLeagueChampionRoom_CreateJournalEventDefeatedRematchCynthia: - CreateJournalEvent LOCATION_EVENT_BEAT_CHAMPION, TRAINER_CHAMPION_CYNTHIA_REMATCH, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_CHAMPION, TRAINER_CHAMPION_CYNTHIA_REMATCH Return PokemonLeagueChampionRoom_BlackOut: diff --git a/res/field/scripts/scripts_pokemon_league_flint_room.s b/res/field/scripts/scripts_pokemon_league_flint_room.s index 57e42d2b63..771967c458 100644 --- a/res/field/scripts/scripts_pokemon_league_flint_room.s +++ b/res/field/scripts/scripts_pokemon_league_flint_room.s @@ -41,11 +41,11 @@ PokemonLeagueFlintRoom_StartFlintRematchBattle: Return PokemonLeagueFlintRoom_CreateJournalEventDefeatedFlint: - CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_FLINT, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_FLINT Return PokemonLeagueFlintRoom_CreateJournalEventDefeatedRematchFlint: - CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_FLINT_REMATCH, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_FLINT_REMATCH Return PokemonLeagueFlintRoom_BlackOut: diff --git a/res/field/scripts/scripts_pokemon_league_hallway_to_hall_of_fame.s b/res/field/scripts/scripts_pokemon_league_hallway_to_hall_of_fame.s index a19cd79b5d..c266506b14 100644 --- a/res/field/scripts/scripts_pokemon_league_hallway_to_hall_of_fame.s +++ b/res/field/scripts/scripts_pokemon_league_hallway_to_hall_of_fame.s @@ -64,7 +64,7 @@ PokemonLeagueHallwayToHallOfFame_EnterHallOfFameRoom: PlaySE SEQ_SE_DP_KAIDAN2 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_POKEMON_LEAGUE_HALL_OF_FAME, 0, 8, 15, DIR_NORTH + Warp MAP_HEADER_POKEMON_LEAGUE_HALL_OF_FAME, 8, 15, DIR_NORTH FadeScreenIn WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_pokemon_league_lucian_room.s b/res/field/scripts/scripts_pokemon_league_lucian_room.s index b8c3c5ef73..228636ee23 100644 --- a/res/field/scripts/scripts_pokemon_league_lucian_room.s +++ b/res/field/scripts/scripts_pokemon_league_lucian_room.s @@ -39,11 +39,11 @@ PokemonLeagueLucianRoom_StartLucianRematchBattle: Return PokemonLeagueLucianRoom_CreateJournalEventDefeatedLucian: - CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_LUCIAN, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_LUCIAN Return PokemonLeagueLucianRoom_CreateJournalEventDefeatedRematchLucian: - CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_LUCIAN_REMATCH, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_ELITE_FOUR_MEMBER, TRAINER_ELITE_FOUR_LUCIAN_REMATCH Return PokemonLeagueLucianRoom_BlackOut: diff --git a/res/field/scripts/scripts_resort_area.s b/res/field/scripts/scripts_resort_area.s index 1d0022b355..2bcaf9e343 100644 --- a/res/field/scripts/scripts_resort_area.s +++ b/res/field/scripts/scripts_resort_area.s @@ -135,7 +135,7 @@ ResortArea_CoordEvent_SchoolKidM: SetVar VAR_RESORT_VILLA_VISITOR, VILLA_VISITOR_NONE FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_VILLA, 0, 10, 6, DIR_WEST + Warp MAP_HEADER_VILLA, 10, 6, DIR_WEST FadeScreenIn WaitFadeScreen End @@ -297,7 +297,7 @@ ResortArea_ProfRowan: SetFlag FLAG_VILLA_VISITOR_INSIDE FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_VILLA, 0, 11, 11, DIR_NORTH + Warp MAP_HEADER_VILLA, 11, 11, DIR_NORTH FadeScreenIn WaitFadeScreen End @@ -327,7 +327,7 @@ ResortArea_Roark: SetFlag FLAG_VILLA_VISITOR_INSIDE FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_VILLA, 0, 11, 11, DIR_NORTH + Warp MAP_HEADER_VILLA, 11, 11, DIR_NORTH FadeScreenIn WaitFadeScreen End @@ -351,7 +351,7 @@ ResortArea_Gardenia: SetFlag FLAG_VILLA_VISITOR_INSIDE FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_VILLA, 0, 11, 11, DIR_NORTH + Warp MAP_HEADER_VILLA, 11, 11, DIR_NORTH FadeScreenIn WaitFadeScreen End @@ -375,7 +375,7 @@ ResortArea_Maylene: SetFlag FLAG_VILLA_VISITOR_INSIDE FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_VILLA, 0, 11, 11, DIR_NORTH + Warp MAP_HEADER_VILLA, 11, 11, DIR_NORTH FadeScreenIn WaitFadeScreen End @@ -399,7 +399,7 @@ ResortArea_Byron: SetFlag FLAG_VILLA_VISITOR_INSIDE FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_VILLA, 0, 11, 11, DIR_NORTH + Warp MAP_HEADER_VILLA, 11, 11, DIR_NORTH FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s b/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s index 14241c88d3..103b10cbbf 100644 --- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s +++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s @@ -44,7 +44,7 @@ ResortAreaRibbonSyndicate1F_DenyEntry: WaitTime 20, VAR_RESULT FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_RESORT_AREA, 0, 824, 454, DIR_SOUTH + Warp MAP_HEADER_RESORT_AREA, 824, 454, DIR_SOUTH FadeScreenIn WaitFadeScreen ReleaseAll diff --git a/res/field/scripts/scripts_restaurant.s b/res/field/scripts/scripts_restaurant.s index 9f7438e145..07d9e52e44 100644 --- a/res/field/scripts/scripts_restaurant.s +++ b/res/field/scripts/scripts_restaurant.s @@ -174,7 +174,7 @@ Restaurant_OnFrame_Closed: ReleaseAll FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_VALOR_LAKEFRONT, 0, 706, 791, DIR_SOUTH + Warp MAP_HEADER_VALOR_LAKEFRONT, 706, 791, DIR_SOUTH FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_rock_peak_ruins.s b/res/field/scripts/scripts_rock_peak_ruins.s index 813d9340ff..7ef092f98a 100644 --- a/res/field/scripts/scripts_rock_peak_ruins.s +++ b/res/field/scripts/scripts_rock_peak_ruins.s @@ -54,13 +54,13 @@ RockPeakRuins_EncounterRegirock: End RockPeakRuins_CaughtRegirockStatueStoppedEmanatingPower: - Message RockPeakRuins_Text_ThePokemonStatueHasStoppedEmanatingPower + Message RockPeakRuins_Text_StatueStoppedEmanatingPower GoTo RockPeakRuins_StatueEnd End RockPeakRuins_DidNotCatchRegirockStatueStoppedEmanatingPower: SetVar VAR_ROCK_PEAK_RUINS_STATE, RUINS_STATE_DID_NOT_CATCH_REGI - Message RockPeakRuins_Text_ThePokemonStatueHasStoppedEmanatingPower + Message RockPeakRuins_Text_StatueStoppedEmanatingPower GoTo RockPeakRuins_StatueEnd End diff --git a/res/field/scripts/scripts_rotoms_room.s b/res/field/scripts/scripts_rotoms_room.s index a11964c227..b482af2d9a 100644 --- a/res/field/scripts/scripts_rotoms_room.s +++ b/res/field/scripts/scripts_rotoms_room.s @@ -173,7 +173,7 @@ RotomsRoom_RecallRotom: RotomsRoom_WarpInPlace: GetPlayerMapPos VAR_0x8006, VAR_0x8007 GetPlayerDir VAR_RESULT - Warp MAP_HEADER_ROTOMS_ROOM, 0, VAR_0x8006, VAR_0x8007, VAR_RESULT + Warp MAP_HEADER_ROTOMS_ROOM, VAR_0x8006, VAR_0x8007, VAR_RESULT FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_route_201.s b/res/field/scripts/scripts_route_201.s index 6bc12a905d..3617b639d5 100644 --- a/res/field/scripts/scripts_route_201.s +++ b/res/field/scripts/scripts_route_201.s @@ -17,7 +17,7 @@ ScriptEntry Route201_Briefcase ScriptEntry Route201_CoordEvent_FollowingRivalStopPlayerEast ScriptEntry Route201_ProfRowan - ScriptEntry Route201_CoordEvent_LetsCatchThatLegendaryPokemon + ScriptEntry Route201_CoordEvent_LetsCatchThatLegendary ScriptEntryEnd Route201_OnTransition: @@ -404,7 +404,7 @@ Route201_EndChooseStarterSequenceAndWarpHome: FadeScreenOut FADE_SCREEN_SPEED_MEDIUM WaitFadeScreen HealParty - Warp MAP_HEADER_TWINLEAF_TOWN_PLAYER_HOUSE_1F, 0, 2, 6, DIR_NORTH + Warp MAP_HEADER_TWINLEAF_TOWN_PLAYER_HOUSE_1F, 2, 6, DIR_NORTH FadeScreenIn FADE_SCREEN_SPEED_MEDIUM WaitFadeScreen ReleaseAll @@ -1045,7 +1045,7 @@ _0CF1: WaitTime 30, VAR_RESULT FadeScreenOut FADE_SCREEN_SPEED_MEDIUM WaitFadeScreen - Warp MAP_HEADER_TWINLEAF_TOWN_PLAYER_HOUSE_1F, 0, 2, 6, DIR_NORTH + Warp MAP_HEADER_TWINLEAF_TOWN_PLAYER_HOUSE_1F, 2, 6, DIR_NORTH FadeScreenIn FADE_SCREEN_SPEED_MEDIUM WaitFadeScreen ReleaseAll @@ -1190,13 +1190,13 @@ Route201_ProfRowan: NPCMessage Route201_Text_RowanGoOnChooseAPokemon End -Route201_CoordEvent_LetsCatchThatLegendaryPokemon: +Route201_CoordEvent_LetsCatchThatLegendary: LockAll ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalNoticePlayer WaitMovement BufferRivalName 0 BufferPlayerName 1 - Message Route201_Text_LetsCatchThatLegendaryPokemon + Message Route201_Text_LetsCatchThatLegendary CloseMessage GetPlayerMapPos VAR_0x8004, VAR_0x8005 GoToIfEq VAR_0x8004, 110, Route201_RivalRunToPlayerX110 diff --git a/res/field/scripts/scripts_route_224.s b/res/field/scripts/scripts_route_224.s index da147d7374..788e1f1722 100644 --- a/res/field/scripts/scripts_route_224.s +++ b/res/field/scripts/scripts_route_224.s @@ -102,7 +102,7 @@ Route224_ExpressThanks: WaitFadeScreen EnableHiddenLocation HIDDEN_LOCATION_SEABREAK_PATH SetPlayerVolume SOUND_VOLUME_MIN - Warp MAP_HEADER_ROUTE_224, 0, 908, 492, DIR_NORTH + Warp MAP_HEADER_ROUTE_224, 908, 492, DIR_NORTH WaitTime 15, VAR_RESULT FadeScreenIn FADE_SCREEN_SPEED_SLOW, COLOR_WHITE WaitFadeScreen diff --git a/res/field/scripts/scripts_safari_game.s b/res/field/scripts/scripts_safari_game.s index d478ab2a64..678edeea63 100644 --- a/res/field/scripts/scripts_safari_game.s +++ b/res/field/scripts/scripts_safari_game.s @@ -41,7 +41,7 @@ SafariGame_OutOfSteps: CloseMessage FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_1F, 0, 5, 2, DIR_SOUTH + Warp MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_1F, 5, 2, DIR_SOUTH FadeScreenIn WaitFadeScreen SetVar VAR_SAFARI_GAME_STATE, 2 @@ -64,7 +64,7 @@ SafariGame_OutOfSafariBalls_Field: CloseMessage FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_1F, 0, 5, 2, DIR_SOUTH + Warp MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_1F, 5, 2, DIR_SOUTH FadeScreenIn WaitFadeScreen SetVar VAR_SAFARI_GAME_STATE, 2 @@ -80,7 +80,7 @@ SafariGame_OutOfRoomForPokemon: CloseMessage FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_1F, 0, 5, 2, DIR_SOUTH + Warp MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_1F, 5, 2, DIR_SOUTH FadeScreenIn WaitFadeScreen SetVar VAR_SAFARI_GAME_STATE, 2 @@ -96,7 +96,7 @@ SafariGame_Retire: GoToIfNe VAR_RESULT, MENU_YES, SafariGame_NoRetire FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_1F, 0, 5, 2, DIR_SOUTH + Warp MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_1F, 5, 2, DIR_SOUTH FadeScreenIn WaitFadeScreen SetVar VAR_SAFARI_GAME_STATE, 2 diff --git a/res/field/scripts/scripts_sandgem_town.s b/res/field/scripts/scripts_sandgem_town.s index fa212d1dcc..7bcf4ba850 100644 --- a/res/field/scripts/scripts_sandgem_town.s +++ b/res/field/scripts/scripts_sandgem_town.s @@ -215,7 +215,7 @@ SandgemTown_EnterPokemonResearchLab: SetVar VAR_SANDGEM_TOWN_STATE, 1 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_SANDGEM_TOWN_POKEMON_RESEARCH_LAB, 0, 7, 15, DIR_NORTH + Warp MAP_HEADER_SANDGEM_TOWN_POKEMON_RESEARCH_LAB, 7, 15, DIR_NORTH FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_snowpoint_city_gym.s b/res/field/scripts/scripts_snowpoint_city_gym.s index 345b9e33b6..42ae8e5d39 100644 --- a/res/field/scripts/scripts_snowpoint_city_gym.s +++ b/res/field/scripts/scripts_snowpoint_city_gym.s @@ -21,7 +21,7 @@ SnowpointGym_Candice: LockAll FacePlayer GoToIfBadgeAcquired BADGE_ID_ICICLE, SnowpointGym_CandiceAfterBadge - CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_SNOWPOINT_CITY_GYM, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_SNOWPOINT_CITY_GYM Message SnowpointGym_Text_CandiceIntro CloseMessage StartTrainerBattle TRAINER_LEADER_CANDICE @@ -40,7 +40,7 @@ SnowpointGym_Candice: SetTrainerFlag TRAINER_ACE_TRAINER_SAVANNAH SetTrainerFlag TRAINER_ACE_TRAINER_ALICIA SetTrainerFlag TRAINER_ACE_TRAINER_BRENNA - CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_SNOWPOINT_CITY_GYM, TRAINER_LEADER_CANDICE, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_SNOWPOINT_CITY_GYM, TRAINER_LEADER_CANDICE SetFlag FLAG_HIDE_VEILSTONE_GALACTIC_GRUNTS Message SnowpointGym_Text_CandiceExplainIcicleBadge GoTo SnowpointGym_CandiceTryGiveTM72 diff --git a/res/field/scripts/scripts_spear_pillar.s b/res/field/scripts/scripts_spear_pillar.s index 8761010761..d63b1987b4 100644 --- a/res/field/scripts/scripts_spear_pillar.s +++ b/res/field/scripts/scripts_spear_pillar.s @@ -394,7 +394,7 @@ SpearPillar_WaitThenWarpToSpearPillarDistorted: SetSpeciesSeen SPECIES_DIALGA SetSpeciesSeen SPECIES_PALKIA RestoreCamera - Warp MAP_HEADER_SPEAR_PILLAR_DISTORTED, 0, 30, 30, DIR_NORTH + Warp MAP_HEADER_SPEAR_PILLAR_DISTORTED, 30, 30, DIR_NORTH End .balign 4, 0 diff --git a/res/field/scripts/scripts_spear_pillar_distorted.s b/res/field/scripts/scripts_spear_pillar_distorted.s index bdf53d172c..ff8a0f9c8e 100644 --- a/res/field/scripts/scripts_spear_pillar_distorted.s +++ b/res/field/scripts/scripts_spear_pillar_distorted.s @@ -69,7 +69,7 @@ SpearPillarDistorted_EnterDistortionWorld: DoDWWarp ReturnToField SetPartyGiratinaForm GIRATINA_FORM_ORIGIN - Warp MAP_HEADER_DISTORTION_WORLD_1F, 0, 55, 40, DIR_SOUTH + Warp MAP_HEADER_DISTORTION_WORLD_1F, 55, 40, DIR_SOUTH FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_stark_mountain_room_3.s b/res/field/scripts/scripts_stark_mountain_room_3.s index 7ed20a007c..d25205fcad 100644 --- a/res/field/scripts/scripts_stark_mountain_room_3.s +++ b/res/field/scripts/scripts_stark_mountain_room_3.s @@ -236,7 +236,7 @@ StarkMountainRoom3_OnFrame_Charon: ClearFlag FLAG_HIDE_STARK_MOUNTAIN_OUTSIDE_LOOKER FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_STARK_MOUNTAIN_OUTSIDE, 0, 751, 233, DIR_NORTH + Warp MAP_HEADER_STARK_MOUNTAIN_OUTSIDE, 751, 233, DIR_NORTH FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_sunyshore_city_gym_room_3.s b/res/field/scripts/scripts_sunyshore_city_gym_room_3.s index 40de00b0f3..0392126013 100644 --- a/res/field/scripts/scripts_sunyshore_city_gym_room_3.s +++ b/res/field/scripts/scripts_sunyshore_city_gym_room_3.s @@ -27,7 +27,7 @@ SunyshoreGymRoom3_Volkner: LockAll FacePlayer GoToIfBadgeAcquired BADGE_ID_BEACON, SunyshoreGymRoom3_VolknerAlreadyHaveBeaconBadge - CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_3, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_3 Message SunyshoreGymRoom3_Text_VolknerIntro CloseMessage StartTrainerBattle TRAINER_LEADER_VOLKNER @@ -50,7 +50,7 @@ SunyshoreGymRoom3_Volkner: SetTrainerFlag TRAINER_SCHOOL_KID_TIERA SetVar VAR_SUNYSHORE_STATE, 2 // BUG: TRAINER_LEADER_ROARK should be TRAINER_LEADER_VOLKNER - CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_3, TRAINER_LEADER_ROARK, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_3, TRAINER_LEADER_ROARK Message SunyshoreGymRoom3_Text_VolknerExplainBeaconBadge GoTo SunyshoreGymRoom3_VolknerTryGiveTM57 diff --git a/res/field/scripts/scripts_sunyshore_city_northeast_house.s b/res/field/scripts/scripts_sunyshore_city_northeast_house.s index 807e67d15d..be29c18dae 100644 --- a/res/field/scripts/scripts_sunyshore_city_northeast_house.s +++ b/res/field/scripts/scripts_sunyshore_city_northeast_house.s @@ -116,7 +116,7 @@ SunyshoreCityNortheastHouse_AskSundayStory: CloseMessage FadeScreenOut WaitFadeScreen - ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8000 + ChooseCustomMessageWord VAR_RESULT, VAR_0x8000 ReturnToField FadeScreenIn WaitFadeScreen @@ -134,7 +134,7 @@ SunyshoreCityNortheastHouse_AskMondayStory: CloseMessage FadeScreenOut WaitFadeScreen - ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8000 + ChooseCustomMessageWord VAR_RESULT, VAR_0x8000 ReturnToField FadeScreenIn WaitFadeScreen @@ -152,7 +152,7 @@ SunyshoreCityNortheastHouse_AskTuesdayStory: CloseMessage FadeScreenOut WaitFadeScreen - ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8000 + ChooseCustomMessageWord VAR_RESULT, VAR_0x8000 ReturnToField FadeScreenIn WaitFadeScreen @@ -170,7 +170,7 @@ SunyshoreCityNortheastHouse_AskWednesdayStory: CloseMessage FadeScreenOut WaitFadeScreen - ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8000 + ChooseCustomMessageWord VAR_RESULT, VAR_0x8000 ReturnToField FadeScreenIn WaitFadeScreen @@ -188,7 +188,7 @@ SunyshoreCityNortheastHouse_AskThursdayStory: CloseMessage FadeScreenOut WaitFadeScreen - ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8000 + ChooseCustomMessageWord VAR_RESULT, VAR_0x8000 ReturnToField FadeScreenIn WaitFadeScreen @@ -206,7 +206,7 @@ SunyshoreCityNortheastHouse_AskFridayStory: CloseMessage FadeScreenOut WaitFadeScreen - ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8000 + ChooseCustomMessageWord VAR_RESULT, VAR_0x8000 ReturnToField FadeScreenIn WaitFadeScreen @@ -224,7 +224,7 @@ SunyshoreCityNortheastHouse_AskSaturdayStory: CloseMessage FadeScreenOut WaitFadeScreen - ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8000 + ChooseCustomMessageWord VAR_RESULT, VAR_0x8000 ReturnToField FadeScreenIn WaitFadeScreen diff --git a/res/field/scripts/scripts_turnback_cave_giratina_room.s b/res/field/scripts/scripts_turnback_cave_giratina_room.s index 44d03ac4e4..62a687075c 100644 --- a/res/field/scripts/scripts_turnback_cave_giratina_room.s +++ b/res/field/scripts/scripts_turnback_cave_giratina_room.s @@ -110,7 +110,7 @@ TurnbackCaveGiratinaRoom_GoToDistortionWorld: SetPartyGiratinaForm GIRATINA_FORM_ORIGIN FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_DISTORTION_WORLD_TURNBACK_CAVE_ROOM, 0, 116, 75, DIR_SOUTH + Warp MAP_HEADER_DISTORTION_WORLD_TURNBACK_CAVE_ROOM, 116, 75, DIR_SOUTH FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_tv_reporter_interviews.s b/res/field/scripts/scripts_tv_reporter_interviews.s index 3e9d49c786..d544aafb5b 100644 --- a/res/field/scripts/scripts_tv_reporter_interviews.s +++ b/res/field/scripts/scripts_tv_reporter_interviews.s @@ -121,7 +121,7 @@ TVReporterInterviews_DoInterview: FadeScreenOut WaitFadeScreen CloseMessage - ChooseCustomMessageWord 0, VAR_RESULT, VAR_0x8004 + ChooseCustomMessageWord VAR_RESULT, VAR_0x8004 ReturnToField FadeScreenIn WaitFadeScreen diff --git a/res/field/scripts/scripts_veilstone_city.s b/res/field/scripts/scripts_veilstone_city.s index 7e6fa8ff2a..6f5852ae6f 100644 --- a/res/field/scripts/scripts_veilstone_city.s +++ b/res/field/scripts/scripts_veilstone_city.s @@ -614,7 +614,7 @@ VeilstoneCity_WarpToWarehouse: PlaySE SEQ_SE_DP_KAIDAN2 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_VEILSTONE_CITY_GALACTIC_WAREHOUSE, 0, 8, 11, DIR_NORTH + Warp MAP_HEADER_VEILSTONE_CITY_GALACTIC_WAREHOUSE, 8, 11, DIR_NORTH FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_veilstone_city_gym.s b/res/field/scripts/scripts_veilstone_city_gym.s index 7a2b3f5694..95c0448087 100644 --- a/res/field/scripts/scripts_veilstone_city_gym.s +++ b/res/field/scripts/scripts_veilstone_city_gym.s @@ -20,7 +20,7 @@ VeilstoneGym_Maylene: LockAll FacePlayer GoToIfBadgeAcquired BADGE_ID_COBBLE, VeilstoneGym_MayleneAfterBadge - CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_VEILSTONE_CITY_GYM, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_GYM_WAS_TOO_TOUGH, MAP_HEADER_VEILSTONE_CITY_GYM Message VeilstoneGym_Text_MayleneIntro CloseMessage StartTrainerBattle TRAINER_LEADER_MAYLENE @@ -37,7 +37,7 @@ VeilstoneGym_Maylene: SetTrainerFlag TRAINER_BLACK_BELT_DARREN SetTrainerFlag TRAINER_BLACK_BELT_RAFAEL SetTrainerFlag TRAINER_BLACK_BELT_JEFFERY - CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_VEILSTONE_CITY_GYM, TRAINER_LEADER_MAYLENE, 0, 0 + CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_VEILSTONE_CITY_GYM, TRAINER_LEADER_MAYLENE SetFlag FLAG_HIDE_GAME_CORNER_LOOKER ClearFlag FLAG_HIDE_VEILSTONE_COUNTERPART SetVar VAR_VEILSTONE_WAREHOUSE_GUARDS_FIGHTABLE, TRUE diff --git a/res/field/scripts/scripts_verity_lakefront.s b/res/field/scripts/scripts_verity_lakefront.s index 9a0a695033..c661f78bd9 100644 --- a/res/field/scripts/scripts_verity_lakefront.s +++ b/res/field/scripts/scripts_verity_lakefront.s @@ -52,7 +52,7 @@ VerityLakefront_WarpToLakeValor: PlaySE SEQ_SE_DP_KAIDAN2 FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_LAKE_VERITY_LOW_WATER, 0, 46, 54, DIR_NORTH + Warp MAP_HEADER_LAKE_VERITY_LOW_WATER, 46, 54, DIR_NORTH FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_villa.s b/res/field/scripts/scripts_villa.s index 55c2feed41..1566d07413 100644 --- a/res/field/scripts/scripts_villa.s +++ b/res/field/scripts/scripts_villa.s @@ -1196,7 +1196,7 @@ Villa_WarpAndShowDeliveryGuyAndBook: ClearFlag FLAG_HIDE_VILLA_BOOK FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_VILLA, 0, 10, 6, DIR_SOUTH + Warp MAP_HEADER_VILLA, 10, 6, DIR_SOUTH FadeScreenIn WaitFadeScreen GoToIfEq VAR_0x8002, VILLA_FURNITURE_TABLE, Villa_DeliverFreeTable diff --git a/res/field/scripts/scripts_visible_items.s b/res/field/scripts/scripts_visible_items.s index 2b9fe1c525..7f9ba7a0cf 100644 --- a/res/field/scripts/scripts_visible_items.s +++ b/res/field/scripts/scripts_visible_items.s @@ -2389,7 +2389,7 @@ VisibleItems_BufferPocketNameBattleItems: End VisibleItems_MessagePlayerPutTheItemInTheItemPocket: - CreateJournalEvent LOCATION_EVENT_ITEM_WAS_OBTAINED, VAR_0x8004, 0, 0, 0 + CreateJournalEvent LOCATION_EVENT_ITEM_WAS_OBTAINED, VAR_0x8004 Message VisibleItems_Text_PlayerPutTheItemInTheItemPocket2 WaitButton SetVar VAR_RESULT, TRUE diff --git a/res/field/scripts/scripts_vista_lighthouse_elevator.s b/res/field/scripts/scripts_vista_lighthouse_elevator.s index d157ca9b50..b74c88dbb9 100644 --- a/res/field/scripts/scripts_vista_lighthouse_elevator.s +++ b/res/field/scripts/scripts_vista_lighthouse_elevator.s @@ -19,7 +19,7 @@ VistaLighthouseElevator_ElevatorUp: Call VistaLighthouseElevator_ElevatorAnimation FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_VISTA_LIGHTHOUSE, 0, 6, 10, DIR_SOUTH + Warp MAP_HEADER_VISTA_LIGHTHOUSE, 6, 10, DIR_SOUTH FadeScreenIn WaitFadeScreen End @@ -29,7 +29,7 @@ VistaLighthouseElevator_ElevatorDown: Call VistaLighthouseElevator_ElevatorAnimation FadeScreenOut WaitFadeScreen - Warp MAP_HEADER_SUNYSHORE_CITY, 0, 0x376, 0x317, DIR_SOUTH + Warp MAP_HEADER_SUNYSHORE_CITY, 0x376, 0x317, DIR_SOUTH FadeScreenIn WaitFadeScreen End diff --git a/res/field/scripts/scripts_wifi_plaza_entrance.s b/res/field/scripts/scripts_wifi_plaza_entrance.s index 822309fade..fdef22e82a 100644 --- a/res/field/scripts/scripts_wifi_plaza_entrance.s +++ b/res/field/scripts/scripts_wifi_plaza_entrance.s @@ -66,7 +66,7 @@ WifiPlazaEntrance_TakeWarpPanel: FadeScreenOut WaitFadeScreen SetVar VAR_MAP_LOCAL_3, 1 - Warp VAR_WIFI_PLAZA_RETURN_WARP_ID, 0, 5, 2, DIR_SOUTH + Warp VAR_WIFI_PLAZA_RETURN_WARP_ID, 5, 2, DIR_SOUTH WaitForTransition ScrCmd_0B3 VAR_RESULT SetVar VAR_0x8004, VAR_RESULT diff --git a/res/text/canalave_city_pokecenter_1f.json b/res/text/canalave_city_pokecenter_1f.json index 8ecbd99107..41a015b91d 100644 --- a/res/text/canalave_city_pokecenter_1f.json +++ b/res/text/canalave_city_pokecenter_1f.json @@ -39,28 +39,28 @@ ] }, { - "id": "CanalaveCityPokecenter1F_Text_LetsDoBattle", + "id": "CanalaveCityPokecenter1F_Text_ArturoIntro_Unused", "en_US": [ "Come on, let’s show off our Pokémon!\n", "Let’s do battle, kiddo!" ] }, { - "id": "CanalaveCityPokecenter1F_Text_RockInYourVeins", + "id": "CanalaveCityPokecenter1F_Text_ArturoBattleAccepted_Unused", "en_US": [ "Your spirit’s vibes...\n", "You’ve got rock in your veins!\r" ] }, { - "id": "CanalaveCityPokecenter1F_Text_MyGuitarLiesBroken", + "id": "CanalaveCityPokecenter1F_Text_ArturoBattleDeclined_Unused", "en_US": [ "My guitar...\n", "It lies broken and weeping..." ] }, { - "id": "CanalaveCityPokecenter1F_Text_PokemonAndRockNRoll", + "id": "CanalaveCityPokecenter1F_Text_ArturoPostBattle_Unused", "en_US": [ "Pokémon and rock ’n’ roll are all\n", "anyone needs to survive in this world!" diff --git a/res/text/celestic_town_pokecenter_1f.json b/res/text/celestic_town_pokecenter_1f.json index b02b5fb668..961a7e0e0a 100644 --- a/res/text/celestic_town_pokecenter_1f.json +++ b/res/text/celestic_town_pokecenter_1f.json @@ -58,7 +58,7 @@ ] }, { - "id": "CelesticTownPokecenter1F_Text_WantToBattle", + "id": "CelesticTownPokecenter1F_Text_LeeIntro_Unused", "en_US": [ "As a clown, I like to show off Pokémon\n", "that are a little out of the ordinary.\r", @@ -66,21 +66,21 @@ ] }, { - "id": "CelesticTownPokecenter1F_Text_DoSomethingFantastical", + "id": "CelesticTownPokecenter1F_Text_LeeBattleAccepted_Unused", "en_US": [ "OK, how shall we do this?\n", "Shall we do something fantastical?\r" ] }, { - "id": "CelesticTownPokecenter1F_Text_ItMakesMeLonely", + "id": "CelesticTownPokecenter1F_Text_LeeBattleDeclined_Unused", "en_US": [ "Oh, how shall I say this...?\n", "It makes me all lonely, I say..." ] }, { - "id": "CelesticTownPokecenter1F_Text_UselessTriviaCoulrophobia", + "id": "CelesticTownPokecenter1F_Text_LeePostBattle_Unused", "en_US": [ "Here’s a piece of useless trivia.\n", "Fear of clowns is also known as\f", diff --git a/res/text/eterna_city_pokecenter_1f.json b/res/text/eterna_city_pokecenter_1f.json index 8a89c8e26f..baeda9a740 100644 --- a/res/text/eterna_city_pokecenter_1f.json +++ b/res/text/eterna_city_pokecenter_1f.json @@ -78,7 +78,7 @@ ] }, { - "id": "EternaCityPokecenter1F_Text_WereLookingForATrainerWhosTravelingWithAtLeastTwoPokemon", + "id": "EternaCityPokecenter1F_Text_OliNotEnoughPokemon_Unused", "en_US": [ "Two Pokémon!\n", "That’s what we need.\r", @@ -87,28 +87,28 @@ ] }, { - "id": "EternaCityPokecenter1F_Text_OhWouldYouLikeToBattleAgainstTheBothOfUs", + "id": "EternaCityPokecenter1F_Text_OliIntro_Unused", "en_US": [ "Oh! Would you like to battle against the\n", "both of us?" ] }, { - "id": "EternaCityPokecenter1F_Text_YoureLiveOnCameraButTryToActNaturalOK", + "id": "EternaCityPokecenter1F_Text_OliBattleAccepted_Unused", "en_US": [ "You’re live on camera, but try to act\n", "natural, OK?\r" ] }, { - "id": "EternaCityPokecenter1F_Text_OKThatsHowItIsHuh", + "id": "EternaCityPokecenter1F_Text_OliBattleDeclined_Unused", "en_US": [ "OK, that’s how it is, huh.\n", "Can’t do anything about that." ] }, { - "id": "EternaCityPokecenter1F_Text_WheeWasntThatBattleSmokingHot", + "id": "EternaCityPokecenter1F_Text_OliPostBattle_Unused", "en_US": [ "Whee!\n", "Wasn’t that battle smoking hot?\r", @@ -117,7 +117,7 @@ ] }, { - "id": "EternaCityPokecenter1F_Text_OhDearYouOnlyHaveOnePokemonWithYou", + "id": "EternaCityPokecenter1F_Text_RoxyNotEnoughPokemon_Unused", "en_US": [ "Oh, dear!\n", "You only have one Pokémon with you?\r", @@ -126,28 +126,28 @@ ] }, { - "id": "EternaCityPokecenter1F_Text_GiggleCouldYouWinAgainstBothOfUs", + "id": "EternaCityPokecenter1F_Text_RoxyIntro_Unused", "en_US": [ "Giggle!\n", "Could you win against both of us?\n" ] }, { - "id": "EternaCityPokecenter1F_Text_WellThoroughlyCheckOutYourAbilitiesAsATrainer", + "id": "EternaCityPokecenter1F_Text_RoxyBattleAccepted_Unused", "en_US": [ "We’ll thoroughly check out your\n", "abilities as a Trainer!\r" ] }, { - "id": "EternaCityPokecenter1F_Text_OhYouHaventHealedYourPokemonMaybe", + "id": "EternaCityPokecenter1F_Text_RoxyBattleDeclined_Unused", "en_US": [ "Oh? You haven’t healed your Pokémon,\n", "maybe?" ] }, { - "id": "EternaCityPokecenter1F_Text_ThatWasAGoodMatch", + "id": "EternaCityPokecenter1F_Text_RoxyPostBattle_Unused", "en_US": [ "That was a good match.\r", "It adds flair and drama when many\n", diff --git a/res/text/fight_area_pokecenter_1f.json b/res/text/fight_area_pokecenter_1f.json index 8e7d307689..3422a466fa 100644 --- a/res/text/fight_area_pokecenter_1f.json +++ b/res/text/fight_area_pokecenter_1f.json @@ -28,7 +28,7 @@ ] }, { - "id": "FightAreaPokecenter1F_Text_WeNeedBattle", + "id": "FightAreaPokecenter1F_Text_KinseyIntro_Unused", "en_US": [ "We’re doing a feature on tough Trainers\n", "in the Battle Zone.\r", @@ -37,18 +37,18 @@ ] }, { - "id": "FightAreaPokecenter1F_Text_ReporterKinseysLiveInterview", + "id": "FightAreaPokecenter1F_Text_KinseyBattleAccepted_Unused", "en_US": "Reporter Kinsey’s live interview!\r" }, { - "id": "FightAreaPokecenter1F_Text_DontBeShy", + "id": "FightAreaPokecenter1F_Text_KinseyBattleDeclined_Unused", "en_US": [ "You don’t have to be shy.\n", "We can obscure your face if we have to." ] }, { - "id": "FightAreaPokecenter1F_Text_IGoAfterInverviews", + "id": "FightAreaPokecenter1F_Text_KinseyPostBattle_Unused", "en_US": [ "I go after interviews like my favorite\n", "Pokémon move--I tackle them!\r", @@ -57,28 +57,28 @@ ] }, { - "id": "FightAreaPokecenter1F_Text_WillYouLetUsBattle", + "id": "FightAreaPokecenter1F_Text_TevinIntro_Unused", "en_US": [ "Expert Trainer spotted!\n", "Will you let us battle with you?" ] }, { - "id": "FightAreaPokecenter1F_Text_YouGuysAreGreat", + "id": "FightAreaPokecenter1F_Text_TevinBattleAccepted_Unused", "en_US": [ "Great! Great!\n", "You guys are great!\r" ] }, { - "id": "FightAreaPokecenter1F_Text_HowGoodAreYou", + "id": "FightAreaPokecenter1F_Text_TevinBattleDeclined_Unused", "en_US": [ "Want to see how good you are before\n", "you go off to the Battle Frontier?" ] }, { - "id": "FightAreaPokecenter1F_Text_CombinationWillTearUp", + "id": "FightAreaPokecenter1F_Text_TevinPostBattle_Unused", "en_US": [ "The combination of you and your Pokémon\n", "will tear up the Battle Tower!" diff --git a/res/text/floaroma_meadow.json b/res/text/floaroma_meadow.json index 0884d94d03..5b1d1e9006 100644 --- a/res/text/floaroma_meadow.json +++ b/res/text/floaroma_meadow.json @@ -2,14 +2,14 @@ "key": 33827, "messages": [ { - "id": "FloaromaMeadow_Text_EnoughArguingHandOverThatSweetHoney", + "id": "FloaromaMeadow_Text_HandOverThatHoney", "en_US": [ "Grunt 1: Enough arguing!\n", "Hand over that sweet Honey!\r" ] }, { - "id": "FloaromaMeadow_Text_DoAsWeSayTeamGalacticWillHaveThatHoney", + "id": "FloaromaMeadow_Text_DoAsWeSay", "en_US": [ "Grunt 2: Do as we say!\n", "Team Galactic will have that Honey!\r", @@ -18,14 +18,14 @@ ] }, { - "id": "FloaromaMeadow_Text_HeyThisKidIsAWitnessWhatllWeDo", + "id": "FloaromaMeadow_Text_WhatllWeDo", "en_US": [ "Grunt 1: Hey! This kid is a witness!\n", "What’ll we do?\r" ] }, { - "id": "FloaromaMeadow_Text_TheSolutionsSimpleWeEnsureTheBratStaysQuiet", + "id": "FloaromaMeadow_Text_EnsureTheBratStaysQuiet", "en_US": [ "Grunt 2: We don’t need the brat\n", "running off to get help...\r", @@ -34,7 +34,7 @@ ] }, { - "id": "FloaromaMeadow_Text_ThisIsSoLameTheyreGoingToDockMyPay", + "id": "FloaromaMeadow_Text_ThisIsSoLame", "en_US": [ "Grunt 1: This is so lame...\n", "They’re going to dock my pay!\r" @@ -50,7 +50,7 @@ ] }, { - "id": "FloaromaMeadow_Text_WereDoneForHereLetsGetBackToTheValleyWindworks", + "id": "FloaromaMeadow_Text_LetsGetBackToWindworks", "en_US": [ "Grunt 1: This brat’s tough!\n", "Like, really, really tough!\r", @@ -61,7 +61,7 @@ ] }, { - "id": "FloaromaMeadow_Text_ItsAWorksKeyItMustBeForTheValleyWindworks", + "id": "FloaromaMeadow_Text_KeyMustBeForWindworks", "en_US": [ "Oh, what’s this thing?\n", "They seem to have forgotten it...\r", @@ -72,7 +72,7 @@ ] }, { - "id": "FloaromaMeadow_Text_INeedToThankYouThisSweetSweetHoneyGoOnTakeAWholeLot", + "id": "FloaromaMeadow_Text_ThankYouTakeALot", "en_US": [ "Thank you!\n", "You surely saved me.\r", @@ -88,14 +88,14 @@ ] }, { - "id": "FloaromaMeadow_Text_SlatherThatHoneyOnASweetSmellingTree", + "id": "FloaromaMeadow_Text_SlatherHoneyOnATree", "en_US": [ "Slather that Honey on a sweet-smelling\n", "tree. It might attract Pokémon." ] }, { - "id": "FloaromaMeadow_Text_WouldYouLikeToBuySomeHoneyForAttractingPokemon", + "id": "FloaromaMeadow_Text_BuySomeHoney", "en_US": [ "Would you like to buy some Honey for\n", "attracting Pokémon? Just $100 each!" @@ -106,7 +106,7 @@ "garbage": 10 }, { - "id": "FloaromaMeadow_Text_OhTooBadSeemsToMeYourBagsFull", + "id": "FloaromaMeadow_Text_YourBagsFull", "en_US": [ "Oh, too bad!\n", "Seems to me your Bag’s full.\r", @@ -115,7 +115,7 @@ ] }, { - "id": "FloaromaMeadow_Text_OopsyYouDontHaveEnoughMoney", + "id": "FloaromaMeadow_Text_NotEnoughMoney", "en_US": [ "Oopsy!\n", "You don’t have enough money." diff --git a/res/text/floaroma_meadow_house.json b/res/text/floaroma_meadow_house.json index a4ed08c121..22c3e6206b 100644 --- a/res/text/floaroma_meadow_house.json +++ b/res/text/floaroma_meadow_house.json @@ -2,7 +2,7 @@ "key": 33839, "messages": [ { - "id": "FloaromaMeadowHouse_Text_TheFlowersThatGrowInTheFieldsHereAreSpecial", + "id": "FloaromaMeadowHouse_Text_FlowersInTheFieldsAreSpecial", "en_US": [ "The flowers that grow in the fields\n", "here are special.\r", @@ -12,7 +12,7 @@ ] }, { - "id": "FloaromaMeadowHouse_Text_IfYouPutHoneyOnATreeCheckBackLaterToSeeIfItsRustlings", + "id": "FloaromaMeadowHouse_Text_RustlingTreeOftenRarePokemon", "en_US": [ "If you put Honey on a tree, check\n", "back later to see if it’s rustling.\r", diff --git a/res/text/floaroma_town.json b/res/text/floaroma_town.json index 8fb26cc642..b7df302ae4 100644 --- a/res/text/floaroma_town.json +++ b/res/text/floaroma_town.json @@ -2,7 +2,7 @@ "key": 18211, "messages": [ { - "id": "FloaromaTown_Text_ThisDoesntSeemAllThatCool", + "id": "FloaromaTown_Text_ThisDoesntSeemCool", "en_US": [ "Grunt 1: Aren’t we Team Galactic?\n", "And we’re assigned here?\r", @@ -11,7 +11,7 @@ ] }, { - "id": "FloaromaTown_Text_DontComplainThisIsAPrettyDecentAssignment", + "id": "FloaromaTown_Text_DontComplain", "en_US": [ "Grunt 2: Hey now! Don’t complain.\n", "This is a pretty decent assignment.\r", @@ -21,7 +21,7 @@ ] }, { - "id": "FloaromaTown_Text_IWantedToGetSomeFlowersFromTheFloaromaMeadow", + "id": "FloaromaTown_Text_IWantedToGetFlowers", "en_US": [ "I wanted to get some flowers from\n", "the Floaroma Meadow...\r", @@ -30,14 +30,14 @@ ] }, { - "id": "FloaromaTown_Text_ThoseGalacticGuysWentToTheMeadowPastTheseFlowersHere", + "id": "FloaromaTown_Text_GalacticGuysWentToMeadow", "en_US": [ "Those Galactic guys went to the\n", "meadow past these flowers here..." ] }, { - "id": "FloaromaTown_Text_BeingSurroundedByFlowersPutsMeInAnOddlyPleasantMood", + "id": "FloaromaTown_Text_OddlyPleasantMood", "en_US": [ "Being surrounded by flowers puts me\n", "in an oddly pleasant mood." @@ -53,7 +53,7 @@ ] }, { - "id": "FloaromaTown_Text_WelcomeToFloaromaTheTownOfFlowersFlowersAndMoreFlowers", + "id": "FloaromaTown_Text_WelcomeToFloaroma", "en_US": [ "Welcome to Floaroma, the town of\n", "flowers, flowers, and more flowers!\r", @@ -62,7 +62,7 @@ ] }, { - "id": "FloaromaTown_Text_TheBerriesYouPickCanBeUsedAsFoodForPokemon", + "id": "FloaromaTown_Text_BerriesCanBeFoodForPokemon", "en_US": [ "The Berries you pick can be used as\n", "food for Pokémon.\r", @@ -73,7 +73,7 @@ ] }, { - "id": "FloaromaTown_Text_IGotDrawnHereByTheSweetScentOfHoney", + "id": "FloaromaTown_Text_DrawnHereByHoney", "en_US": [ "I got drawn here by the sweet scent\n", "of Honey...\r", @@ -82,7 +82,7 @@ ] }, { - "id": "FloaromaTown_Text_IfYouHaveAShayminThenYouAlsoShouldHaveSomeGracideaFlowers", + "id": "FloaromaTown_Text_HaveGracideaFlowers", "en_US": [ "Oh, a SHAYMIN?\r", "If you have that Pokémon, then you\n", @@ -92,7 +92,7 @@ ] }, { - "id": "FloaromaTown_Text_GracideaFlowersHaveBeenAroundALongTimeInThisRegion", + "id": "FloaromaTown_Text_GracideaFlowersBeenAroundLongTime", "en_US": [ "Gracidea flowers have been around a\n", "long time in this region.\r", @@ -106,7 +106,7 @@ ] }, { - "id": "FloaromaTown_Text_DoYouKnowAboutGracideaFlowers", + "id": "FloaromaTown_Text_DoYouKnowGracideaFlowers", "en_US": [ "Do you know about Gracidea flowers?\r", "They’re given as bouquets to express\n", @@ -123,14 +123,14 @@ ] }, { - "id": "FloaromaTown_Text_PickAPeckOfColorsFlowerShopFreeBerriesAvailable", + "id": "FloaromaTown_Text_SignFlowerShop", "en_US": [ "Pick a Peck of Colors Flower Shop\n", "Free Berries Available" ] }, { - "id": "FloaromaTown_Text_FloaromaMeadowAheadHoneyAvailable", + "id": "FloaromaTown_Text_SignFlowerMeadow", "en_US": [ "Floaroma Meadow Ahead\n", "Honey Available" diff --git a/res/text/floaroma_town_middle_house.json b/res/text/floaroma_town_middle_house.json index d0c5801ccb..c180841428 100644 --- a/res/text/floaroma_town_middle_house.json +++ b/res/text/floaroma_town_middle_house.json @@ -2,7 +2,7 @@ "key": 33815, "messages": [ { - "id": "FloaromaTownMiddleHouse_Text_FloaromaTownWasABarrenDesolateHillLongAgo", + "id": "FloaromaTownMiddleHouse_Text_FloaromaTownWasBarren", "en_US": [ "Floaroma Town was a barren, desolate\n", "hill long ago, avoided even by Pokémon.\r", @@ -16,28 +16,28 @@ ] }, { - "id": "FloaromaTownMiddleHouse_Text_DoYouThinkItsCuteHowPokemonPluckBerries", + "id": "FloaromaTownMiddleHouse_Text_CuteHowPokemonPluckBerries", "en_US": [ "Do you think it’s cute how\n", "Pokémon pluck Berries?" ] }, { - "id": "FloaromaTownMiddleHouse_Text_HeresTheTMForTheMovePluck", + "id": "FloaromaTownMiddleHouse_Text_HeresTMForPluck", "en_US": [ "Yes! You agreed!\n", "Here’s the TM for the move Pluck!\r" ] }, { - "id": "FloaromaTownMiddleHouse_Text_OhIGuessIJustLikeWeirdThings", + "id": "FloaromaTownMiddleHouse_Text_IJustLikeWeirdThings", "en_US": [ "Oh...\n", "I guess I just like weird things..." ] }, { - "id": "FloaromaTownMiddleHouse_Text_WhenAPokemonUsesPluckItEatsABerryHeldByItsFoe", + "id": "FloaromaTownMiddleHouse_Text_UsingPluckEatsBerry", "en_US": [ "When a Pokémon uses Pluck, it eats\n", "a Berry held by its foe in battle.\r", @@ -46,7 +46,7 @@ ] }, { - "id": "FloaromaTownMiddleHouse_Text_ClefairyRii", + "id": "FloaromaTownMiddleHouse_Text_ClefairyCry", "en_US": "CLEFAIRY: Rii?" } ] diff --git a/res/text/floaroma_town_pokecenter_1f.json b/res/text/floaroma_town_pokecenter_1f.json index a238b9db97..55ddf7cc97 100644 --- a/res/text/floaroma_town_pokecenter_1f.json +++ b/res/text/floaroma_town_pokecenter_1f.json @@ -2,7 +2,7 @@ "key": 44594, "messages": [ { - "id": "FloaromaTownPokecenter1F_Text_IfYouveGotPokemonWithYouItsSafeToGoOffTravelingAlone", + "id": "FloaromaTownPokecenter1F_Text_WithPokemonSafeToTravelAlone", "en_US": [ "If you’ve got Pokémon with you,\n", "it’s safe for even a kid like you\f", @@ -10,7 +10,7 @@ ] }, { - "id": "FloaromaTownPokecenter1F_Text_IHadABattleTheOtherDayAndMyPokemonsHPGotLow", + "id": "FloaromaTownPokecenter1F_Text_MyPokemonsHPGotLow", "en_US": [ "I had a battle the other day, and my\n", "Pokémon’s HP got low.\r", @@ -20,7 +20,7 @@ ] }, { - "id": "FloaromaTownPokecenter1F_Text_ThereveBeenProblemsWithTheElectricPowerLately", + "id": "FloaromaTownPokecenter1F_Text_ProblemsWithElectricPower", "en_US": [ "There’ve been problems with the\n", "electric power lately.\r", @@ -29,7 +29,7 @@ ] }, { - "id": "FloaromaTownPokecenter1F_Text_ItsALongWayFromHereToEternaCity", + "id": "FloaromaTownPokecenter1F_Text_LongWayToEternaCity", "en_US": [ "It’s a long way from here to Eterna\n", "City.\r", @@ -38,7 +38,7 @@ ] }, { - "id": "FloaromaTownPokecenter1F_Text_PoPoPokemonIWantToBecomeMoreLikeAPikachu", + "id": "FloaromaTownPokecenter1F_Text_ArielIntro_Unused", "en_US": [ "Po-Po-Pokémon!\r", "I want to become more like a PIKACHU!\n", @@ -46,15 +46,15 @@ ] }, { - "id": "FloaromaTownPokecenter1F_Text_PiPikachu", + "id": "FloaromaTownPokecenter1F_Text_ArielBattleAccepted_Unused", "en_US": "Pi-Pikachu!\r" }, { - "id": "FloaromaTownPokecenter1F_Text_PiPikachu2", + "id": "FloaromaTownPokecenter1F_Text_ArielBattleDeclined_Unused", "en_US": "Pi-Pikachu!" }, { - "id": "FloaromaTownPokecenter1F_Text_ICanMakeStaticElectricityButImNotVeryMuchLikeAPokemonYet", + "id": "FloaromaTownPokecenter1F_Text_ArielPostBattle_Unused", "en_US": [ "I can make static electricity, but I’m\n", "not very much like a Pokémon yet.\r", diff --git a/res/text/floaroma_town_southeast_house.json b/res/text/floaroma_town_southeast_house.json index 8b0b2f1592..de6a1e0d6d 100644 --- a/res/text/floaroma_town_southeast_house.json +++ b/res/text/floaroma_town_southeast_house.json @@ -2,7 +2,7 @@ "key": 1054, "messages": [ { - "id": "FloaromaTownSoutheastHouse_Text_SomeKindsOfPokemonAppearOnlyIfTheyreAttractedByHoney", + "id": "FloaromaTownSoutheastHouse_Text_SomePokemonAppearOnlyByHoney", "en_US": [ "Some kinds of Pokémon appear only\n", "if they’re attracted by the sweet\f", @@ -10,7 +10,7 @@ ] }, { - "id": "FloaromaTownSoutheastHouse_Text_PokemonHaveAnAcuteSenseOfSmell", + "id": "FloaromaTownSoutheastHouse_Text_PokemonHaveAcuteSmell", "en_US": [ "Pokémon must have an acute sense\n", "of smell.\r", diff --git a/res/text/flower_paradise.json b/res/text/flower_paradise.json index 243a9e8671..2f37c516f5 100644 --- a/res/text/flower_paradise.json +++ b/res/text/flower_paradise.json @@ -6,7 +6,7 @@ "en_US": "Kyuu uuhn.\r" }, { - "id": "FlowerParadise_Text_ShayminDisappearedAmongTheFlowers", + "id": "FlowerParadise_Text_ShayminDisappearedAmongFlowers", "en_US": [ "SHAYMIN disappeared among\n", "the flowers..." diff --git a/res/text/flower_shop.json b/res/text/flower_shop.json index 2b99acd638..a01c00bb66 100644 --- a/res/text/flower_shop.json +++ b/res/text/flower_shop.json @@ -2,7 +2,7 @@ "key": 1030, "messages": [ { - "id": "FlowerShop_Text_ASingleBerryWillGrowIntoAPlantThatMakesSeveralBerries", + "id": "FlowerShop_Text_BerryWillGrowIntoPlant", "en_US": [ "A single Berry will grow into a plant\n", "that makes several Berries.\r", @@ -13,7 +13,7 @@ ] }, { - "id": "FlowerShop_Text_PleasePlantThatBerryInSoftEarthySoil", + "id": "FlowerShop_Text_PlantBerryInSoil", "en_US": [ "Please plant that Berry in soft,\n", "earthy soil.\r", @@ -22,14 +22,14 @@ ] }, { - "id": "FlowerShop_Text_TrainerPleaseWaterBerriesUsingThisSprayduckWateringCan", + "id": "FlowerShop_Text_WaterBerriesUsingSprayduck", "en_US": [ "Trainer, please water Berries using\n", "this Sprayduck watering can.\r" ] }, { - "id": "FlowerShop_Text_UseThatSprayduckToWaterTheSoilWhereYouvePlantedBerries", + "id": "FlowerShop_Text_UseSprayduckToWaterSoil", "en_US": [ "Use that Sprayduck to water the soil\n", "where you’ve planted Berries.\r", diff --git a/res/text/foreign_building.json b/res/text/foreign_building.json index ee5c1b8b72..2648b708dd 100644 --- a/res/text/foreign_building.json +++ b/res/text/foreign_building.json @@ -21,7 +21,7 @@ ] }, { - "id": "ForeignBuilding_Text_PeopleAndPokemonMakeEveryoneComeTogether", + "id": "ForeignBuilding_Text_ItMakesEveryoneComeTogether", "en_US": [ "When people and Pokémon join hands,\n", "everyone’s happy.\r", @@ -30,7 +30,7 @@ ] }, { - "id": "ForeignBuilding_Text_ThatPeopleAreLonelyIsOnlyNatural", + "id": "ForeignBuilding_Text_ThatPeopleAreLonelyIsNatural", "en_US": [ "That people are lonely is only natural.\n", "It gives me compassion for others.\r", @@ -42,7 +42,7 @@ ] }, { - "id": "ForeignBuilding_Text_ThereAreWordsThatNotEveryoneCanDescribe", + "id": "ForeignBuilding_Text_WordsThatNotEveryoneCanDescribe", "en_US": [ "There are still words that not everyone\n", "can describe...\f", @@ -50,7 +50,7 @@ ] }, { - "id": "ForeignBuilding_Text_ItsOnlyNaturalWeAreDifferent", + "id": "ForeignBuilding_Text_OnlyNaturalWeAreDifferent", "en_US": [ "Pokémon... People... It’s only natural\n", "that we are all so very different.\r", diff --git a/res/text/game_corner.json b/res/text/game_corner.json index 47da3ea951..ec042ba8f6 100644 --- a/res/text/game_corner.json +++ b/res/text/game_corner.json @@ -2,11 +2,11 @@ "key": 9219, "messages": [ { - "id": "GameCorner_Text_WelcomeToTheVeilstoneGameCorner", + "id": "GameCorner_Text_WelcomeToGameCorner", "en_US": "Welcome to the Veilstone Game Corner!\r" }, { - "id": "GameCorner_Text_DidYouWantSomeCoins_NoCoinCase", + "id": "GameCorner_Text_NoCoinCaseToHoldCoins", "en_US": [ "Did you want some Coins for the\n", "slots?\r", @@ -15,7 +15,7 @@ ] }, { - "id": "GameCorner_Text_DidYouWantSomeCoins_1000For50Coins", + "id": "GameCorner_Text_1000For50Coins", "en_US": [ "Did you want some game Coins?\r", "It’s $1000 for 50 Coins.\n", @@ -23,35 +23,35 @@ ] }, { - "id": "GameCorner_Text_DidYouWantSomeCoins_ThankYouVeryMuchHereAreYourCoins", + "id": "GameCorner_Text_HereAreYourCoins", "en_US": [ "Thank you very much!\n", "Here are your Coins!" ] }, { - "id": "GameCorner_Text_UmYouDontAppearToHaveEnoughMoney", + "id": "GameCorner_Text_NotEnoughMoney", "en_US": [ "Um... You don’t appear to have\n", "enough money..." ] }, { - "id": "GameCorner_Text_OhYourCoinCaseIsFull", + "id": "GameCorner_Text_CoinCaseIsFull", "en_US": [ "Oh?\n", "Your Coin Case is full." ] }, { - "id": "GameCorner_Text_OhYouDontNeedCoinsThen", + "id": "GameCorner_Text_PleaseComeAgain", "en_US": [ "Oh... You don’t need Coins, then?\n", "Please come again!" ] }, { - "id": "GameCorner_Text_TenStraightBonusRoundsOnTheSlots", + "id": "GameCorner_Text_MementoForBonusRounds", "en_US": [ "Ten straight bonus rounds on\n", "the slots! That’s amazing!\r", @@ -62,21 +62,21 @@ ] }, { - "id": "GameCorner_Text_PleaseKeepPlayingTheSlots", + "id": "GameCorner_Text_PleaseKeepPlayingSlots", "en_US": [ "Please keep playing the slots for\n", "another explosion of good luck!" ] }, { - "id": "GameCorner_Text_OhYourBagIsFullWeWillHoldTheTMForYou", + "id": "GameCorner_Text_BagIsFull", "en_US": [ "Oh, your Bag is full...\n", "We will hold the TM for you." ] }, { - "id": "GameCorner_Text_WeReStillAmazedByYourTenStraightBonusRounds", + "id": "GameCorner_Text_StillAmazedTakeMemento", "en_US": [ "We’re still amazed by your ten straight\n", "bonus rounds on the slots before.\r", @@ -87,14 +87,14 @@ ] }, { - "id": "GameCorner_Text_YouCantPlayIfYouDontHaveACoinCase", + "id": "GameCorner_Text_CantPlayWithoutCoinCase", "en_US": [ "You can’t play if you don’t have\n", "a Coin Case." ] }, { - "id": "GameCorner_Text_IllEplainHowTheSlotMachinesWorkAtThisGameCorner", + "id": "GameCorner_Text_ExplainSlotMachines", "en_US": [ "I’ll explain how the slot machines\n", "work at this Game Corner.\r", @@ -106,7 +106,7 @@ ] }, { - "id": "GameCorner_Text_HeyKidIfYouWantToPlayHereYouNeedACoinCase", + "id": "GameCorner_Text_ManNextDoorHadCoinCase", "en_US": [ "Hey, kid, if you want to play here,\n", "you need a Coin Case.\r", @@ -135,7 +135,7 @@ ] }, { - "id": "GameCorner_Text_WooHooClefairyLookAtItItsDrivingMeBananas", + "id": "GameCorner_Text_ItsDrivingMeBananas", "en_US": [ "Woohoo! CLEFAIRY! Look at it!\n", "It’s driving me bananas!\r", @@ -144,7 +144,7 @@ ] }, { - "id": "GameCorner_Text_WooHooClefairyLookYeahahItsACarnival", + "id": "GameCorner_Text_ItsACarnival", "en_US": [ "Woohoo! CLEFAIRY! Look!\n", "Yeahah! It’s a carnival!\r", @@ -157,7 +157,7 @@ ] }, { - "id": "GameCorner_Text_WooHooClefairyItsAdorable", + "id": "GameCorner_Text_ClefairyIsAdorable", "en_US": [ "Woohoo! CLEFAIRY! It’s adorable!\n", "Just seeing it gets my pulse racing!\r", @@ -187,7 +187,7 @@ ] }, { - "id": "GameCorner_Text_AFriendInMyGroupScoredATonOfCoinsHere", + "id": "GameCorner_Text_AFriendScoredTonOfCoins", "en_US": [ "A friend in my group scored a ton of\n", "Coins here.\r", @@ -196,7 +196,7 @@ ] }, { - "id": "GameCorner_Text_SighNothingGoingMyWayToday", + "id": "GameCorner_Text_NothingGoingMyWay", "en_US": [ "Sigh...\n", "Nothing’s going my way today...\r", @@ -247,11 +247,11 @@ ] }, { - "id": "GameCorner_Text_Unused_00026", + "id": "GameCorner_Text_Dummy26", "garbage": 0 }, { - "id": "GameCorner_Text_Unused_00027", + "id": "GameCorner_Text_Dummy27", "garbage": 0 } ] diff --git a/res/text/hearthome_city.json b/res/text/hearthome_city.json index 2f90f92faa..5dbcc74636 100644 --- a/res/text/hearthome_city.json +++ b/res/text/hearthome_city.json @@ -82,7 +82,7 @@ ] }, { - "id": "HearthomeCity_Text_TheyFoundAnEggAtTheDayCare", + "id": "HearthomeCity_Text_FoundAnEggAtDayCare", "en_US": [ "Did you know?\r", "They found an Egg at the Day Care in\n", @@ -90,7 +90,7 @@ ] }, { - "id": "HearthomeCity_Text_TheyFindEggsInJohtoToo", + "id": "HearthomeCity_Text_EggsInJohtoToo", "en_US": [ "Did you know?\r", "They find Eggs in the far-off Johto\n", @@ -106,7 +106,7 @@ ] }, { - "id": "HearthomeCity_Text_AtTheLostTowerPeopleUnburdenThemselves", + "id": "HearthomeCity_Text_PeopleUnburdenThemselves", "en_US": [ "At the Lost Tower, people unburden\n", "themselves of unbearable sorrow...\r", @@ -140,14 +140,14 @@ ] }, { - "id": "HearthomeCity_Text_IUsedAFireStoneToEvolve", + "id": "HearthomeCity_Text_UsedFireStoneToEvolve", "en_US": [ "I used a Fire Stone on my Pokémon,\n", "and it evolved!" ] }, { - "id": "HearthomeCity_Text_MayIShowYouToTheContestHall", + "id": "HearthomeCity_Text_ShowYouToContestHall", "en_US": [ "I’m visiting here all the way from\n", "the Hoenn region.\r", @@ -203,7 +203,7 @@ "en_US": "Apapapu!" }, { - "id": "HearthomeCity_Text_IWentForAStrollWithPachirisu", + "id": "HearthomeCity_Text_StrollWithPachirisu", "en_US": [ "I went for a stroll in Amity Square\n", "with my PACHIRISU today.\r", @@ -218,7 +218,7 @@ "en_US": "PACHIRISU: Kyukyuuh!" }, { - "id": "HearthomeCity_Text_SometimesEggsAreFoundAtTheDayCare", + "id": "HearthomeCity_Text_SometimesEggsAtDayCare", "en_US": [ "I have a professor friend, and this is\n", "what he told me.\r", @@ -444,7 +444,7 @@ ] }, { - "id": "HearthomeCity_Text_WhatPokemonWillMyChildBefriend", + "id": "HearthomeCity_Text_WhatWillMyChildBefriend", "en_US": [ "I can feel the baby stroller getting\n", "heavier each and every day.\r", @@ -475,7 +475,7 @@ ] }, { - "id": "HearthomeCity_Text_IPutMyVsSeekerThroughALot", + "id": "HearthomeCity_Text_UsedVsSeekerALot", "en_US": [ "I put my Vs. Seeker through its paces\n", "a lot.\r", @@ -493,7 +493,7 @@ ] }, { - "id": "HearthomeCity_Text_SignHearthomeCityPokemonGym", + "id": "HearthomeCity_Text_SignPokemonGym", "en_US": [ "Hearthome City Pokémon Gym\n", "Leader: Fantina\f", @@ -543,7 +543,7 @@ ] }, { - "id": "HearthomeCity_Text_SignThePoffinHouse", + "id": "HearthomeCity_Text_SignPoffinHouse", "en_US": [ "The Poffin House\n", "Delicious Poffins--Smiles for All" diff --git a/res/text/hearthome_city_northwest_house.json b/res/text/hearthome_city_northwest_house.json index bfa6af4a31..3d942f7072 100644 --- a/res/text/hearthome_city_northwest_house.json +++ b/res/text/hearthome_city_northwest_house.json @@ -68,7 +68,7 @@ ] }, { - "id": "HearthomeCityNorthwestHouse_Text_BillDevelopedTheBasicStorageSystem", + "id": "HearthomeCityNorthwestHouse_Text_BillDevelopedStorageSystem", "en_US": [ "Bebe: My buddy Bill developed the\n", "basic Pokémon Box storage system.\r", diff --git a/res/text/hearthome_city_pokecenter_1f.json b/res/text/hearthome_city_pokecenter_1f.json index a0d8080663..67e0144e7b 100644 --- a/res/text/hearthome_city_pokecenter_1f.json +++ b/res/text/hearthome_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "key": 43826, "messages": [ { - "id": "HearthomeCityPokecenter1F_Text_HaveYouCheckedTheGlobalTerminal", + "id": "HearthomeCityPokecenter1F_Text_HaveYouCheckedGlobalTerminal", "en_US": [ "Have you checked out the Global\n", "Terminal in Jubilife City?\r", @@ -45,25 +45,25 @@ ] }, { - "id": "HearthomeCityPokecenter1F_Text_CanYouParticipateInAPieceOnTrainers", + "id": "HearthomeCityPokecenter1F_Text_KinseyIntro_Unused", "en_US": [ "We’re doing a news piece on Trainers.\n", "Can we get you to participate?" ] }, { - "id": "HearthomeCityPokecenter1F_Text_ReporterKinseysLiveInterview", + "id": "HearthomeCityPokecenter1F_Text_KinseyBattleAccepted_Unused", "en_US": "Reporter Kinsey’s live interview!\r" }, { - "id": "HearthomeCityPokecenter1F_Text_DoYouReplyNoFirstThing", + "id": "HearthomeCityPokecenter1F_Text_KinseyBattleDeclined_Unused", "en_US": [ "...Are you one of those contrary\n", "people who reply “No” first thing?" ] }, { - "id": "HearthomeCityPokecenter1F_Text_WereInvestigatingWhyTrainersChoosePokemon", + "id": "HearthomeCityPokecenter1F_Text_KinseyPostBattle_Unused", "en_US": [ "Why Trainers choose certain kinds of\n", "Pokémon and their feelings about it...\r", @@ -71,7 +71,7 @@ ] }, { - "id": "HearthomeCityPokecenter1F_Text_IFeltAFlashOfInspiration", + "id": "HearthomeCityPokecenter1F_Text_TevinIntro_Unused", "en_US": [ "I felt a flash of inspiration when I laid\n", "eyes on you.\r", @@ -80,14 +80,14 @@ ] }, { - "id": "HearthomeCityPokecenter1F_Text_INeedToGetInTightYouDontMindDoYou", + "id": "HearthomeCityPokecenter1F_Text_TevinBattleAccepted_Unused", "en_US": [ "For close-ups, I need to get in tight.\n", "You don’t mind, do you?\r" ] }, { - "id": "HearthomeCityPokecenter1F_Text_ThatsADowner", + "id": "HearthomeCityPokecenter1F_Text_TevinBattleDEclined_Unused", "en_US": [ "That’s a downer...\r", "I thought I’d found a Trainer and\n", @@ -95,7 +95,7 @@ ] }, { - "id": "HearthomeCityPokecenter1F_Text_DidYouComeToCompeteInContests", + "id": "HearthomeCityPokecenter1F_Text_TevinPostBattle_Unused", "en_US": [ "So, did you come to Hearthome to\n", "compete in Contests?" diff --git a/res/text/hearthome_city_pokemon_fan_club.json b/res/text/hearthome_city_pokemon_fan_club.json index b36310f403..7dd362089f 100644 --- a/res/text/hearthome_city_pokemon_fan_club.json +++ b/res/text/hearthome_city_pokemon_fan_club.json @@ -36,7 +36,7 @@ ] }, { - "id": "HearthomeCityPokemonFanClub_Text_WeAreTheNumberOneFanClub", + "id": "HearthomeCityPokemonFanClub_Text_WeAreNumberOneFanClub", "en_US": [ "Nationwide, there are other fan\n", "clubs, but we are number one!\r", @@ -97,7 +97,7 @@ ] }, { - "id": "HearthomeCityPokemonFanClub_Text_ThisOneReallyHasntTakenTooKindlyToYou", + "id": "HearthomeCityPokemonFanClub_Text_HasntTakenTooKindlyToYou", "en_US": [ "Oh, my... I think this one really\n", "hasn’t taken too kindly to you." diff --git a/res/text/hearthome_city_southeast_house_1f.json b/res/text/hearthome_city_southeast_house_1f.json index 528d1c3d8a..ecbe69cb8a 100644 --- a/res/text/hearthome_city_southeast_house_1f.json +++ b/res/text/hearthome_city_southeast_house_1f.json @@ -11,7 +11,7 @@ ] }, { - "id": "HearthomeCitySoutheastHouse1F_Text_ICouldCaptivateTheWholeWorld", + "id": "HearthomeCitySoutheastHouse1F_Text_CaptivateTheWholeWorld", "en_US": [ "People all over the world follow\n", "Pokémon Contests.\r", diff --git a/res/text/hearthome_city_southeast_house_2f.json b/res/text/hearthome_city_southeast_house_2f.json index a7cc6a65b8..1cbf45736f 100644 --- a/res/text/hearthome_city_southeast_house_2f.json +++ b/res/text/hearthome_city_southeast_house_2f.json @@ -2,14 +2,14 @@ "key": 1039, "messages": [ { - "id": "HearthomeCitySoutheastHouse2F_Text_IHaveSomethingForYourPokemon", + "id": "HearthomeCitySoutheastHouse2F_Text_SomethingForYourPokemon", "en_US": [ "I have something for your Pokémon\n", "to hold. Take this {STRVAR_1 8, 0, 0}.\r" ] }, { - "id": "HearthomeCitySoutheastHouse2F_Text_TheHolderRegainsHPWhenItInflictsDamage", + "id": "HearthomeCitySoutheastHouse2F_Text_RegainHPWhenInflictingDamage", "en_US": [ "The {STRVAR_1 8, 0, 0} should be held by\n", "a Pokémon in battles.\r", diff --git a/res/text/iceberg_ruins.json b/res/text/iceberg_ruins.json index d37c5d1e11..66cd3e9baf 100644 --- a/res/text/iceberg_ruins.json +++ b/res/text/iceberg_ruins.json @@ -24,14 +24,14 @@ "en_US": "Jakiih!\r" }, { - "id": "IcebergRuins_Text_ThePokemonStatueHasStoppedEmanatingPower", + "id": "IcebergRuins_Text_StatueStoppedEmanatingPower", "en_US": [ "The Pokémon statue has stopped\n", "emanating power." ] }, { - "id": "IcebergRuins_Text_ItsAStatueOfAPokemonBecomeStrongerYouMust", + "id": "IcebergRuins_Text_BecomeStrongerYouMust", "en_US": [ "It’s a statue of a Pokémon.\n", "It seems to exude power...\r", diff --git a/res/text/iron_ruins.json b/res/text/iron_ruins.json index 0869609bfe..acbd088593 100644 --- a/res/text/iron_ruins.json +++ b/res/text/iron_ruins.json @@ -24,14 +24,14 @@ "en_US": "Ji-ji-ze-ji-zoh.\r" }, { - "id": "IronRuins_Text_ThePokemonStatueHasStoppedEmanatingPower", + "id": "IronRuins_Text_StatueStoppedEmanatingPower", "en_US": [ "The Pokémon statue has stopped\n", "emanating power." ] }, { - "id": "IronRuins_Text_ItsAStatueOfAPokemonBecomeStrongerYouMust", + "id": "IronRuins_Text_BecomeStrongerYouMust", "en_US": [ "It’s a statue of a Pokémon.\n", "It seems to exude power...\r", diff --git a/res/text/jubilife_city.json b/res/text/jubilife_city.json index 95541ba1d6..9ab35463a1 100644 --- a/res/text/jubilife_city.json +++ b/res/text/jubilife_city.json @@ -9,7 +9,7 @@ ] }, { - "id": "JubilifeCity_Text_DawnWowYouveAlreadyGotNumPokemonWithYou", + "id": "JubilifeCity_Text_DawnWowAlreadyGotXPokemon", "en_US": [ "Wow! You’ve already got {STRVAR_1 50, 0, 0} Pokémon\n", "with you!\r", @@ -18,7 +18,7 @@ ] }, { - "id": "JubilifeCity_Text_DawnIThinkYoudFeelALotSaferIfYouWereToCatchSomeMore", + "id": "JubilifeCity_Text_DawnSaferIfYouCatchMore", "en_US": [ "...Um...\r", "I think you’d feel a lot safer if you\n", @@ -39,21 +39,21 @@ ] }, { - "id": "JubilifeCity_Text_LucasHowManyPokemonhaveYouCaught", + "id": "JubilifeCity_Text_LucasHowManyPokemon", "en_US": [ "Lucas: Hey, {STRVAR_1 3, 1, 0}!\n", "How many Pokémon have you caught?\r" ] }, { - "id": "JubilifeCity_Text_LucasWhoaYouAlreadyHaveNumPokemonWithYou", + "id": "JubilifeCity_Text_LucasYouAlreadyHaveXPokemon", "en_US": [ "Whoa! You already have {STRVAR_1 50, 0, 0} Pokémon\n", "with you!\r" ] }, { - "id": "JubilifeCity_Text_LucasIThinkYouShouldCatchSomeMore", + "id": "JubilifeCity_Text_LucasYouShouldCatchMore", "en_US": [ "Huh?\n", "I think you should catch some more.\r", @@ -75,7 +75,7 @@ ] }, { - "id": "JubilifeCity_Text_DawnThatManWhatIsHeDoing", + "id": "JubilifeCity_Text_DawnWhatIsHeDoing", "en_US": [ "Dawn: That man...\n", "What is he doing?\r" @@ -86,7 +86,7 @@ "en_US": "Dawn: Um..." }, { - "id": "JubilifeCity_Text_LucasThatGuyWhatsHeDoing", + "id": "JubilifeCity_Text_LucasWhatsHeDoing", "en_US": [ "Lucas: That guy...\n", "What’s he doing?\r" @@ -109,21 +109,21 @@ ] }, { - "id": "JubilifeCity_Text_DawnIWasJustMakingConversation", + "id": "JubilifeCity_Text_DawnJustMakingConversation", "en_US": [ "Dawn: Huh? What? I beg your pardon?\n", "I was just making conversation...\r" ] }, { - "id": "JubilifeCity_Text_LucasIWasJustMakingSmallTalk", + "id": "JubilifeCity_Text_LucasJustMakingSmallTalk", "en_US": [ "Lucas: Huh? What? Are you kidding?\n", "I was just making small talk...\r" ] }, { - "id": "JubilifeCity_Text_IKnowBetterNotToBelieveThat", + "id": "JubilifeCity_Text_IKnowBetter", "en_US": [ "Shady man: ...Heh. You claim you were\n", "only making conversation, do you?\r", @@ -137,7 +137,7 @@ ] }, { - "id": "JubilifeCity_Text_IsTheSayingDontBeAThiefFamiliarToYou", + "id": "JubilifeCity_Text_IsSayingFamiliarToYou", "en_US": [ "Now that my cover has been blown, let\n", "me introduce myself.\r", @@ -152,7 +152,7 @@ ] }, { - "id": "JubilifeCity_Text_TakingWhatBelongsToOthersIsWrong", + "id": "JubilifeCity_Text_TakingFromOthersIsWrong", "en_US": [ "Looker: Yes, that is correct.\n", "Taking what belongs to others is wrong.\r" @@ -170,7 +170,7 @@ ] }, { - "id": "JubilifeCity_Text_PerhapsYouCanMakeUseOfThis", + "id": "JubilifeCity_Text_PerhapsYouCanUseThis", "en_US": [ "Unfortunately, there are apparently\n", "those who do not heed those words.\r", @@ -183,7 +183,7 @@ ] }, { - "id": "JubilifeCity_Text_ThatVsRecorderItIsANiftyDeviceForRecordingAMatch", + "id": "JubilifeCity_Text_DeviceForRecordingAMatch", "en_US": [ "That Vs. Recorder, it is a nifty device\n", "for recording a match.\r", @@ -195,7 +195,7 @@ ] }, { - "id": "JubilifeCity_Text_YouMustInformMeOfAnyHappenings", + "id": "JubilifeCity_Text_InformMeOfAnyHappenings", "en_US": [ "Looker: Also, I have a request.\r", "If you were to see me again, I ask that\n", @@ -208,14 +208,14 @@ ] }, { - "id": "JubilifeCity_Text_DawnWorkingForTheInternationPoliceMustBeHard", + "id": "JubilifeCity_Text_DawnInternationPoliceMustBeHard", "en_US": [ "Dawn: ...Working for the International\n", "Police must be hard.\r" ] }, { - "id": "JubilifeCity_Text_DawnHereItIsItsTheTrainersSchool", + "id": "JubilifeCity_Text_DawnHereIsTheTrainersSchool", "en_US": [ "{STRVAR_1 3, 0, 0}, here it is.\n", "It’s the Trainers’ School.\f", @@ -223,7 +223,7 @@ ] }, { - "id": "JubilifeCity_Text_DawnISawYourFriendRivalGoInEarlier", + "id": "JubilifeCity_Text_DawnRivalWentInEarlier", "en_US": [ "I saw your friend {STRVAR_1 3, 1, 0} go in\n", "earlier.\r", @@ -232,14 +232,14 @@ ] }, { - "id": "JubilifeCity_Text_LucasWorkingForTheInternationPoliceSoundsHard", + "id": "JubilifeCity_Text_LucasInternationPoliceSoundsHard", "en_US": [ "Lucas: ...Working for the International\n", "Police sounds hard.\r" ] }, { - "id": "JubilifeCity_Text_LucasHereWeAreThisIsTheTrainersSchool", + "id": "JubilifeCity_Text_LucasThisIsTheTrainersSchool", "en_US": [ "{STRVAR_1 3, 0, 0}, here we are.\n", "This is the Trainers’ School.\f", @@ -247,7 +247,7 @@ ] }, { - "id": "JubilifeCity_Text_LucasYourPalRivalWentInEarier", + "id": "JubilifeCity_Text_LucasRivalWentInEarier", "en_US": [ "Your pal {STRVAR_1 3, 1, 0} went in earlier.\n", "He might still be studying in there.\r", @@ -255,7 +255,7 @@ ] }, { - "id": "JubilifeCity_Text_JubilifeCitysBuiltOnLandTheyCarvedOutOfAMountain", + "id": "JubilifeCity_Text_CarvedOutOfAMountain", "en_US": [ "Jubilife City’s built on land they\n", "carved out of a mountain.\r", @@ -264,7 +264,7 @@ ] }, { - "id": "JubilifeCity_Text_HaveYouPaidAVisitToTheTVStation", + "id": "JubilifeCity_Text_HaveYouVisitedTVStation", "en_US": [ "Hello! Let me ask you, have you paid\n", "a visit to the TV station?\r", @@ -277,7 +277,7 @@ ] }, { - "id": "JubilifeCity_Text_ItIsYouHaveYouVisitedTheTrainersSchool", + "id": "JubilifeCity_Text_ItIsYouHaveYouVisitedTrainersSchool", "en_US": [ "Ah, it is you! Have no fear.\n", "There are no shady characters about.\r", @@ -288,7 +288,7 @@ ] }, { - "id": "JubilifeCity_Text_HelloMyFriendHaveYouVisitedTheTrainersSchool", + "id": "JubilifeCity_Text_HelloHaveYouVisitedTrainersSchool", "en_US": [ "Looker: Hello, my friend.\n", "Have you visited the Trainers’ School?\r", @@ -317,7 +317,7 @@ ] }, { - "id": "JubilifeCity_Text_ItIsYouHaveYouNotObtainedAGymBadge", + "id": "JubilifeCity_Text_HaveYouNotObtainedAGymBadge", "en_US": [ "Ah, it is you! Have no fear.\n", "There are no shady characters about.\r", @@ -328,7 +328,7 @@ ] }, { - "id": "JubilifeCity_Text_TellMeHaveYouNotObtainedAPalPad", + "id": "JubilifeCity_Text_HaveYouNotObtainedAPalPad", "en_US": [ "Looker: Tell me, have you not obtained\n", "a Pal Pad?\r", @@ -337,7 +337,7 @@ ] }, { - "id": "JubilifeCity_Text_ISeeThatYouHaveObtainedItAPalPadForYourself", + "id": "JubilifeCity_Text_YouObtainedPalPad", "en_US": [ "Ah, yes. I see that you have obtained\n", "it, a Pal Pad for yourself.\r", @@ -351,7 +351,7 @@ ] }, { - "id": "JubilifeCity_Text_IShallTakeMyInvestigationElsewhere", + "id": "JubilifeCity_Text_TakeInvestigationElsewhere", "en_US": [ "Anyway, there appears to be no one\n", "shady in this Jubilife City.\r", @@ -362,7 +362,7 @@ ] }, { - "id": "JubilifeCity_Text_YouCallYourselfAPokemonTrainerAndYetYouHaveNoPoketch", + "id": "JubilifeCity_Text_YouHaveNoPoketch", "en_US": [ "Oh, oh, oh?\r", "You call yourself a Pokémon Trainer?\n", @@ -374,7 +374,7 @@ ] }, { - "id": "JubilifeCity_Text_AllYouHaveToDoIsFindThreeClownsInJubilifeCity", + "id": "JubilifeCity_Text_FindThreeClowns", "en_US": [ "You see, I invented, and now\n", "manufacture, Pokétches.\r", @@ -387,7 +387,7 @@ ] }, { - "id": "JubilifeCity_Text_CollectACouponFromEachClownThenComeSeeMeOK", + "id": "JubilifeCity_Text_CollectCouponFromEachClown", "en_US": [ "The three clowns will each ask you\n", "a skill-testing question.\r", @@ -400,7 +400,7 @@ ] }, { - "id": "JubilifeCity_Text_InReturnForTheseCouponsIPresentYouThisPokemonWatch", + "id": "JubilifeCity_Text_PokemonWatchInReturnForCoupons", "en_US": [ "OK, let me count your Coupons!\n", "I’ll use the Pokétch here...\r", @@ -416,7 +416,7 @@ "en_US": "{STRVAR_1 3, 0, 0} received a {COLOR 1}Pokétch{COLOR 0}!{YESNO 1}" }, { - "id": "JubilifeCity_Text_YouCanAddAppsToYourPoketch", + "id": "JubilifeCity_Text_AddAppsToPoketch", "en_US": [ "You can add apps to your Pokétch\n", "to make it even more versatile!\r", @@ -425,7 +425,7 @@ ] }, { - "id": "JubilifeCity_Text_DoesAPokemonGrowByDefeatingOthersAndGainingExpPoints", + "id": "JubilifeCity_Text_DoPokemonGrowByDefeatingOthers", "en_US": [ "Hi! I’m a Pokétch campaign clown!\n", "Let’s roll out my question!\r", @@ -434,21 +434,21 @@ ] }, { - "id": "JubilifeCity_Text_DingDingYoureAbsolutelyCorrect1", + "id": "JubilifeCity_Text_AbsolutelyCorrect1", "en_US": [ "Ding-ding!\n", "You’re absolutely correct!\r" ] }, { - "id": "JubilifeCity_Text_BzzzztThatsTheWrongAnswer1", + "id": "JubilifeCity_Text_WrongAnswer1", "en_US": [ "Bzzzzt!\n", "That’s the wrong answer..." ] }, { - "id": "JubilifeCity_Text_PokemonGrowStrongerByDefeatingOtherPokemonInBattle", + "id": "JubilifeCity_Text_GrowStrongerByDefeatingOthers", "en_US": [ "Pokémon grow stronger by defeating\n", "other Pokémon in battle.\r", @@ -458,7 +458,7 @@ ] }, { - "id": "JubilifeCity_Text_HereYouGoYourPoketchCoupon1", + "id": "JubilifeCity_Text_HeresPoketchCoupon1", "en_US": [ "Here you go!\n", "Your Pokétch Coupon!\r" @@ -475,7 +475,7 @@ ] }, { - "id": "JubilifeCity_Text_AskJustLikePokemonTypesTheMovesOfPokemonAlsoHaveTypes", + "id": "JubilifeCity_Text_DoMovesHaveTypes", "en_US": [ "Hi! I’m a Pokétch campaign clown!\n", "Let’s roll out my question!\r", @@ -484,21 +484,21 @@ ] }, { - "id": "JubilifeCity_Text_DingDingYoureAbsolutelyCorrect2", + "id": "JubilifeCity_Text_AbsolutelyCorrect2", "en_US": [ "Ding-ding!\n", "You’re absolutely correct!\r" ] }, { - "id": "JubilifeCity_Text_BzzzztThatsTheWrongAnswer2", + "id": "JubilifeCity_Text_WrongAnswer2", "en_US": [ "Bzzzzt!\n", "That’s the wrong answer..." ] }, { - "id": "JubilifeCity_Text_IfThePokemonsTypeMatchesItsMovesTypeThatMoveIsMadeMuchMorePowerful", + "id": "JubilifeCity_Text_IfPokemonMatchTypeMoveMorePowerful", "en_US": [ "If the Pokémon’s type matches its\n", "move’s type, that move is made much\f", @@ -506,14 +506,14 @@ ] }, { - "id": "JubilifeCity_Text_HereYouGoYourPoketchCoupon2", + "id": "JubilifeCity_Text_HeresPoketchCoupon2", "en_US": [ "Here you go!\n", "Your Pokétch Coupon!\r" ] }, { - "id": "JubilifeCity_Text_IfThePokemonsTypeMatchesItsMovesTypeThatMoveIsMadeMuchMorePowerful2", + "id": "JubilifeCity_Text_IfPokemonMatchTypeMoveMorePowerful2", "en_US": [ "If the Pokémon’s type matches its\n", "move’s type, that move is made much\f", @@ -529,21 +529,21 @@ ] }, { - "id": "JubilifeCity_Text_DingDingYoureAbsolutelyCorrect3", + "id": "JubilifeCity_Text_AbsolutelyCorrect3", "en_US": [ "Ding-ding!\n", "You’re absolutely correct!\r" ] }, { - "id": "JubilifeCity_Text_BzzzztThatsTheWrongAnswer3", + "id": "JubilifeCity_Text_WrongAnswer3", "en_US": [ "Bzzzzt!\n", "That’s the wrong answer..." ] }, { - "id": "JubilifeCity_Text_APokemonMayHoldASingleItem", + "id": "JubilifeCity_Text_PokemonMayHoldSingleItem", "en_US": [ "A Pokémon may hold a single item.\r", "Some items become effective as soon\n", @@ -553,7 +553,7 @@ ] }, { - "id": "JubilifeCity_Text_HereYouGoYourPoketchCoupon3", + "id": "JubilifeCity_Text_HeresPoketchCoupon3", "en_US": [ "Here you go!\n", "Your Pokétch Coupon!\r" @@ -569,7 +569,7 @@ ] }, { - "id": "JubilifeCity_Text_APokemonMayHoldASingleItem2", + "id": "JubilifeCity_Text_PokemonMayHoldSingleItem2", "en_US": [ "A Pokémon may hold a single item.\r", "Some items become effective as soon\n", @@ -579,7 +579,7 @@ ] }, { - "id": "JubilifeCity_Text_HandOverAllYourResearchFindings", + "id": "JubilifeCity_Text_HandOverResearchFindings", "en_US": [ "Mystery man: Now, now, now, now, now!\n", "Professor Rowan, you must comply.\r", @@ -590,7 +590,7 @@ ] }, { - "id": "JubilifeCity_Text_ThatsOreburghsGymBadgeISee", + "id": "JubilifeCity_Text_ThatsOreburghsGymBadge", "en_US": [ "Rowan: Ah, {STRVAR_1 3, 0, 0}.\n", "Well? How is the Pokédex progressing?\r", @@ -603,7 +603,7 @@ ] }, { - "id": "JubilifeCity_Text_OhProfessorOfRowanMustYouBeSoDifficult", + "id": "JubilifeCity_Text_MustYouBeSoDifficult", "en_US": [ "Mystery man: Oh, professor of Pokémon,\n", "must you be so difficult?\r", @@ -633,7 +633,7 @@ ] }, { - "id": "JubilifeCity_Text_MyGoodnessYouCallYourselvesAdults", + "id": "JubilifeCity_Text_YouCallYourselvesAdults", "en_US": [ "My goodness...\n", "You call yourselves adults?\r", @@ -642,7 +642,7 @@ ] }, { - "id": "JubilifeCity_Text_WeWillMakeYouRegretInsultingTeamGalactic", + "id": "JubilifeCity_Text_RegretInsultingTeamGalactic", "en_US": [ "Mystery man: Eeeeeh!\n", "You had to make this personal!\r", @@ -653,7 +653,7 @@ ] }, { - "id": "JubilifeCity_Text_YouKidsGiveTheseThugsALessonInCivilityPlease", + "id": "JubilifeCity_Text_GiveThugsALessonInCivility", "en_US": [ "Rowan: You kids, give these thugs a\n", "lesson in civility, please.\r" @@ -683,7 +683,7 @@ ] }, { - "id": "JubilifeCity_Text_ThatLotTheyCalledThemselvesTeamGalactic", + "id": "JubilifeCity_Text_CalledThemselvesTeamGalactic", "en_US": [ "Rowan: That lot...\n", "They called themselves Team Galactic.\r", @@ -698,7 +698,7 @@ ] }, { - "id": "JubilifeCity_Text_DawnTheProfessorStudiesTheEvolutionOfPokemonToo", + "id": "JubilifeCity_Text_DawnProfessorStudiesEvolutionOfPokemon", "en_US": [ "Dawn: {STRVAR_1 3, 1, 0}, did you know?\r", "The professor studies the evolution\n", @@ -712,7 +712,7 @@ ] }, { - "id": "JubilifeCity_Text_LucasTheProfessorStudiesTheEvolutionOfPokemonToo", + "id": "JubilifeCity_Text_LucasProfessorStudiesEvolutionOfPokemon", "en_US": [ "Lucas: {STRVAR_1 3, 1, 0}, did you know\n", "about this?\r", @@ -727,7 +727,7 @@ ] }, { - "id": "JubilifeCity_Text_WhyDontYouCollectAllTheGymBadgesOfSinnoh", + "id": "JubilifeCity_Text_CollectAllGymBadges", "en_US": [ "Rowan: It’s all over, so you can \n", "relax now.\r", @@ -761,7 +761,7 @@ ] }, { - "id": "JubilifeCity_Text_DressUpYourPokemonAndWatchTheirAppealGrow", + "id": "JubilifeCity_Text_DressUpYourPokemon", "en_US": [ "Contained within that Fashion Case...\r", "You will find a whole spectrum of chic\n", @@ -776,7 +776,7 @@ ] }, { - "id": "JubilifeCity_Text_CanYouTellMeWhatTypeOfPokemonYouLike", + "id": "JubilifeCity_Text_CanYouTellTypePreference", "en_US": [ "The way you look...\n", "You’re obviously a Trainer!\r", @@ -785,7 +785,7 @@ ] }, { - "id": "JubilifeCity_Text_TheFireTypeYouMustHaveAFieryPersonality", + "id": "JubilifeCity_Text_FireMustHaveFieryPersonality", "en_US": [ "The Fire type?\n", "You must have a fiery personality.\r", @@ -794,7 +794,7 @@ ] }, { - "id": "JubilifeCity_Text_APersonThatLikesTheWaterTypeMustBeSomewhatCool", + "id": "JubilifeCity_Text_WaterMustBeCool", "en_US": [ "A person that likes the Water type\n", "must be somewhat cool.\r", @@ -803,7 +803,7 @@ ] }, { - "id": "JubilifeCity_Text_YouChoseTheGrassTypeNoWonderYouLookSoCalm", + "id": "JubilifeCity_Text_GrassNoWonderYouLookCalm", "en_US": [ "You chose the Grass type?\n", "No wonder you look so calm.\r", @@ -819,14 +819,14 @@ ] }, { - "id": "JubilifeCity_Text_WhenYouWalkWithYourPokemonTheyGraduallyGrowFriendlier", + "id": "JubilifeCity_Text_GraduallyGrowFriendlier", "en_US": [ "When you walk with your Pokémon,\n", "they gradually grow friendlier." ] }, { - "id": "JubilifeCity_Text_AtMostYouCanHaveSixPokemonWithYou", + "id": "JubilifeCity_Text_AtMostSixPokemonWithYou", "en_US": [ "OK, set six Poké Balls in my\n", "belt...\r", @@ -835,7 +835,7 @@ ] }, { - "id": "JubilifeCity_Text_HiyaWheredYouComeFrom", + "id": "JubilifeCity_Text_WheredYouComeFrom", "en_US": [ "Hiya, where’d you come from?\r", "...\r", @@ -846,14 +846,14 @@ ] }, { - "id": "JubilifeCity_Text_HelloTrainerDoYouKnowMuchAboutPokemon", + "id": "JubilifeCity_Text_DoYouKnowMuchAboutPokemon", "en_US": [ "Hello, Trainer!\n", "Do you know much about Pokémon?" ] }, { - "id": "JubilifeCity_Text_AhISeeYouAreKnowledgeable", + "id": "JubilifeCity_Text_YouAreKnowledgeable", "en_US": [ "Ah, I see!\n", "You are knowledgeable!\r", @@ -864,7 +864,7 @@ ] }, { - "id": "JubilifeCity_Text_OhYoureNotKnowledgeable", + "id": "JubilifeCity_Text_YoureNotKnowledgeable", "en_US": [ "Oh, you’re not knowledgeable...\n", "But not to worry!\f", @@ -874,7 +874,7 @@ ] }, { - "id": "JubilifeCity_Text_TheGlobalTerminalIsOffLimitsIfYouDontHaveAGymBadge", + "id": "JubilifeCity_Text_OffLimitsIfNoGymBadge", "en_US": [ "Past here is the Global Terminal, your\n", "gateway to the world!\r", @@ -885,7 +885,7 @@ ] }, { - "id": "JubilifeCity_Text_PastHereIsTheGlobalTerminal", + "id": "JubilifeCity_Text_PastHereIsGlobalTerminal", "en_US": [ "Past here is the Global Terminal.\n", "It lets you trade with the whole world!\r", @@ -895,11 +895,11 @@ ] }, { - "id": "JubilifeCity_Text_ImTradingPokemonWithMyBuddy", + "id": "JubilifeCity_Text_ImTradingPokemon", "en_US": "I’m trading Pokémon with my buddy!" }, { - "id": "JubilifeCity_TextIMadeMyPokemonHoldAnItemBeforeTradingIt", + "id": "JubilifeCity_Text_IMadePokemonHoldItem", "en_US": [ "I made my Pokémon hold an item before\n", "trading it.\r", @@ -915,35 +915,35 @@ ] }, { - "id": "JubilifeCity_Text_JubilifeCondominiumsTenantsWanted", + "id": "JubilifeCity_Text_SignJubilifeCondominiums", "en_US": [ "Jubilife Condominiums\n", "Tenants Wanted!" ] }, { - "id": "JubilifeCity_Text_ThePoketchCompanyPokemonWatchesForTheWorld", + "id": "JubilifeCity_Text_SignPoketchCompany", "en_US": [ "The Pokétch Company\n", "Pokémon Watches for the World!" ] }, { - "id": "JubilifeCity_Text_TrainersSchoolTheFirstStepForTrainers", + "id": "JubilifeCity_Text_SignTrainersSchool", "en_US": [ "Trainers’ School\n", "The First Step for Trainers!" ] }, { - "id": "JubilifeCity_Text_JubilifeTVTheFunAndGamesTVStation", + "id": "JubilifeCity_Text_SignJubilifeTV", "en_US": [ "Jubilife TV\n", "The Fun-and-Games TV Station!" ] }, { - "id": "JubilifeCity_Text_TheGlobalTerminalYourGatewayToTheWholeWorld", + "id": "JubilifeCity_Text_SignGlobalTerminal", "en_US": [ "The Global Terminal\n", "Your Gateway to the Whole World!" diff --git a/res/text/jubilife_city_condominiums_1f.json b/res/text/jubilife_city_condominiums_1f.json index 8312b54f51..1a2b1c035d 100644 --- a/res/text/jubilife_city_condominiums_1f.json +++ b/res/text/jubilife_city_condominiums_1f.json @@ -13,15 +13,15 @@ ] }, { - "id": "JubilifeCityCondominiums1F_Text_PiikaPi", + "id": "JubilifeCityCondominiums1F_Text_PikachuCry", "en_US": "PIKACHU: Piika pi!" }, { - "id": "JubilifeCityCondominiums1F_Text_Pachipachii", + "id": "JubilifeCityCondominiums1F_Text_PachirisuCry", "en_US": "PACHIRISU: Pachipachii?" }, { - "id": "JubilifeCityCondominiums1F_Text_YourPokemonIsQuiteAdorableTryMakingItHoldThis", + "id": "JubilifeCityCondominiums1F_Text_MakePokemonHoldThis", "en_US": [ "Oh, your Pokémon is quite adorable!\r", "Here, try making it hold this\n", @@ -29,7 +29,7 @@ ] }, { - "id": "JubilifeCityCondominiums1F_Text_APokemonHoldingThatQuickClawCanSometimesAttackFirst", + "id": "JubilifeCityCondominiums1F_Text_SometimesAttackFirst", "en_US": [ "A Pokémon holding that Quick Claw can\n", "sometimes attack first, even if it is\f", diff --git a/res/text/jubilife_city_condominiums_2f.json b/res/text/jubilife_city_condominiums_2f.json index 56c23b72e3..6df2ad3da2 100644 --- a/res/text/jubilife_city_condominiums_2f.json +++ b/res/text/jubilife_city_condominiums_2f.json @@ -2,7 +2,7 @@ "key": 50222, "messages": [ { - "id": "JubilifeCityCondominiums2F_Text_ILikeHowPokemonCanUseAttacks", + "id": "JubilifeCityCondominiums2F_Text_ILikeHowPokemonAttack", "en_US": [ "I like how Pokémon can use attacks.\n", "That makes things fun and different.\r", @@ -13,7 +13,7 @@ ] }, { - "id": "JubilifeCityCondominiums2F_Text_DidYouBuySomeHealBallsAtThePokeMart", + "id": "JubilifeCityCondominiums2F_Text_DidYouBuyHealBalls", "en_US": [ "Did you buy some Heal Balls at the\n", "Poké Mart?\r", diff --git a/res/text/jubilife_city_condominiums_3f.json b/res/text/jubilife_city_condominiums_3f.json index adfb7a1967..a018826783 100644 --- a/res/text/jubilife_city_condominiums_3f.json +++ b/res/text/jubilife_city_condominiums_3f.json @@ -2,7 +2,7 @@ "key": 50218, "messages": [ { - "id": "JubilifeCityCondominiums3F_Text_ICanTradePokemonAroundTheWorldUsingNintendoWFC", + "id": "JubilifeCityCondominiums3F_Text_TradeAroundTheWorld", "en_US": [ "I can trade Pokémon around the world\n", "using Nintendo WFC...\r", @@ -11,7 +11,7 @@ ] }, { - "id": "JubilifeCityCondominiums3F_Text_TheWorldYouCanReachWithNintendoWFC", + "id": "JubilifeCityCondominiums3F_Text_TheWorldYouCanReach", "en_US": [ "The world you can reach with\n", "Nintendo WFC...\f", diff --git a/res/text/jubilife_city_condominiums_4f.json b/res/text/jubilife_city_condominiums_4f.json index 05800ae3fb..dd71d6cec3 100644 --- a/res/text/jubilife_city_condominiums_4f.json +++ b/res/text/jubilife_city_condominiums_4f.json @@ -2,7 +2,7 @@ "key": 50230, "messages": [ { - "id": "JubilifeCityCondominiums4F_Text_ForSomeoneLikeYouThisMightBePerfect", + "id": "JubilifeCityCondominiums4F_Text_ThisMightBePerfect", "en_US": [ "You managed to come out here?\n", "That takes focus!\r", @@ -12,7 +12,7 @@ ] }, { - "id": "JubilifeCityCondominiums4F_Text_ThereAreItemsThatAreUsefulOnlyWhenTheyreHeldByPokemon", + "id": "JubilifeCityCondominiums4F_Text_SomeItemsOnlyUsefulWhenHeld", "en_US": [ "There are items that are useful only\n", "when they’re held by Pokémon.\r", diff --git a/res/text/jubilife_city_pokecenter_1f.json b/res/text/jubilife_city_pokecenter_1f.json index cbe794e81f..a605e1fbca 100644 --- a/res/text/jubilife_city_pokecenter_1f.json +++ b/res/text/jubilife_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "key": 11187, "messages": [ { - "id": "JubilifeCityPokecenter1F_Text_AllTypesHaveStrengthsAndWeaknesses", + "id": "JubilifeCityPokecenter1F_Text_StrengthsAndWeaknesses", "en_US": [ "You know how Pokémon have types like\n", "Water, Fire, and Grass?\r", @@ -11,7 +11,7 @@ ] }, { - "id": "JubilifeCityPokecenter1F_Text_InTheUnionRoomUpstairsYouCanChatAndTradeWithOtherPeople", + "id": "JubilifeCityPokecenter1F_Text_ChatAndTradeInUnionRoom", "en_US": [ "In the Union Room upstairs, you can\n", "chat and trade with other people.\r", @@ -20,7 +20,7 @@ ] }, { - "id": "JubilifeCityPokecenter1F_Text_YouCanStillCatchAPokemonIfYouAlreadyHaveSixTravelingWithYou", + "id": "JubilifeCityPokecenter1F_Text_CanStillCatchWithSixPokemon", "en_US": [ "You can still catch a Pokémon if you\n", "already have six traveling with you.\r", @@ -33,7 +33,7 @@ ] }, { - "id": "JubilifeCityPokecenter1F_Text_HiCanWeFeatureYouInANewsPieceWereDoing", + "id": "JubilifeCityPokecenter1F_Text_KinseyIntro_Unused", "en_US": [ "Hi, can we feature you in a news piece\n", "we’re doing?\r", @@ -42,18 +42,18 @@ ] }, { - "id": "JubilifeCityPokecenter1F_Text_ReporterKinseysLiveInterview", + "id": "JubilifeCityPokecenter1F_Text_KinseyBattleAccepted_Unused", "en_US": "Reporter Kinsey’s live interview!\r" }, { - "id": "JubilifeCityPokecenter1F_Text_UnbelievablePressCoverageDenied", + "id": "JubilifeCityPokecenter1F_Text_KinseyBattleDeclined_Unused", "en_US": [ "Unbelievable! Press coverage denied!\n", "I find you intriguing, too..." ] }, { - "id": "JubilifeCityPokecenter1F_Text_ToGetPeopleToOpenUpWeApproachThemHonestly", + "id": "JubilifeCityPokecenter1F_Text_KinseyPostBattle_Unused", "en_US": [ "To get people to open up, we approach\n", "them honestly with no hidden tricks.\r", @@ -62,21 +62,21 @@ ] }, { - "id": "JubilifeCityPokecenter1F_Text_IsItOKToGoForTheScoop", + "id": "JubilifeCityPokecenter1F_Text_TevinIntro_Unused", "en_US": [ "I’ve spotted a charismatic Trainer!\n", "Is it OK to go for the scoop?" ] }, { - "id": "JubilifeCityPokecenter1F_Text_AsAProfessionalCameramanIAlwaysGoForTheBestShot", + "id": "JubilifeCityPokecenter1F_Text_TevinBattleAccepted_Unused", "en_US": [ "As a professional cameraman, I always\n", "go for the best shot!\r" ] }, { - "id": "JubilifeCityPokecenter1F_Text_ThatsADowner", + "id": "JubilifeCityPokecenter1F_Text_TevinBattleDeclined_Unused", "en_US": [ "That’s a downer...\r", "I thought I’d found a Trainer and\n", @@ -84,7 +84,7 @@ ] }, { - "id": "JubilifeCityPokecenter1F_Text_TheLivelyExpressionsOnYouAndYourPokemonsFaces", + "id": "JubilifeCityPokecenter1F_Text_TevinPostBattle_Unused", "en_US": [ "The lively expressions on you and your\n", "Pokémon’s faces...\r", @@ -92,7 +92,7 @@ ] }, { - "id": "JubilifeCityPokecenter1F_Text_AreWeAllReadyToHaveSomeFun", + "id": "JubilifeCityPokecenter1F_Text_LeeIntro_Unused", "en_US": [ "Are we all ready to have some fun?\n", "I sure am! Aren’t you having fun?!\f", @@ -100,21 +100,21 @@ ] }, { - "id": "JubilifeCityPokecenter1F_Text_OKHowShallWeDoThis", + "id": "JubilifeCityPokecenter1F_Text_LeeBattleAccepted_Unused", "en_US": [ "OK, how shall we do this?\n", "Shall we do something fantastical?\r" ] }, { - "id": "JubilifeCityPokecenter1F_Text_OhHowShallISayThis", + "id": "JubilifeCityPokecenter1F_Text_LeeBattleDeclined_Unused", "en_US": [ "Oh, how shall I say this...?\n", "It makes me all lonely, I say..." ] }, { - "id": "JubilifeCityPokecenter1F_Text_AClownsMakeupIsAFaceThatsCryingWhileLaughing", + "id": "JubilifeCityPokecenter1F_Text_LeePostBattle_Unused", "en_US": [ "A clown’s makeup is a face that’s\n", "crying while laughing. Mwahahah!\r", diff --git a/res/text/jubilife_city_south_house_1f.json b/res/text/jubilife_city_south_house_1f.json index e6e1146b43..e6499069a0 100644 --- a/res/text/jubilife_city_south_house_1f.json +++ b/res/text/jubilife_city_south_house_1f.json @@ -2,7 +2,7 @@ "key": 50194, "messages": [ { - "id": "JubilifeCitySouthHouse1F_PokemonAreWonderfulDeeplyMysteriousCreatures", + "id": "JubilifeCitySouthHouse1F_DeeplyMysteriousCreatures", "en_US": [ "Pokémon are wonderful, deeply\n", "mysterious creatures.\r", @@ -26,7 +26,7 @@ ] }, { - "id": "JubilifeCitySouthHouse1F_PachirisuKukkuuh", + "id": "JubilifeCitySouthHouse1F_PachirisuCry", "en_US": "PACHIRISU: Kukkuuh!" } ] diff --git a/res/text/jubilife_city_south_house_2f.json b/res/text/jubilife_city_south_house_2f.json index a740954599..19ec010769 100644 --- a/res/text/jubilife_city_south_house_2f.json +++ b/res/text/jubilife_city_south_house_2f.json @@ -2,7 +2,7 @@ "key": 50206, "messages": [ { - "id": "JubilifeCitySouthHouse2F_SomeKindsOfPokemonEvolveWhenTheyGetStrongerFromBattling", + "id": "JubilifeCitySouthHouse2F_EvolveWhenStrongerFromBattling", "en_US": [ "Did you know?\r", "Some kinds of Pokémon evolve when\n", @@ -12,7 +12,7 @@ ] }, { - "id": "JubilifeCitySouthHouse2F_EvolutionMakesPokemonJustThatMuchMoreFascinating", + "id": "JubilifeCitySouthHouse2F_EvolutionMakesMoreFascinating", "en_US": [ "Evolution makes Pokémon just that\n", "much more fascinating.\r", @@ -21,7 +21,7 @@ ] }, { - "id": "JubilifeCitySouthHouse2F_DidntProfRowanConductResearchWithProfOak", + "id": "JubilifeCitySouthHouse2F_ConductResearchWithProfOak", "en_US": [ "Didn’t Prof. Rowan conduct research\n", "with Prof. Oak of the Kanto region?" diff --git a/res/text/jubilife_city_south_house_3f.json b/res/text/jubilife_city_south_house_3f.json index d9488dbb02..443edf5170 100644 --- a/res/text/jubilife_city_south_house_3f.json +++ b/res/text/jubilife_city_south_house_3f.json @@ -2,7 +2,7 @@ "key": 50202, "messages": [ { - "id": "JubilifeCitySouthHouse3F_WhenIGiveMyPokemonNicknamesItsLikeTheyreMyVeryOwn", + "id": "JubilifeCitySouthHouse3F_ItsLikeTheyreMyOwn", "en_US": [ "When I give my Pokémon nicknames,\n", "it’s like they’re my very own.\r", diff --git a/res/text/jubilife_city_southwest_house_1f.json b/res/text/jubilife_city_southwest_house_1f.json index 99ea896e44..9c1a831c40 100644 --- a/res/text/jubilife_city_southwest_house_1f.json +++ b/res/text/jubilife_city_southwest_house_1f.json @@ -2,7 +2,7 @@ "key": 17483, "messages": [ { - "id": "JubilifeCitySouthwestHouse1F_Text_IGotMyPikachuThroughATradeFromSomeone", + "id": "JubilifeCitySouthwestHouse1F_Text_GotPikachuThroughTrade", "en_US": [ "I got my PIKACHU through a trade from\n", "someone somewhere in the world.\r", @@ -16,11 +16,11 @@ ] }, { - "id": "JubilifeCitySouthwestHouse1F_Text_PikachuPikapikapikaaah", + "id": "JubilifeCitySouthwestHouse1F_Text_PikachuCry", "en_US": "PIKACHU: Pikapikapikaaah!" }, { - "id": "JubilifeCitySouthwestHouse1F_Text_IfEveryoneAroundTheWorldHadPokemon", + "id": "JubilifeCitySouthwestHouse1F_Text_IfEveryoneHadPokemon", "en_US": [ "If everyone around the world had\n", "Pokémon...\r", diff --git a/res/text/jubilife_city_southwest_house_2f.json b/res/text/jubilife_city_southwest_house_2f.json index 83623e1bc5..73e2c6fc31 100644 --- a/res/text/jubilife_city_southwest_house_2f.json +++ b/res/text/jubilife_city_southwest_house_2f.json @@ -10,7 +10,7 @@ ] }, { - "id": "JubilifeCitySouthwestHouse2F_Text_ILikeLookAtPokemonIGetFromFriendInTrade", + "id": "JubilifeCitySouthwestHouse2F_Text_ILikeLookAtPokemon", "en_US": [ "Fi: I like look at Pokémon I get\n", "from friend in trade.\r", @@ -18,7 +18,7 @@ ] }, { - "id": "JubilifeCitySouthwestHouse2F_Text_YouCanTradePokemonWithPeopleAroundTheWorldOnNintendoWFC", + "id": "JubilifeCitySouthwestHouse2F_Text_TradePAroundTheWorld", "en_US": [ "You can trade Pokémon with people\n", "around the world on Nintendo WFC...\r", @@ -27,7 +27,7 @@ ] }, { - "id": "JubilifeCitySouthwestHouse2F_Text_WhenYouConnectWithPeopleOnNintendoWFCItsHardToBe", + "id": "JubilifeCitySouthwestHouse2F_Text_WorldsBigOrSmall", "en_US": [ "When you connect with people on\n", "Nintendo WFC, it’s hard to\f", diff --git a/res/text/jubilife_tv_1f.json b/res/text/jubilife_tv_1f.json index 295ec9e9c9..bb7786a9c6 100644 --- a/res/text/jubilife_tv_1f.json +++ b/res/text/jubilife_tv_1f.json @@ -2,7 +2,7 @@ "key": 17435, "messages": [ { - "id": "JubilifeTV1F_Text_WhyDontYouTryDressingUpYourPokemonNow", + "id": "JubilifeTV1F_Text_TryDressingUpPokemon", "en_US": [ "Why don’t you try dressing up your\n", "Pokémon now?\r", @@ -13,7 +13,7 @@ ] }, { - "id": "JubilifeTV1F_Text_ThisIsThePokemonLotteryCorner", + "id": "JubilifeTV1F_Text_ThisIsLotteryCorner", "en_US": [ "This is the Pokémon Lottery Corner.\n", "I’m Felicity, your attendant today.\r", @@ -25,21 +25,21 @@ ] }, { - "id": "JubilifeTV1F_Text_YouveAlreadyDrawnALotoTicketToday", + "id": "JubilifeTV1F_Text_AlreadyDrawnTicketToday", "en_US": [ "You’ve already drawn a Loto Ticket\n", "today. Please come back tomorrow." ] }, { - "id": "JubilifeTV1F_Text_OhISeePleaseDoVisitUsAgain", + "id": "JubilifeTV1F_Text_PleaseVisitAgain", "en_US": [ "Oh. I see.\n", "Please do visit us again." ] }, { - "id": "JubilifeTV1F_Text_FirstIllLookUpTodaysPokemonLotteryCornerLuckyNumber", + "id": "JubilifeTV1F_Text_LookUpTodaysLuckyNumber", "en_US": [ "First, I’ll look up today’s Pokémon\n", "Lottery Corner lucky number.\r", @@ -47,7 +47,7 @@ ] }, { - "id": "JubilifeTV1F_Text_YourLotoTicketNumberIsNum", + "id": "JubilifeTV1F_Text_YourLotoTicketNumberIsX", "en_US": [ "Your Loto Ticket number is {STRVAR_1 54, 0, 0}.\r", "Now, let’s see if it matches the\n", @@ -55,7 +55,7 @@ ] }, { - "id": "JubilifeTV1F_Text_CongratulationsTheIDOfYourTeamsPokemonMatchesYourLotoTicketNumber", + "id": "JubilifeTV1F_Text_IDOfTeamPokemonMatchesTicketNumber", "en_US": [ "Congratulations!\r", "The ID No. of your team’s\n", @@ -64,7 +64,7 @@ ] }, { - "id": "JubilifeTV1F_Text_CongratulationsTheIDOfYourPCBoxedPokemonMatchesYourLotoTicketNumber", + "id": "JubilifeTV1F_Text_IDOfBoxedPokemonMatchesTicketNumber", "en_US": [ "Congratulations!\r", "The ID No. of your PC-boxed\n", @@ -73,14 +73,14 @@ ] }, { - "id": "JubilifeTV1F_Text_ImSorryYouDidntGetAMatch", + "id": "JubilifeTV1F_Text_YouDidntGetAMatch", "en_US": [ "I’m sorry.\n", "You didn’t get a match..." ] }, { - "id": "JubilifeTV1F_Text_TheLastDigitMatchedSoYouWinTheFourthPrize", + "id": "JubilifeTV1F_Text_LastDigitMatchedWinFourthPrize", "en_US": [ "The last digit matched, so you\n", "win the fourth prize!\r" @@ -94,28 +94,28 @@ ] }, { - "id": "JubilifeTV1F_Text_TheLastTwoDigitsMatchedSoYouWinTheThirdPrize", + "id": "JubilifeTV1F_Text_LastTwoDigitsMatchedWinThirdPrize", "en_US": [ "The last two digits matched, so you\n", "win the third prize!\r" ] }, { - "id": "JubilifeTV1F_Text_TheLastThreeDigitsMatchedSoYouWinTheSecondPrize", + "id": "JubilifeTV1F_Text_LastThreeDigitsMatchedWinSecondPrize", "en_US": [ "The last three digits matched, so you\n", "win the second prize!\r" ] }, { - "id": "JubilifeTV1F_Text_TheLastFourDigitsMatchedSoYouWinTheFirstPrize", + "id": "JubilifeTV1F_Text_LastFourDigitsMatchedWinFirstPrize", "en_US": [ "The last four digits matched, so you\n", "win the first prize!\r" ] }, { - "id": "JubilifeTV1F_Text_OhMyGoodnessAllFiveDigitsMatchedYouveWonTheJackpotPrize", + "id": "JubilifeTV1F_Text_AllDigitsMatchedWinJackpot", "en_US": [ "Oh, my goodness, all five digits\n", "matched!\r", @@ -127,7 +127,7 @@ ] }, { - "id": "JubilifeTV1F_Text_OhYouSeemToHaveNoRoomForThis", + "id": "JubilifeTV1F_Text_NoRoomForThis", "en_US": [ "...Oh?\n", "You seem to have no room for this.\r", @@ -136,7 +136,7 @@ ] }, { - "id": "JubilifeTV1F_Text_ThisIsThePrizeWeveBeenHoldingForYou", + "id": "JubilifeTV1F_Text_ThisIsPrizeWeveBeenHolding", "en_US": [ "{STRVAR_1 3, 0, 0}?\n", "Yes, I’ve been expecting you.\r", @@ -152,7 +152,7 @@ ] }, { - "id": "JubilifeTV1F_Text_WouldYouLikeToCheckTodaysLuckyNumberAgain", + "id": "JubilifeTV1F_Text_CheckLuckyNumberAgain", "en_US": [ "This is the Pokémon Lottery Corner.\r", "Would you like to check today’s lucky\n", @@ -160,7 +160,7 @@ ] }, { - "id": "JubilifeTV1F_Text_TheyKeepTrackOfOfficialRecordsHere", + "id": "JubilifeTV1F_Text_TheyKeepTrackOfRecords", "en_US": [ "They keep track of official records\n", "here.\r", @@ -171,7 +171,7 @@ ] }, { - "id": "JubilifeTV1F_Text_ImGoingToGetCommercialsShownOnTV", + "id": "JubilifeTV1F_Text_CommercialsShownOnTV", "en_US": [ "I’m going to get commercials shown\n", "on TV.\r", @@ -180,7 +180,7 @@ ] }, { - "id": "JubilifeTV1F_Text_TheTVStationInterviewsAllSortsOfTrainersForItsShows", + "id": "JubilifeTV1F_Text_InterviewsAllSortsOfTrainers", "en_US": [ "The TV station interviews all sorts of\n", "Trainers for its shows.\r", diff --git a/res/text/jubilife_tv_2f.json b/res/text/jubilife_tv_2f.json index e602c76c3f..7c5d37ca80 100644 --- a/res/text/jubilife_tv_2f.json +++ b/res/text/jubilife_tv_2f.json @@ -2,7 +2,7 @@ "key": 17431, "messages": [ { - "id": "JubilifeTV2F_Text_WhatAccessoriesWillGoWellWithMyDressToday", + "id": "JubilifeTV2F_Text_WhatAccessoriesWillGoWell", "en_US": [ "I don’t know what to do.\r", "What Accessories will go well with\n", @@ -10,7 +10,7 @@ ] }, { - "id": "JubilifeTV2F_Text_SoAGiftForOurFutureStar", + "id": "JubilifeTV2F_Text_GiftForFutureStar", "en_US": [ "The star of tomorrow is... You!\n", "Your Pokémon has a glow about it!\r", @@ -18,7 +18,7 @@ ] }, { - "id": "JubilifeTV2F_Text_IHopeYouGetIntoCollectingAccessoriesForYourPokemon", + "id": "JubilifeTV2F_Text_IHopeYouCollectAccessories", "en_US": [ "That’s a {STRVAR_1 31, 0, 0}!\r", "I hope you get into collecting\n", @@ -26,7 +26,7 @@ ] }, { - "id": "JubilifeTV2F_Text_TheRoomAtTheBackIsOurDreamyFittingRoom", + "id": "JubilifeTV2F_Text_FittingRoomAtTheBack", "en_US": [ "The room at the back is our dreamy\n", "fitting room.\r", diff --git a/res/text/jubilife_tv_2f_gallery.json b/res/text/jubilife_tv_2f_gallery.json index 238bd37707..45841909f1 100644 --- a/res/text/jubilife_tv_2f_gallery.json +++ b/res/text/jubilife_tv_2f_gallery.json @@ -6,7 +6,7 @@ "garbage": 58 }, { - "id": "JubilifeTV2FGallery_Text_DressUpYourPokemonYouWillDoThisWontYou", + "id": "JubilifeTV2FGallery_Text_DressUpYourPokemon", "en_US": [ "Ooh, your Pokémon are so very\n", "charming! How enchanting!\r", @@ -21,14 +21,14 @@ ] }, { - "id": "JubilifeTV2FGallery_Text_OhYouSillyThingWheresYourSenseOfAdventure", + "id": "JubilifeTV2FGallery_Text_WheresYourSenseOfAdventure", "en_US": [ "Oh, you silly thing...\n", "Where’s your sense of adventure?" ] }, { - "id": "JubilifeTV2FGallery_Text_ShouldIExplainToYouHowToDressUpYourPokemon", + "id": "JubilifeTV2FGallery_Text_ShouldIExplainDressUp", "en_US": [ "Ooh, ooh, yes! How nice!\n", "Let’s not delay!\r", @@ -37,21 +37,21 @@ ] }, { - "id": "JubilifeTV2FGallery_Text_OohIWonderWhichPokemonYoullDressUp", + "id": "JubilifeTV2FGallery_Text_DressUpWhichPokemon", "en_US": [ "Ooh, I wonder which Pokémon you’ll\n", "dress up?\r" ] }, { - "id": "JubilifeTV2FGallery_Text_TehehehIHopeYouWillDressItUpAdorably", + "id": "JubilifeTV2FGallery_Text_DressItUpAdorably", "en_US": [ "Teheheh...\n", "I hope you will dress it up adorably!\r" ] }, { - "id": "JubilifeTV2FGallery_Text_JustChooseTheAccessoriesAndPutThemOnYourPokemon", + "id": "JubilifeTV2FGallery_Text_ExplainDressUp", "en_US": [ "You have a Fashion Case, don’t you?\n", "Ah, oui, wonderful!\r", @@ -66,7 +66,7 @@ ] }, { - "id": "JubilifeTV2FGallery_Text_OohNiceWorkOhButItNeedsToHaveATitle", + "id": "JubilifeTV2FGallery_Text_ItNeedsATitle", "en_US": [ "Ooh, nice work!\n", "Let’s display the photo right away!\f", @@ -74,7 +74,7 @@ ] }, { - "id": "JubilifeTV2FGallery_Text_OohYesYesIGetItNow", + "id": "JubilifeTV2FGallery_Text_IGetItNow", "en_US": [ "{STRVAR_1 28, 0, 0}...\r", "Ooh, yes, yes! I get it now!\n", @@ -82,21 +82,21 @@ ] }, { - "id": "JubilifeTV2FGallery_Text_OhNonNonNonItWillBeForlornWithoutATitle", + "id": "JubilifeTV2FGallery_Text_ForlornWithoutATitle", "en_US": [ "Oh, non, non, non!\n", "It will be forlorn without a title." ] }, { - "id": "JubilifeTV2FGallery_Text_OhYouCameOutWithoutDoingAnythingHowDisappointing", + "id": "JubilifeTV2FGallery_Text_CameOutWithoutDoingAnything", "en_US": [ "Oh... You came out without doing\n", "anything... How disappointing." ] }, { - "id": "JubilifeTV2FGallery_Text_WouldYouLikeToDressUpAPokemonDearie", + "id": "JubilifeTV2FGallery_Text_WouldYouLikeToDressUp", "en_US": [ "If you dress up any Pokémon again,\n", "the photo here will be changed.\r", @@ -109,28 +109,28 @@ "garbage": 54 }, { - "id": "JubilifeTV2FGallery_Text_OohNonNonNonThatsAnEgg", + "id": "JubilifeTV2FGallery_Text_ThatsAnEgg", "en_US": [ "Ooh, non, non, non! That’s an Egg!\n", "It’s too young to be dressing up!\r" ] }, { - "id": "JubilifeTV2FGallery_Text_IPutYourPhotoUpRightHere", + "id": "JubilifeTV2FGallery_Text_IPutPhotoRightHere", "en_US": [ "I put your photo up right here.\n", "It just looks so perfect there!" ] }, { - "id": "JubilifeTV2FGallery_Text_ItsAFrameForHoldingAPokemonPortraitPhoto", + "id": "JubilifeTV2FGallery_Text_FrameForHoldingPortrait", "en_US": [ "It’s a frame for holding a Pokémon\n", "portrait photo." ] }, { - "id": "JubilifeTV2FGallery_Text_TheyDisplayPhotosFromTrainersYouBeenMixinRecordsWithRight", + "id": "JubilifeTV2FGallery_Text_DisplayTrainersMixedRecordsWith", "en_US": [ "They display photos from Trainers\n", "you been mixin’ records with, right?\r", @@ -139,7 +139,7 @@ ] }, { - "id": "JubilifeTV2FGallery_Text_SomeoneGaveMeANewBackdropWhenIWentToTheGlobalTerminal", + "id": "JubilifeTV2FGallery_Text_SomeoneGaveNewBackdrop", "en_US": [ "Someone gave me a new Backdrop when I\n", "went to the Global Terminal." diff --git a/res/text/jubilife_tv_3f.json b/res/text/jubilife_tv_3f.json index 66b017ee7f..6349dc2820 100644 --- a/res/text/jubilife_tv_3f.json +++ b/res/text/jubilife_tv_3f.json @@ -2,21 +2,21 @@ "key": 17427, "messages": [ { - "id": "JubilifeTV3F_Text_TheRoomClosestToTheStairsIsTheGroupRankingRoom", + "id": "JubilifeTV3F_Text_ClosestToStairsIsGroupRankingRoom", "en_US": [ "The room closest to the stairs is the\n", "Group Ranking Room.\r" ] }, { - "id": "JubilifeTV3F_Text_TheRoomOnTheOppositeSideIsTheGlobalRankingRoom", + "id": "JubilifeTV3F_Text_OppositeSideIsGlobalRankingRoom", "en_US": [ "The room on the opposite side\n", "is the Global Ranking Room." ] }, { - "id": "JubilifeTV3F_Text_TheMoreTradesIMakeTheBetterMyOddsOfWinningThePokemonLottery", + "id": "JubilifeTV3F_Text_BetterOddsOfWinningLottery", "en_US": [ "I just realized something awesome!\n", "I should be trading Pokémon more!\r", @@ -36,7 +36,7 @@ ] }, { - "id": "JubilifeTV3F_Text_WillYouTellMeYourOpinionOnTV", + "id": "JubilifeTV3F_Text_TellMeYourOpinionOnTV", "en_US": [ "Hey, there!\n", "How’s it going?\r", @@ -47,7 +47,7 @@ ] }, { - "id": "JubilifeTV3F_Text_MovingRightAlongWhatFeedbackCanYouGiveMeAboutTV", + "id": "JubilifeTV3F_Text_WhatFeedbackCanYouGive", "en_US": [ "Oh, yeah?\n", "That’s interesting.\r", @@ -67,7 +67,7 @@ ] }, { - "id": "JubilifeTV3F_Text_OhAllRightICanUnderstandHowBusyItMustGetForYou", + "id": "JubilifeTV3F_Text_OhAllRight", "en_US": [ "Oh, all right.\r", "I can understand how busy it must\n", @@ -78,7 +78,7 @@ ] }, { - "id": "JubilifeTV3F_Text_IThinkICanSwingADealToGetYouANewWallpaperForYourPCBoxes", + "id": "JubilifeTV3F_Text_DealForNewPCBoxesWallpaper", "en_US": [ "...Oh?\r", "The fact that you know that phrase\n", @@ -92,7 +92,7 @@ ] }, { - "id": "JubilifeTV3F_Text_IThinkICanSwingADealSoYouCanReceiveAMysteryGift", + "id": "JubilifeTV3F_Text_DealForMysteryGift", "en_US": [ "...Oh?\r", "The fact that you know that phrase\n", diff --git a/res/text/jubilife_tv_3f_global_ranking_room.json b/res/text/jubilife_tv_3f_global_ranking_room.json index 1eb2116064..aa7a3ad5e4 100644 --- a/res/text/jubilife_tv_3f_global_ranking_room.json +++ b/res/text/jubilife_tv_3f_global_ranking_room.json @@ -2,7 +2,7 @@ "key": 17415, "messages": [ { - "id": "JubilifeTV3FGlobalRankingRoom_Text_SomeoneBrokeMyPokemonCatchingRecord", + "id": "JubilifeTV3FGlobalRankingRoom_Text_SomeoneBrokeMyCatchingRecord", "en_US": [ "Someone broke my Pokémon-catching\n", "record!\r", @@ -11,7 +11,7 @@ ] }, { - "id": "JubilifeTV3FGlobalRankingRoom_Text_IBetItdFeelGreatIfICouldBeNumberOneHere", + "id": "JubilifeTV3FGlobalRankingRoom_Text_NumberOneWouldFeelGreat", "en_US": [ "I bet it’d feel great if I could be\n", "number one here!\r", @@ -20,7 +20,7 @@ ] }, { - "id": "JubilifeTV3FGlobalRankingRoom_Text_ImTryingForTheWorldRecordAtPokemonFishing", + "id": "JubilifeTV3FGlobalRankingRoom_Text_ImTryingForRecordAtFishing", "en_US": [ "I really don’t win many battles...\n", "But it doesn’t get me down.\r", @@ -29,7 +29,7 @@ ] }, { - "id": "JubilifeTV3FGlobalRankingRoom_Text_SorryImStillFineTuningThisThingyHere", + "id": "JubilifeTV3FGlobalRankingRoom_Text_ImStillFineTuningThisThingy", "en_US": [ "Sorry, I’m still fine-tuning this\n", "thingy here." diff --git a/res/text/jubilife_tv_3f_group_ranking_room.json b/res/text/jubilife_tv_3f_group_ranking_room.json index 6ffcaf2cae..776fa7549a 100644 --- a/res/text/jubilife_tv_3f_group_ranking_room.json +++ b/res/text/jubilife_tv_3f_group_ranking_room.json @@ -2,7 +2,7 @@ "key": 17411, "messages": [ { - "id": "JubilifeTV3FGroupRankingRoom_Text_YouCanSeeTheRankingsOfPeopleInYourGroupHere", + "id": "JubilifeTV3FGroupRankingRoom_Text_SeeRankingsInGroupHere", "en_US": [ "You can see the rankings of people\n", "in your group here.\r", @@ -19,7 +19,7 @@ ] }, { - "id": "JubilifeTV3FGroupRankingRoom_Text_SorryImStillFineTuningThisThingyHere", + "id": "JubilifeTV3FGroupRankingRoom_Text_ImStillFineTuningThisThingy", "en_US": [ "Sorry, I’m still fine-tuning this\n", "thingy here." diff --git a/res/text/jubilife_tv_4f.json b/res/text/jubilife_tv_4f.json index 0fa457961d..ecabaaae01 100644 --- a/res/text/jubilife_tv_4f.json +++ b/res/text/jubilife_tv_4f.json @@ -12,14 +12,14 @@ ] }, { - "id": "JubilifeTV4F_Text_ParticipationForAllIsOurTVNetworksMotto", + "id": "JubilifeTV4F_Text_TVNetworksMotto", "en_US": [ "“Participation for all” is our TV\n", "network’s motto." ] }, { - "id": "JubilifeTV4F_Text_WerePromotingTheThemeSmilesAreDreamy", + "id": "JubilifeTV4F_Text_ThemeSmilesAreDreamy", "en_US": [ "We’re promoting the theme “Smiles are\n", "dreamy.”\r", diff --git a/res/text/lake_verity.json b/res/text/lake_verity.json index 7ed8eb0cf8..a34462b410 100644 --- a/res/text/lake_verity.json +++ b/res/text/lake_verity.json @@ -2,7 +2,7 @@ "key": 50255, "messages": [ { - "id": "LakeVerity_Text_WhatTimingYouveGotToHelpDawn", + "id": "LakeVerity_Text_YouveGotToHelpDawn", "en_US": [ "Rowan: Ah, {STRVAR_1 3, 0, 0}!\n", "What timing!\r", @@ -12,7 +12,7 @@ ] }, { - "id": "LakeVerity_Text_WhatTimingYouveGotToHelpLucas", + "id": "LakeVerity_Text_YouveGotToHelpLucas", "en_US": [ "Rowan: Ah, {STRVAR_1 3, 0, 0}!\n", "What timing!\r", @@ -23,7 +23,7 @@ ] }, { - "id": "LakeVerity_Text_HowDareYouMisguidedThugs", + "id": "LakeVerity_Text_HowDareYou", "en_US": [ "Rowan: How dare you!\n", "You misguided thugs!\r" @@ -37,7 +37,7 @@ ] }, { - "id": "LakeVerity_Text_HowDareYouMisguidedThugsUnused", + "id": "LakeVerity_Text_HowDareYou_Unused", "en_US": [ "Rowan: How dare you!\n", "You misguided thugs!\r" @@ -51,7 +51,7 @@ ] }, { - "id": "LakeVerity_Text_OuchWhatsWithThisOldTimer", + "id": "LakeVerity_Text_WhatsWithThisOldTimer", "en_US": [ "Ow! Ouch!\n", "What’s with this old-timer?" @@ -159,7 +159,7 @@ ] }, { - "id": "LakeVerity_Text_INeedYouToGoToLakeAcuity", + "id": "LakeVerity_Text_GoToLakeAcuity", "en_US": [ "Rowan: {STRVAR_1 3, 0, 0}, I need you to\n", "go to Lake Acuity right away.\r", @@ -176,7 +176,7 @@ ] }, { - "id": "LakeVerity_Text_LucasWhatsTeamGalacticUpTo", + "id": "LakeVerity_Text_LucasWhatsGalacticUpTo", "en_US": [ "Lucas: {STRVAR_1 3, 0, 0}, what’s Team\n", "Galactic up to?\r", diff --git a/res/text/lake_verity_low_water.json b/res/text/lake_verity_low_water.json index 58fee4618f..d35cf07aa8 100644 --- a/res/text/lake_verity_low_water.json +++ b/res/text/lake_verity_low_water.json @@ -6,7 +6,7 @@ "en_US": "{STRVAR_1 3, 0, 0}: What’s going on...?\r" }, { - "id": "LakeVerityLowWater_Text_IWillMakeTimeAndSpaceMine", + "id": "LakeVerityLowWater_Text_MakeTimeAndSpaceMine", "en_US": [ "...The flowing time...\n", "...The expanding space...\r", @@ -31,7 +31,7 @@ ] }, { - "id": "LakeVerityLowWater_Text_LetsCatchThatLegendaryPokemon", + "id": "LakeVerityLowWater_Text_LetsCatchThatLegendary", "en_US": [ "OK, {STRVAR_1 3, 1, 0}!\n", "Let’s catch that legendary Pokémon!\r" @@ -42,7 +42,7 @@ "en_US": "Kyauuun!\r" }, { - "id": "LakeVerityLowWater_Text_ThatWasTheLegendaryPokemonCrying", + "id": "LakeVerityLowWater_Text_ThatWasTheLegendaryCrying", "en_US": [ "{STRVAR_1 3, 0, 0}: !\n", "Did you hear that, {STRVAR_1 3, 1, 0}?!\r", @@ -75,7 +75,7 @@ ] }, { - "id": "LakeVerityLowWater_Text_RowanNoLegendaryPokemonHowWasLakeValor", + "id": "LakeVerityLowWater_Text_RowanNoLegendaryHowWasLakeValor", "en_US": [ "Rowan: Hmmm...\r", "No legendary Pokémon, nothing out\n", diff --git a/res/text/mt_coronet_1f_north_room_1.json b/res/text/mt_coronet_1f_north_room_1.json index 1ba7a33c51..ed520deb31 100644 --- a/res/text/mt_coronet_1f_north_room_1.json +++ b/res/text/mt_coronet_1f_north_room_1.json @@ -2,7 +2,7 @@ "key": 24590, "messages": [ { - "id": "MtCoronet1FNorthRoom1_Text_TheresNoWayOfGettingToThePeakOfMtCoronetFromThisSide", + "id": "MtCoronet1FNorthRoom1_Text_NoWayToPeakFromThisSide", "en_US": [ "There’s no way of getting to the\n", "peak of Mt. Coronet from this side!\r", @@ -15,7 +15,7 @@ ] }, { - "id": "MtCoronet1FNorthRoom1_Text_TheFogIsSoThickAheadICantEvenSeeMyOwnHand", + "id": "MtCoronet1FNorthRoom1_Text_FogIsSoThick", "en_US": [ "Grunt 1: The fog is so thick ahead\n", "I can’t even see my own hand!\r", @@ -23,7 +23,7 @@ ] }, { - "id": "MtCoronet1FNorthRoom1_Text_HahThePokemonTheyGaveMeCantUseDefogEither", + "id": "MtCoronet1FNorthRoom1_Text_MyPokemonCantUseDefog", "en_US": [ "Grunt 2: Hah? The Pokémon they gave me\n", "can’t use Defog, either.\r", diff --git a/res/text/mt_coronet_1f_south.json b/res/text/mt_coronet_1f_south.json index 1098d8ed40..9d300d3625 100644 --- a/res/text/mt_coronet_1f_south.json +++ b/res/text/mt_coronet_1f_south.json @@ -2,7 +2,7 @@ "key": 25602, "messages": [ { - "id": "MtCoronet1FSouth_Text_AccordingToOneTheoryMtCoronetIsWhereTheSinnohRegionBegan", + "id": "MtCoronet1FSouth_Text_MtCoronetIsWhereSinnohBegan", "en_US": [ "According to one theory, Mt. Coronet\n", "is where the Sinnoh region began.\r" diff --git a/res/text/mt_coronet_2f.json b/res/text/mt_coronet_2f.json index 5402421bd4..75d09e5101 100644 --- a/res/text/mt_coronet_2f.json +++ b/res/text/mt_coronet_2f.json @@ -2,7 +2,7 @@ "key": 25614, "messages": [ { - "id": "MtCoronet2F_Text_ObserveIfYouWillThatHole", + "id": "MtCoronet2F_Text_ObserveThatHole", "en_US": [ "Looker: Observe, if you will, that hole.\r", "There was once a cave painting that had\n", @@ -16,7 +16,7 @@ ] }, { - "id": "MtCoronet2F_Text_AreYouTrainerEnoughToAdvanceShowMeIfYouWill", + "id": "MtCoronet2F_Text_AreYouEnoughToAdvance", "en_US": [ "There is but one cause!\n", "Team Galactic’s Cyrus!\r", @@ -27,7 +27,7 @@ ] }, { - "id": "MtCoronet2F_Text_YouAreFarSuperiorToMeAllICanDoNowIsGiveYouThis", + "id": "MtCoronet2F_Text_YouAreFarSuperiorToMe", "en_US": [ "...\n", "...\r", @@ -46,7 +46,7 @@ ] }, { - "id": "MtCoronet2F_Text_PleaseYouMustStopTeamGalactic", + "id": "MtCoronet2F_Text_YouMustStopTeamGalactic", "en_US": [ "Looker: Please!\n", "You must stop Team Galactic!" @@ -60,7 +60,7 @@ ] }, { - "id": "MtCoronet2F_Text_PleaseStopTeamGalacticAllICanDoNowIsGiveYouThis", + "id": "MtCoronet2F_Text_AllICanDoIsGiveThis", "en_US": [ "Looker: Please, stop Team Galactic!\n", "For only you are able!\r", @@ -70,14 +70,14 @@ ] }, { - "id": "MtCoronet2F_Text_ThereAppearsToBeACavePaintingFromAnAncientTime", + "id": "MtCoronet2F_Text_CavePaintingFromAncientTime", "en_US": [ "There appears to be a cave painting\n", "from an ancient time..." ] }, { - "id": "MtCoronet2F_Text_ShardsAreAllThatRemainOfTheAncientCavePainting", + "id": "MtCoronet2F_Text_ShardsAreAllThatRemain", "en_US": [ "Shards are all that remain of the\n", "ancient cave painting..." diff --git a/res/text/old_chateau.json b/res/text/old_chateau.json index 02d3c8b0b5..e0115af94e 100644 --- a/res/text/old_chateau.json +++ b/res/text/old_chateau.json @@ -2,7 +2,7 @@ "key": 58435, "messages": [ { - "id": "OldChateau_Text_ItAppearsAsIfItIsGlaring", + "id": "OldChateau_Text_ItAppearsGlaring", "en_US": "...It appears as if it is glaring..." } ] diff --git a/res/text/old_chateau_back_middle_west_room.json b/res/text/old_chateau_back_middle_west_room.json index bde31c79ed..6c89682b2a 100644 --- a/res/text/old_chateau_back_middle_west_room.json +++ b/res/text/old_chateau_back_middle_west_room.json @@ -2,14 +2,14 @@ "key": 58463, "messages": [ { - "id": "OldChateauBackMiddleWestRoom_Text_TheTVHasAnOddlyMalevolentFeel", + "id": "OldChateauBackMiddleWestRoom_Text_TVHasMalevolentFeel", "en_US": [ "The TV has an oddly malevolent feel...\n", "It’s as if it is staring..." ] }, { - "id": "OldChateauBackMiddleWestRoom_Text_ThereAppearsToBeAPokemonWantToThumpTheTV", + "id": "OldChateauBackMiddleWestRoom_Text_WantToThumpTheTV", "en_US": [ "Inside the TV...\n", "There appears to be a Pokémon?...\r", @@ -22,7 +22,7 @@ "en_US": "{STRVAR_1 3, 0, 0} thumped the TV set!\r" }, { - "id": "OldChateauBackMiddleWestRoom_Text_RotomDisappearedIntoTheTVSet", + "id": "OldChateauBackMiddleWestRoom_Text_RotomDisappearedIntoTV", "en_US": "ROTOM disappeared into the TV set..." } ] diff --git a/res/text/oreburgh_city.json b/res/text/oreburgh_city.json index 52ad41fe78..81a52eae8c 100644 --- a/res/text/oreburgh_city.json +++ b/res/text/oreburgh_city.json @@ -2,7 +2,7 @@ "key": 18331, "messages": [ { - "id": "OreburghCity_Text_TheGymLeadersGoneOffToTheCoalMine", + "id": "OreburghCity_Text_GymLeadersGoneOffToTheMine", "en_US": [ "{STRVAR_1 3, 0, 0}: Hunh?\r", "Oh, it’s you, {STRVAR_1 3, 1, 0}!\n", @@ -21,7 +21,7 @@ ] }, { - "id": "OreburghCity_Text_IToldYouTheGymLeaderWentDownToTheOreburghMine", + "id": "OreburghCity_Text_GymLeaderWentDownToTheMine", "en_US": [ "{STRVAR_1 3, 0, 0}: I told you, the Gym\n", "Leader went down to the Oreburgh Mine.\r", @@ -34,7 +34,7 @@ "en_US": "{SIZE 200}Thud!!{SIZE 100}\r" }, { - "id": "OreburghCity_Text_EternaCityIsTheNextPlaceWithAGymThatGivesAwayBadgesRight", + "id": "OreburghCity_Text_EternaCityNextPlaceWithAGym", "en_US": [ "{STRVAR_1 3, 0, 0}: Whoops! {STRVAR_1 3, 1, 0}!\n", "You got the Gym Badge, huh?\r", @@ -43,7 +43,7 @@ ] }, { - "id": "OreburghCity_Text_IWentToRoute207ButYouCantGoThereWithoutABicycle", + "id": "OreburghCity_Text_CantGoToRoute207WithoutBicycle", "en_US": [ "So, yeah, I went to Route 207, but\n", "you can’t go there without a Bicycle.\r", @@ -62,7 +62,7 @@ ] }, { - "id": "OreburghCity_Text_IllTakeYouToThePokemonGym", + "id": "OreburghCity_Text_IllTakeYouToTheGym", "en_US": [ "Howdy, Trainer!\r", "Huh? Uh-oh!\n", @@ -79,7 +79,7 @@ ] }, { - "id": "OreburghCity_Text_IsThatGuyInFrontOfTheGymYourFriend", + "id": "OreburghCity_Text_IsThatGuyYourFriend", "en_US": [ "Is that guy in front of the Gym\n", "your friend?\r", @@ -102,14 +102,14 @@ ] }, { - "id": "OreburghCity_Text_TheGymLeaderWentOffToWorkInTheMine", + "id": "OreburghCity_Text_GymLeaderWentOffToWork", "en_US": [ "The Gym Leader went off to work in\n", "the mine." ] }, { - "id": "OreburghCity_Text_TheGymLeaderIsYoungButHesTheMinesSafetySupervisor", + "id": "OreburghCity_Text_GymLeaderIsSafetySupervisor", "en_US": [ "The Gym Leader is young, but he’s\n", "the mine’s safety supervisor.\r", @@ -127,7 +127,7 @@ ] }, { - "id": "OreburghCity_Text_UpAheadTheresAHugeMountainThatTowersAboveEverything", + "id": "OreburghCity_Text_UpAheadTheresAHugeMountain", "en_US": [ "Up ahead there’s a huge mountain\n", "that towers above everything.\r", @@ -143,7 +143,7 @@ ] }, { - "id": "OreburghCity_Text_TheseVentsExchangeTheHotAirDownBelowWithTheFreshAirOutside", + "id": "OreburghCity_Text_TheseVentsExchangeAirDownBelow", "en_US": [ "These vents exchange the hot air\n", "down below with the fresh air outside.\r", @@ -162,14 +162,14 @@ ] }, { - "id": "OreburghCity_Text_FeelingHaleAndHeartyPutsASmileOnMyFace", + "id": "OreburghCity_Text_PutsASmileOnMyFace", "en_US": [ "Feeling hale and hearty puts a smile\n", "on my face. And that makes me happy." ] }, { - "id": "OreburghCity_Text_ThisPileOfDirtySandIsCalledASlagHeap", + "id": "OreburghCity_Text_ThisPileIsCalledASlagHeap", "en_US": [ "This pile of dirty sand is called\n", "a slag heap.\r", @@ -177,14 +177,14 @@ ] }, { - "id": "OreburghCity_Text_ChopChopMachopChopChopAwayOnRocks", + "id": "OreburghCity_Text_ChopChopAwayOnRocks", "en_US": [ "Chop, chop, MACHOP!\n", "Chop, chop away on rocks! ~♫" ] }, { - "id": "OreburghCity_Text_TMsAreSingleUseOnlyButHMsCanBeUsedOverAndOver", + "id": "OreburghCity_Text_TMsSingleUseHMsOverAndOver", "en_US": [ "TMs are single use only, but HMs\n", "can be used over and over.\r", @@ -193,7 +193,7 @@ ] }, { - "id": "OreburghCity_Text_WhenIRunAroundWithMyRunningShoesOnImTheCenterOfAttention", + "id": "OreburghCity_Text_ImTheCenterOfAttention", "en_US": [ "When I run around with my Running\n", "Shoes on, I’m the center of attention!\r", @@ -210,15 +210,15 @@ ] }, { - "id": "OreburghCity_Text_MachopMachoChopo", + "id": "OreburghCity_Text_MachopCryMachoChopo", "en_US": "MACHOP: Macho! Chopo!" }, { - "id": "OreburghCity_Text_MachopPigyooh", + "id": "OreburghCity_Text_MachopCryPigyooh", "en_US": "MACHOP: Pigyooh!" }, { - "id": "OreburghCity_Text_MachopGwoohGogogooh", + "id": "OreburghCity_Text_MachopCryGwoohGogogooh", "en_US": "MACHOP: Gwooh! Gogogooh!" }, { @@ -229,7 +229,7 @@ ] }, { - "id": "OreburghCity_Text_OreburgCityPokemonGymCallMeRoarkTheRock", + "id": "OreburghCity_Text_SignPokemonGym", "en_US": [ "Oreburgh City Pokémon Gym\n", "Leader: Roark\f", @@ -237,14 +237,14 @@ ] }, { - "id": "OreburghCity_Text_OreburghMiningMuseumCoalMiningAndYou", + "id": "OreburghCity_Text_SignOreburghMiningMuseum", "en_US": [ "Oreburgh Mining Museum\n", "“Coal Mining and You!”" ] }, { - "id": "OreburghCity_Text_OreburghMineBewareOfBusyPokemon", + "id": "OreburghCity_Text_SignOreburghMine", "en_US": [ "Oreburgh Mine\n", "Beware of Busy Pokémon!" diff --git a/res/text/oreburgh_city_east_house_1f.json b/res/text/oreburgh_city_east_house_1f.json index b7564c5eda..983c4fe490 100644 --- a/res/text/oreburgh_city_east_house_1f.json +++ b/res/text/oreburgh_city_east_house_1f.json @@ -2,7 +2,7 @@ "key": 58426, "messages": [ { - "id": "OreburghCityEastHouse1F_Text_WhyNotTryTrainingInTheOreburghMine", + "id": "OreburghCityEastHouse1F_Text_TrainInOreburghMine", "en_US": [ "Hiya! Your Pokémon could use some\n", "toughening up.\r", @@ -11,7 +11,7 @@ ] }, { - "id": "OreburghCityEastHouse1F_Text_IAlwaysHaveARottenTimeTryingToDecideWhichMovesMyPokemonShouldLearn", + "id": "OreburghCityEastHouse1F_Text_IAlwaysHaveARottenTime", "en_US": [ "I always have a rotten time trying\n", "to decide which moves my Pokémon\f", @@ -19,7 +19,7 @@ ] }, { - "id": "OreburghCityEastHouse1F_Text_YouRemindMeSoMuchOfTheTimeIGotMyFirstPokemon", + "id": "OreburghCityEastHouse1F_Text_RemindMeOfTimeIGotMyPokemon", "en_US": [ "You remind me so much of the time\n", "I got my first Pokémon." diff --git a/res/text/oreburgh_city_east_house_2f.json b/res/text/oreburgh_city_east_house_2f.json index 68a94c55c6..5738b392cc 100644 --- a/res/text/oreburgh_city_east_house_2f.json +++ b/res/text/oreburgh_city_east_house_2f.json @@ -2,7 +2,7 @@ "key": 58422, "messages": [ { - "id": "OreburghCityEastHouse2F_Text_TheOreburghMineIsOperatedWithTheUtmostCare", + "id": "OreburghCityEastHouse2F_Text_OperatedWithUtmostCare", "en_US": [ "The Oreburgh Mine is operated\n", "with the utmost care.\r", @@ -11,7 +11,7 @@ ] }, { - "id": "OreburghCityEastHouse2F_Text_HereIWantYouToHaveThis", + "id": "OreburghCityEastHouse2F_Text_HereHaveThis", "en_US": [ "Wow... Your Pokémon’s eyes are\n", "twinkling brightly!\r", @@ -20,7 +20,7 @@ ] }, { - "id": "OreburghCityEastHouse2F_Text_YouKnowHowPokemonStayInsideTheirPokeBalls", + "id": "OreburghCityEastHouse2F_Text_IThinkAboutBestPokeBalls", "en_US": [ "You know how Pokémon stay inside\n", "their Poké Balls?\r", @@ -29,7 +29,7 @@ ] }, { - "id": "OreburghCityEastHouse2F_Text_CoalIsCarriedOutOfTheOreburghMineOnAFullyAutomatedSystem", + "id": "OreburghCityEastHouse2F_Text_FullyAutomatedSystem", "en_US": [ "Coal is carried out of Oreburgh Mine on\n", "a fully automated system.\r", diff --git a/res/text/oreburgh_city_east_house_3f.json b/res/text/oreburgh_city_east_house_3f.json index e8d7d46dcb..dd720fa4de 100644 --- a/res/text/oreburgh_city_east_house_3f.json +++ b/res/text/oreburgh_city_east_house_3f.json @@ -2,7 +2,7 @@ "key": 58418, "messages": [ { - "id": "OreburghCityEastHouse3F_Text_TheCoalMineHeresFullyAutomated", + "id": "OreburghCityEastHouse3F_Text_MineIsFullyAutomated", "en_US": [ "The coal mine here’s fully automated.\r", "Coal mining was brutally hard in the\n", @@ -10,7 +10,7 @@ ] }, { - "id": "OreburghCityEastHouse3F_Text_YouRemindMeSoMuchOfTheTimeIGotMyFirstPokemon", + "id": "OreburghCityEastHouse3F_Text_RemindMeOfFirstPokemon", "en_US": [ "You remind me so much of the time\n", "I got my first Pokémon." diff --git a/res/text/oreburgh_city_mart.json b/res/text/oreburgh_city_mart.json index f2a2c136ae..de9b5b711e 100644 --- a/res/text/oreburgh_city_mart.json +++ b/res/text/oreburgh_city_mart.json @@ -11,7 +11,7 @@ ] }, { - "id": "OreburghCityMart_Text_TwoStaffOfferDifferentMerchandise", + "id": "OreburghCityMart_Text_StaffOfferDifferentMerchandise", "en_US": [ "The Poké Mart is staffed by a lady and\n", "a young fellow.\r", diff --git a/res/text/oreburgh_city_middle_house.json b/res/text/oreburgh_city_middle_house.json index bbbc01dd28..bc3c5079f1 100644 --- a/res/text/oreburgh_city_middle_house.json +++ b/res/text/oreburgh_city_middle_house.json @@ -2,7 +2,7 @@ "key": 58386, "messages": [ { - "id": "OreburghCityMiddleHouse_Text_RoarkIsAUserOfRockTypePokemon", + "id": "OreburghCityMiddleHouse_Text_RoarkUsesRockTypePokemon", "en_US": [ "Roark is a user of Rock-type Pokémon.\r", "Don’t you think Rock-type Pokémon are\n", diff --git a/res/text/oreburgh_city_north_house_1f.json b/res/text/oreburgh_city_north_house_1f.json index 2e1212135b..48abef5bc6 100644 --- a/res/text/oreburgh_city_north_house_1f.json +++ b/res/text/oreburgh_city_north_house_1f.json @@ -2,7 +2,7 @@ "key": 25627, "messages": [ { - "id": "OreburghCityNorthHouse1F_Text_WouldYouBeWillingToTradeYourMachopForMyAbra", + "id": "OreburghCityNorthHouse1F_Text_AskTradeMachopForAbra", "en_US": [ "Listen, listen. Do you have a Pokémon\n", "called MACHOP?\r", @@ -19,11 +19,11 @@ ] }, { - "id": "OreburghCityNorthHouse1F_Text_WhatIAskedForWasAMachop", + "id": "OreburghCityNorthHouse1F_Text_AskedForMachop", "en_US": "What I asked for was a MACHOP..." }, { - "id": "OreburghCityNorthHouse1F_Text_IfYouChangeYourMindIllBeRightHereWaiting", + "id": "OreburghCityNorthHouse1F_Text_IllBeWaiting", "en_US": [ "Oh, OK...\n", "Well, I can’t make you trade me.\r", @@ -32,14 +32,14 @@ ] }, { - "id": "OreburghCityNorthHouse1F_Text_ThanksToPokemonIGotToBeFriendsWithYou", + "id": "OreburghCityNorthHouse1F_Text_ThanksToPokemonWereFriends", "en_US": [ "Thanks to Pokémon, I got to be\n", "friends with you!" ] }, { - "id": "OreburghCityNorthHouse1F_Text_APokemonObtainedInATradeGrowsQuickly", + "id": "OreburghCityNorthHouse1F_Text_PokemonFromTradeGrowsQuickly", "en_US": [ "A Pokémon obtained in a trade grows\n", "quickly.\r", @@ -50,7 +50,7 @@ ] }, { - "id": "OreburghCityNorthHouse1F_Text_WhenYouTradeAPokemonTheItemItsHoldingIsTradedAsWell", + "id": "OreburghCityNorthHouse1F_Text_ItemIsTradedAsWell", "en_US": [ "When you trade a Pokémon, the item it’s\n", "holding is traded as well.\r", diff --git a/res/text/oreburgh_city_north_house_2f.json b/res/text/oreburgh_city_north_house_2f.json index 8f840424f0..01f2dc1798 100644 --- a/res/text/oreburgh_city_north_house_2f.json +++ b/res/text/oreburgh_city_north_house_2f.json @@ -2,14 +2,14 @@ "key": 25623, "messages": [ { - "id": "OreburghCityNorthHouse2F_Text_AllPokemonHaveASpecialPowerCalledAnAbility", + "id": "OreburghCityNorthHouse2F_Text_SpecialPowerCalledAbility", "en_US": [ "All Pokémon have a special power\n", "called an ability." ] }, { - "id": "OreburghCityNorthHouse2F_Text_MyFavoritePokemonAbilityIsMyPachirisusPickup", + "id": "OreburghCityNorthHouse2F_Text_FavoriteAbilityIsPickup", "en_US": [ "My favorite Pokémon ability is my\n", "PACHIRISU’s Pickup.\r", @@ -18,7 +18,7 @@ ] }, { - "id": "OreburghCityNorthHouse2F_Text_HowAboutShowingMeAPokemonCalledGeodude", + "id": "OreburghCityNorthHouse2F_Text_ShowMeGeodude", "en_US": [ "The view is good from the second floor,\n", "but it’s a pain going outside.\r", @@ -27,7 +27,7 @@ ] }, { - "id": "OreburghCityNorthHouse2F_Text_ThatsAGeodudeThisIsATokenOfMyThanks", + "id": "OreburghCityNorthHouse2F_Text_TokenOfMyThanks", "en_US": [ "The view is good from the second floor,\n", "but it’s a pain going outside.\r", @@ -44,7 +44,7 @@ ] }, { - "id": "OreburghCityNorthHouse2F_Text_YeahThereAreSoManyKindsOfPokemonOutInTheWorld", + "id": "OreburghCityNorthHouse2F_Text_SoManyKindsOfPokemon", "en_US": [ "Yeah, there are so many kinds of\n", "Pokémon out in the world.\r", diff --git a/res/text/oreburgh_city_north_house_3f.json b/res/text/oreburgh_city_north_house_3f.json index d6ee22adf5..8e093e2db0 100644 --- a/res/text/oreburgh_city_north_house_3f.json +++ b/res/text/oreburgh_city_north_house_3f.json @@ -2,7 +2,7 @@ "key": 25619, "messages": [ { - "id": "OreburghCityNorthHouse3F_Text_DuringTheDaytimeEveryoneGoesOffToTheMine", + "id": "OreburghCityNorthHouse3F_Text_EveryoneGoesToTheMine", "en_US": [ "During the daytime, everyone goes off\n", "to the mine.\r", @@ -18,7 +18,7 @@ ] }, { - "id": "OreburghCityNorthHouse3F_Text_EveryoneIncludingLotsOfPokemonDugTheBigUndergroundMaze", + "id": "OreburghCityNorthHouse3F_Text_EveryoneDugUndergroundMaze", "en_US": [ "Everyone, including lots of Pokémon,\n", "dug the big underground maze!" diff --git a/res/text/oreburgh_city_northwest_house_1f.json b/res/text/oreburgh_city_northwest_house_1f.json index cb34115a26..2336be9dbe 100644 --- a/res/text/oreburgh_city_northwest_house_1f.json +++ b/res/text/oreburgh_city_northwest_house_1f.json @@ -2,7 +2,7 @@ "key": 25603, "messages": [ { - "id": "OreburghCityNorthwestHouse1F_Text_ThereAreEightGymLeadersInTheSinnohRegion", + "id": "OreburghCityNorthwestHouse1F_Text_EightGymLeadersInSinnoh", "en_US": [ "There are eight Gym Leaders in the\n", "Sinnoh region.\r", @@ -13,7 +13,7 @@ ] }, { - "id": "OreburghCityNorthwestHouse1F_Text_AGymLeaderIsntLikeJustAnyTrainerYouMeet", + "id": "OreburghCityNorthwestHouse1F_Text_GymLeaderUnlikeAnyTrainer", "en_US": [ "A Gym Leader isn’t like just any Trainer\n", "you meet.\r", @@ -24,7 +24,7 @@ ] }, { - "id": "OreburghCityNorthwestHouse1F_Text_RoarkLetsUsTrainOurPokemonInTheMine", + "id": "OreburghCityNorthwestHouse1F_Text_RoarkLetsUsTrainInTheMine", "en_US": [ "Roark lets us train our Pokémon in\n", "the mine." diff --git a/res/text/oreburgh_city_northwest_house_2f.json b/res/text/oreburgh_city_northwest_house_2f.json index 5d17b5eab9..24d2d5a2da 100644 --- a/res/text/oreburgh_city_northwest_house_2f.json +++ b/res/text/oreburgh_city_northwest_house_2f.json @@ -2,7 +2,7 @@ "key": 25615, "messages": [ { - "id": "OreburghCityNorthwestHouse2F_Text_GivingNicknamesToPokemonIsTheWayToGo", + "id": "OreburghCityNorthwestHouse2F_Text_GivingNicknamesIsTheWayToGo", "en_US": [ "Giving nicknames to Pokémon is\n", "the way to go.\r", @@ -11,7 +11,7 @@ ] }, { - "id": "OreburghCityNorthwestHouse2F_Text_ButHeNamedOurPsyduckYellowJustBecauseOfItsColor", + "id": "OreburghCityNorthwestHouse2F_Text_HeNamedPsyduckYellow", "en_US": [ "But he named our PSYDUCK “Yellow”\n", "just because of its color...\r", @@ -20,14 +20,14 @@ ] }, { - "id": "OreburghCityNorthwestHouse2F_Text_HereTakeThisIfYoudLike", + "id": "OreburghCityNorthwestHouse2F_Text_HereTakeThis", "en_US": [ "Are you catching Pokémon?\n", "Here, take this if you’d like.\r" ] }, { - "id": "OreburghCityNorthwestHouse2F_Text_TheDuskBallIsAPokeBallDesignedForUseInDarkness", + "id": "OreburghCityNorthwestHouse2F_Text_DuskBallIsDesignedForDarkness", "en_US": [ "The Dusk Ball is a Poké Ball designed\n", "for use in darkness.\r", @@ -36,7 +36,7 @@ ] }, { - "id": "OreburghCityNorthwestHouse2F_Text_YellowDuuuck", + "id": "OreburghCityNorthwestHouse2F_Text_YellowPsyduckCry", "en_US": "Yellow: Duuuck?" } ] diff --git a/res/text/oreburgh_city_northwest_house_3f.json b/res/text/oreburgh_city_northwest_house_3f.json index 82b16b6651..59d2933a7c 100644 --- a/res/text/oreburgh_city_northwest_house_3f.json +++ b/res/text/oreburgh_city_northwest_house_3f.json @@ -2,7 +2,7 @@ "key": 25611, "messages": [ { - "id": "OreburghCityNorthwestHouse3F_Text_IfYoudLikeLetOneHoldThisItem", + "id": "OreburghCityNorthwestHouse3F_Text_LetOneHoldThisItem", "en_US": [ "Do you make your Pokémon hold items?\r", "If you’d like, let one hold this\n", @@ -10,7 +10,7 @@ ] }, { - "id": "OreburghCityNorthwestHouse3F_Text_ThatItemIntensifiesThePowerOfRockTypeMoves", + "id": "OreburghCityNorthwestHouse3F_Text_IntensifiesPowerOfRockTypeMoves", "en_US": [ "That {STRVAR_1 8, 0, 0} intensifies the\n", "power of Rock-type moves.\r", diff --git a/res/text/oreburgh_city_northwest_house_4f.json b/res/text/oreburgh_city_northwest_house_4f.json index 1e9965e1f9..bb42f3031e 100644 --- a/res/text/oreburgh_city_northwest_house_4f.json +++ b/res/text/oreburgh_city_northwest_house_4f.json @@ -2,21 +2,21 @@ "key": 25623, "messages": [ { - "id": "OreburghCityNorthwestHouse4F_Text_HahahaImGonnaSwipeYourFlag", + "id": "OreburghCityNorthwestHouse4F_Text_ImGonnaSwipeYourFlag", "en_US": [ "Hahaha!\n", "I’m gonna swipe your Flag!" ] }, { - "id": "OreburghCityNorthwestHouse4F_Text_ISetSomeNastyTrapsCatchMeIfYouCan", + "id": "OreburghCityNorthwestHouse4F_Text_CatchMeIfYouCan", "en_US": [ "I set some nasty Traps!\n", "Catch me if you can!" ] }, { - "id": "OreburghCityNorthwestHouse4F_Text_ThanksToTheGymLeaderWeCanPlayUnderground", + "id": "OreburghCityNorthwestHouse4F_Text_WeCanPlayUnderground", "en_US": [ "Thanks to the Gym Leader, we can\n", "play underground." diff --git a/res/text/oreburgh_city_pokecenter_1f.json b/res/text/oreburgh_city_pokecenter_1f.json index 4c9a41a899..f45722b30f 100644 --- a/res/text/oreburgh_city_pokecenter_1f.json +++ b/res/text/oreburgh_city_pokecenter_1f.json @@ -2,14 +2,14 @@ "key": 44018, "messages": [ { - "id": "OreburghCityPokecenter1F_Text_YayIGotAPalPadAtThePokemonWiFiClubDownstairs", + "id": "OreburghCityPokecenter1F_Text_IGotAPalPadDownstairs", "en_US": [ "Yay! I got a Pal Pad at the\n", "Pokémon Wi-Fi Club downstairs!" ] }, { - "id": "OreburghCityPokecenter1F_Text_SwitchOnThePCAtAnyPokemonCenter", + "id": "OreburghCityPokecenter1F_Text_SwitchOnThePC", "en_US": [ "Switch on the PC at any Pokémon\n", "Center.\r", @@ -20,7 +20,7 @@ ] }, { - "id": "OreburghCityPokecenter1F_Text_WhatIsYourFavoriteKindOfTrainerCanYouTellMe", + "id": "OreburghCityPokecenter1F_Text_TellMeFavoriteKindOfTrainer", "en_US": [ "Hmmm...!\r", "What is your favorite kind of Trainer?\n", @@ -28,21 +28,21 @@ ] }, { - "id": "OreburghCityPokecenter1F_Text_WhichKindOfTrainerWouldYouLikeToBe", + "id": "OreburghCityPokecenter1F_Text_BeWhichKindOfTrainer", "en_US": [ "Which kind of Trainer would you like\n", "to be?" ] }, { - "id": "OreburghCityPokecenter1F_Text_AskThisIsTheKindOfTrainerYouWantToBe", + "id": "OreburghCityPokecenter1F_Text_IsThisWhatYouWantToBe", "en_US": [ "{STRVAR_1 14, 0, 0} is the kind of Trainer\n", "you want to be?" ] }, { - "id": "OreburghCityPokecenter1F_Text_ISeeSoThisIsTheKindOfTrainerYouLike", + "id": "OreburghCityPokecenter1F_Text_SoThisIsWhatYouLike", "en_US": [ "I see! So {STRVAR_1 14, 0, 0} is the kind\n", "of Trainer you like.\r", @@ -51,11 +51,11 @@ ] }, { - "id": "OreburghCityPokecenter1F_Text_OKThenIllJustTalkToYouLater", + "id": "OreburghCityPokecenter1F_Text_IllJustTalkToYouLater", "en_US": "OK, then I’ll just talk to you later!" }, { - "id": "OreburghCityPokecenter1F_Text_HowAboutTellingMeWhatKindOfTrainerYouLike", + "id": "OreburghCityPokecenter1F_Text_WhatKindOfTrainerDoYouLike", "en_US": [ "Hello! You’ve been mistaken for\n", "{STRVAR_1 14, 0, 0}, haven’t you?\r", @@ -66,7 +66,7 @@ ] }, { - "id": "OreburghCityPokecenter1F_Text_WhatOrWhoIsThisTeamGalacticItsAMystery", + "id": "OreburghCityPokecenter1F_Text_TeamGalacticIsAMystery", "en_US": [ "Hmmm!\n", "What, or who, is this Team Galactic?!\r", @@ -79,7 +79,7 @@ ] }, { - "id": "OreburghCityPokecenter1F_Text_WhatOrWhoIsThisTeamGalactic", + "id": "OreburghCityPokecenter1F_Text_WhatOrWhoIsTeamGalactic", "en_US": [ "Hmmm!\n", "What, or who, is this Team Galactic?!\r", @@ -90,7 +90,7 @@ ] }, { - "id": "OreburghCityPokecenter1F_Text_NowYouCanCaptureItAsABattleVideoUsingAVsRecorder", + "id": "OreburghCityPokecenter1F_Text_CaptureBattleVideoUsingVsRecorder", "en_US": [ "You know how you can battle a friend\n", "using wireless communications?\r", @@ -108,7 +108,7 @@ ] }, { - "id": "OreburghCityPokecenter1F_Text_HiImGraceTheIdolSoShallWeBattle", + "id": "OreburghCityPokecenter1F_Text_GraceIntro_Unused", "en_US": [ "Hi, I’m Grace, the Idol! I’m just back\n", "from a show in Oreburgh Mine!\r", @@ -116,21 +116,21 @@ ] }, { - "id": "OreburghCityPokecenter1F_Text_IllLetYouJoinMyFanClubIfYouCanBeatMe", + "id": "OreburghCityPokecenter1F_Text_GraceBattleAccepted_Unused", "en_US": [ "I’ll let you join my fan club if you can\n", "beat me!\r" ] }, { - "id": "OreburghCityPokecenter1F_Text_YouWontAcceptMyChallengeButImAnIdol", + "id": "OreburghCityPokecenter1F_Text_GraceBattleDeclined_Unused", "en_US": [ "You won’t accept my challenge?!\n", "But I’m an Idol..." ] }, { - "id": "OreburghCityPokecenter1F_Text_WellThatsMeAndMyPokemon", + "id": "OreburghCityPokecenter1F_Text_GracePostBattle_Unused", "en_US": [ "Well, that’s me and my Pokémon!\n", "I hope you’ll support us!\r", diff --git a/res/text/oreburgh_city_pokecenter_b1f.json b/res/text/oreburgh_city_pokecenter_b1f.json index cfd865d715..265664b88e 100644 --- a/res/text/oreburgh_city_pokecenter_b1f.json +++ b/res/text/oreburgh_city_pokecenter_b1f.json @@ -2,7 +2,7 @@ "key": 44026, "messages": [ { - "id": "OreburghCityPokecenterB1F_Text_IWantToBecomeFriendsWithAnExperiencedTrainerIReallyAdmire", + "id": "OreburghCityPokecenterB1F_Text_IWantToBecomeFriends", "en_US": [ "I want to become friends with an\n", "experienced Trainer I really admire.\r", diff --git a/res/text/oreburgh_city_south_house.json b/res/text/oreburgh_city_south_house.json index 23b6c892e0..dddd87eae7 100644 --- a/res/text/oreburgh_city_south_house.json +++ b/res/text/oreburgh_city_south_house.json @@ -2,7 +2,7 @@ "key": 25651, "messages": [ { - "id": "OreburghCitySouthHouse_Text_YoureTakingATourOfOurCoalMine", + "id": "OreburghCitySouthHouse_Text_ItsAlwaysGoodToLearn", "en_US": [ "You’re taking a tour of our coal mine?\r", "Wonderful!\n", diff --git a/res/text/oreburgh_city_west_house.json b/res/text/oreburgh_city_west_house.json index 6985e28e79..4e4dd1ed45 100644 --- a/res/text/oreburgh_city_west_house.json +++ b/res/text/oreburgh_city_west_house.json @@ -2,7 +2,7 @@ "key": 58402, "messages": [ { - "id": "OreburghCityWestHouse_Text_HaveYouEverSeenOrHeardAboutDifferentlyColoredPokemon", + "id": "OreburghCityWestHouse_Text_HaveYouSeenDifferentlyColoredPokemon", "en_US": [ "Have you ever seen or heard about\n", "differently colored Pokémon?\r", @@ -13,7 +13,7 @@ ] }, { - "id": "OreburghCityWestHouse_Text_YouKnowHowPokemonHaveDifferentNaturesLikeWeHavePersonalities", + "id": "OreburghCityWestHouse_Text_PokemonHaveDifferentNatures", "en_US": [ "You know how Pokémon have different\n", "natures like we have personalities?\r", @@ -22,7 +22,7 @@ ] }, { - "id": "OreburghCityWestHouse_Text_PikachuPikaaah", + "id": "OreburghCityWestHouse_Text_PikachuCry", "en_US": "PIKACHU: Pikaaah!" } ] diff --git a/res/text/oreburgh_gate_1f.json b/res/text/oreburgh_gate_1f.json index a3ef48280f..7c7a73ca1c 100644 --- a/res/text/oreburgh_gate_1f.json +++ b/res/text/oreburgh_gate_1f.json @@ -2,7 +2,7 @@ "key": 62499, "messages": [ { - "id": "OreburghGate1F_Text_SoLetMeMakeAGiftOfThisHiddenMachineToYou", + "id": "OreburghGate1F_Text_MakeAGiftOfThisHM", "en_US": [ "That sparkling new Pokétch!\n", "Your awkwardness as a traveler!\r", @@ -15,7 +15,7 @@ ] }, { - "id": "OreburghGate1F_Text_ThatHiddenMachineContainsRockSmash", + "id": "OreburghGate1F_Text_ThatHMContainsRockSmash", "en_US": [ "That Hidden Machine, or HM for short,\n", "contains the hidden move Rock Smash.\r", @@ -29,7 +29,7 @@ ] }, { - "id": "OreburghGate1F_Text_NowYouCanUseTheHiddenMoveRockSmashOnSmallBoulders", + "id": "OreburghGate1F_Text_NowYouCanUseRockSmash", "en_US": [ "Oh! Good golly!\n", "That’s Oreburgh City’s Gym Badge!\r", diff --git a/res/text/oreburgh_gate_b1f.json b/res/text/oreburgh_gate_b1f.json index f78b307f90..1806c74806 100644 --- a/res/text/oreburgh_gate_b1f.json +++ b/res/text/oreburgh_gate_b1f.json @@ -2,7 +2,7 @@ "key": 62511, "messages": [ { - "id": "OreburghGateB1F_Text_DoYouSeeThoseBumpsOnTheGround", + "id": "OreburghGateB1F_Text_DoYouSeeThoseBumps", "en_US": [ "Do you see those bumps on the\n", "ground?\r", diff --git a/res/text/oreburgh_mine_b1f.json b/res/text/oreburgh_mine_b1f.json index 6cfeec2b01..aa9f370347 100644 --- a/res/text/oreburgh_mine_b1f.json +++ b/res/text/oreburgh_mine_b1f.json @@ -2,7 +2,7 @@ "key": 9218, "messages": [ { - "id": "OreburghMineB1F_Text_EveryoneThatWorksInTheCoalMineKeepsTheirOwnPokemonWithThem", + "id": "OreburghMineB1F_Text_EveryoneKeepsTheirOwnPokemon", "en_US": [ "Everyone that works in the coal mine\n", "keeps their own Pokémon with them.\r", @@ -11,7 +11,7 @@ ] }, { - "id": "OreburghMineB1F_Text_IFoundWhatIThoughtWereSomeRocksThenTheyStartedMoving", + "id": "OreburghMineB1F_Text_SomeRocksStartedMoving", "en_US": [ "I found what I thought were some\n", "rocks, then they started moving!\r", @@ -20,7 +20,7 @@ ] }, { - "id": "OreburghMineB1F_Text_IFoundSomethingVeryInterestingSoonAfterArrivalYouMayHaveItIfYoudLike", + "id": "OreburghMineB1F_Text_IFoundSomethingInteresting", "en_US": [ "Hello! How do you do!\n", "I’m a student of philosophy.\r", @@ -38,7 +38,7 @@ ] }, { - "id": "OreburghMineB1F_Text_OhYouHaveAnOveradundanceOfThings", + "id": "OreburghMineB1F_Text_YouHaveAnOveradundance", "en_US": [ "Oh?\n", "You have an overabundance of things!\f", @@ -46,7 +46,7 @@ ] }, { - "id": "OreburghMineB1F_Text_AboutThatVeryInterestingThingIFoundYouMayHaveItIfYoudLike", + "id": "OreburghMineB1F_Text_YouMayHaveItIfYoudLike", "en_US": [ "Well, hello!\r", "About that very interesting thing\n", @@ -55,7 +55,7 @@ ] }, { - "id": "OreburghMineB1F_Text_ImToldThatPlateWasCreatedAtTheSameTimeAsSinnoh", + "id": "OreburghMineB1F_Text_CreatedAtSameTimeAsSinnoh", "en_US": [ "I’m told that Plate was created at the\n", "same time as Sinnoh.\r", diff --git a/res/text/oreburgh_mine_b2f.json b/res/text/oreburgh_mine_b2f.json index 1540a102ae..2f33f70ba2 100644 --- a/res/text/oreburgh_mine_b2f.json +++ b/res/text/oreburgh_mine_b2f.json @@ -2,7 +2,7 @@ "key": 9230, "messages": [ { - "id": "OreburghMineB2F_Text_OKStandBackAndWatchThis", + "id": "OreburghMineB2F_Text_StandBackAndWatch", "en_US": [ "OK, stand back and watch this.\r", "Using the hidden move Rock Smash,\n", @@ -10,7 +10,7 @@ ] }, { - "id": "OreburghMineB2F_Text_FallenBouldersNeedToBeSmashedSoTheyreOutOfTheWay", + "id": "OreburghMineB2F_Text_BouldersNeedToBeSmashed", "en_US": [ "Fallen boulders need to be smashed\n", "so they’re out of the way.\r", @@ -22,19 +22,19 @@ ] }, { - "id": "OreburghMineB2F_Text_MachopMaaacho", + "id": "OreburghMineB2F_Text_MachopCryMaaacho", "en_US": "MACHOP: Maaacho!" }, { - "id": "OreburghMineB2F_Text_MachopChopChop", + "id": "OreburghMineB2F_Text_MachopCryChopChop", "en_US": "MACHOP: Chopchop!" }, { - "id": "OreburghMineB2F_Text_MachopChopmacho", + "id": "OreburghMineB2F_Text_MachopCryChopmacho", "en_US": "MACHOP: Chopmacho!" }, { - "id": "OreburghMineB2F_Text_IMetTheseMachopOnRoute207", + "id": "OreburghMineB2F_Text_IMetMachopOnRoute207", "en_US": [ "I met these MACHOP on Route 207.\r", "They’ve now become my most trusted\n", diff --git a/res/text/pastoria_city_pokecenter_1f.json b/res/text/pastoria_city_pokecenter_1f.json index 02b8baca14..680dbb5420 100644 --- a/res/text/pastoria_city_pokecenter_1f.json +++ b/res/text/pastoria_city_pokecenter_1f.json @@ -22,28 +22,28 @@ ] }, { - "id": "PastoriaCityPokecenter1F_Text_AskBattleWithMe", + "id": "PastoriaCityPokecenter1F_Text_GraceIntro_Unused", "en_US": [ "Would you like to battle with me?\n", "As a memento of your visit to Pastoria?" ] }, { - "id": "PastoriaCityPokecenter1F_Text_JoinMyFanClub", + "id": "PastoriaCityPokecenter1F_Text_GraceBattleAccepted_Unused", "en_US": [ "I’ll let you join my fan club if you can\n", "beat me!\r" ] }, { - "id": "PastoriaCityPokecenter1F_Text_ImGoingToCry", + "id": "PastoriaCityPokecenter1F_Text_GraceBattleDeclined_Unused", "en_US": [ "You’re not interested in Idols?\n", "...I think I’m going to cry." ] }, { - "id": "PastoriaCityPokecenter1F_Text_SupportUs", + "id": "PastoriaCityPokecenter1F_Text_GracePostBattle_Unused", "en_US": [ "Well, that’s me and my Pokémon!\n", "I hope you’ll support us!\r", @@ -52,56 +52,56 @@ ] }, { - "id": "PastoriaCityPokecenter1F_Text_BattleWillBeFun", + "id": "PastoriaCityPokecenter1F_Text_LeeIntro_Unused", "en_US": [ "Are we all ready to have some fun?\n", "Our battle will be fun! OK?!" ] }, { - "id": "PastoriaCityPokecenter1F_Text_ShallWeDoThis", + "id": "PastoriaCityPokecenter1F_Text_LeeBattleAccepted_Unused", "en_US": [ "OK, how shall we do this?\n", "Shall we do something fantastical?\r" ] }, { - "id": "PastoriaCityPokecenter1F_Text_ItMakesMeLonely", + "id": "PastoriaCityPokecenter1F_Text_LeeBattleDeclined_Unused", "en_US": [ "Oh, how shall I say this...?\n", "It makes me all lonely, I say..." ] }, { - "id": "PastoriaCityPokecenter1F_Text_WhichTownNext", + "id": "PastoriaCityPokecenter1F_Text_LeePostBattle_Unused", "en_US": [ "Well, let’s see!\n", "Which town will we go to next?" ] }, { - "id": "PastoriaCityPokecenter1F_Text_LetsDoBattle", + "id": "PastoriaCityPokecenter1F_Text_ArturoIntro_Unused", "en_US": [ "Come on, let’s show off our Pokémon!\n", "Let’s do battle, kiddo!" ] }, { - "id": "PastoriaCityPokecenter1F_Text_RockInYourVeins", + "id": "PastoriaCityPokecenter1F_Text_ArturoBattleAccepted_Unused", "en_US": [ "Your spirit’s vibes...\n", "You’ve got rock in your veins!\r" ] }, { - "id": "PastoriaCityPokecenter1F_Text_MyGuitarLiesBroken", + "id": "PastoriaCityPokecenter1F_Text_ArturoBattleDeclined_Unused", "en_US": [ "My guitar...\n", "It lies broken and weeping..." ] }, { - "id": "PastoriaCityPokecenter1F_Text_RockIsAboutSpirit", + "id": "PastoriaCityPokecenter1F_Text_ArturoPostBattle_Unused", "en_US": [ "Rock is about your spirit!\n", "Battling is about spirit, too!\f", diff --git a/res/text/pokemon_center_daily_trainers.json b/res/text/pokemon_center_daily_trainers.json index 4e68d439e1..c7c9f3b1ca 100644 --- a/res/text/pokemon_center_daily_trainers.json +++ b/res/text/pokemon_center_daily_trainers.json @@ -289,28 +289,28 @@ ] }, { - "id": "PokemonCenterDailyTrainers_Text_GracePastiora_Intro", + "id": "PokemonCenterDailyTrainers_Text_GracePastoria_Intro", "en_US": [ "Would you like to battle with me?\n", "As a memento of your visit to Pastoria?" ] }, { - "id": "PokemonCenterDailyTrainers_Text_GracePastiora_BattleAccepted", + "id": "PokemonCenterDailyTrainers_Text_GracePastoria_BattleAccepted", "en_US": [ "I’ll let you join my fan club if you can\n", "beat me!\r" ] }, { - "id": "PokemonCenterDailyTrainers_Text_GracePastiora_BattleDeclined", + "id": "PokemonCenterDailyTrainers_Text_GracePastoria_BattleDeclined", "en_US": [ "You’re not interested in Idols?\n", "...I think I’m going to cry." ] }, { - "id": "PokemonCenterDailyTrainers_Text_GracePastiora_PostBattle", + "id": "PokemonCenterDailyTrainers_Text_GracePastoria_PostBattle", "en_US": [ "Well, that’s me and my Pokémon!\n", "I hope you’ll support us!\r", @@ -326,21 +326,21 @@ ] }, { - "id": "PokemonCenterDailyTrainers_Text_LeePastiora_BattleAccepted", + "id": "PokemonCenterDailyTrainers_Text_LeePastoria_BattleAccepted", "en_US": [ "OK, how shall we do this?\n", "Shall we do something fantastical?\r" ] }, { - "id": "PokemonCenterDailyTrainers_Text_LeePastiora_BattleDeclined", + "id": "PokemonCenterDailyTrainers_Text_LeePastoria_BattleDeclined", "en_US": [ "Oh, how shall I say this...?\n", "It makes me all lonely, I say..." ] }, { - "id": "PokemonCenterDailyTrainers_Text_LeePastiora_PostBattle", + "id": "PokemonCenterDailyTrainers_Text_LeePastoria_PostBattle", "en_US": [ "Well, let’s see!\n", "Which town will we go to next?" @@ -354,21 +354,21 @@ ] }, { - "id": "PokemonCenterDailyTrainers_Text_ArturoPastiora_BattleAccepted", + "id": "PokemonCenterDailyTrainers_Text_ArturoPastoria_BattleAccepted", "en_US": [ "Your spirit’s vibes...\n", "You’ve got rock in your veins!\r" ] }, { - "id": "PokemonCenterDailyTrainers_Text_ArturoPastiora_BattleDeclined", + "id": "PokemonCenterDailyTrainers_Text_ArturoPastoria_BattleDeclined", "en_US": [ "My guitar...\n", "It lies broken and weeping..." ] }, { - "id": "PokemonCenterDailyTrainers_Text_ArturoPastiora_PostBattle", + "id": "PokemonCenterDailyTrainers_Text_ArturoPastoria_PostBattle", "en_US": [ "Rock is about your spirit!\n", "Battling is about spirit, too!\f", diff --git a/res/text/resort_area_pokecenter_1f.json b/res/text/resort_area_pokecenter_1f.json index d93111a887..5d19bea9bc 100644 --- a/res/text/resort_area_pokecenter_1f.json +++ b/res/text/resort_area_pokecenter_1f.json @@ -20,7 +20,7 @@ ] }, { - "id": "ResortAreaPokecenter1F_Text_WillYouBattleMe", + "id": "ResortAreaPokecenter1F_Text_ArielIntro_Unused", "en_US": [ "Po-Po-Pokémon!\r", "I want to become more like a PIKACHU!\n", @@ -28,15 +28,15 @@ ] }, { - "id": "ResortAreaPokecenter1F_Text_PiPikachu", + "id": "ResortAreaPokecenter1F_Text_ArielBattleAccepted_Unused", "en_US": "Pi-Pikachu!\r" }, { - "id": "ResortAreaPokecenter1F_Text_PiPikachu2", + "id": "ResortAreaPokecenter1F_Text_ArielBattleDeclined_Unused", "en_US": "Pi-Pikachu!" }, { - "id": "ResortAreaPokecenter1F_Text_HadTeamPampered", + "id": "ResortAreaPokecenter1F_Text_ArielPostBattle_Unused", "en_US": [ "But I just had my team pampered at the\n", "Ribbon Syndicate!\r", diff --git a/res/text/rock_peak_ruins.json b/res/text/rock_peak_ruins.json index 91e087b37d..55e3bd89c6 100644 --- a/res/text/rock_peak_ruins.json +++ b/res/text/rock_peak_ruins.json @@ -24,7 +24,7 @@ "en_US": "Zaza zari za...\r" }, { - "id": "RockPeakRuins_Text_ThePokemonStatueHasStoppedEmanatingPower", + "id": "RockPeakRuins_Text_StatueStoppedEmanatingPower", "en_US": [ "The Pokémon statue has stopped\n", "emanating power." diff --git a/res/text/route_201.json b/res/text/route_201.json index f39f792749..5db1a37fbe 100644 --- a/res/text/route_201.json +++ b/res/text/route_201.json @@ -432,7 +432,7 @@ ] }, { - "id": "Route201_Text_LetsCatchThatLegendaryPokemon", + "id": "Route201_Text_LetsCatchThatLegendary", "en_US": [ "{STRVAR_1 3, 0, 0}: Too slow!\n", "{STRVAR_1 3, 1, 0}, I’m sick of waiting!\r", diff --git a/res/text/snowpoint_city_pokecenter_1f.json b/res/text/snowpoint_city_pokecenter_1f.json index a29dee29c5..bd1bf5f991 100644 --- a/res/text/snowpoint_city_pokecenter_1f.json +++ b/res/text/snowpoint_city_pokecenter_1f.json @@ -50,7 +50,7 @@ "en_US": "PSYDUCK: Gaga guwawa!" }, { - "id": "SnowpointCityPokecenter1F_Text_BattleAsThankYou", + "id": "SnowpointCityPokecenter1F_Text_GraceIntro_Unused", "en_US": [ "Thank you for coming to Grace’s live\n", "show in Snowpoint!\r", @@ -59,21 +59,21 @@ ] }, { - "id": "SnowpointCityPokecenter1F_Text_JoinMyFanClub", + "id": "SnowpointCityPokecenter1F_Text_GraceBattleAccepted_Unused", "en_US": [ "I’ll let you join my fan club if you can\n", "beat me!\r" ] }, { - "id": "SnowpointCityPokecenter1F_Text_MySongIsNicer", + "id": "SnowpointCityPokecenter1F_Text_GraceBattleDeclined_Unused", "en_US": [ "But my song!\n", "It’s nicer than that Crasher Wake’s!" ] }, { - "id": "SnowpointCityPokecenter1F_Text_MyDreamIsTopIdol", + "id": "SnowpointCityPokecenter1F_Text_GracePostBattle_Unused", "en_US": [ "My dream is to be the top Idol!\r", "To win everyone’s heart, I’ll sing my\n", diff --git a/res/text/solaceon_town_pokecenter_1f.json b/res/text/solaceon_town_pokecenter_1f.json index 2f205727a7..04da32b783 100644 --- a/res/text/solaceon_town_pokecenter_1f.json +++ b/res/text/solaceon_town_pokecenter_1f.json @@ -29,7 +29,7 @@ ] }, { - "id": "SolaceonTownPokecenter1F_Text_WillYouBattleMe", + "id": "SolaceonTownPokecenter1F_Text_ArielIntro_Unused", "en_US": [ "Pikachu!\r", "I want to become more like a PIKACHU!\n", @@ -37,15 +37,15 @@ ] }, { - "id": "SolaceonTownPokecenter1F_Text_PiPikachu", + "id": "SolaceonTownPokecenter1F_Text_ArielBattleAccepted_Unused", "en_US": "Pi-Pikachu!\r" }, { - "id": "SolaceonTownPokecenter1F_Text_PiPikachu2", + "id": "SolaceonTownPokecenter1F_Text_ArielBattleDeclined_Unused", "en_US": "Pi-Pikachu!" }, { - "id": "SolaceonTownPokecenter1F_Text_INeedToGetMoreIntoCharacter", + "id": "SolaceonTownPokecenter1F_Text_ArielPostBattle_Unused", "en_US": [ "I need to find a way to get more into\n", "the character of a Pokémon...\r", diff --git a/res/text/sunyshore_city_pokecenter_1f.json b/res/text/sunyshore_city_pokecenter_1f.json index b31008e84f..b431b3c76c 100644 --- a/res/text/sunyshore_city_pokecenter_1f.json +++ b/res/text/sunyshore_city_pokecenter_1f.json @@ -42,28 +42,28 @@ ] }, { - "id": "SunyshoreCityPokecenter1F_Text_DoWeBattle", + "id": "SunyshoreCityPokecenter1F_Text_ArturoIntro_Unused", "en_US": [ "Do you want to hear me play my guitar?\n", "Or do we battle?" ] }, { - "id": "SunyshoreCityPokecenter1F_Text_RockInYourVeins", + "id": "SunyshoreCityPokecenter1F_Text_ArturoBattleAccepted_Unused", "en_US": [ "Your spirit’s vibes...\n", "You’ve got rock in your veins!\r" ] }, { - "id": "SunyshoreCityPokecenter1F_Text_MyGuitarLiesBroken", + "id": "SunyshoreCityPokecenter1F_Text_ArturoBattleDeclined_Unused", "en_US": [ "My guitar...\n", "It lies broken and weeping..." ] }, { - "id": "SunyshoreCityPokecenter1F_Text_PerfectWorld", + "id": "SunyshoreCityPokecenter1F_Text_ArturoPostBattle_Unused", "en_US": [ "For Trainers, Pokémon!\r", "For my girl, sweet kisses!\r", diff --git a/res/text/veilstone_city_pokecenter_1f.json b/res/text/veilstone_city_pokecenter_1f.json index 3cb32bea30..a5a43579c1 100644 --- a/res/text/veilstone_city_pokecenter_1f.json +++ b/res/text/veilstone_city_pokecenter_1f.json @@ -19,70 +19,70 @@ ] }, { - "id": "VeilstoneCityPokecenter1F_Text_IfYouHadTwoPokemon", + "id": "VeilstoneCityPokecenter1F_Text_OliNotEnoughPokemon_Unused", "en_US": [ "Two Pokémon! If you had two Pokémon,\n", "we’d get a great shot here." ] }, { - "id": "VeilstoneCityPokecenter1F_Text_YoureReadyForBattle", + "id": "VeilstoneCityPokecenter1F_Text_OliIntro_Unused", "en_US": [ "Oh! You’re ready for a battle\n", "with us?" ] }, { - "id": "VeilstoneCityPokecenter1F_Text_TryToActNatural", + "id": "VeilstoneCityPokecenter1F_Text_OliBattleAccepted_Unused", "en_US": [ "You’re live on camera, but try to act\n", "natural, OK?\r" ] }, { - "id": "VeilstoneCityPokecenter1F_Text_ThatsHowItIs", + "id": "VeilstoneCityPokecenter1F_Text_OliBattleDeclined_Unused", "en_US": [ "OK, that’s how it is, huh.\n", "Can’t do anything about that." ] }, { - "id": "VeilstoneCityPokecenter1F_Text_IdLikeToBroadcast", + "id": "VeilstoneCityPokecenter1F_Text_OliPostBattle_Unused", "en_US": [ "I’d like to take that footage and\n", "broadcast it worldwide." ] }, { - "id": "VeilstoneCityPokecenter1F_Text_WeWantTwoPokemon", + "id": "VeilstoneCityPokecenter1F_Text_RoxyNotEnoughPokemon_Unused", "en_US": [ "Oh, no. What we really want to see\n", "is you battling using two Pokémon!" ] }, { - "id": "VeilstoneCityPokecenter1F_Text_WillYouBattleUs", + "id": "VeilstoneCityPokecenter1F_Text_RoxyIntro_Unused", "en_US": [ "Giggle!\n", "Will you have a battle with us?" ] }, { - "id": "VeilstoneCityPokecenter1F_Text_WellCheckYourAbilities", + "id": "VeilstoneCityPokecenter1F_Text_RoxyBattleAccepted_Unused", "en_US": [ "We’ll thoroughly check out your\n", "abilities as a Trainer!\r" ] }, { - "id": "VeilstoneCityPokecenter1F_Text_OhTooBad", + "id": "VeilstoneCityPokecenter1F_Text_RoxyBattleDeclined_Unused", "en_US": [ "Oh, too bad!\n", "I wanted to check out your Pokémon!" ] }, { - "id": "VeilstoneCityPokecenter1F_Text_WeMadeASpectacle", + "id": "VeilstoneCityPokecenter1F_Text_RoxyPostBattle_Unused", "en_US": [ "I lost but I’m totally thrilled!\n", "We made a wonderful spectacle!" diff --git a/src/applications/frontier/battle_arcade/main.c b/src/applications/frontier/battle_arcade/main.c index c43e16d9f6..deb42f01e8 100644 --- a/src/applications/frontier/battle_arcade/main.c +++ b/src/applications/frontier/battle_arcade/main.c @@ -16,7 +16,7 @@ #include "applications/frontier/battle_arcade/windows.h" #include "overlay104/ov104_0223BCBC.h" -#include "battle_frontier_stats.h" +#include "battle_frontier_save.h" #include "bg_window.h" #include "comm_command_frontier.h" #include "communication_system.h" @@ -170,7 +170,7 @@ static const u8 Unk_ov108_0224367C[] = { typedef struct BattleArcadeApp { ApplicationManager *appMan; - BattleFrontier *frontier; + BattleFrontierSave *frontier; u8 subState; u8 challengeType; u8 unused; diff --git a/src/applications/frontier/battle_castle/helpers.c b/src/applications/frontier/battle_castle/helpers.c index 7205949177..f816e940de 100644 --- a/src/applications/frontier/battle_castle/helpers.c +++ b/src/applications/frontier/battle_castle/helpers.c @@ -2,6 +2,7 @@ #include +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "communication_information.h" #include "communication_system.h" @@ -10,7 +11,6 @@ #include "sound_playback.h" #include "string_template.h" #include "trainer_info.h" -#include "unk_0205DFC4.h" u8 BattleCastleApp_GetSelectedSlot(u8 numSlots, u8 slot) { @@ -28,7 +28,7 @@ u8 BattleCastleApp_GetSlotFromSlotID(u8 exitSlot, u8 slotID) u8 BattleCastleApp_GetRank(SaveData *saveData, u8 challengeType, u8 rankType) { - return BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetCastleRankIndex(challengeType, rankType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleRankIndex(challengeType, rankType))); + return BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetCastleRankIndex(challengeType, rankType)); } void BattleCastleApp_PlaySound(u32 input, u16 seqID) diff --git a/src/applications/frontier/battle_castle/opponent_app.c b/src/applications/frontier/battle_castle/opponent_app.c index 2a03b81be5..776f26600c 100644 --- a/src/applications/frontier/battle_castle/opponent_app.c +++ b/src/applications/frontier/battle_castle/opponent_app.c @@ -17,6 +17,7 @@ #include "overlay104/ov104_0222DCE0.h" #include "overlay104/ov104_0223B6F4.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "bg_window.h" #include "comm_command_frontier.h" @@ -119,7 +120,7 @@ enum BattleCastleAppMainSubState { typedef struct BattleCastleOpponentApp { ApplicationManager *appMan; - BattleFrontier *frontier; + BattleFrontierSave *frontier; u8 subState; u8 challengeType; u8 printerID; @@ -623,7 +624,7 @@ static BOOL State_MainAppFlow(BattleCastleOpponentApp *app) FreeSimpleMenu(app); CloseMessageBox(&app->windows[OPPONENT_APP_WINDOW_MSG_BOX]); - currentCP = BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))); + currentCP = BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)); if (currentCP < CP_COST_CHECK_IDENTITY) { DrawMessageBox(app); @@ -659,7 +660,7 @@ static BOOL State_MainAppFlow(BattleCastleOpponentApp *app) break; case 0: FreeSimpleMenu(app); - currentCP = BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))); + currentCP = BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)); if (app->levelAdjustmentForSlot[BattleCastleApp_GetSelectedSlot(app->numSlots, app->selectedMonSlot)] == LEVEL_ADJUSTMENT_UP_5) { DrawMessageBox(app); @@ -673,7 +674,7 @@ static BOOL State_MainAppFlow(BattleCastleOpponentApp *app) break; case 1: FreeSimpleMenu(app); - currentCP = BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))); + currentCP = BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)); if (app->levelAdjustmentForSlot[BattleCastleApp_GetSelectedSlot(app->numSlots, app->selectedMonSlot)] == LEVEL_ADJUSTMENT_DOWN_5) { DrawMessageBox(app); @@ -703,7 +704,7 @@ static BOOL State_MainAppFlow(BattleCastleOpponentApp *app) case MENU_YES: FreeSimpleMenu(app); - currentCP = BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))); + currentCP = BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)); cost = GetCostOfLevelAdjustment(app->levelAdjustment); if (currentCP < cost) { @@ -797,7 +798,7 @@ static BOOL State_MainAppFlow(BattleCastleOpponentApp *app) app->selectedMenuEntry = input; FreeListMenu2(app); - currentCP = BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))); + currentCP = BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)); SetStringTemplateNumber(app, 0, CP_COST_RANK_UP, 4, PADDING_MODE_NONE); app->printerID = PrintMessageAndCopyToVRAM(app, BattleCastleOpponentApp_Text_RankUpForCP, FONT_MESSAGE); @@ -855,7 +856,7 @@ static BOOL State_MainAppFlow(BattleCastleOpponentApp *app) case MENU_YES: FreeSimpleMenu(app); - currentCP = BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))); + currentCP = BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)); rank = BattleCastleApp_GetRank(app->saveData, app->challengeType, BATTLE_CASTLE_RANK_OPPONENT_SUMMARY); if (currentCP < CP_COST_RANK_UP) { @@ -2533,14 +2534,14 @@ static void PrintPlayersAndPartnersCastlePoints(BattleCastleOpponentApp *app, Wi x = playerXOffset + 104; y = playerYOffset; Window_FillRectWithColor(window, 0, x - 48, y, 48, 16); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))), 4, PADDING_MODE_SPACES); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)), 4, PADDING_MODE_SPACES); app->printerID = PrintMessage(app, window, BattleCastleOpponentApp_Text_CastlePoints, x, y, TEXT_SPEED_NO_TRANSFER, 1, 2, 0, FONT_SYSTEM, TEXT_ALIGN_RIGHT); } else { if (CommSys_CurNetId() == 0) { x = playerXOffset + 104; y = playerYOffset; Window_FillRectWithColor(window, 0, x - 48, y, 48, 16); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))), 4, PADDING_MODE_SPACES); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)), 4, PADDING_MODE_SPACES); app->printerID = PrintMessage(app, window, BattleCastleOpponentApp_Text_CastlePoints, x, y, TEXT_SPEED_NO_TRANSFER, 1, 2, 0, FONT_SYSTEM, TEXT_ALIGN_RIGHT); x = partnerXOffset + 104; @@ -2558,7 +2559,7 @@ static void PrintPlayersAndPartnersCastlePoints(BattleCastleOpponentApp *app, Wi x = partnerXOffset + 104; y = partnerYOffset; Window_FillRectWithColor(window, 0, x - 48, partnerYOffset, 48, 16); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))), 4, PADDING_MODE_SPACES); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)), 4, PADDING_MODE_SPACES); app->printerID = PrintMessage(app, window, BattleCastleOpponentApp_Text_CastlePoints, x, y, TEXT_SPEED_NO_TRANSFER, 1, 2, 0, FONT_SYSTEM, TEXT_ALIGN_RIGHT); } } @@ -2774,7 +2775,7 @@ static BOOL TryToBuySummaryScreen(BattleCastleOpponentApp *app, u16 cost, u16 fa { FreeSimpleMenu(app); - u16 currentCP = BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))); + u16 currentCP = BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)); if (currentCP < cost) { DrawMessageBox(app); @@ -2833,7 +2834,7 @@ static void IncreaseRank(BattleCastleOpponentApp *app, u8 slot, u8 menuOption) ov104_0223BC2C(app->frontier, app->challengeType, CP_COST_RANK_UP); rank = BattleCastleApp_GetRank(app->saveData, app->challengeType, rankType); - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(app->saveData), BattleFrontierStats_GetCastleRankIndex(app->challengeType, rankType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleRankIndex(app->challengeType, rankType)), rank + 1); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(app->saveData), BattleFrontierStats_GetCastleRankIndex(app->challengeType, rankType), rank + 1); if (BattleCastle_IsMultiPlayerChallenge(app->challengeType) == TRUE) { app->syncPurchaseState = 2; @@ -2857,7 +2858,7 @@ static void IncreaseRank(BattleCastleOpponentApp *app, u8 slot, u8 menuOption) ov104_0223BC2C(app->frontier, app->challengeType, CP_COST_RANK_UP); rank = BattleCastleApp_GetRank(app->saveData, app->challengeType, rankType); - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(app->saveData), BattleFrontierStats_GetCastleRankIndex(app->challengeType, rankType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleRankIndex(app->challengeType, rankType)), rank + 1); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(app->saveData), BattleFrontierStats_GetCastleRankIndex(app->challengeType, rankType), rank + 1); if (BattleCastle_IsMultiPlayerChallenge(app->challengeType) == TRUE) { app->syncPurchaseState = 2; diff --git a/src/applications/frontier/battle_castle/self_app.c b/src/applications/frontier/battle_castle/self_app.c index 37b51cd6d7..a0f3617aee 100644 --- a/src/applications/frontier/battle_castle/self_app.c +++ b/src/applications/frontier/battle_castle/self_app.c @@ -15,6 +15,7 @@ #include "overlay104/ov104_0222DCE0.h" #include "overlay104/ov104_0223B6F4.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "bg_window.h" #include "comm_command_frontier.h" @@ -56,7 +57,6 @@ #include "trainer_info.h" #include "unk_020302D0.h" #include "unk_020363E8.h" -#include "unk_0205DFC4.h" #include "unk_0208C098.h" #include "vram_transfer.h" @@ -260,7 +260,7 @@ const u16 sBerriesAvailableByRank[] = { typedef struct BattleCastleSelfApp { ApplicationManager *appMan; - BattleFrontier *frontier; + BattleFrontierSave *frontier; u8 subState; u8 challengeType; u8 printerID; @@ -852,7 +852,7 @@ static BOOL State_MainAppFlow(BattleCastleSelfApp *app) } else { app->selectedMenuEntry = input; FreeListMenu2(app); - currentCP = BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))); + currentCP = BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)); SetStringTemplateNumber(app, 0, sRankUpCosts[0][rank], 4, PADDING_MODE_NONE); app->printerID = PrintMessageAndCopyToVRAM(app, BattleCastleSelfApp_Text_RankUpForCP, FONT_MESSAGE); OpenYesNoMenu(app); @@ -871,7 +871,7 @@ static BOOL State_MainAppFlow(BattleCastleSelfApp *app) mon = Party_GetPokemonBySlotIndex(app->party, BattleCastleApp_GetSelectedSlot(app->numSlots, app->selectedMonSlot)); CloseYesNoMenu(app); - currentCP = BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))); + currentCP = BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)); rank = BattleCastleApp_GetRank(app->saveData, app->challengeType, BATTLE_CASTLE_RANK_HEALING); if (rank < sHealMenuEntries[app->menuPos][0]) { @@ -938,7 +938,7 @@ static BOOL State_MainAppFlow(BattleCastleSelfApp *app) case MENU_YES: CloseYesNoMenu(app); - currentCP = BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))); + currentCP = BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)); rank = BattleCastleApp_GetRank(app->saveData, app->challengeType, BATTLE_CASTLE_RANK_HEALING); if (currentCP < sRankUpCosts[BATTLE_CASTLE_RANK_HEALING][rank]) { @@ -1083,7 +1083,7 @@ static BOOL State_MainAppFlow(BattleCastleSelfApp *app) break; case MENU_YES: CloseYesNoMenu(app); - currentCP = BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))); + currentCP = BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)); if (currentCP < GetItemPriceFromListPos(app, app->menuPos, app->selectedMenuEntry)) { BattleCastleApp_DrawMessageBox(&app->windows[SELF_APP_WINDOW_MSG_BOX], Options_Frame(app->options)); @@ -1133,7 +1133,7 @@ static BOOL State_MainAppFlow(BattleCastleSelfApp *app) case MENU_YES: CloseYesNoMenu(app); - currentCP = BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))); + currentCP = BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)); rank = BattleCastleApp_GetRank(app->saveData, app->challengeType, BATTLE_CASTLE_RANK_RENTALS); if (currentCP < sRankUpCosts[BATTLE_CASTLE_RANK_RENTALS][rank]) { @@ -2002,7 +2002,7 @@ static void PrintMonLevelAndGender(BattleCastleSelfApp *app, Window *window, u8 static void DrawPlayerInfoOnItemSelectMenu(BattleCastleSelfApp *app, Window *window) { - u16 castlePoints = BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))); + u16 castlePoints = BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)); BattleCastleApp_DrawWindow(app->bgConfig, window); Window_FillTilemap(window, 15); @@ -3308,14 +3308,14 @@ static void PrintPlayersAndPartnersCastlePoints(BattleCastleSelfApp *app, Window x = playerXOffset + 104; y = playerYOffset; Window_FillRectWithColor(window, 0, x - 48, y, 48, 16); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))), 4, PADDING_MODE_SPACES); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)), 4, PADDING_MODE_SPACES); app->printerID = PrintMessage(app, window, BattleCastleSelfApp_Text_CastlePoints, x, y, TEXT_SPEED_NO_TRANSFER, 1, 2, 0, FONT_SYSTEM, TEXT_ALIGN_RIGHT); } else { if (CommSys_CurNetId() == 0) { x = playerXOffset + 104; y = playerYOffset; Window_FillRectWithColor(window, 0, x - 48, y, 48, 16); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))), 4, PADDING_MODE_SPACES); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)), 4, PADDING_MODE_SPACES); app->printerID = PrintMessage(app, window, BattleCastleSelfApp_Text_CastlePoints, x, y, TEXT_SPEED_NO_TRANSFER, 1, 2, 0, FONT_SYSTEM, TEXT_ALIGN_RIGHT); x = partnerXOffset + 104; @@ -3333,7 +3333,7 @@ static void PrintPlayersAndPartnersCastlePoints(BattleCastleSelfApp *app, Window x = partnerXOffset + 104; y = partnerYOffset; Window_FillRectWithColor(window, 0, x - 48, partnerYOffset, 48, 16); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))), 4, PADDING_MODE_SPACES); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStatAutoHostIdx(app->frontier, BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)), 4, PADDING_MODE_SPACES); app->printerID = PrintMessage(app, window, BattleCastleSelfApp_Text_CastlePoints, x, y, TEXT_SPEED_NO_TRANSFER, 1, 2, 0, FONT_SYSTEM, TEXT_ALIGN_RIGHT); } } @@ -3490,7 +3490,7 @@ static void IncreaseRank(BattleCastleSelfApp *app, u8 slot, u8 menuOption) ov104_0223BC2C(app->frontier, app->challengeType, sRankUpCosts[rankType][rank]); rank = BattleCastleApp_GetRank(app->saveData, app->challengeType, rankType); - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(app->saveData), BattleFrontierStats_GetCastleRankIndex(app->challengeType, rankType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleRankIndex(app->challengeType, rankType)), rank + 1); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(app->saveData), BattleFrontierStats_GetCastleRankIndex(app->challengeType, rankType), rank + 1); if (BattleCastle_IsMultiPlayerChallenge(app->challengeType) == TRUE) { if (menuOption == MENU_ENTRY_RANK_UP_HEALING) { @@ -3518,7 +3518,7 @@ static void IncreaseRank(BattleCastleSelfApp *app, u8 slot, u8 menuOption) ov104_0223BC2C(app->frontier, app->challengeType, sRankUpCosts[rankType][rank]); rank = BattleCastleApp_GetRank(app->saveData, app->challengeType, rankType); - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(app->saveData), BattleFrontierStats_GetCastleRankIndex(app->challengeType, rankType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleRankIndex(app->challengeType, rankType)), rank + 1); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(app->saveData), BattleFrontierStats_GetCastleRankIndex(app->challengeType, rankType), rank + 1); if (BattleCastle_IsMultiPlayerChallenge(app->challengeType) == TRUE) { if (menuOption == MENU_ENTRY_RANK_UP_HEALING) { diff --git a/src/applications/frontier/records/main.c b/src/applications/frontier/records/main.c index 03120c8257..53cb3b89ca 100644 --- a/src/applications/frontier/records/main.c +++ b/src/applications/frontier/records/main.c @@ -11,6 +11,7 @@ #include "applications/frontier/records/windows.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "battle_hall_win_records.h" #include "battle_tower_modes.h" @@ -36,7 +37,6 @@ #include "unk_0202FF4C.h" #include "unk_020302D0.h" #include "unk_02030494.h" -#include "unk_0205DFC4.h" #include "res/graphics/poketch/poketch.naix" #include "res/text/bank/battle_frontier_records.h" @@ -58,7 +58,7 @@ typedef struct FrontierRecordsApp { PaletteData *plttData; const Options *options; SaveData *saveData; - BattleFrontier *frontier; + BattleFrontierSave *frontier; } FrontierRecordsApp; static BOOL State_FadeInApp(FrontierRecordsApp *app); @@ -515,16 +515,16 @@ static void DisplayBattleFactoryLevel50Record(FrontierRecordsApp *app) Window_ScheduleCopyToVRAM(&app->windows[WINDOW_FACTORY_LEVEL_50_HEADER]); PrintBasicMessage(app, &app->windows[WINDOW_FACTORY_LEVEL_50_LATEST], GetBattleFactoryLatestStreakEntryID(app, FALSE), FONT_MESSAGE); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetFactoryLatestStreakIdx(FALSE, app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetFactoryLatestStreakIdx(FALSE, app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_FACTORY_LEVEL_50_LATEST], BattleFrontierRecords_Text_WinStreak, 112, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_CENTER); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetFactoryLatestTradeCountIndex(0, app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetFactoryLatestTradeCountIndex(0, app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_FACTORY_LEVEL_50_LATEST], BattleFrontierRecords_Text_Number, 224, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_RIGHT); Window_ScheduleCopyToVRAM(&app->windows[WINDOW_FACTORY_LEVEL_50_LATEST]); PrintBasicMessage(app, &app->windows[WINDOW_FACTORY_LEVEL_50_RECORD], BattleFrontierRecords_Text_Record, FONT_MESSAGE); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetFactoryRecordStreakIdx(FALSE, app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetFactoryRecordStreakIdx(FALSE, app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_FACTORY_LEVEL_50_RECORD], BattleFrontierRecords_Text_WinStreak, 112, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_CENTER); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetFactoryRecordTradeCountIndex(0, app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetFactoryRecordTradeCountIndex(0, app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_FACTORY_LEVEL_50_RECORD], BattleFrontierRecords_Text_Number, 224, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_RIGHT); Window_ScheduleCopyToVRAM(&app->windows[WINDOW_FACTORY_LEVEL_50_RECORD]); } @@ -535,16 +535,16 @@ static void DisplayBattleFactoryOpenLevelRecord(FrontierRecordsApp *app) Window_ScheduleCopyToVRAM(&app->windows[WINDOW_FACTORY_OPEN_LEVEL_HEADER]); PrintBasicMessage(app, &app->windows[WINDOW_FACTORY_OPEN_LEVEL_LATEST], GetBattleFactoryLatestStreakEntryID(app, TRUE), FONT_MESSAGE); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetFactoryLatestStreakIdx(TRUE, app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetFactoryLatestStreakIdx(TRUE, app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_FACTORY_OPEN_LEVEL_LATEST], BattleFrontierRecords_Text_WinStreak, 112, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_CENTER); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetFactoryLatestTradeCountIndex(1, app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetFactoryLatestTradeCountIndex(1, app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_FACTORY_OPEN_LEVEL_LATEST], BattleFrontierRecords_Text_Number, 224, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_RIGHT); Window_ScheduleCopyToVRAM(&app->windows[WINDOW_FACTORY_OPEN_LEVEL_LATEST]); PrintBasicMessage(app, &app->windows[WINDOW_FACTORY_OPEN_LEVEL_RECORD], BattleFrontierRecords_Text_Record, FONT_MESSAGE); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetFactoryRecordStreakIdx(TRUE, app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetFactoryRecordStreakIdx(TRUE, app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_FACTORY_OPEN_LEVEL_RECORD], BattleFrontierRecords_Text_WinStreak, 112, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_CENTER); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetFactoryRecordTradeCountIndex(1, app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetFactoryRecordTradeCountIndex(1, app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_FACTORY_OPEN_LEVEL_RECORD], BattleFrontierRecords_Text_Number, 224, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_RIGHT); Window_ScheduleCopyToVRAM(&app->windows[WINDOW_FACTORY_OPEN_LEVEL_RECORD]); } @@ -555,7 +555,7 @@ static u32 GetBattleFactoryLatestStreakEntryID(FrontierRecordsApp *app, u8 openL u8 streakIsActive; if (app->challengeType == FRONTIER_CHALLENGE_MULTI_WFC) { - streakIsActive = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(app->saveData), v1, BattleFrontierStats_GetHostFriendIdx(v1)); + streakIsActive = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(app->saveData), v1); } else { streakIsActive = sub_020300E0(sub_020300F4(app->saveData), 10, (openLevel * 4) + app->challengeType, NULL); } @@ -595,10 +595,10 @@ static void DisplayBattleHallRecord(FrontierRecordsApp *app) PrintBasicMessage(app, &app->windows[WINDOW_HALL_LATEST], BattleFrontierRecords_Text_Prev, FONT_MESSAGE); u16 streak; - if (app->species != BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(app->saveData), BattleFrontierStats_GetHallLatestSpeciesIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetHallLatestSpeciesIndex(app->challengeType)))) { + if (app->species != BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(app->saveData), BattleFrontierStats_GetHallLatestSpeciesIndex(app->challengeType))) { streak = 0; } else { - streak = BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetHallLatestStreakIndex(app->challengeType), 0xFF); + streak = BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetHallLatestStreakIndex(app->challengeType), 0xFF); } SetStringTemplateNumber(app, 0, streak); @@ -659,16 +659,16 @@ static void DisplayBattleCastleRecord(FrontierRecordsApp *app) Window_ScheduleCopyToVRAM(&app->windows[WINDOW_CASTLE_POINTS]); PrintBasicMessage(app, &app->windows[WINDOW_CASTLES_LATEST], GetBattleCastleLatestStreakEntryID(app), FONT_MESSAGE); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestStreakIndex(app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetCastleLatestStreakIndex(app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_CASTLES_LATEST], BattleFrontierRecords_Text_WinStreakTemplate, 112, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_CENTER); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(app->saveData), BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType)))); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(app->saveData), BattleFrontierStats_GetCastleLatestCPIndex(app->challengeType))); PrintMessage(app, &app->windows[WINDOW_CASTLES_LATEST], BattleFrontierRecords_Text_CP, 224, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_RIGHT); Window_ScheduleCopyToVRAM(&app->windows[WINDOW_CASTLES_LATEST]); PrintBasicMessage(app, &app->windows[WINDOW_CASTLES_RECORD], BattleFrontierRecords_Text_Record, FONT_MESSAGE); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetCastleRecordStreakIndex(app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetCastleRecordStreakIndex(app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_CASTLES_RECORD], BattleFrontierRecords_Text_WinStreakTemplate, 112, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_CENTER); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(app->saveData), BattleFrontierStats_GetCastleRecordCPIndex(app->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleRecordCPIndex(app->challengeType)))); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(app->saveData), BattleFrontierStats_GetCastleRecordCPIndex(app->challengeType))); PrintMessage(app, &app->windows[WINDOW_CASTLES_RECORD], BattleFrontierRecords_Text_CP, 224, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_RIGHT); Window_ScheduleCopyToVRAM(&app->windows[WINDOW_CASTLES_RECORD]); } @@ -677,7 +677,7 @@ static u32 GetBattleCastleLatestStreakEntryID(FrontierRecordsApp *app) { u8 isActive; if (app->challengeType == FRONTIER_CHALLENGE_MULTI_WFC) { - isActive = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(app->saveData), STAT_CASTLE_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_CASTLE_WFC_STREAK_ACTIVE)); + isActive = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(app->saveData), STAT_CASTLE_WFC_STREAK_ACTIVE); } else { isActive = sub_02030470(sub_0203041C(app->saveData), 9, app->challengeType, 0, NULL); } @@ -711,12 +711,12 @@ static void DisplayBattleArcadeRecord(FrontierRecordsApp *app) Window_ScheduleCopyToVRAM(&app->windows[WINDOW_HEADER]); PrintBasicMessage(app, &app->windows[WINDOW_ARCADE_LATEST], GetBattleArcadeLatestStreakEntryID(app), FONT_MESSAGE); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetArcadeLatestStreakIndex(app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetArcadeLatestStreakIndex(app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_ARCADE_LATEST], BattleFrontierRecords_Text_GamesCleared, 112, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_CENTER); Window_ScheduleCopyToVRAM(&app->windows[WINDOW_ARCADE_LATEST]); PrintBasicMessage(app, &app->windows[WINDOW_ARCADE_RECORD], 31, FONT_MESSAGE); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetArcadeCurrentStreakIndex(app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetArcadeCurrentStreakIndex(app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_ARCADE_RECORD], BattleFrontierRecords_Text_GamesCleared, 112, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_CENTER); Window_ScheduleCopyToVRAM(&app->windows[WINDOW_ARCADE_RECORD]); } @@ -725,7 +725,7 @@ static u32 GetBattleArcadeLatestStreakEntryID(FrontierRecordsApp *app) { u8 isActive; if (app->challengeType == FRONTIER_CHALLENGE_MULTI_WFC) { - isActive = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(app->saveData), STAT_ARCADE_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_ARCADE_WFC_STREAK_ACTIVE)); + isActive = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(app->saveData), STAT_ARCADE_WFC_STREAK_ACTIVE); } else { isActive = sub_02030600(sub_020305B8(app->saveData), 8, app->challengeType, 0, NULL); } @@ -756,12 +756,12 @@ static void DisplayBattleTowerSoloRecord(FrontierRecordsApp *app) Window_ScheduleCopyToVRAM(&app->windows[WINDOW_HEADER]); PrintBasicMessage(app, &app->windows[WINDOW_TOWER_SOLO_LATEST], GetBattleTowerLatestStreakEntryID(app, app->challengeType), FONT_MESSAGE); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetTowerLatestStreakIndex(app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetTowerLatestStreakIndex(app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_TOWER_SOLO_LATEST], BattleFrontierRecords_Text_WinStreak, 112, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_CENTER); Window_ScheduleCopyToVRAM(&app->windows[WINDOW_TOWER_SOLO_LATEST]); PrintBasicMessage(app, &app->windows[WINDOW_TOWER_SOLO_RECORD], 31, FONT_MESSAGE); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetTowerRecordStreakIndex(app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetTowerRecordStreakIndex(app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_TOWER_SOLO_RECORD], BattleFrontierRecords_Text_WinStreak, 112, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_CENTER); Window_ScheduleCopyToVRAM(&app->windows[WINDOW_TOWER_SOLO_RECORD]); } @@ -777,12 +777,12 @@ static void DisplayBattleTowerMultiRecord(FrontierRecordsApp *app) Window_ScheduleCopyToVRAM(&app->windows[WINDOW_TOWER_MULTI_W_TRAINER]); PrintBasicMessage(app, &app->windows[WINDOW_TOWER_MULTI_LATEST], GetBattleTowerLatestStreakEntryID(app, app->challengeType), FONT_MESSAGE); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetTowerLatestStreakIndex(app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetTowerLatestStreakIndex(app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_TOWER_MULTI_LATEST], BattleFrontierRecords_Text_WinStreak, 112, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_CENTER); Window_ScheduleCopyToVRAM(&app->windows[WINDOW_TOWER_MULTI_LATEST]); PrintBasicMessage(app, &app->windows[WINDOW_TOWER_MULTI_RECORD], BattleFrontierRecords_Text_Record, FONT_MESSAGE); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetTowerRecordStreakIndex(app->challengeType), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetTowerRecordStreakIndex(app->challengeType), 0xFF)); PrintMessage(app, &app->windows[WINDOW_TOWER_MULTI_RECORD], BattleFrontierRecords_Text_WinStreak, 112, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_CENTER); Window_ScheduleCopyToVRAM(&app->windows[WINDOW_TOWER_MULTI_RECORD]); @@ -790,12 +790,12 @@ static void DisplayBattleTowerMultiRecord(FrontierRecordsApp *app) Window_ScheduleCopyToVRAM(&app->windows[WINDOW_TOWER_MULTI_W_FRIEND]); PrintBasicMessage(app, &app->windows[WINDOW_TOWER_W_FRIEND_LATEST], GetBattleTowerLatestStreakEntryID(app, BATTLE_TOWER_MODE_LINK_MULTI), FONT_MESSAGE); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetTowerLatestStreakIndex(3), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetTowerLatestStreakIndex(3), 0xFF)); PrintMessage(app, &app->windows[WINDOW_TOWER_W_FRIEND_LATEST], BattleFrontierRecords_Text_WinStreak, 112, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_CENTER); Window_ScheduleCopyToVRAM(&app->windows[WINDOW_TOWER_W_FRIEND_LATEST]); PrintBasicMessage(app, &app->windows[WINDOW_TOWER_W_FRIEND_RECORD], BattleFrontierRecords_Text_Record, FONT_MESSAGE); - SetStringTemplateNumber(app, 0, BattleFrontierStats_GetStat(app->frontier, BattleFrontierStats_GetTowerRecordStreakIndex(3), 0xFF)); + SetStringTemplateNumber(app, 0, BattleFrontierSave_GetStat(app->frontier, BattleFrontierStats_GetTowerRecordStreakIndex(3), 0xFF)); PrintMessage(app, &app->windows[WINDOW_TOWER_W_FRIEND_RECORD], BattleFrontierRecords_Text_WinStreak, 112, 0, 1, 2, 0, FONT_SYSTEM, FALSE, TEXT_ALIGN_CENTER); Window_ScheduleCopyToVRAM(&app->windows[WINDOW_TOWER_W_FRIEND_RECORD]); } diff --git a/src/battle_frontier_save.c b/src/battle_frontier_save.c new file mode 100644 index 0000000000..f65dd82544 --- /dev/null +++ b/src/battle_frontier_save.c @@ -0,0 +1,177 @@ +#include "battle_frontier_save.h" + +#include + +#include "struct_defs/battle_frontier.h" + +#include "battle_hall_save.h" +#include "savedata.h" +#include "unk_0202D05C.h" +#include "unk_0202FF4C.h" +#include "unk_020302D0.h" +#include "unk_02030494.h" +#include "wifi_list.h" + +int BattleFrontierSave_Size(void) +{ + return sizeof(BattleFrontierSave); +} + +void BattleFrontier_Init(BattleFrontierSave *frontier) +{ + MI_CpuClear8(frontier, sizeof(BattleFrontierSave)); + + sub_0202D06C(&frontier->unk_950.unk_00); + sub_0202D080(&frontier->unk_950.unk_168); + sub_0202D0AC(&frontier->unk_950.unk_188); + sub_020300A4(&frontier->unk_1614.unk_00); + BattleHallStreakFlags_Init(&frontier->hall.streakFlags); + sub_02030410(&frontier->unk_161C.unk_00); + sub_020305AC(&frontier->unk_1620.unk_00); +} + +BattleFrontierSave *SaveData_GetBattleFrontier(SaveData *saveData) +{ + return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); +} + +u16 BattleFrontierSave_GetStat(BattleFrontierSave *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID) +{ + BattleFrontierStats *stats = &frontier->stats; + + if (statIndex < STATS_NUM_SOLO_STATS_AND_ACTIVE_FLAGS) { + if (statIndex >= STATS_NUM_SOLO_STATS) { + int flagGroup, bit; + + if (hostFriendID < 16) { + flagGroup = statIndex; + bit = hostFriendID; + } else { + flagGroup = statIndex + 1; + bit = hostFriendID - 16; + } + + return (stats->soloStats[flagGroup] >> bit) & 1; + } + + return stats->soloStats[statIndex]; + } else { + if (hostFriendID == -1) { + GF_ASSERT(FALSE); + return 0; + } + + return stats->wfcStats[hostFriendID][statIndex - STATS_NUM_SOLO_STATS_AND_ACTIVE_FLAGS]; + } +} + +u16 BattleFrontierSave_SetStat(BattleFrontierSave *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, u16 newValue) +{ + BattleFrontierStats *stats = &frontier->stats; + + if (newValue > 9999) { + newValue = 9999; + } + + if (statIndex < STATS_NUM_SOLO_STATS_AND_ACTIVE_FLAGS) { + if (statIndex >= STATS_NUM_SOLO_STATS) { + int flagGroup, bit; + + GF_ASSERT(hostFriendID != 0xff); + + if (hostFriendID < 16) { + flagGroup = statIndex; + bit = hostFriendID; + } else { + flagGroup = statIndex + 1; + bit = hostFriendID - 16; + } + + if (newValue == 0) { + stats->soloStats[flagGroup] &= 0xffff ^ (1 << bit); + } else { + stats->soloStats[flagGroup] |= 1 << bit; + } + } else { + GF_ASSERT(hostFriendID == 0xff); + stats->soloStats[statIndex] = newValue; + } + } else { + GF_ASSERT(hostFriendID != 0xff); + stats->wfcStats[hostFriendID][statIndex - STATS_NUM_SOLO_STATS_AND_ACTIVE_FLAGS] = newValue; + } + + return newValue; +} + +void BattleFrontierSave_ClearAllWFCStats(BattleFrontierSave *frontier) +{ + BattleFrontierStats *stats = &frontier->stats; + + MI_CpuClear8(stats->wfcStats, sizeof(u16) * STATS_NUM_WFC_STATS * MAX_FRIENDS); + + for (int i = STATS_NUM_SOLO_STATS; i <= STATS_NUM_SOLO_STATS_AND_ACTIVE_FLAGS - 1; i++) { + stats->soloStats[i] = 0; + } +} + +void BattleFrontierSave_ClearFriendStatsAndShift(BattleFrontierSave *frontier, int friendIdx) +{ + GF_ASSERT(friendIdx != 0xff); + + BattleFrontierStats *stats = &frontier->stats; + int i; + for (i = friendIdx; i < MAX_FRIENDS - 1; i++) { + MI_CpuCopy8(stats->wfcStats[i + 1], stats->wfcStats[i], sizeof(u16) * STATS_NUM_WFC_STATS); + + for (int statIndex = STATS_NUM_SOLO_STATS; statIndex < STATS_NUM_SOLO_STATS_AND_ACTIVE_FLAGS - 1; statIndex += 2) { + u16 activeFlag = BattleFrontierSave_GetStat(frontier, statIndex, i + 1); + BattleFrontierSave_SetStat(frontier, statIndex, i, activeFlag); + } + } + + i = MAX_FRIENDS - 1; + MI_CpuClear8(stats->wfcStats[i], sizeof(u16) * STATS_NUM_WFC_STATS); +} + +void BattleFrontierSave_ClearFriendStats(BattleFrontierSave *frontier, int friendIndex, int unused) +{ + BattleFrontierStats *stats = &frontier->stats; + MI_CpuClear8(stats->wfcStats[friendIndex], sizeof(u16) * STATS_NUM_WFC_STATS); +} + +u16 BattleFrontierSave_AddToStat(BattleFrontierSave *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, int addValue) +{ + BattleFrontierStats *stats = &frontier->stats; + u16 value = BattleFrontierSave_GetStat(frontier, statIndex, hostFriendID); + value += addValue; + + return BattleFrontierSave_SetStat(frontier, statIndex, hostFriendID, value); +} + +u16 BattleFrontierSave_SubtractFromStat(BattleFrontierSave *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, int subtractValue) +{ + BattleFrontierStats *stats = &frontier->stats; + int value = BattleFrontierSave_GetStat(frontier, statIndex, hostFriendID) - subtractValue; + + if (value < 0) { + value = 0; + } + + return BattleFrontierSave_SetStat(frontier, statIndex, hostFriendID, value); +} + +u16 BattleFrontierSave_SetIfBetter(BattleFrontierSave *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, u16 newValue) +{ + u16 currentValue = BattleFrontierSave_GetStat(frontier, statIndex, hostFriendID); + + if (currentValue < newValue) { + return BattleFrontierSave_SetStat(frontier, statIndex, hostFriendID, newValue); + } + + if (currentValue > 9999) { + return BattleFrontierSave_SetStat(frontier, statIndex, hostFriendID, 9999); + } + + return currentValue; +} diff --git a/src/battle_frontier_stats.c b/src/battle_frontier_stats.c index 99d522dd33..fad9788f21 100644 --- a/src/battle_frontier_stats.c +++ b/src/battle_frontier_stats.c @@ -1,177 +1,482 @@ #include "battle_frontier_stats.h" -#include +#include "constants/battle_frontier.h" +#include "constants/battle_frontier_stats.h" +#include "constants/versions.h" -#include "struct_defs/battle_frontier.h" +#include "nintendo_wfc/main.h" -#include "battle_hall_save.h" -#include "savedata.h" -#include "unk_0202D05C.h" -#include "unk_0202FF4C.h" -#include "unk_020302D0.h" -#include "unk_02030494.h" -#include "wifi_list.h" +#include "battle_tower_modes.h" +#include "communication_information.h" +#include "communication_system.h" +#include "save_player.h" +#include "trainer_info.h" -int BattleFrontier_SaveSize(void) +enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryLatestStreakIdx(u8 isOpenLevel, u8 challengeType) { - return sizeof(BattleFrontier); -} + enum BattleFrontierStatsIndex index; -void BattleFrontier_Init(BattleFrontier *frontier) -{ - MI_CpuClear8(frontier, sizeof(BattleFrontier)); - - sub_0202D06C(&frontier->unk_950.unk_00); - sub_0202D080(&frontier->unk_950.unk_168); - sub_0202D0AC(&frontier->unk_950.unk_188); - sub_020300A4(&frontier->unk_1614.unk_00); - BattleHallStreakFlags_Init(&frontier->hall.streakFlags); - sub_02030410(&frontier->unk_161C.unk_00); - sub_020305AC(&frontier->unk_1620.unk_00); -} - -BattleFrontier *SaveData_GetBattleFrontier(SaveData *saveData) -{ - return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); -} - -u16 BattleFrontierStats_GetStat(BattleFrontier *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID) -{ - BattleFrontierStats *stats = &frontier->stats; - - if (statIndex < STATS_NUM_SOLO_STATS_AND_ACTIVE_FLAGS) { - if (statIndex >= STATS_NUM_SOLO_STATS) { - int flagGroup, bit; - - if (hostFriendID < 16) { - flagGroup = statIndex; - bit = hostFriendID; - } else { - flagGroup = statIndex + 1; - bit = hostFriendID - 16; - } - - return (stats->soloStats[flagGroup] >> bit) & 1; - } - - return stats->soloStats[statIndex]; - } else { - if (hostFriendID == -1) { - GF_ASSERT(FALSE); - return 0; - } - - return stats->wfcStats[hostFriendID][statIndex - STATS_NUM_SOLO_STATS_AND_ACTIVE_FLAGS]; - } -} - -u16 BattleFrontierStats_SetStat(BattleFrontier *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, u16 newValue) -{ - BattleFrontierStats *stats = &frontier->stats; - - if (newValue > 9999) { - newValue = 9999; + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_FACTORY_LATEST_STREAK_50_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_FACTORY_LATEST_STREAK_50_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_FACTORY_LATEST_STREAK_50_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_FACTORY_LATEST_STREAK_50_MULTI_WFC; + break; } - if (statIndex < STATS_NUM_SOLO_STATS_AND_ACTIVE_FLAGS) { - if (statIndex >= STATS_NUM_SOLO_STATS) { - int flagGroup, bit; + return index + (isOpenLevel * 4); +} - GF_ASSERT(hostFriendID != 0xff); +enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryRecordStreakIdx(u8 isOpenLevel, u8 challengeType) +{ + enum BattleFrontierStatsIndex index; - if (hostFriendID < 16) { - flagGroup = statIndex; - bit = hostFriendID; - } else { - flagGroup = statIndex + 1; - bit = hostFriendID - 16; - } - - if (newValue == 0) { - stats->soloStats[flagGroup] &= 0xffff ^ (1 << bit); - } else { - stats->soloStats[flagGroup] |= 1 << bit; - } - } else { - GF_ASSERT(hostFriendID == 0xff); - stats->soloStats[statIndex] = newValue; - } - } else { - GF_ASSERT(hostFriendID != 0xff); - stats->wfcStats[hostFriendID][statIndex - STATS_NUM_SOLO_STATS_AND_ACTIVE_FLAGS] = newValue; + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_FACTORY_RECORD_STREAK_50_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_FACTORY_RECORD_STREAK_50_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_FACTORY_RECORD_STREAK_50_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_FACTORY_RECORD_STREAK_50_MULTI_WFC; + break; } - return newValue; + return index + (isOpenLevel * 4); } -void BattleFrontierStats_ClearAllWFCStats(BattleFrontier *frontier) +enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryLatestTradeCountIndex(u8 isOpenLevel, u8 challengeType) { - BattleFrontierStats *stats = &frontier->stats; + enum BattleFrontierStatsIndex index; - MI_CpuClear8(stats->wfcStats, sizeof(u16) * STATS_NUM_WFC_STATS * MAX_FRIENDS); - - for (int i = STATS_NUM_SOLO_STATS; i <= STATS_NUM_SOLO_STATS_AND_ACTIVE_FLAGS - 1; i++) { - stats->soloStats[i] = 0; - } -} - -void BattleFrontierStats_ClearFriendStatsAndShift(BattleFrontier *frontier, int friendIdx) -{ - GF_ASSERT(friendIdx != 0xff); - - BattleFrontierStats *stats = &frontier->stats; - int i; - for (i = friendIdx; i < MAX_FRIENDS - 1; i++) { - MI_CpuCopy8(stats->wfcStats[i + 1], stats->wfcStats[i], sizeof(u16) * STATS_NUM_WFC_STATS); - - for (int statIndex = STATS_NUM_SOLO_STATS; statIndex < STATS_NUM_SOLO_STATS_AND_ACTIVE_FLAGS - 1; statIndex += 2) { - u16 activeFlag = BattleFrontierStats_GetStat(frontier, statIndex, i + 1); - BattleFrontierStats_SetStat(frontier, statIndex, i, activeFlag); - } + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_FACTORY_LATEST_TRADE_COUNT_50_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_FACTORY_LATEST_TRADE_COUNT_50_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_FACTORY_LATEST_TRADE_COUNT_50_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_FACTORY_LATEST_TRADE_COUNT_50_MULTI_WFC; + break; } - i = MAX_FRIENDS - 1; - MI_CpuClear8(stats->wfcStats[i], sizeof(u16) * STATS_NUM_WFC_STATS); + return index + (isOpenLevel * 4); } -void BattleFrontierStats_ClearFriendStats(BattleFrontier *frontier, int friendIndex, int unused) +enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryRecordTradeCountIndex(u8 isOpenLevel, u8 challengeType) { - BattleFrontierStats *stats = &frontier->stats; - MI_CpuClear8(stats->wfcStats[friendIndex], sizeof(u16) * STATS_NUM_WFC_STATS); -} + enum BattleFrontierStatsIndex index; -u16 BattleFrontierStats_AddToStat(BattleFrontier *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, int addValue) -{ - BattleFrontierStats *stats = &frontier->stats; - u16 value = BattleFrontierStats_GetStat(frontier, statIndex, hostFriendID); - value += addValue; - - return BattleFrontierStats_SetStat(frontier, statIndex, hostFriendID, value); -} - -u16 BattleFrontierStats_SubtractFromStat(BattleFrontier *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, int subtractValue) -{ - BattleFrontierStats *stats = &frontier->stats; - int value = BattleFrontierStats_GetStat(frontier, statIndex, hostFriendID) - subtractValue; - - if (value < 0) { - value = 0; + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_FACTORY_RECORD_TRADE_COUNT_50_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_FACTORY_RECORD_TRADE_COUNT_50_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_FACTORY_RECORD_TRADE_COUNT_50_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_FACTORY_RECORD_TRADE_COUNT_50_MULTI_WFC; + break; } - return BattleFrontierStats_SetStat(frontier, statIndex, hostFriendID, value); + return index + (isOpenLevel * 4); } -u16 BattleFrontierStats_SetIfBetter(BattleFrontier *frontier, enum BattleFrontierStatsIndex statIndex, int hostFriendID, u16 newValue) +enum BattleFrontierStatsIndex BattleFrontierStats_GetHallCurrentTypeRanksIndex(u8 challengeType, u8 pokemonType) { - u16 currentValue = BattleFrontierStats_GetStat(frontier, statIndex, hostFriendID); + enum BattleFrontierStatsIndex index; - if (currentValue < newValue) { - return BattleFrontierStats_SetStat(frontier, statIndex, hostFriendID, newValue); + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_HALL_CURRENT_RANKS_NORMAL_FIGHTING_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_HALL_CURRENT_RANKS_NORMAL_FIGHTING_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_HALL_CURRENT_RANKS_NORMAL_FIGHTING_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_HALL_CURRENT_RANKS_NORMAL_FIGHTING_MULTI_WFC; + break; } - if (currentValue > 9999) { - return BattleFrontierStats_SetStat(frontier, statIndex, hostFriendID, 9999); - } - - return currentValue; + index += pokemonType / 2; + return index; +} + +enum BattleFrontierStatsIndex BattleFrontierStats_GetHallLatestStreakIndex(u8 challengeType) +{ + enum BattleFrontierStatsIndex index; + + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_HALL_LATEST_STREAK_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_HALL_LATEST_STREAK_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_HALL_LATEST_STREAK_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_HALL_LATEST_STREAK_MULTI_WFC; + break; + } + + return index; +} + +enum BattleFrontierStatsIndex BattleFrontierStats_GetHallCurrentStreakIndex(u8 challengeType) +{ + enum BattleFrontierStatsIndex index; + + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_HALL_CURRENT_STREAK_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_HALL_CURRENT_STREAK_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_HALL_CURRENT_STREAK_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_HALL_CURRENT_STREAK_MULTI_WFC; + break; + } + + return index; +} + +enum BattleFrontierStatsIndex BattleFrontierStats_GetHallLatestSpeciesIndex(u8 challengeType) +{ + enum BattleFrontierStatsIndex index; + + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_HALL_LATEST_SPECIES_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_HALL_LATEST_SPECIES_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_HALL_LATEST_SPECIES_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_HALL_LATEST_SPECIES_MULTI_WFC; + break; + } + + return index; +} + +enum BattleFrontierStatsIndex BattleFrontierStats_GetHallRecordStreakIndex(u8 challengeType) +{ + enum BattleFrontierStatsIndex index; + + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = FRONTIER_CHALLENGE_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = FRONTIER_CHALLENGE_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = FRONTIER_CHALLENGE_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = 2; + GF_ASSERT(FALSE); + break; + } + + return index; +} + +enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleRankIndex(u8 challengeType, u8 rankType) +{ + enum BattleFrontierStatsIndex index; + + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_CASTLE_RANK_HEALING_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_CASTLE_RANK_HEALING_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_CASTLE_RANK_HEALING_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_CASTLE_RANK_HEALING_MULTI_WFC; + break; + } + + index += rankType; + return index; +} + +enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleLatestStreakIndex(u8 challengeType) +{ + enum BattleFrontierStatsIndex index; + + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_CASTLE_LATEST_STREAK_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_CASTLE_LATEST_STREAK_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_CASTLE_LATEST_STREAK_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_CASTLE_LATEST_STREAK_MULTI_WFC; + break; + } + + return index; +} + +enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleRecordStreakIndex(u8 challengeType) +{ + enum BattleFrontierStatsIndex index; + + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_CASTLE_RECORD_STREAK_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_CASTLE_RECORD_STREAK_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_CASTLE_RECORD_STREAK_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_CASTLE_RECORD_STREAK_MULTI_WFC; + break; + } + + return index; +} + +enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleLatestCPIndex(u8 challengeType) +{ + enum BattleFrontierStatsIndex index; + + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_CASTLE_LATEST_CP_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_CASTLE_LATEST_CP_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_CASTLE_LATEST_CP_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_CASTLE_LATEST_CP_MULTI_WFC; + break; + } + + return index; +} + +enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleSpentCPIndex(u8 challengeType) +{ + enum BattleFrontierStatsIndex index; + + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_CASTLE_SPENT_CP_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_CASTLE_SPENT_CP_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_CASTLE_SPENT_CP_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_CASTLE_SPENT_CP_MULTI_WFC; + break; + } + + return index; +} + +enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleRecordCPIndex(u8 challengeType) +{ + enum BattleFrontierStatsIndex index; + + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_CASTLE_RECORD_CP_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_CASTLE_RECORD_CP_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_CASTLE_RECORD_CP_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_CASTLE_RECORD_CP_MULTI_WFC; + break; + } + + return index; +} + +int BattleFrontierStats_GetHostFriendIdx(u32 statIndex) +{ + if (statIndex < 100) { + return 0xff; + } + + return NintendoWFC_GetHostFriendIdx(); +} + +static u8 GetPartnerGameCode(void) +{ + TrainerInfo *trainerInfo = CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1); + GF_ASSERT(trainerInfo != NULL); + + return TrainerInfo_GameCode(trainerInfo); +} + +u8 sub_0205E6D8(SaveData *saveData) +{ + if (TrainerInfo_GameCode(SaveData_GetTrainerInfo(saveData)) == VERSION_NONE) { + return 1; + } + + if (GetPartnerGameCode() == VERSION_NONE) { + return 1; + } + + return 0; +} + +enum BattleFrontierStatsIndex BattleFrontierStats_GetArcadeLatestStreakIndex(u8 challengeType) +{ + enum BattleFrontierStatsIndex index; + + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_ARCADE_LATEST_STREAK_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_ARCADE_LATEST_STREAK_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_ARCADE_LATEST_STREAK_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_ARCADE_LATEST_STREAK_MULTI_WFC; + break; + } + + return index; +} + +enum BattleFrontierStatsIndex BattleFrontierStats_GetArcadeCurrentStreakIndex(u8 challengeType) +{ + enum BattleFrontierStatsIndex index; + + switch (challengeType) { + case FRONTIER_CHALLENGE_SINGLE: + index = STAT_ARCADE_RECORD_STREAK_SINGLE; + break; + case FRONTIER_CHALLENGE_DOUBLE: + index = STAT_ARCADE_RECORD_STREAK_DOUBLE; + break; + case FRONTIER_CHALLENGE_MULTI: + index = STAT_ARCADE_RECORD_STREAK_MULTI; + break; + case FRONTIER_CHALLENGE_MULTI_WFC: + index = STAT_ARCADE_RECORD_STREAK_MULTI_WFC; + break; + } + + return index; +} + +enum BattleFrontierStatsIndex BattleFrontierStats_GetTowerLatestStreakIndex(u8 challengeType) +{ + enum BattleFrontierStatsIndex index; + + switch (challengeType) { + case BATTLE_TOWER_MODE_SINGLE: + index = STAT_TOWER_LATEST_STREAK_SINGLE; + break; + case BATTLE_TOWER_MODE_DOUBLE: + index = STAT_TOWER_LATEST_STREAK_DOUBLE; + break; + case BATTLE_TOWER_MODE_MULTI: + index = STAT_TOWER_LATEST_STREAK_MULTI; + break; + case BATTLE_TOWER_MODE_LINK_MULTI: + index = STAT_TOWER_LATEST_STREAK_LINK_MULTI; + break; + case BATTLE_TOWER_MODE_WIFI: + index = STAT_TOWER_LATEST_STREAK_WIFI; + break; + case BATTLE_TOWER_MODE_6: + index = STAT_TOWER_LATEST_STREAK_MODE_6; + break; + default: + GF_ASSERT(FALSE); + break; + } + + return index; +} + +enum BattleFrontierStatsIndex BattleFrontierStats_GetTowerRecordStreakIndex(u8 challengeType) +{ + enum BattleFrontierStatsIndex index; + + switch (challengeType) { + case BATTLE_TOWER_MODE_SINGLE: + index = STAT_TOWER_RECORD_STREAK_SINGLE; + break; + case BATTLE_TOWER_MODE_DOUBLE: + index = STAT_TOWER_RECORD_STREAK_DOUBLE; + break; + case BATTLE_TOWER_MODE_MULTI: + index = STAT_TOWER_RECORD_STREAK_MULTI; + break; + case BATTLE_TOWER_MODE_LINK_MULTI: + index = STAT_TOWER_RECORD_STREAK_LINK_MULTI; + break; + case BATTLE_TOWER_MODE_WIFI: + index = STAT_TOWER_RECORD_STREAK_WIFI; + break; + case BATTLE_TOWER_MODE_6: + index = STAT_TOWER_RECORD_STREAK_MODE_6; + break; + default: + GF_ASSERT(FALSE); + break; + } + + return index; } diff --git a/src/battle_hall_save.c b/src/battle_hall_save.c index c20c038704..d62e807c41 100644 --- a/src/battle_hall_save.c +++ b/src/battle_hall_save.c @@ -15,7 +15,7 @@ void BattleHallSave_Init(BattleHallSave *challenge) BattleHallSave *BattleHallSave_Get(SaveData *saveData) { - BattleFrontier *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); + BattleFrontierSave *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); return &frontier->hallSave; } @@ -112,7 +112,7 @@ void BattleHallStreakFlags_Init(BattleHallStreakFlags *flags) BattleHallStreakFlags *BattleHallStreakFlags_Get(SaveData *saveData) { - BattleFrontier *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); + BattleFrontierSave *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); return &frontier->hall.streakFlags; } diff --git a/src/battle_hall_win_records.c b/src/battle_hall_win_records.c index 7a81c3e591..ba099e4a92 100644 --- a/src/battle_hall_win_records.c +++ b/src/battle_hall_win_records.c @@ -8,7 +8,7 @@ #include "savedata/save_table.h" -#include "battle_frontier_stats.h" +#include "battle_frontier_save.h" #include "heap.h" #include "savedata.h" @@ -117,9 +117,9 @@ BOOL BattleHallWinRecords_UpdateRecord(SaveData *saveData, enum BattleFrontierSt return updated; } - BattleFrontier *frontier = SaveData_GetBattleFrontier(saveData); - newRecord = BattleFrontierStats_GetStat(frontier, recordIndex, hostFriendID); - species = BattleFrontierStats_GetStat(frontier, speciesIndex, hostFriendID); + BattleFrontierSave *frontier = SaveData_GetBattleFrontier(saveData); + newRecord = BattleFrontierSave_GetStat(frontier, recordIndex, hostFriendID); + species = BattleFrontierSave_GetStat(frontier, speciesIndex, hostFriendID); BattleHallWinRecords *records = BattleHallWinRecords_Get(saveData, heapID, resultCode); if (*resultCode != LOAD_RESULT_OK) { diff --git a/src/meson.build b/src/meson.build index e753c4da20..f2c7ab5e50 100644 --- a/src/meson.build +++ b/src/meson.build @@ -135,7 +135,7 @@ pokeplatinum_c = files( 'battle_hall_save.c', 'unk_020302D0.c', 'unk_02030494.c', - 'battle_frontier_stats.c', + 'battle_frontier_save.c', 'battle_hall_win_records.c', 'unk_02030A80.c', 'unk_02030CE8.c', @@ -235,6 +235,7 @@ pokeplatinum_c = files( 'field_message.c', 'map_tile_behavior.c', 'unk_0205DFC4.c', + 'battle_frontier_stats.c', 'player_avatar.c', 'unk_0205F180.c', 'map_object.c', diff --git a/src/nintendo_wfc/main.c b/src/nintendo_wfc/main.c index 86103eccc5..f9d23b3cde 100644 --- a/src/nintendo_wfc/main.c +++ b/src/nintendo_wfc/main.c @@ -13,7 +13,7 @@ #include "global/assert.h" #include "nintendo_wfc/voice_chat.h" -#include "battle_frontier_stats.h" +#include "battle_frontier_save.h" #include "comm_manager.h" #include "communication_system.h" #include "dwc_error.h" @@ -566,7 +566,7 @@ static void DeleteDuplicateFriendCallback(int deletedFriendIdx, int duplicateFri MI_CpuCopy8(sNintendoWFCManager->friends, sub_0202AED8(SaveData_GetWiFiList(sNintendoWFCManager->saveData), 0), MAX_FRIENDS * sizeof(DWCFriendData)); sub_0202B270(SaveData_GetWiFiList(sNintendoWFCManager->saveData), deletedFriendIdx, duplicateFriendIdx); - BattleFrontierStats_ClearFriendStats(SaveData_GetBattleFrontier(sNintendoWFCManager->saveData), deletedFriendIdx, duplicateFriendIdx); + BattleFrontierSave_ClearFriendStats(SaveData_GetBattleFrontier(sNintendoWFCManager->saveData), deletedFriendIdx, duplicateFriendIdx); } static void DummyWFCBuddyFriendCB(int friendIdx, void *userParam) diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c index 3aec0c8bf0..2764e96b77 100644 --- a/src/overlay005/ov5_021EA874.c +++ b/src/overlay005/ov5_021EA874.c @@ -8,7 +8,7 @@ #include "field/field_system.h" #include "bag.h" -#include "battle_frontier_stats.h" +#include "battle_frontier_save.h" #include "bg_window.h" #include "communication_information.h" #include "communication_system.h" @@ -352,7 +352,7 @@ static BOOL ov5_021EAD38(UnkStruct_ov5_021EAE78 *param0) if (v4 == 0xffffffff) { return 0; } else if (v4 == 0) { - BattleFrontierStats_ClearFriendStatsAndShift(SaveData_GetBattleFrontier(param0->saveData), param0->unk_90); + BattleFrontierSave_ClearFriendStatsAndShift(SaveData_GetBattleFrontier(param0->saveData), param0->unk_90); sub_0202AFD4(v0, param0->unk_90); sub_02039298(param0->saveData, param0->unk_8C, 32 - 1, HEAP_ID_FIELD1, 0); param0->unk_48 = 1; diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index c91ba7123f..457f3e0ca0 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -21,6 +21,7 @@ #include "overlay005/ov5_021ECE40.h" #include "bag.h" +#include "battle_frontier_stats.h" #include "battle_hall_win_records.h" #include "berry_patch_graphics.h" #include "bg_window.h" @@ -54,7 +55,6 @@ #include "sys_task_manager.h" #include "system_vars.h" #include "unk_02038F8C.h" -#include "unk_0205DFC4.h" #include "vars_flags.h" #include "wifi_history_save_data.h" diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index afd17af00e..3fadb1966f 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -21,7 +21,7 @@ #include "appearance.h" #include "ascii_util.h" #include "bag.h" -#include "battle_frontier_stats.h" +#include "battle_frontier_save.h" #include "bg_window.h" #include "char_transfer.h" #include "character_sprite.h" @@ -1718,7 +1718,7 @@ static int ov64_0222F0C4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E06 v2 = ov64_0222FF38(param0); sub_0202AFD4(v1, param1->unk_08.unk_04[v2]); - BattleFrontierStats_ClearFriendStatsAndShift(SaveData_GetBattleFrontier(param1->saveData), param1->unk_08.unk_04[v2]); + BattleFrontierSave_ClearFriendStatsAndShift(SaveData_GetBattleFrontier(param1->saveData), param1->unk_08.unk_04[v2]); ov64_0222E164(param1); ov64_0222FC80(param0, param1, param2, param0->unk_00, param0->unk_04, 0, heapID); ov64_0222EA28(param2, 1); @@ -3180,7 +3180,7 @@ static void ov64_02231164(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 static void ov64_02231528(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { - BattleFrontier *frontier = SaveData_GetBattleFrontier(param1->saveData); + BattleFrontierSave *frontier = SaveData_GetBattleFrontier(param1->saveData); String *string = String_Init(128, heapID); String *fmtString = String_Init(128, heapID); @@ -3188,18 +3188,18 @@ static void ov64_02231528(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 ov64_022320B8(param0, 2, 0, param1, param2, 25, 0, 8, TEXT_COLOR(1, 2, 0), string, fmtString, 0); u32 entryID; - if (BattleFrontierStats_GetStat(frontier, STAT_TOWER_WFC_STREAK_ACTIVE, param1->unk_08.unk_04[param1->unk_07]) == 0) { + if (BattleFrontierSave_GetStat(frontier, STAT_TOWER_WFC_STREAK_ACTIVE, param1->unk_08.unk_04[param1->unk_07]) == 0) { entryID = 30; } else { entryID = 31; } ov64_022320B8(param0, 2, 0, param1, param2, entryID, 0, 32, TEXT_COLOR(1, 2, 0), string, fmtString, 0); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_TOWER_LATEST_STREAK_MODE_6, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_TOWER_LATEST_STREAK_MODE_6, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 2, 0, param1, param2, 38, 160, 32, TEXT_COLOR(1, 2, 0), string, fmtString, 2); ov64_022320B8(param0, 2, 0, param1, param2, 32, 0, 56, TEXT_COLOR(1, 2, 0), string, fmtString, 0); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_TOWER_RECORD_STREAK_MODE_6, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_TOWER_RECORD_STREAK_MODE_6, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 2, 0, param1, param2, 38, 160, 56, TEXT_COLOR(1, 2, 0), string, fmtString, 2); ov64_02231080(param0, 2); @@ -3210,7 +3210,7 @@ static void ov64_02231528(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 static void ov64_02231664(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { - BattleFrontier *frontier = SaveData_GetBattleFrontier(param1->saveData); + BattleFrontierSave *frontier = SaveData_GetBattleFrontier(param1->saveData); String *string = String_Init(128, heapID); String *fmtString = String_Init(128, heapID); @@ -3221,7 +3221,7 @@ static void ov64_02231664(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 ov64_022320B8(param0, 3, 1, param1, param2, 35, 224, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 2); u32 entryID; - if (BattleFrontierStats_GetStat(frontier, STAT_FACTORY_50_WFC_STREAK_ACTIVE, param1->unk_08.unk_04[param1->unk_07]) == 0) { + if (BattleFrontierSave_GetStat(frontier, STAT_FACTORY_50_WFC_STREAK_ACTIVE, param1->unk_08.unk_04[param1->unk_07]) == 0) { entryID = 30; } else { entryID = 31; @@ -3229,24 +3229,24 @@ static void ov64_02231664(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 ov64_022320B8(param0, 3, 2, param1, param2, entryID, 0, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 0); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_FACTORY_LATEST_STREAK_50_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_FACTORY_LATEST_STREAK_50_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 3, 2, param1, param2, 38, 112, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 1); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_FACTORY_LATEST_TRADE_COUNT_50_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_FACTORY_LATEST_TRADE_COUNT_50_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 3, 2, param1, param2, 39, 224, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 2); ov64_022320B8(param0, 3, 2, param1, param2, 32, 0, 16, TEXT_COLOR(1, 2, 0), string, fmtString, 0); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_FACTORY_RECORD_STREAK_50_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_FACTORY_RECORD_STREAK_50_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 3, 2, param1, param2, 38, 112, 16, TEXT_COLOR(1, 2, 0), string, fmtString, 1); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_FACTORY_RECORD_TRADE_COUNT_50_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_FACTORY_RECORD_TRADE_COUNT_50_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 3, 2, param1, param2, 39, 224, 16, TEXT_COLOR(1, 2, 0), string, fmtString, 2); ov64_022320B8(param0, 3, 3, param1, param2, 34, 0, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 0); ov64_022320B8(param0, 3, 3, param1, param2, 35, 224, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 2); - if (BattleFrontierStats_GetStat(frontier, STAT_FACTORY_OPEN_WFC_STREAK_ACTIVE, param1->unk_08.unk_04[param1->unk_07]) == 0) { + if (BattleFrontierSave_GetStat(frontier, STAT_FACTORY_OPEN_WFC_STREAK_ACTIVE, param1->unk_08.unk_04[param1->unk_07]) == 0) { entryID = 30; } else { entryID = 31; @@ -3254,18 +3254,18 @@ static void ov64_02231664(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 ov64_022320B8(param0, 3, 4, param1, param2, entryID, 0, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 0); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_FACTORY_LATEST_STREAK_OPEN_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_FACTORY_LATEST_STREAK_OPEN_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 3, 4, param1, param2, 38, 112, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 1); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_FACTORY_LATEST_TRADE_COUNT_OPEN_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_FACTORY_LATEST_TRADE_COUNT_OPEN_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 3, 4, param1, param2, 39, 224, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 2); ov64_022320B8(param0, 3, 4, param1, param2, 32, 0, 16, TEXT_COLOR(1, 2, 0), string, fmtString, 0); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_FACTORY_RECORD_STREAK_OPEN_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_FACTORY_RECORD_STREAK_OPEN_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 3, 4, param1, param2, 38, 112, 16, TEXT_COLOR(1, 2, 0), string, fmtString, 1); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_FACTORY_RECORD_TRADE_COUNT_OPEN_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_FACTORY_RECORD_TRADE_COUNT_OPEN_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 3, 4, param1, param2, 39, 224, 16, TEXT_COLOR(1, 2, 0), string, fmtString, 2); ov64_02231080(param0, 3); @@ -3276,7 +3276,7 @@ static void ov64_02231664(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 static void ov64_02231A00(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { - BattleFrontier *frontier = SaveData_GetBattleFrontier(param1->saveData); + BattleFrontierSave *frontier = SaveData_GetBattleFrontier(param1->saveData); String *string = String_Init(128, heapID); String *fmtString = String_Init(128, heapID); @@ -3285,7 +3285,7 @@ static void ov64_02231A00(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 ov64_022320B8(param0, 4, 0, param1, param2, 36, 224, 20, TEXT_COLOR(1, 2, 0), string, fmtString, 2); u32 entryID; - if (BattleFrontierStats_GetStat(frontier, STAT_CASTLE_WFC_STREAK_ACTIVE, param1->unk_08.unk_04[param1->unk_07]) == 0) { + if (BattleFrontierSave_GetStat(frontier, STAT_CASTLE_WFC_STREAK_ACTIVE, param1->unk_08.unk_04[param1->unk_07]) == 0) { entryID = 30; } else { entryID = 31; @@ -3293,18 +3293,18 @@ static void ov64_02231A00(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 ov64_022320B8(param0, 4, 0, param1, param2, entryID, 0, 48, TEXT_COLOR(1, 2, 0), string, fmtString, 0); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_CASTLE_LATEST_STREAK_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_CASTLE_LATEST_STREAK_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 4, 0, param1, param2, 41, 112, 48, TEXT_COLOR(1, 2, 0), string, fmtString, 1); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_CASTLE_LATEST_CP_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_CASTLE_LATEST_CP_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 4, 0, param1, param2, 40, 224, 48, TEXT_COLOR(1, 2, 0), string, fmtString, 2); ov64_022320B8(param0, 4, 0, param1, param2, 32, 0, 72, TEXT_COLOR(1, 2, 0), string, fmtString, 0); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_CASTLE_RECORD_STREAK_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_CASTLE_RECORD_STREAK_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 4, 0, param1, param2, 41, 112, 72, TEXT_COLOR(1, 2, 0), string, fmtString, 1); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_CASTLE_RECORD_CP_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_CASTLE_RECORD_CP_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 4, 0, param1, param2, 40, 224, 72, TEXT_COLOR(1, 2, 0), string, fmtString, 2); ov64_02231080(param0, 4); @@ -3315,19 +3315,19 @@ static void ov64_02231A00(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 static void ov64_02231BE0(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { - BattleFrontier *frontier = SaveData_GetBattleFrontier(param1->saveData); + BattleFrontierSave *frontier = SaveData_GetBattleFrontier(param1->saveData); String *string = String_Init(128, heapID); String *fmtString = String_Init(128, heapID); ov64_022320B8(param0, 5, 0, param1, param2, 28, 0, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 0); - String *speciesName = MessageUtil_SpeciesName(BattleFrontierStats_GetStat(frontier, STAT_HALL_LATEST_SPECIES_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07]), heapID); + String *speciesName = MessageUtil_SpeciesName(BattleFrontierSave_GetStat(frontier, STAT_HALL_LATEST_SPECIES_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07]), heapID); Text_AddPrinterWithParamsAndColor(¶m0->unk_0C[5][0], FONT_SYSTEM, speciesName, 0, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); String_Free(speciesName); u32 entryID; - if (BattleFrontierStats_GetStat(frontier, STAT_HALL_WFC_STREAK_ACTIVE, param1->unk_08.unk_04[param1->unk_07]) == 0) { + if (BattleFrontierSave_GetStat(frontier, STAT_HALL_WFC_STREAK_ACTIVE, param1->unk_08.unk_04[param1->unk_07]) == 0) { entryID = 30; } else { entryID = 31; @@ -3335,12 +3335,12 @@ static void ov64_02231BE0(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 ov64_022320B8(param0, 5, 0, param1, param2, entryID, 0, 48, TEXT_COLOR(1, 2, 0), string, fmtString, 0); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_HALL_LATEST_STREAK_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_HALL_LATEST_STREAK_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 5, 0, param1, param2, 38, 160, 48, TEXT_COLOR(1, 2, 0), string, fmtString, 2); ov64_022320B8(param0, 5, 0, param1, param2, 32, 0, 72, TEXT_COLOR(1, 2, 0), string, fmtString, 0); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, 122, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, 122, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 5, 0, param1, param2, 38, 160, 72, TEXT_COLOR(1, 2, 0), string, fmtString, 2); ov64_02231080(param0, 5); @@ -3351,7 +3351,7 @@ static void ov64_02231BE0(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 static void ov64_02231D58(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { - BattleFrontier *frontier = SaveData_GetBattleFrontier(param1->saveData); + BattleFrontierSave *frontier = SaveData_GetBattleFrontier(param1->saveData); String *string = String_Init(128, heapID); String *fmtString = String_Init(128, heapID); @@ -3359,7 +3359,7 @@ static void ov64_02231D58(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 ov64_022320B8(param0, 6, 0, param1, param2, 29, 0, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 0); u32 entryID; - if (BattleFrontierStats_GetStat(frontier, STAT_ARCADE_WFC_STREAK_ACTIVE, param1->unk_08.unk_04[param1->unk_07]) == 0) { + if (BattleFrontierSave_GetStat(frontier, STAT_ARCADE_WFC_STREAK_ACTIVE, param1->unk_08.unk_04[param1->unk_07]) == 0) { entryID = 30; } else { entryID = 31; @@ -3367,12 +3367,12 @@ static void ov64_02231D58(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 ov64_022320B8(param0, 6, 0, param1, param2, entryID, 0, 24, TEXT_COLOR(1, 2, 0), string, fmtString, 0); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_ARCADE_LATEST_STREAK_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_ARCADE_LATEST_STREAK_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 6, 0, param1, param2, 42, 160, 24, TEXT_COLOR(1, 2, 0), string, fmtString, 2); ov64_022320B8(param0, 6, 0, param1, param2, 32, 0, 48, TEXT_COLOR(1, 2, 0), string, fmtString, 0); - ov64_0222E970(param2, BattleFrontierStats_GetStat(frontier, STAT_ARCADE_RECORD_STREAK_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); + ov64_0222E970(param2, BattleFrontierSave_GetStat(frontier, STAT_ARCADE_RECORD_STREAK_MULTI_WFC, param1->unk_08.unk_04[param1->unk_07])); ov64_022320B8(param0, 6, 0, param1, param2, 42, 160, 48, TEXT_COLOR(1, 2, 0), string, fmtString, 2); ov64_02231080(param0, 6); @@ -3383,7 +3383,7 @@ static void ov64_02231D58(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 static void ov64_02231E94(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, enum HeapID heapID) { - BattleFrontier *unused = SaveData_GetBattleFrontier(param1->saveData); + BattleFrontierSave *unused = SaveData_GetBattleFrontier(param1->saveData); WiFiList *wifiList = SaveData_GetWiFiList(param1->saveData); String *string = String_Init(128, heapID); diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index fecc981415..5b20f50629 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -26,7 +26,7 @@ #include "assert.h" #include "bag.h" -#include "battle_frontier_stats.h" +#include "battle_frontier_save.h" #include "bg_window.h" #include "char_transfer.h" #include "comm_manager.h" @@ -1720,7 +1720,7 @@ static int ov65_0222F304(UnkStruct_ov65_0222EBE0 *param0, int param1) if (v1 == 0) { WiFiList_Init(param0->unk_00); Email_Init(SaveData_SaveTable(param0->saveData, SAVE_TABLE_ENTRY_EMAIL)); - BattleFrontierStats_ClearAllWFCStats(SaveData_GetBattleFrontier(param0->saveData)); + BattleFrontierSave_ClearAllWFCStats(SaveData_GetBattleFrontier(param0->saveData)); param0->unk_3A8 = 14; param0->unk_04 = CommManager_LoginWifiBattleServer(param0->saveData, sizeof(UnkStruct_0207DFAC)); ov65_02232B58(param0, 23, 1); @@ -5501,7 +5501,7 @@ static void ov65_022342A8(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID) { int v0; int v1; - BattleFrontier *frontier; + BattleFrontierSave *frontier; String *v3; frontier = SaveData_GetBattleFrontier(param0->saveData); @@ -5511,7 +5511,7 @@ static void ov65_022342A8(UnkStruct_ov65_0222EBE0 *param0, enum HeapID heapID) MessageLoader_GetString(param0->unk_168, 55, param0->unk_178); Text_AddPrinterWithParamsAndColor(¶m0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL); - v1 = BattleFrontierStats_GetStat(frontier, STAT_HALL_LATEST_SPECIES_MULTI_WFC, v0); + v1 = BattleFrontierSave_GetStat(frontier, STAT_HALL_LATEST_SPECIES_MULTI_WFC, v0); v3 = MessageUtil_SpeciesName(v1, heapID); { @@ -5609,15 +5609,15 @@ static void ov65_02234628(UnkStruct_ov65_0222EBE0 *param0) static void ov65_02234694(UnkStruct_ov65_0222EBE0 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) { int v0; - BattleFrontier *frontier = SaveData_GetBattleFrontier(param0->saveData); - v0 = BattleFrontierStats_GetStat(frontier, param2, param3); + BattleFrontierSave *frontier = SaveData_GetBattleFrontier(param0->saveData); + v0 = BattleFrontierSave_GetStat(frontier, param2, param3); ov65_02234708(param0, param1, v0, param4, param5); } static void ov65_022346C4(UnkStruct_ov65_0222EBE0 *param0, String *param1, u32 param2, u32 param3) { - BattleFrontier *frontier; + BattleFrontierSave *frontier; BOOL v1; u32 v2; static const u32 v3[6] = { @@ -5632,7 +5632,7 @@ static void ov65_022346C4(UnkStruct_ov65_0222EBE0 *param0, String *param1, u32 p GF_ASSERT(param2 < 6); frontier = SaveData_GetBattleFrontier(param0->saveData); - v1 = BattleFrontierStats_GetStat(frontier, v3[param2], param3); + v1 = BattleFrontierSave_GetStat(frontier, v3[param2], param3); if (v1 == 0) { v2 = 57; diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 7f43cc9965..75907eac62 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -19,7 +19,7 @@ #include "overlay088/struct_ov88_0223C8AC.h" #include "bag.h" -#include "battle_frontier_stats.h" +#include "battle_frontier_save.h" #include "bg_window.h" #include "brightness_controller.h" #include "char_transfer.h" @@ -1815,7 +1815,7 @@ static int ov88_0223D514(UnkStruct_02095E80 *param0) switch (ov88_0223ED2C(param0->unk_174, ¶m0->unk_6BC, ¶m0->unk_6C8)) { case 0: - BattleFrontierStats_ClearFriendStatsAndShift(SaveData_GetBattleFrontier(param0->saveData), param0->unk_36C8); + BattleFrontierSave_ClearFriendStatsAndShift(SaveData_GetBattleFrontier(param0->saveData), param0->unk_36C8); sub_0202AFD4(param0->unk_36EC, param0->unk_36C8); sub_02039298(param0->saveData, param0->unk_36C4, 32 - 1, HEAP_ID_26, 0); param0->unk_226C = ov88_0223D854; diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index e644a42961..7316e3d2a9 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -12,7 +12,7 @@ #include "overlay090/struct_ov90_021D0D80.h" #include "overlay090/struct_ov90_021D1750.h" -#include "battle_frontier_stats.h" +#include "battle_frontier_save.h" #include "bg_window.h" #include "easy_chat_sentence.h" #include "font.h" @@ -75,7 +75,7 @@ typedef struct { BgConfig *unk_10; UnkStruct_ov90_021D0D80 *unk_14; Options *options; - BattleFrontier *frontier; + BattleFrontierSave *frontier; UnkStruct_0202D750 *unk_20; UnkStruct_0202D764 *unk_24; UnkStruct_ov90_021D0ECC_sub1 unk_28; @@ -641,8 +641,8 @@ static void ov90_021D14C8(UnkStruct_ov90_021D0ECC *param0, Window *param1, u8 pa u16 v0, v1, v2; int v3; - v1 = BattleFrontierStats_GetStat(param0->frontier, param3, 0xff); - v2 = BattleFrontierStats_GetStat(param0->frontier, param3 + 1, 0xff); + v1 = BattleFrontierSave_GetStat(param0->frontier, param3, 0xff); + v2 = BattleFrontierSave_GetStat(param0->frontier, param3 + 1, 0xff); v0 = sub_0202D414(param0->unk_20, 8 + param2, 0); Text_AddPrinterWithParamsAndColor(param1, FONT_SYSTEM, param0->unk_28.unk_24[v0], 4, param4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 4, 0), NULL); diff --git a/src/overlay104/frscrcmd.c b/src/overlay104/frscrcmd.c index 991d789316..e7e5dbde2a 100644 --- a/src/overlay104/frscrcmd.c +++ b/src/overlay104/frscrcmd.c @@ -49,6 +49,7 @@ #include "overlay104/struct_ov104_0223F1B4.h" #include "savedata/save_table.h" +#include "battle_frontier_stats.h" #include "bg_window.h" #include "brightness_controller.h" #include "comm_manager.h" @@ -86,7 +87,6 @@ #include "unk_0202F1D4.h" #include "unk_02033200.h" #include "unk_020363E8.h" -#include "unk_0205DFC4.h" #include "unk_0209B6F8.h" #include "vars_flags.h" #include "wifi_list.h" diff --git a/src/overlay104/frscrcmd_battle_castle.c b/src/overlay104/frscrcmd_battle_castle.c index 9ab5c8175e..2ceb4ca3ec 100644 --- a/src/overlay104/frscrcmd_battle_castle.c +++ b/src/overlay104/frscrcmd_battle_castle.c @@ -17,6 +17,7 @@ #include "overlay104/struct_battle_castle.h" #include "overlay104/struct_ov104_02230BE4.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "comm_command_frontier.h" #include "communication_system.h" @@ -25,7 +26,6 @@ #include "party.h" #include "pokemon.h" #include "unk_020302D0.h" -#include "unk_0205DFC4.h" #include "unk_0209B6F8.h" #include "constdata/const_020EA358.h" @@ -410,10 +410,10 @@ BOOL FrontierScrCmd_CallBattleCastleFunction(FrontierScriptContext *ctx) case BC_FUNC_UNK_44: if (battleCastle->challengeType == 3) { if (arg1 == 0) { - battleCastle->unk_22 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(v11->saveData), BattleFrontierStats_GetCastleLatestCPIndex(battleCastle->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(battleCastle->challengeType))); - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(v11->saveData), BattleFrontierStats_GetCastleLatestCPIndex(battleCastle->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(battleCastle->challengeType)), battleCastle->unk_20); + battleCastle->unk_22 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(v11->saveData), BattleFrontierStats_GetCastleLatestCPIndex(battleCastle->challengeType)); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(v11->saveData), BattleFrontierStats_GetCastleLatestCPIndex(battleCastle->challengeType), battleCastle->unk_20); } else { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(v11->saveData), BattleFrontierStats_GetCastleLatestCPIndex(battleCastle->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(battleCastle->challengeType)), battleCastle->unk_22); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(v11->saveData), BattleFrontierStats_GetCastleLatestCPIndex(battleCastle->challengeType), battleCastle->unk_22); } } break; @@ -529,7 +529,7 @@ BOOL FrontierScrCmd_A6(FrontierScriptContext *param0) u16 *v2 = FrontierScriptContext_TryGetVarPointer(param0); v0 = sub_0209B970(param0->scriptMan->unk_00); - *v2 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(v0->saveData), BattleFrontierStats_GetCastleLatestCPIndex(v1), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(v1))); + *v2 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(v0->saveData), BattleFrontierStats_GetCastleLatestCPIndex(v1)); return 0; } diff --git a/src/overlay104/ov104_0222ECE8.c b/src/overlay104/ov104_0222ECE8.c index 9e04b13ba7..ececb3f217 100644 --- a/src/overlay104/ov104_0222ECE8.c +++ b/src/overlay104/ov104_0222ECE8.c @@ -16,6 +16,7 @@ #include "overlay104/struct_battle_factory.h" #include "overlay104/struct_battle_hall.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "communication_system.h" #include "heap.h" @@ -25,7 +26,6 @@ #include "trainer_info.h" #include "unk_020302D0.h" #include "unk_02030494.h" -#include "unk_0205DFC4.h" BOOL ov104_0222EEF8(BattleFactory *param0); void CommCmd_Frontier_22(int param0, int param1, void *param2, void *param3); @@ -737,7 +737,7 @@ BOOL ov104_0222F3B8(BattleCastle *param0) v1 += 3; v1 += (7 + 1); - param0->unk_3C0[v1] = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(param0->saveData), BattleFrontierStats_GetCastleLatestCPIndex(param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(param0->challengeType))); + param0->unk_3C0[v1] = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(param0->saveData), BattleFrontierStats_GetCastleLatestCPIndex(param0->challengeType)); v1 += 1; if (CommSys_SendData(COMM_CMD_F_42, param0->unk_3C0, v3) == 1) { diff --git a/src/overlay104/ov104_022339B4.c b/src/overlay104/ov104_022339B4.c index b6cb876fed..6f03dba73f 100644 --- a/src/overlay104/ov104_022339B4.c +++ b/src/overlay104/ov104_022339B4.c @@ -14,6 +14,7 @@ #include "overlay104/struct_battle_factory.h" #include "overlay104/struct_ov104_0224028C.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "game_records.h" #include "heap.h" @@ -23,7 +24,6 @@ #include "savedata.h" #include "system_vars.h" #include "unk_0202FF4C.h" -#include "unk_0205DFC4.h" #include "vars_flags.h" void ov104_02233B98(BattleFactory *param0, u16 param1); @@ -88,8 +88,8 @@ BattleFactory *ov104_022339B4(SaveData *saveData, u16 param1, u8 param2, u8 para } if (v3 == 1) { - v7->currentStreak = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(v7->saveData), BattleFrontierStats_GetFactoryLatestStreakIdx(v7->unk_05, v7->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetFactoryLatestStreakIdx(v7->unk_05, v7->challengeType))); - v7->unk_08 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(v7->saveData), BattleFrontierStats_GetFactoryLatestTradeCountIndex(v7->unk_05, v7->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetFactoryLatestTradeCountIndex(v7->unk_05, v7->challengeType))); + v7->currentStreak = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(v7->saveData), BattleFrontierStats_GetFactoryLatestStreakIdx(v7->unk_05, v7->challengeType)); + v7->unk_08 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(v7->saveData), BattleFrontierStats_GetFactoryLatestTradeCountIndex(v7->unk_05, v7->challengeType)); } else { v7->currentStreak = 0; v7->unk_08 = 0; @@ -100,8 +100,8 @@ BattleFactory *ov104_022339B4(SaveData *saveData, u16 param1, u8 param2, u8 para v7->challengeType = (u8)sub_02030030(v0, 1, 0, NULL); v7->unk_05 = (u8)sub_02030030(v0, 0, 0, NULL); v7->unk_06 = (u8)sub_02030030(v0, 2, 0, NULL); - v7->currentStreak = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(v7->saveData), BattleFrontierStats_GetFactoryLatestStreakIdx(v7->unk_05, v7->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetFactoryLatestStreakIdx(v7->unk_05, v7->challengeType))); - v7->unk_08 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(v7->saveData), BattleFrontierStats_GetFactoryLatestTradeCountIndex(v7->unk_05, v7->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetFactoryLatestTradeCountIndex(v7->unk_05, v7->challengeType))); + v7->currentStreak = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(v7->saveData), BattleFrontierStats_GetFactoryLatestStreakIdx(v7->unk_05, v7->challengeType)); + v7->unk_08 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(v7->saveData), BattleFrontierStats_GetFactoryLatestTradeCountIndex(v7->unk_05, v7->challengeType)); } v7->unk_0E = (u16)(v7->currentStreak / 7); @@ -328,7 +328,7 @@ void ov104_02234148(BattleFactory *param0, u8 param1) u16 v6[4]; u32 v7[4]; u32 v8, v9, v10; - BattleFrontier *frontier; + BattleFrontierSave *frontier; Pokemon *v12; UnkStruct_0202FF58 *v13 = param0->unk_4F4; UnkStruct_020300F4 *v14 = sub_020300F4(param0->saveData); @@ -346,18 +346,18 @@ void ov104_02234148(BattleFactory *param0, u8 param1) v5[0] = param0->unk_06; sub_0202FF84(param0->unk_4F4, 2, 0, v5); - BattleFrontierStats_SetStat(frontier, BattleFrontierStats_GetFactoryLatestTradeCountIndex(param0->unk_05, param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetFactoryLatestTradeCountIndex(param0->unk_05, param0->challengeType)), param0->unk_08); - BattleFrontierStats_SetStat(frontier, BattleFrontierStats_GetFactoryLatestStreakIdx(param0->unk_05, param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetFactoryLatestStreakIdx(param0->unk_05, param0->challengeType)), param0->currentStreak); + BattleFrontierSave_SetStatAutoHostIdx(frontier, BattleFrontierStats_GetFactoryLatestTradeCountIndex(param0->unk_05, param0->challengeType), param0->unk_08); + BattleFrontierSave_SetStatAutoHostIdx(frontier, BattleFrontierStats_GetFactoryLatestStreakIdx(param0->unk_05, param0->challengeType), param0->currentStreak); if (param1 != 2) { - v1 = BattleFrontierStats_GetStat(frontier, BattleFrontierStats_GetFactoryRecordStreakIdx(param0->unk_05, param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetFactoryRecordStreakIdx(param0->unk_05, param0->challengeType))); - v8 = BattleFrontierStats_SetIfBetter(frontier, BattleFrontierStats_GetFactoryRecordStreakIdx(param0->unk_05, param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetFactoryRecordStreakIdx(param0->unk_05, param0->challengeType)), param0->currentStreak); - v2 = BattleFrontierStats_GetStat(frontier, BattleFrontierStats_GetFactoryRecordStreakIdx(param0->unk_05, param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetFactoryRecordStreakIdx(param0->unk_05, param0->challengeType))); + v1 = BattleFrontierSave_GetStatAutoHostIdx(frontier, BattleFrontierStats_GetFactoryRecordStreakIdx(param0->unk_05, param0->challengeType)); + v8 = BattleFrontierSave_SetIfBetterAutoHostIdx(frontier, BattleFrontierStats_GetFactoryRecordStreakIdx(param0->unk_05, param0->challengeType), param0->currentStreak); + v2 = BattleFrontierSave_GetStatAutoHostIdx(frontier, BattleFrontierStats_GetFactoryRecordStreakIdx(param0->unk_05, param0->challengeType)); if (param0->currentStreak == v1) { - BattleFrontierStats_SetIfBetter(frontier, BattleFrontierStats_GetFactoryRecordTradeCountIndex(param0->unk_05, param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetFactoryRecordTradeCountIndex(param0->unk_05, param0->challengeType)), param0->unk_08); + BattleFrontierSave_SetIfBetterAutoHostIdx(frontier, BattleFrontierStats_GetFactoryRecordTradeCountIndex(param0->unk_05, param0->challengeType), param0->unk_08); } else if (v1 < v2) { - BattleFrontierStats_SetStat(frontier, BattleFrontierStats_GetFactoryRecordTradeCountIndex(param0->unk_05, param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetFactoryRecordTradeCountIndex(param0->unk_05, param0->challengeType)), param0->unk_08); + BattleFrontierSave_SetStatAutoHostIdx(frontier, BattleFrontierStats_GetFactoryRecordTradeCountIndex(param0->unk_05, param0->challengeType), param0->unk_08); } v5[0] = param0->unk_0A; @@ -370,7 +370,7 @@ void ov104_02234148(BattleFactory *param0, u8 param1) v10 = 104; } - BattleFrontierStats_SetStat(frontier, v10, BattleFrontierStats_GetHostFriendIdx(v10), param0->unk_0A); + BattleFrontierSave_SetStatAutoHostIdx(frontier, v10, param0->unk_0A); } } diff --git a/src/overlay104/ov104_02234DB4.c b/src/overlay104/ov104_02234DB4.c index f2e1a3f373..0c10340871 100644 --- a/src/overlay104/ov104_02234DB4.c +++ b/src/overlay104/ov104_02234DB4.c @@ -12,6 +12,7 @@ #include "overlay104/ov104_0223AF58.h" #include "overlay104/struct_battle_hall.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "battle_hall_save.h" #include "battle_hall_win_records.h" @@ -20,7 +21,6 @@ #include "pokemon.h" #include "savedata.h" #include "system_vars.h" -#include "unk_0205DFC4.h" #include "vars_flags.h" static void ov104_022350B8(BattleHall *param0); @@ -62,7 +62,7 @@ BattleHall *BattleHall_Init(SaveData *saveData, u16 resumingFromSave, u8 challen } if (streakActive == TRUE) { - battleHall->currentStreak = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(battleHall->saveData), BattleFrontierStats_GetHallLatestStreakIndex(battleHall->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetHallLatestStreakIndex(battleHall->challengeType))); + battleHall->currentStreak = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(battleHall->saveData), BattleFrontierStats_GetHallLatestStreakIndex(battleHall->challengeType)); } else { battleHall->currentStreak = 0; @@ -77,7 +77,7 @@ BattleHall *BattleHall_Init(SaveData *saveData, u16 resumingFromSave, u8 challen battleHall->challengeType = BattleHallSave_GetMember(currentChallenge, HALL_SAVE_CHALLENGE_TYPE, 0, 0, NULL); partySize = BattleHall_GetPlayerPartySize(battleHall->challengeType); battleHall->unk_05 = BattleHallSave_GetMember(currentChallenge, HALL_SAVE_UNK_1, 0, 0, NULL); - battleHall->currentStreak = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(battleHall->saveData), BattleFrontierStats_GetHallLatestStreakIndex(battleHall->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetHallLatestStreakIndex(battleHall->challengeType))); + battleHall->currentStreak = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(battleHall->saveData), BattleFrontierStats_GetHallLatestStreakIndex(battleHall->challengeType)); for (i = 0; i < partySize; i++) { battleHall->partySlots[i] = BattleHallSave_GetMember(currentChallenge, HALL_SAVE_PARTY_SLOTS, i, 0, NULL); @@ -224,7 +224,7 @@ void BattleHall_Save(BattleHall *battleHall, u8 saveType) u8 u8Ptr[4]; u16 u16Ptr[4]; u32 u32Ptr[4]; - BattleFrontier *frontier; + BattleFrontierSave *frontier; Pokemon *mon; BattleHallStreakFlags *streakFlags = BattleHallStreakFlags_Get(battleHall->saveData); @@ -236,20 +236,20 @@ void BattleHall_Save(BattleHall *battleHall, u8 saveType) mon = Party_GetPokemonBySlotIndex(SaveData_GetParty(battleHall->saveData), battleHall->partySlots[0]); u16 currentSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL); - u16 speciesOnRecord = BattleFrontierStats_GetStat(frontier, BattleFrontierStats_GetHallLatestSpeciesIndex(battleHall->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetHallLatestSpeciesIndex(battleHall->challengeType))); + u16 speciesOnRecord = BattleFrontierSave_GetStatAutoHostIdx(frontier, BattleFrontierStats_GetHallLatestSpeciesIndex(battleHall->challengeType)); *u8Ptr = battleHall->unk_05; BattleHallSave_SetMember(battleHall->hallSave, HALL_SAVE_UNK_1, 0, 0, u8Ptr); - BattleFrontierStats_SetStat(frontier, BattleFrontierStats_GetHallLatestStreakIndex(battleHall->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetHallLatestStreakIndex(battleHall->challengeType)), battleHall->currentStreak); + BattleFrontierSave_SetStatAutoHostIdx(frontier, BattleFrontierStats_GetHallLatestStreakIndex(battleHall->challengeType), battleHall->currentStreak); if (saveType != 2) { if (battleHall->challengeType != FRONTIER_CHALLENGE_MULTI_WFC) { - BattleFrontierStats_SetStat(frontier, BattleFrontierStats_GetHallCurrentStreakIndex(battleHall->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetHallCurrentStreakIndex(battleHall->challengeType)), battleHall->currentStreak); + BattleFrontierSave_SetStatAutoHostIdx(frontier, BattleFrontierStats_GetHallCurrentStreakIndex(battleHall->challengeType), battleHall->currentStreak); } else { if (speciesOnRecord != currentSpecies) { - BattleFrontierStats_SetStat(frontier, BattleFrontierStats_GetHallCurrentStreakIndex(battleHall->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetHallCurrentStreakIndex(battleHall->challengeType)), battleHall->currentStreak); + BattleFrontierSave_SetStatAutoHostIdx(frontier, BattleFrontierStats_GetHallCurrentStreakIndex(battleHall->challengeType), battleHall->currentStreak); } else { - BattleFrontierStats_SetIfBetter(frontier, BattleFrontierStats_GetHallCurrentStreakIndex(battleHall->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetHallCurrentStreakIndex(battleHall->challengeType)), battleHall->currentStreak); + BattleFrontierSave_SetIfBetterAutoHostIdx(frontier, BattleFrontierStats_GetHallCurrentStreakIndex(battleHall->challengeType), battleHall->currentStreak); } } @@ -257,7 +257,7 @@ void BattleHall_Save(BattleHall *battleHall, u8 saveType) BattleHallStreakFlags_SetFlag(streakFlags, HALL_SAVE_STREAK_FLAGS, battleHall->challengeType, 0, u8Ptr); if (battleHall->challengeType == FRONTIER_CHALLENGE_MULTI_WFC) { - BattleFrontierStats_SetStat(frontier, STAT_HALL_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_HALL_WFC_STREAK_ACTIVE), battleHall->streakActive); + BattleFrontierSave_SetStatAutoHostIdx(frontier, STAT_HALL_WFC_STREAK_ACTIVE, battleHall->streakActive); } } @@ -281,7 +281,7 @@ void BattleHall_Save(BattleHall *battleHall, u8 saveType) BattleHallSave_SetMember(battleHall->hallSave, HALL_SAVE_UNK_4, i, 0, u16Ptr); } - BattleFrontierStats_SetStat(frontier, BattleFrontierStats_GetHallLatestSpeciesIndex(battleHall->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetHallLatestSpeciesIndex(battleHall->challengeType)), Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL)); + BattleFrontierSave_SetStatAutoHostIdx(frontier, BattleFrontierStats_GetHallLatestSpeciesIndex(battleHall->challengeType), Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL)); } u16 ov104_022354B0(BattleHall *param0) @@ -389,7 +389,7 @@ u16 ov104_02235578(BattleHall *param0) static u16 BattleHall_LoadTypeRanks(SaveData *saveData, u8 challengeType, u8 type, u16 *type1Rank, u16 *type2Rank) { - u16 rankPair = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetHallCurrentTypeRanksIndex(challengeType, type), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetHallCurrentTypeRanksIndex(challengeType, type))); + u16 rankPair = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetHallCurrentTypeRanksIndex(challengeType, type)); rankPair &= 0xff; *type1Rank = rankPair & 0xf; @@ -419,7 +419,7 @@ static void BattleHall_SaveTypeRank(SaveData *saveData, u8 challengeType, u8 typ u8 newRank = value << (4 * nybble); currentRanks |= newRank; - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetHallCurrentTypeRanksIndex(challengeType, type), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetHallCurrentTypeRanksIndex(challengeType, type)), currentRanks); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetHallCurrentTypeRanksIndex(challengeType, type), currentRanks); } void ov104_022356A0(BattleHall *param0) diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c index ce4798076f..53b974c1f3 100644 --- a/src/overlay104/ov104_022361B4.c +++ b/src/overlay104/ov104_022361B4.c @@ -17,6 +17,7 @@ #include "overlay104/ov104_0223B6F4.h" #include "overlay104/struct_battle_castle.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "bg_window.h" #include "communication_information.h" @@ -35,7 +36,6 @@ #include "text.h" #include "trainer_info.h" #include "unk_020302D0.h" -#include "unk_0205DFC4.h" #include "vars_flags.h" void ov104_02236514(BattleCastle *param0, u16 param1); @@ -93,15 +93,15 @@ BattleCastle *ov104_022361B4(SaveData *saveData, u16 param1, u8 param2, u16 para } if (v5 == 1) { - v9->currentStreak = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetCastleLatestStreakIndex(v9->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestStreakIndex(v9->challengeType))); + v9->currentStreak = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetCastleLatestStreakIndex(v9->challengeType)); } else { v9->currentStreak = 0; - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetCastleLatestCPIndex(v9->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(v9->challengeType)), 0); - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetCastleSpentCPIndex(param2), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleSpentCPIndex(param2)), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetCastleLatestCPIndex(v9->challengeType), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetCastleSpentCPIndex(param2), 0); for (v7 = 0; v7 < 3; v7++) { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetCastleRankIndex(v9->challengeType, v7), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleRankIndex(v9->challengeType, v7)), 1); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetCastleRankIndex(v9->challengeType, v7), 1); } } @@ -110,13 +110,13 @@ BattleCastle *ov104_022361B4(SaveData *saveData, u16 param1, u8 param2, u16 para v9->unk_24[0] = param3; v9->unk_24[1] = param4; v9->unk_24[2] = param5; - v9->unk_20 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetCastleLatestCPIndex(v9->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(v9->challengeType))); + v9->unk_20 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetCastleLatestCPIndex(v9->challengeType)); - BattleFrontierStats_AddToStat(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetCastleLatestCPIndex(v9->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(v9->challengeType)), 10); + BattleFrontierSave_AddToStat(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetCastleLatestCPIndex(v9->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(v9->challengeType)), 10); } else { v9->challengeType = (u8)sub_02030398(v4, 0, 0, 0, NULL); v9->unk_11 = (u8)sub_02030398(v4, 1, 0, 0, NULL); - v9->currentStreak = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetCastleLatestStreakIndex(v9->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestStreakIndex(v9->challengeType))); + v9->currentStreak = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetCastleLatestStreakIndex(v9->challengeType)); v9->unk_16 = (u16)(v9->currentStreak / 7); for (v7 = 0; v7 < 3; v7++) { @@ -318,7 +318,7 @@ void ov104_02236848(BattleCastle *param0, u8 param1) u16 v5[4]; u32 v6[4]; u32 v7, v8, v9; - BattleFrontier *frontier; + BattleFrontierSave *frontier; Pokemon *v11; UnkStruct_020302DC *v12 = param0->unk_08; UnkStruct_0203041C *v13 = sub_0203041C(param0->saveData); @@ -333,25 +333,25 @@ void ov104_02236848(BattleCastle *param0, u8 param1) v4[0] = param0->unk_11; sub_02030308(param0->unk_08, 1, 0, 0, v4); - BattleFrontierStats_SetStat(frontier, BattleFrontierStats_GetCastleLatestStreakIndex(param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestStreakIndex(param0->challengeType)), param0->currentStreak); + BattleFrontierSave_SetStatAutoHostIdx(frontier, BattleFrontierStats_GetCastleLatestStreakIndex(param0->challengeType), param0->currentStreak); if (param1 != 2) { - v1 = BattleFrontierStats_GetStat(frontier, BattleFrontierStats_GetCastleRecordStreakIndex(param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleRecordStreakIndex(param0->challengeType))); - v7 = BattleFrontierStats_SetIfBetter(frontier, BattleFrontierStats_GetCastleRecordStreakIndex(param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleRecordStreakIndex(param0->challengeType)), param0->currentStreak); - v2 = BattleFrontierStats_GetStat(frontier, BattleFrontierStats_GetCastleRecordStreakIndex(param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleRecordStreakIndex(param0->challengeType))); - v9 = BattleFrontierStats_GetStat(frontier, BattleFrontierStats_GetCastleLatestCPIndex(param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(param0->challengeType))); + v1 = BattleFrontierSave_GetStatAutoHostIdx(frontier, BattleFrontierStats_GetCastleRecordStreakIndex(param0->challengeType)); + v7 = BattleFrontierSave_SetIfBetterAutoHostIdx(frontier, BattleFrontierStats_GetCastleRecordStreakIndex(param0->challengeType), param0->currentStreak); + v2 = BattleFrontierSave_GetStatAutoHostIdx(frontier, BattleFrontierStats_GetCastleRecordStreakIndex(param0->challengeType)); + v9 = BattleFrontierSave_GetStatAutoHostIdx(frontier, BattleFrontierStats_GetCastleLatestCPIndex(param0->challengeType)); if (param0->currentStreak == v1) { - BattleFrontierStats_SetIfBetter(frontier, BattleFrontierStats_GetCastleRecordCPIndex(param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleRecordCPIndex(param0->challengeType)), v9); + BattleFrontierSave_SetIfBetterAutoHostIdx(frontier, BattleFrontierStats_GetCastleRecordCPIndex(param0->challengeType), v9); } else if (v1 < v2) { - BattleFrontierStats_SetStat(frontier, BattleFrontierStats_GetCastleRecordCPIndex(param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleRecordCPIndex(param0->challengeType)), v9); + BattleFrontierSave_SetStatAutoHostIdx(frontier, BattleFrontierStats_GetCastleRecordCPIndex(param0->challengeType), v9); } v4[0] = param0->unk_27; sub_02030430(v13, 9, param0->challengeType, 0, v4); if (param0->challengeType == 3) { - BattleFrontierStats_SetStat(frontier, STAT_CASTLE_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_CASTLE_WFC_STREAK_ACTIVE), param0->unk_27); + BattleFrontierSave_SetStatAutoHostIdx(frontier, STAT_CASTLE_WFC_STREAK_ACTIVE, param0->unk_27); } } @@ -433,7 +433,7 @@ void ov104_02236B8C(BattleCastle *param0) v0[0] = 1; for (v1 = 0; v1 < 3; v1++) { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(param0->saveData), BattleFrontierStats_GetCastleRankIndex(param0->challengeType, v1), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleRankIndex(param0->challengeType, v1)), 1); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(param0->saveData), BattleFrontierStats_GetCastleRankIndex(param0->challengeType, v1), 1); } ov104_02236848(param0, 1); @@ -615,12 +615,12 @@ int ov104_02236D10(BattleCastle *param0) void ov104_02236ED8(SaveData *saveData, u8 param1, int param2) { - u16 v0 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetCastleLatestCPIndex(param1), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(param1))); + u16 v0 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetCastleLatestCPIndex(param1)); if (v0 + param2 > 9999) { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetCastleLatestCPIndex(param1), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(param1)), 9999); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetCastleLatestCPIndex(param1), 9999); } else { - BattleFrontierStats_AddToStat(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetCastleLatestCPIndex(param1), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(param1)), param2); + BattleFrontierSave_AddToStat(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetCastleLatestCPIndex(param1), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(param1)), param2); } GameRecords_AddToRecordValue(SaveData_GetGameRecords(saveData), RECORD_UNK_065, param2); @@ -732,18 +732,18 @@ void ov104_02237180(FrontierScriptManager *param0, BattleCastle *param1) if (BattleCastle_IsMultiPlayerChallenge(param1->challengeType) == 0) { GF_ASSERT(param0->unk_A8 != NULL); - v0 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(param1->saveData), BattleFrontierStats_GetCastleLatestCPIndex(param1->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(param1->challengeType))); + v0 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(param1->saveData), BattleFrontierStats_GetCastleLatestCPIndex(param1->challengeType)); ov104_02237284(param0, param0->unk_A8, SaveData_GetTrainerInfo(param1->saveData), v0); } else { GF_ASSERT(param0->unk_A8 != NULL); GF_ASSERT(param0->unk_AC != NULL); if (CommSys_CurNetId() == 0) { - v0 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(param1->saveData), BattleFrontierStats_GetCastleLatestCPIndex(param1->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(param1->challengeType))); + v0 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(param1->saveData), BattleFrontierStats_GetCastleLatestCPIndex(param1->challengeType)); v1 = param1->partnersCP; } else { v0 = param1->partnersCP; - v1 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(param1->saveData), BattleFrontierStats_GetCastleLatestCPIndex(param1->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(param1->challengeType))); + v1 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(param1->saveData), BattleFrontierStats_GetCastleLatestCPIndex(param1->challengeType)); } ov104_02237284(param0, param0->unk_A8, CommInfo_TrainerInfo(0), v0); diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c index dd6fb3135e..9df7ec0d27 100644 --- a/src/overlay104/ov104_02237DD8.c +++ b/src/overlay104/ov104_02237DD8.c @@ -15,6 +15,7 @@ #include "overlay104/ov104_0223BCBC.h" #include "overlay104/struct_battle_arcade.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "bg_window.h" #include "graphics.h" @@ -29,7 +30,6 @@ #include "sprite.h" #include "system_vars.h" #include "unk_02030494.h" -#include "unk_0205DFC4.h" #include "vars_flags.h" typedef struct { @@ -174,7 +174,7 @@ BattleArcade *ov104_02237DD8(SaveData *saveData, u16 param1, u8 param2, u16 para } if (v5 == 1) { - v9->currentStreak = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetArcadeLatestStreakIndex(v9->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetArcadeLatestStreakIndex(v9->challengeType))); + v9->currentStreak = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetArcadeLatestStreakIndex(v9->challengeType)); } else { v9->currentStreak = 0; } @@ -190,7 +190,7 @@ BattleArcade *ov104_02237DD8(SaveData *saveData, u16 param1, u8 param2, u16 para v9->unk_11 = (u8)sub_0203054C(v4, 2, 0, 0, NULL); v9->unk_1C = (u8)sub_0203054C(v4, 3, 0, 0, NULL); v9->unk_12 = (u8)sub_0203054C(v4, 1, 0, 0, NULL); - v9->currentStreak = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetArcadeLatestStreakIndex(v9->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetArcadeLatestStreakIndex(v9->challengeType))); + v9->currentStreak = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(v9->saveData), BattleFrontierStats_GetArcadeLatestStreakIndex(v9->challengeType)); v9->unk_1A = (u16)(v9->currentStreak / 7); for (v7 = 0; v7 < 3; v7++) { @@ -376,16 +376,16 @@ void ov104_02238278(BattleArcade *param0, u8 param1) v2[0] = param0->unk_12; sub_020304CC(param0->unk_08, 1, 0, 0, v2); - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(param0->saveData), BattleFrontierStats_GetArcadeLatestStreakIndex(param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetArcadeLatestStreakIndex(param0->challengeType)), param0->currentStreak); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(param0->saveData), BattleFrontierStats_GetArcadeLatestStreakIndex(param0->challengeType), param0->currentStreak); if (param1 != 2) { - v5 = BattleFrontierStats_SetIfBetter(SaveData_GetBattleFrontier(param0->saveData), BattleFrontierStats_GetArcadeCurrentStreakIndex(param0->challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetArcadeCurrentStreakIndex(param0->challengeType)), param0->currentStreak); + v5 = BattleFrontierSave_SetIfBetterAutoHostIdx(SaveData_GetBattleFrontier(param0->saveData), BattleFrontierStats_GetArcadeCurrentStreakIndex(param0->challengeType), param0->currentStreak); v2[0] = param0->unk_2F; sub_020305CC(v9, 8, param0->challengeType, 0, v2); if (param0->challengeType == 3) { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(param0->saveData), STAT_ARCADE_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_ARCADE_WFC_STREAK_ACTIVE), param0->unk_2F); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(param0->saveData), STAT_ARCADE_WFC_STREAK_ACTIVE, param0->unk_2F); } } diff --git a/src/overlay104/ov104_022395F0.c b/src/overlay104/ov104_022395F0.c index 6ca8a919c1..7eca2db990 100644 --- a/src/overlay104/ov104_022395F0.c +++ b/src/overlay104/ov104_022395F0.c @@ -17,6 +17,7 @@ #include "overlay104/ov104_0223C164.h" #include "overlay104/struct_ov104_02230BE4.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "battle_hall_save.h" #include "comm_command_frontier.h" @@ -27,7 +28,6 @@ #include "unk_0202D05C.h" #include "unk_02049D08.h" #include "unk_0204FA34.h" -#include "unk_0205DFC4.h" #include "unk_0209B6F8.h" static BOOL ov104_02239680(FrontierScriptContext *param0); @@ -220,10 +220,10 @@ BOOL FrontierScrCmd_B2(FrontierScriptContext *param0) break; case 3: - *v9 = (u16)BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(v5->saveData), STAT_HALL_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_HALL_WFC_STREAK_ACTIVE)); + *v9 = (u16)BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(v5->saveData), STAT_HALL_WFC_STREAK_ACTIVE); break; case 4: - *v9 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(v5->saveData), BattleFrontierStats_GetHallLatestSpeciesIndex(3), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetHallLatestSpeciesIndex(3))); + *v9 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(v5->saveData), BattleFrontierStats_GetHallLatestSpeciesIndex(3)); break; case 5: *v9 = v4->unk_76[v7]; @@ -246,24 +246,24 @@ BOOL FrontierScrCmd_B2(FrontierScriptContext *param0) case 11: *v9 = 1; v1 = ov104_0223C264(v4->unk_A0); - v2 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(v4->saveData), v1, BattleFrontierStats_GetHostFriendIdx(v1)); + v2 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(v4->saveData), v1); if (v2 != v4->unk_72) { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(v4->saveData), v1, BattleFrontierStats_GetHostFriendIdx(v1), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(v4->saveData), v1, 0); v1 = ov104_0223C29C(v4->unk_A0); - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(v4->saveData), v1, BattleFrontierStats_GetHostFriendIdx(v1), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(v4->saveData), v1, 0); *v9 = 0; } break; case 12: v1 = ov104_0223C29C(v4->unk_A0); - *v9 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(v4->saveData), v1, BattleFrontierStats_GetHostFriendIdx(v1)); + *v9 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(v4->saveData), v1); if (*v9 == 0) { v1 = ov104_0223C264(v4->unk_A0); - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(v4->saveData), v1, BattleFrontierStats_GetHostFriendIdx(v1), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(v4->saveData), v1, 0); if (v4->unk_A0 == 1) { v3 = sub_0202D750(v4->saveData); @@ -271,19 +271,19 @@ BOOL FrontierScrCmd_B2(FrontierScriptContext *param0) } if (v4->unk_A0 == 4) { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(v4->saveData), STAT_CASTLE_LATEST_CP_MULTI_WFC, BattleFrontierStats_GetHostFriendIdx(v1), 0); - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(v4->saveData), STAT_CASTLE_SPENT_CP_MULTI_WFC, BattleFrontierStats_GetHostFriendIdx(v1), 0); + BattleFrontierSave_SetStat(SaveData_GetBattleFrontier(v4->saveData), STAT_CASTLE_LATEST_CP_MULTI_WFC, BattleFrontierStats_GetHostFriendIdx(v1), 0); + BattleFrontierSave_SetStat(SaveData_GetBattleFrontier(v4->saveData), STAT_CASTLE_SPENT_CP_MULTI_WFC, BattleFrontierStats_GetHostFriendIdx(v1), 0); } if (v4->unk_A0 == 2) { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(v4->saveData), BattleFrontierStats_GetFactoryLatestTradeCountIndex(0, 3), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetFactoryLatestTradeCountIndex(0, 3)), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(v4->saveData), BattleFrontierStats_GetFactoryLatestTradeCountIndex(0, 3), 0); } if (v4->unk_A0 == 3) { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(v4->saveData), BattleFrontierStats_GetFactoryLatestTradeCountIndex(1, 3), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetFactoryLatestTradeCountIndex(1, 3)), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(v4->saveData), BattleFrontierStats_GetFactoryLatestTradeCountIndex(1, 3), 0); } } else { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(v4->saveData), v1, BattleFrontierStats_GetHostFriendIdx(v1), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(v4->saveData), v1, 0); } break; case 13: diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c index d68a0d693a..6e146d73a5 100644 --- a/src/overlay104/ov104_0223B6F4.c +++ b/src/overlay104/ov104_0223B6F4.c @@ -13,6 +13,7 @@ #include "overlay104/struct_battle_castle.h" #include "overlay104/struct_ov104_02230BE4.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "bg_window.h" #include "communication_information.h" @@ -26,7 +27,6 @@ #include "pokemon.h" #include "save_player.h" #include "string_gf.h" -#include "unk_0205DFC4.h" static int ov104_0223B6F4(u8 param0, int param1, int param2); void ov104_0223B760(u8 param0, int param1, u16 param2[], u8 param3); @@ -411,17 +411,17 @@ u16 ov104_0223BC24(u16 param0) return param0; } -void ov104_0223BC2C(BattleFrontier *frontier, u8 challengeType, int castlePoints) +void ov104_0223BC2C(BattleFrontierSave *frontier, u8 challengeType, int castlePoints) { u16 v0; - BattleFrontierStats_SubtractFromStat(frontier, BattleFrontierStats_GetCastleLatestCPIndex(challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(challengeType)), castlePoints); - v0 = BattleFrontierStats_GetStat(frontier, BattleFrontierStats_GetCastleSpentCPIndex(challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleSpentCPIndex(challengeType))); + BattleFrontierSave_SubtractFromStat(frontier, BattleFrontierStats_GetCastleLatestCPIndex(challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(challengeType)), castlePoints); + v0 = BattleFrontierSave_GetStatAutoHostIdx(frontier, BattleFrontierStats_GetCastleSpentCPIndex(challengeType)); if (v0 + castlePoints > 9999) { - BattleFrontierStats_SetStat(frontier, BattleFrontierStats_GetCastleSpentCPIndex(challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleSpentCPIndex(challengeType)), 9999); + BattleFrontierSave_SetStatAutoHostIdx(frontier, BattleFrontierStats_GetCastleSpentCPIndex(challengeType), 9999); } else { - BattleFrontierStats_AddToStat(frontier, BattleFrontierStats_GetCastleSpentCPIndex(challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleSpentCPIndex(challengeType)), castlePoints); + BattleFrontierSave_AddToStat(frontier, BattleFrontierStats_GetCastleSpentCPIndex(challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleSpentCPIndex(challengeType)), castlePoints); } return; diff --git a/src/rankings.c b/src/rankings.c index 1c890d1ae1..23a5261cc6 100644 --- a/src/rankings.c +++ b/src/rankings.c @@ -7,7 +7,7 @@ #include "struct_defs/battle_frontier.h" -#include "battle_frontier_stats.h" +#include "battle_frontier_save.h" #include "charcode_util.h" #include "game_records.h" #include "heap.h" @@ -134,7 +134,7 @@ static u32 *GetRecordValues(SaveData *saveData, enum HeapID heapID) }; GameRecords *gameRecords = SaveData_GetGameRecords(saveData); - BattleFrontier *frontier = SaveData_GetBattleFrontier(saveData); + BattleFrontierSave *frontier = SaveData_GetBattleFrontier(saveData); u32 *recordValues = Heap_AllocAtEnd(heapID, sizeof(u32) * RECORDS_WITH_RANKINGS_COUNT); for (i = 0; i < RECORDS_WITH_RANKINGS_COUNT; i++) { @@ -165,7 +165,7 @@ static u32 *GetRecordValues(SaveData *saveData, enum HeapID heapID) break; default: if (i >= 0 && i <= 4) { - recordValues[i] = BattleFrontierStats_GetStat(frontier, recordIDs[i], 0xFF); + recordValues[i] = BattleFrontierSave_GetStat(frontier, recordIDs[i], 0xFF); } else { recordValues[i] = GameRecords_GetRecordValue(gameRecords, recordIDs[i]); } diff --git a/src/savedata/save_table.c b/src/savedata/save_table.c index 5c753736ac..278bc556ac 100644 --- a/src/savedata/save_table.c +++ b/src/savedata/save_table.c @@ -4,7 +4,7 @@ #include #include "bag.h" -#include "battle_frontier_stats.h" +#include "battle_frontier_save.h" #include "battle_hall_win_records.h" #include "battle_regulation.h" #include "chatot_cry.h" @@ -69,7 +69,7 @@ const SaveTableEntry gSaveTable[] = { { SAVE_TABLE_ENTRY_GAME_RECORDS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)GameRecords_SaveSize, (SaveEntryInitFunc)GameRecords_Init }, { SAVE_TABLE_ENTRY_SEAL_CASE, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)SealCase_SaveSize, (SaveEntryInitFunc)SealCase_Init }, { SAVE_TABLE_ENTRY_CHATOT, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)ChatotCry_SaveSize, (SaveEntryInitFunc)ChatotCry_Init }, - { SAVE_TABLE_ENTRY_FRONTIER, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)BattleFrontier_SaveSize, (SaveEntryInitFunc)BattleFrontier_Init }, + { SAVE_TABLE_ENTRY_FRONTIER, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)BattleFrontierSave_Size, (SaveEntryInitFunc)BattleFrontier_Init }, { SAVE_TABLE_ENTRY_RIBBONS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Ribbons_SaveSize, (SaveEntryInitFunc)Ribbons_Init }, { SAVE_TABLE_ENTRY_ENCOUNTERS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)SpecialEncounter_SaveSize, (SaveEntryInitFunc)SpecialEncounter_Init }, { SAVE_TABLE_ENTRY_GLOBAL_TRADE, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)GlobalTrade_SaveSize, (SaveEntryInitFunc)GlobalTrade_Init }, diff --git a/src/scrcmd.c b/src/scrcmd.c index 8862eaa7a7..382916fda7 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -3568,7 +3568,7 @@ static BOOL ScriptContext_ScreenWipeDone(ScriptContext *ctx) static BOOL ScrCmd_Warp(ScriptContext *ctx) { u16 mapID = ScriptContext_GetVar(ctx); - s16 dummy = ScriptContext_ReadHalfWord(ctx); + s16 unused = ScriptContext_ReadHalfWord(ctx); u16 x = ScriptContext_GetVar(ctx); u16 z = ScriptContext_GetVar(ctx); u16 direction = ScriptContext_GetVar(ctx); diff --git a/src/scrcmd_battle_hall.c b/src/scrcmd_battle_hall.c index a3e53961c7..a926515207 100644 --- a/src/scrcmd_battle_hall.c +++ b/src/scrcmd_battle_hall.c @@ -13,6 +13,7 @@ #include "field/field_system.h" #include "bag.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "battle_hall_save.h" #include "battle_hall_win_records.h" @@ -85,17 +86,14 @@ BOOL ScrCmd_2CC(ScriptContext *ctx) break; case 1: if (arg == 3) { - *result = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(ctx->fieldSystem->saveData), - 106, - BattleFrontierStats_GetHostFriendIdx(106)); + *result = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(ctx->fieldSystem->saveData), 106); } else { *result = BattleHallStreakFlags_GetFlag(v11, 5, arg, 0, NULL); } break; case 2: - *result = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(ctx->fieldSystem->saveData), - BattleFrontierStats_GetHallLatestSpeciesIndex(arg), - BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetHallLatestSpeciesIndex(arg))); + *result = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(ctx->fieldSystem->saveData), + BattleFrontierStats_GetHallLatestSpeciesIndex(arg)); break; case 3: sub_0204FA50(ctx->fieldSystem->saveData, v11, arg); @@ -612,11 +610,11 @@ BOOL ScrCmd_32A(ScriptContext *ctx) { u16 *v2 = ScriptContext_GetVarPointer(ctx); - u16 v0 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(ctx->fieldSystem->saveData), + u16 v0 = BattleFrontierSave_GetStat(SaveData_GetBattleFrontier(ctx->fieldSystem->saveData), BattleFrontierStats_GetHallLatestSpeciesIndex(0), 0xff); - u16 v1 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(ctx->fieldSystem->saveData), + u16 v1 = BattleFrontierSave_GetStat(SaveData_GetBattleFrontier(ctx->fieldSystem->saveData), BattleFrontierStats_GetHallLatestStreakIndex(0), 0xff); diff --git a/src/scrcmd_daycare.c b/src/scrcmd_daycare.c index 520c690669..1e69044e8f 100644 --- a/src/scrcmd_daycare.c +++ b/src/scrcmd_daycare.c @@ -124,7 +124,7 @@ BOOL ScrCmd_BufferPartyMonNicknameReturnSpecies(ScriptContext *ctx) party = SaveData_GetParty(fieldSystem->saveData); *destVar = Party_StringTemplateSetNicknameReturnSpecies(party, partySlot, *strTemplate); - return 0; + return FALSE; } BOOL ScrCmd_StorePartyMonIntoDaycare(ScriptContext *ctx) diff --git a/src/scrcmd_sound.c b/src/scrcmd_sound.c index e770e36f5e..37c7283752 100644 --- a/src/scrcmd_sound.c +++ b/src/scrcmd_sound.c @@ -34,7 +34,7 @@ BOOL ScrCmd_PlayMusic(ScriptContext *ctx) BOOL ScrCmd_StopMusic(ScriptContext *ctx) { - u16 dummy = ScriptContext_ReadHalfWord(ctx); + u16 unused = ScriptContext_ReadHalfWord(ctx); Sound_StopBGM(Sound_GetCurrentBGM(), 0); return FALSE; diff --git a/src/trainer_case.c b/src/trainer_case.c index 88aff863a3..eb222986be 100644 --- a/src/trainer_case.c +++ b/src/trainer_case.c @@ -10,7 +10,7 @@ #include "field/field_system.h" #include "badges.h" -#include "battle_frontier_stats.h" +#include "battle_frontier_save.h" #include "charcode_util.h" #include "field_system.h" #include "field_task.h" @@ -109,7 +109,7 @@ u8 TrainerCase_CalculateTrainerCardLevel(FieldSystem *fieldSystem) GameRecords *gameRecords = SaveData_GetGameRecords(saveData); VarsFlags *varsFlags = SaveData_GetVarsFlags(saveData); UndergroundRecord *undergroundRecord = SaveData_GetUndergroundRecord(saveData); - BattleFrontier *frontier = SaveData_GetBattleFrontier(saveData); + BattleFrontierSave *frontier = SaveData_GetBattleFrontier(saveData); trainerCardLevel = 0; if (SystemFlag_CheckGameCompleted(varsFlags)) { @@ -120,7 +120,7 @@ u8 TrainerCase_CalculateTrainerCardLevel(FieldSystem *fieldSystem) trainerCardLevel++; } - if ((BattleFrontierStats_GetStat(frontier, STAT_TOWER_RECORD_STREAK_SINGLE, 0xff) >= 100) || (BattleFrontierStats_GetStat(frontier, STAT_TOWER_RECORD_STREAK_DOUBLE, 0xff) >= 100) || (BattleFrontierStats_GetStat(frontier, STAT_TOWER_RECORD_STREAK_MULTI, 0xff) >= 100) || (BattleFrontierStats_GetStat(frontier, STAT_TOWER_RECORD_STREAK_LINK_MULTI, 0xff) >= 100) || (BattleFrontierStats_GetStat(frontier, STAT_TOWER_RECORD_STREAK_WIFI, 0xff) >= 100)) { + if ((BattleFrontierSave_GetStat(frontier, STAT_TOWER_RECORD_STREAK_SINGLE, 0xff) >= 100) || (BattleFrontierSave_GetStat(frontier, STAT_TOWER_RECORD_STREAK_DOUBLE, 0xff) >= 100) || (BattleFrontierSave_GetStat(frontier, STAT_TOWER_RECORD_STREAK_MULTI, 0xff) >= 100) || (BattleFrontierSave_GetStat(frontier, STAT_TOWER_RECORD_STREAK_LINK_MULTI, 0xff) >= 100) || (BattleFrontierSave_GetStat(frontier, STAT_TOWER_RECORD_STREAK_WIFI, 0xff) >= 100)) { trainerCardLevel++; } diff --git a/src/unk_0202D05C.c b/src/unk_0202D05C.c index 33a59f67e8..d4c9aef2cb 100644 --- a/src/unk_0202D05C.c +++ b/src/unk_0202D05C.c @@ -372,13 +372,13 @@ u32 sub_0202D474(UnkStruct_0202D750 *param0) void sub_0202D478(SaveData *saveData, int param1, EasyChatSentence *param2) { - BattleFrontier *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); + BattleFrontierSave *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); EasyChatSentence_Copy(&(frontier->unk_950.unk_168.unk_00[param1]), param2); } EasyChatSentence *sub_0202D498(SaveData *saveData, int param1) { - BattleFrontier *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); + BattleFrontierSave *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); return &(frontier->unk_950.unk_168.unk_00[param1]); } @@ -535,18 +535,18 @@ UnkStruct_ov90_021D1750 *sub_0202D71C(UnkStruct_0202D764 *param0, enum HeapID he UnkStruct_0202D060 *sub_0202D740(SaveData *saveData) { - BattleFrontier *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); + BattleFrontierSave *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); return &frontier->unk_8E0_val1; } UnkStruct_0202D750 *sub_0202D750(SaveData *saveData) { - BattleFrontier *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); + BattleFrontierSave *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); return &frontier->unk_950.unk_00; } UnkStruct_0202D764 *sub_0202D764(SaveData *saveData) { - BattleFrontier *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); + BattleFrontierSave *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); return &frontier->unk_950.unk_188; } diff --git a/src/unk_0202FF4C.c b/src/unk_0202FF4C.c index 777d580d44..a0ac7d07bc 100644 --- a/src/unk_0202FF4C.c +++ b/src/unk_0202FF4C.c @@ -26,7 +26,7 @@ void sub_0202FF4C(UnkStruct_0202FF58 *param0) UnkStruct_0202FF58 *sub_0202FF58(SaveData *saveData) { - BattleFrontier *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); + BattleFrontierSave *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); return &frontier->unk_8E0_val2; } @@ -148,6 +148,6 @@ u32 sub_020300E0(UnkStruct_020300F4 *param0, u8 param1, u8 param2, void *param3) UnkStruct_020300F4 *sub_020300F4(SaveData *saveData) { - BattleFrontier *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); + BattleFrontierSave *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); return &frontier->unk_1614.unk_00; } diff --git a/src/unk_020302D0.c b/src/unk_020302D0.c index b511b713fb..a49bed8e5b 100644 --- a/src/unk_020302D0.c +++ b/src/unk_020302D0.c @@ -26,7 +26,7 @@ void sub_020302D0(UnkStruct_020302DC *param0) UnkStruct_020302DC *sub_020302DC(SaveData *saveData) { - BattleFrontier *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); + BattleFrontierSave *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); return &frontier->unk_8E0_val4; } @@ -123,7 +123,7 @@ void sub_02030410(UnkStruct_0203041C *param0) UnkStruct_0203041C *sub_0203041C(SaveData *saveData) { - BattleFrontier *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); + BattleFrontierSave *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); return &frontier->unk_161C.unk_00; } diff --git a/src/unk_02030494.c b/src/unk_02030494.c index fcd3f739bb..c4051748cd 100644 --- a/src/unk_02030494.c +++ b/src/unk_02030494.c @@ -26,7 +26,7 @@ void sub_02030494(UnkStruct_020304A0 *param0) UnkStruct_020304A0 *sub_020304A0(SaveData *saveData) { - BattleFrontier *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); + BattleFrontierSave *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); return &frontier->unk_8E0_val5; } @@ -115,7 +115,7 @@ void sub_020305AC(UnkStruct_020305B8 *param0) UnkStruct_020305B8 *sub_020305B8(SaveData *saveData) { - BattleFrontier *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); + BattleFrontierSave *frontier = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER); return &frontier->unk_1620.unk_00; } diff --git a/src/unk_020494DC.c b/src/unk_020494DC.c index 8bdd297416..eb743816f9 100644 --- a/src/unk_020494DC.c +++ b/src/unk_020494DC.c @@ -17,6 +17,7 @@ #include "field/field_system.h" #include "overlay005/field_menu.h" +#include "battle_frontier_stats.h" #include "bg_window.h" #include "comm_command_frontier.h" #include "communication_system.h" @@ -31,7 +32,6 @@ #include "unk_020363E8.h" #include "unk_02049D08.h" #include "unk_0204AEE8.h" -#include "unk_0205DFC4.h" #include "unk_0206B9D8.h" static u16 BattleTower_GetPartnerParam(BattleTower *battleTower, u8 param1); diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c index 4f035c0cb3..83e9fd9f53 100644 --- a/src/unk_02049D08.c +++ b/src/unk_02049D08.c @@ -19,6 +19,7 @@ #include "field/field_system.h" #include "savedata/save_table.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "field_overworld_state.h" #include "field_task.h" @@ -41,7 +42,6 @@ #include "underground.h" #include "unk_0202D05C.h" #include "unk_0204AEE8.h" -#include "unk_0205DFC4.h" #include "unk_0206B9D8.h" #include "vars_flags.h" @@ -249,11 +249,11 @@ u16 sub_02049FF8(SaveData *saveData, u16 param1) } if (param1 == 6) { - v0 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(saveData), STAT_TOWER_LATEST_STREAK_MODE_6, BattleFrontierStats_GetHostFriendIdx(STAT_TOWER_LATEST_STREAK_MODE_6)); + v0 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), STAT_TOWER_LATEST_STREAK_MODE_6); return v0; } - v0 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(saveData), 1 + param1 * 2, 0xff); + v0 = BattleFrontierSave_GetStat(SaveData_GetBattleFrontier(saveData), 1 + param1 * 2, 0xff); return v0; } @@ -288,13 +288,13 @@ u16 sub_0204A064(SaveData *saveData) } if (v0 == 6) { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(saveData), STAT_TOWER_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_TOWER_WFC_STREAK_ACTIVE), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), STAT_TOWER_WFC_STREAK_ACTIVE, 0); } else { sub_0202D414(v3, 8 + v0, 2); } sub_0202D3B4(v3, v0, 2); - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetTowerLatestStreakIndex(v0), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetTowerLatestStreakIndex(v0)), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetTowerLatestStreakIndex(v0), 0); if ((v0 != 4) && (v0 != 6)) { sub_0206C02C(saveData); @@ -320,7 +320,7 @@ BattleTower *BattleTower_Init(SaveData *saveData, u16 param1, u16 challengeMode) u8 v0; u16 v1, v2; BattleTower *battleTower; - BattleFrontier *frontier; + BattleFrontierSave *frontier; GameRecords *v5; battleTower = Heap_Alloc(HEAP_ID_FIELD2, sizeof(BattleTower)); @@ -383,10 +383,9 @@ BattleTower *BattleTower_Init(SaveData *saveData, u16 param1, u16 challengeMode) if (v2) { if (battleTower->challengeMode == BATTLE_TOWER_MODE_6) { - battleTower->unk_1A = BattleFrontierStats_GetStat( - frontier, 113, BattleFrontierStats_GetHostFriendIdx(113)); + battleTower->unk_1A = BattleFrontierSave_GetStatAutoHostIdx(frontier, 113); } else { - battleTower->unk_1A = BattleFrontierStats_GetStat( + battleTower->unk_1A = BattleFrontierSave_GetStat( frontier, 1 + battleTower->challengeMode * 2, 0xff); } @@ -591,7 +590,7 @@ void BattleTower_UpdateGameRecords(BattleTower *battleTower, SaveData *saveData) int v1; u16 v2, v3, v4; GameRecords *v5 = SaveData_GetGameRecords(saveData); - BattleFrontier *frontier = SaveData_GetBattleFrontier(saveData); + BattleFrontierSave *frontier = SaveData_GetBattleFrontier(saveData); if (battleTower->challengeMode == BATTLE_TOWER_MODE_5) { return; @@ -603,8 +602,8 @@ void BattleTower_UpdateGameRecords(BattleTower *battleTower, SaveData *saveData) v1 = battleTower->challengeMode * 2; } - v2 = BattleFrontierStats_GetStat(frontier, v1, BattleFrontierStats_GetHostFriendIdx(v1)); - v3 = BattleFrontierStats_SetIfBetter(frontier, v1, BattleFrontierStats_GetHostFriendIdx(v1), battleTower->unk_1A + battleTower->unk_0D); + v2 = BattleFrontierSave_GetStatAutoHostIdx(frontier, v1); + v3 = BattleFrontierSave_SetIfBetterAutoHostIdx(frontier, v1, battleTower->unk_1A + battleTower->unk_0D); if (v3 > 1) { if (v2 < v3 || (v2 == v3 && v3 % 7 == 0)) { @@ -613,15 +612,15 @@ void BattleTower_UpdateGameRecords(BattleTower *battleTower, SaveData *saveData) } if (battleTower->challengeMode == BATTLE_TOWER_MODE_6) { - v4 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(saveData), STAT_TOWER_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_TOWER_WFC_STREAK_ACTIVE)); + v4 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), STAT_TOWER_WFC_STREAK_ACTIVE); } else { v4 = sub_0202D414(battleTower->unk_74, 8 + battleTower->challengeMode, 0); } - v0 = BattleFrontierStats_SetStat(frontier, v1 + 1, BattleFrontierStats_GetHostFriendIdx(v1 + 1), battleTower->unk_1A + battleTower->unk_0D); + v0 = BattleFrontierSave_SetStatAutoHostIdx(frontier, v1 + 1, battleTower->unk_1A + battleTower->unk_0D); if (battleTower->challengeMode == BATTLE_TOWER_MODE_6) { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(saveData), STAT_TOWER_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_TOWER_WFC_STREAK_ACTIVE), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), STAT_TOWER_WFC_STREAK_ACTIVE, 0); } else { sub_0202D414(battleTower->unk_74, 8 + battleTower->challengeMode, 2); } @@ -651,7 +650,7 @@ void BattleTower_UpdateGameRecordsAndJournal(BattleTower *battleTower, SaveData void *journalEntryOnlineEvent; u16 v3, v4, v5; GameRecords *v6; - BattleFrontier *frontier; + BattleFrontierSave *frontier; if (battleTower->challengeMode == BATTLE_TOWER_MODE_5) { return; @@ -667,21 +666,21 @@ void BattleTower_UpdateGameRecordsAndJournal(BattleTower *battleTower, SaveData } if (battleTower->challengeMode == BATTLE_TOWER_MODE_6) { - v5 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(saveData), STAT_TOWER_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_TOWER_WFC_STREAK_ACTIVE)); + v5 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), STAT_TOWER_WFC_STREAK_ACTIVE); } else { v5 = sub_0202D414(battleTower->unk_74, 8 + battleTower->challengeMode, 0); } - v0 = BattleFrontierStats_SetStat(frontier, v1 + 1, BattleFrontierStats_GetHostFriendIdx(v1 + 1), battleTower->unk_1A + battleTower->unk_0D); + v0 = BattleFrontierSave_SetStatAutoHostIdx(frontier, v1 + 1, battleTower->unk_1A + battleTower->unk_0D); if (battleTower->challengeMode == BATTLE_TOWER_MODE_6) { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(saveData), STAT_TOWER_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_TOWER_WFC_STREAK_ACTIVE), 1); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), STAT_TOWER_WFC_STREAK_ACTIVE, 1); } else { sub_0202D414(battleTower->unk_74, 8 + battleTower->challengeMode, 1); } - v3 = BattleFrontierStats_GetStat(frontier, v1, BattleFrontierStats_GetHostFriendIdx(v1)); - v4 = BattleFrontierStats_SetIfBetter(frontier, v1, BattleFrontierStats_GetHostFriendIdx(v1), v0); + v3 = BattleFrontierSave_GetStatAutoHostIdx(frontier, v1); + v4 = BattleFrontierSave_SetIfBetterAutoHostIdx(frontier, v1, v0); GameRecords_AddToRecordValue(v6, RECORD_BATTLE_TOWER_VICTORIES, 7); sub_0202D3B4(battleTower->unk_74, battleTower->challengeMode, 3); @@ -927,7 +926,7 @@ u16 sub_0204ABF4(BattleTower *battleTower, SaveData *saveData) u8 v0; if (battleTower->challengeMode == BATTLE_TOWER_MODE_6) { - v0 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(saveData), STAT_TOWER_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_TOWER_WFC_STREAK_ACTIVE)); + v0 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), STAT_TOWER_WFC_STREAK_ACTIVE); } else { v0 = sub_0202D414(battleTower->unk_74, 8 + battleTower->challengeMode, 0); } diff --git a/src/unk_0204F04C.c b/src/unk_0204F04C.c index 8471a6453c..431410b883 100644 --- a/src/unk_0204F04C.c +++ b/src/unk_0204F04C.c @@ -5,11 +5,11 @@ #include "struct_defs/struct_020300F4.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "field_script_context.h" #include "inlines.h" #include "unk_0202FF4C.h" -#include "unk_0205DFC4.h" BOOL ScrCmd_2C5(ScriptContext *param0); @@ -33,11 +33,11 @@ BOOL ScrCmd_2C5(ScriptContext *param0) v0 = 104; } - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(param0->fieldSystem->saveData), v0, BattleFrontierStats_GetHostFriendIdx(v0), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(param0->fieldSystem->saveData), v0, 0); } - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(param0->fieldSystem->saveData), BattleFrontierStats_GetFactoryLatestStreakIdx(v4, v3), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetFactoryLatestStreakIdx(v4, v3)), 0); - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(param0->fieldSystem->saveData), BattleFrontierStats_GetFactoryLatestTradeCountIndex(v4, v3), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetFactoryLatestTradeCountIndex(v4, v3)), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(param0->fieldSystem->saveData), BattleFrontierStats_GetFactoryLatestStreakIdx(v4, v3), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(param0->fieldSystem->saveData), BattleFrontierStats_GetFactoryLatestTradeCountIndex(v4, v3), 0); return 0; } diff --git a/src/unk_0204FA34.c b/src/unk_0204FA34.c index d018fb79ea..7feb3bfd8c 100644 --- a/src/unk_0204FA34.c +++ b/src/unk_0204FA34.c @@ -6,11 +6,11 @@ #include "struct_defs/battle_frontier.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "battle_hall_save.h" #include "communication_system.h" #include "savedata.h" -#include "unk_0205DFC4.h" void CommCmd_BattleHallSelectedSpeciesMsg(int netID, int unused, void *data, void *context) { @@ -35,10 +35,10 @@ void sub_0204FA50(SaveData *saveData, BattleHallStreakFlags *param1, u8 challeng BattleHallStreakFlags_SetFlag(param1, 5, challengeType, 0, v1); if (challengeType == FRONTIER_CHALLENGE_MULTI_WFC) { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(saveData), STAT_HALL_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_HALL_WFC_STREAK_ACTIVE), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), STAT_HALL_WFC_STREAK_ACTIVE, 0); } - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetHallLatestStreakIndex(challengeType), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetHallLatestStreakIndex(challengeType)), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetHallLatestStreakIndex(challengeType), 0); return; } diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c index 1cdd10b259..4acd45ce74 100644 --- a/src/unk_0204FAB4.c +++ b/src/unk_0204FAB4.c @@ -17,6 +17,7 @@ #include "field/field_system.h" #include "bag.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "comm_command_field.h" #include "communication_system.h" @@ -76,7 +77,7 @@ BOOL ScrCmd_2D2(ScriptContext *param0) break; case 1: if (v4 == 3) { - *v6 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(param0->fieldSystem->saveData), STAT_CASTLE_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_CASTLE_WFC_STREAK_ACTIVE)); + *v6 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(param0->fieldSystem->saveData), STAT_CASTLE_WFC_STREAK_ACTIVE); } else { *v6 = (u16)sub_02030470(v11, 9, v4, 0, NULL); } @@ -125,16 +126,16 @@ static void sub_0204FBEC(SaveData *saveData, UnkStruct_0203041C *param1, u8 para sub_02030430(param1, 9, param2, 0, v2); if (param2 == 3) { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(saveData), STAT_CASTLE_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_CASTLE_WFC_STREAK_ACTIVE), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), STAT_CASTLE_WFC_STREAK_ACTIVE, 0); } - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetCastleLatestStreakIndex(param2), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestStreakIndex(param2)), 0); - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetCastleLatestCPIndex(param2), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleLatestCPIndex(param2)), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetCastleLatestStreakIndex(param2), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetCastleLatestCPIndex(param2), 0); v1[0] = 1; for (int i = 0; i < 3; i++) { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetCastleRankIndex(param2, i), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetCastleRankIndex(param2, i)), 1); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetCastleRankIndex(param2, i), 1); } } diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c index a3280ca84c..8d935f1361 100644 --- a/src/unk_0205003C.c +++ b/src/unk_0205003C.c @@ -17,6 +17,7 @@ #include "field/field_system.h" #include "bag.h" +#include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "comm_command_field.h" #include "communication_system.h" @@ -76,7 +77,7 @@ BOOL ScrCmd_2D9(ScriptContext *param0) break; case 1: if (v4 == 3) { - *v6 = BattleFrontierStats_GetStat(SaveData_GetBattleFrontier(param0->fieldSystem->saveData), STAT_ARCADE_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_ARCADE_WFC_STREAK_ACTIVE)); + *v6 = BattleFrontierSave_GetStatAutoHostIdx(SaveData_GetBattleFrontier(param0->fieldSystem->saveData), STAT_ARCADE_WFC_STREAK_ACTIVE); } else { *v6 = (u16)sub_02030600(v11, 8, v4, 0, NULL); } @@ -124,10 +125,10 @@ static void sub_02050174(SaveData *saveData, UnkStruct_020305B8 *param1, u8 para sub_020305CC(param1, 8, param2, 0, v2); if (param2 == 3) { - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(saveData), STAT_ARCADE_WFC_STREAK_ACTIVE, BattleFrontierStats_GetHostFriendIdx(STAT_ARCADE_WFC_STREAK_ACTIVE), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), STAT_ARCADE_WFC_STREAK_ACTIVE, 0); } - BattleFrontierStats_SetStat(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetArcadeLatestStreakIndex(param2), BattleFrontierStats_GetHostFriendIdx(BattleFrontierStats_GetArcadeLatestStreakIndex(param2)), 0); + BattleFrontierSave_SetStatAutoHostIdx(SaveData_GetBattleFrontier(saveData), BattleFrontierStats_GetArcadeLatestStreakIndex(param2), 0); } BOOL ScrCmd_2DA(ScriptContext *param0) diff --git a/src/unk_0205DFC4.c b/src/unk_0205DFC4.c index 35e147b5f6..0828ddb2b9 100644 --- a/src/unk_0205DFC4.c +++ b/src/unk_0205DFC4.c @@ -2,27 +2,17 @@ #include -#include "constants/battle_frontier.h" -#include "constants/battle_frontier_stats.h" -#include "constants/versions.h" - #include "struct_decls/map_object.h" #include "field/field_system.h" -#include "nintendo_wfc/main.h" -#include "battle_tower_modes.h" -#include "communication_information.h" -#include "communication_system.h" #include "field_task.h" #include "heap.h" #include "map_object.h" #include "math_util.h" #include "party.h" #include "pokemon.h" -#include "save_player.h" #include "savedata.h" -#include "trainer_info.h" #include "res/text/bank/pokedex_ratings.h" @@ -345,472 +335,3 @@ void MapObject_Flicker(FieldTask *task, MapObject *mapObj, u16 times, u16 delay) FieldTask_InitCall(fieldSystem->task, Task_FlickerMapObject, flickerData); } - -enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryLatestStreakIdx(u8 isOpenLevel, u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_FACTORY_LATEST_STREAK_50_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_FACTORY_LATEST_STREAK_50_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_FACTORY_LATEST_STREAK_50_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_FACTORY_LATEST_STREAK_50_MULTI_WFC; - break; - } - - return index + (isOpenLevel * 4); -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryRecordStreakIdx(u8 isOpenLevel, u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_FACTORY_RECORD_STREAK_50_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_FACTORY_RECORD_STREAK_50_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_FACTORY_RECORD_STREAK_50_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_FACTORY_RECORD_STREAK_50_MULTI_WFC; - break; - } - - return index + (isOpenLevel * 4); -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryLatestTradeCountIndex(u8 isOpenLevel, u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_FACTORY_LATEST_TRADE_COUNT_50_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_FACTORY_LATEST_TRADE_COUNT_50_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_FACTORY_LATEST_TRADE_COUNT_50_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_FACTORY_LATEST_TRADE_COUNT_50_MULTI_WFC; - break; - } - - return index + (isOpenLevel * 4); -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetFactoryRecordTradeCountIndex(u8 isOpenLevel, u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_FACTORY_RECORD_TRADE_COUNT_50_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_FACTORY_RECORD_TRADE_COUNT_50_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_FACTORY_RECORD_TRADE_COUNT_50_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_FACTORY_RECORD_TRADE_COUNT_50_MULTI_WFC; - break; - } - - return index + (isOpenLevel * 4); -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetHallCurrentTypeRanksIndex(u8 challengeType, u8 pokemonType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_HALL_CURRENT_RANKS_NORMAL_FIGHTING_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_HALL_CURRENT_RANKS_NORMAL_FIGHTING_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_HALL_CURRENT_RANKS_NORMAL_FIGHTING_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_HALL_CURRENT_RANKS_NORMAL_FIGHTING_MULTI_WFC; - break; - } - - index += pokemonType / 2; - return index; -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetHallLatestStreakIndex(u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_HALL_LATEST_STREAK_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_HALL_LATEST_STREAK_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_HALL_LATEST_STREAK_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_HALL_LATEST_STREAK_MULTI_WFC; - break; - } - - return index; -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetHallCurrentStreakIndex(u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_HALL_CURRENT_STREAK_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_HALL_CURRENT_STREAK_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_HALL_CURRENT_STREAK_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_HALL_CURRENT_STREAK_MULTI_WFC; - break; - } - - return index; -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetHallLatestSpeciesIndex(u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_HALL_LATEST_SPECIES_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_HALL_LATEST_SPECIES_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_HALL_LATEST_SPECIES_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_HALL_LATEST_SPECIES_MULTI_WFC; - break; - } - - return index; -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetHallRecordStreakIndex(u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = FRONTIER_CHALLENGE_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = FRONTIER_CHALLENGE_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = FRONTIER_CHALLENGE_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = 2; - GF_ASSERT(FALSE); - break; - } - - return index; -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleRankIndex(u8 challengeType, u8 rankType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_CASTLE_RANK_HEALING_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_CASTLE_RANK_HEALING_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_CASTLE_RANK_HEALING_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_CASTLE_RANK_HEALING_MULTI_WFC; - break; - } - - index += rankType; - return index; -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleLatestStreakIndex(u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_CASTLE_LATEST_STREAK_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_CASTLE_LATEST_STREAK_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_CASTLE_LATEST_STREAK_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_CASTLE_LATEST_STREAK_MULTI_WFC; - break; - } - - return index; -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleRecordStreakIndex(u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_CASTLE_RECORD_STREAK_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_CASTLE_RECORD_STREAK_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_CASTLE_RECORD_STREAK_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_CASTLE_RECORD_STREAK_MULTI_WFC; - break; - } - - return index; -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleLatestCPIndex(u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_CASTLE_LATEST_CP_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_CASTLE_LATEST_CP_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_CASTLE_LATEST_CP_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_CASTLE_LATEST_CP_MULTI_WFC; - break; - } - - return index; -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleSpentCPIndex(u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_CASTLE_SPENT_CP_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_CASTLE_SPENT_CP_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_CASTLE_SPENT_CP_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_CASTLE_SPENT_CP_MULTI_WFC; - break; - } - - return index; -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetCastleRecordCPIndex(u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_CASTLE_RECORD_CP_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_CASTLE_RECORD_CP_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_CASTLE_RECORD_CP_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_CASTLE_RECORD_CP_MULTI_WFC; - break; - } - - return index; -} - -int BattleFrontierStats_GetHostFriendIdx(u32 statIndex) -{ - if (statIndex < 100) { - return 0xff; - } - - return NintendoWFC_GetHostFriendIdx(); -} - -static u8 GetPartnerGameCode(void) -{ - TrainerInfo *trainerInfo = CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1); - GF_ASSERT(trainerInfo != NULL); - - return TrainerInfo_GameCode(trainerInfo); -} - -u8 sub_0205E6D8(SaveData *saveData) -{ - if (TrainerInfo_GameCode(SaveData_GetTrainerInfo(saveData)) == VERSION_NONE) { - return 1; - } - - if (GetPartnerGameCode() == VERSION_NONE) { - return 1; - } - - return 0; -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetArcadeLatestStreakIndex(u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_ARCADE_LATEST_STREAK_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_ARCADE_LATEST_STREAK_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_ARCADE_LATEST_STREAK_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_ARCADE_LATEST_STREAK_MULTI_WFC; - break; - } - - return index; -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetArcadeCurrentStreakIndex(u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case FRONTIER_CHALLENGE_SINGLE: - index = STAT_ARCADE_RECORD_STREAK_SINGLE; - break; - case FRONTIER_CHALLENGE_DOUBLE: - index = STAT_ARCADE_RECORD_STREAK_DOUBLE; - break; - case FRONTIER_CHALLENGE_MULTI: - index = STAT_ARCADE_RECORD_STREAK_MULTI; - break; - case FRONTIER_CHALLENGE_MULTI_WFC: - index = STAT_ARCADE_RECORD_STREAK_MULTI_WFC; - break; - } - - return index; -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetTowerLatestStreakIndex(u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case BATTLE_TOWER_MODE_SINGLE: - index = STAT_TOWER_LATEST_STREAK_SINGLE; - break; - case BATTLE_TOWER_MODE_DOUBLE: - index = STAT_TOWER_LATEST_STREAK_DOUBLE; - break; - case BATTLE_TOWER_MODE_MULTI: - index = STAT_TOWER_LATEST_STREAK_MULTI; - break; - case BATTLE_TOWER_MODE_LINK_MULTI: - index = STAT_TOWER_LATEST_STREAK_LINK_MULTI; - break; - case BATTLE_TOWER_MODE_WIFI: - index = STAT_TOWER_LATEST_STREAK_WIFI; - break; - case BATTLE_TOWER_MODE_6: - index = STAT_TOWER_LATEST_STREAK_MODE_6; - break; - default: - GF_ASSERT(FALSE); - break; - } - - return index; -} - -enum BattleFrontierStatsIndex BattleFrontierStats_GetTowerRecordStreakIndex(u8 challengeType) -{ - enum BattleFrontierStatsIndex index; - - switch (challengeType) { - case BATTLE_TOWER_MODE_SINGLE: - index = STAT_TOWER_RECORD_STREAK_SINGLE; - break; - case BATTLE_TOWER_MODE_DOUBLE: - index = STAT_TOWER_RECORD_STREAK_DOUBLE; - break; - case BATTLE_TOWER_MODE_MULTI: - index = STAT_TOWER_RECORD_STREAK_MULTI; - break; - case BATTLE_TOWER_MODE_LINK_MULTI: - index = STAT_TOWER_RECORD_STREAK_LINK_MULTI; - break; - case BATTLE_TOWER_MODE_WIFI: - index = STAT_TOWER_RECORD_STREAK_WIFI; - break; - case BATTLE_TOWER_MODE_6: - index = STAT_TOWER_RECORD_STREAK_MODE_6; - break; - default: - GF_ASSERT(FALSE); - break; - } - - return index; -} diff --git a/src/unk_0206B9D8.c b/src/unk_0206B9D8.c index 42e90cb019..27e66e6e01 100644 --- a/src/unk_0206B9D8.c +++ b/src/unk_0206B9D8.c @@ -16,7 +16,7 @@ #include "field/field_system.h" #include "bag.h" -#include "battle_frontier_stats.h" +#include "battle_frontier_save.h" #include "communication_system.h" #include "dexmode_checker.h" #include "field_system.h" @@ -321,8 +321,8 @@ void sub_0206BD88(FieldTask *param0, u16 param1, u16 param2) u16 sub_0206BDBC(SaveData *saveData) { - BattleFrontier *frontier = SaveData_GetBattleFrontier(saveData); - u16 v3 = BattleFrontierStats_GetStat(frontier, STAT_TOWER_RECORD_STREAK_SINGLE, 0xff); + BattleFrontierSave *frontier = SaveData_GetBattleFrontier(saveData); + u16 v3 = BattleFrontierSave_GetStat(frontier, STAT_TOWER_RECORD_STREAK_SINGLE, 0xff); if (v3 < 20) { return 0; @@ -390,8 +390,8 @@ u16 sub_0206BDBC(SaveData *saveData) u16 sub_0206BF04(SaveData *saveData) { - BattleFrontier *frontier = SaveData_GetBattleFrontier(saveData); - u16 frontierStats = BattleFrontierStats_GetStat(frontier, STAT_TOWER_RECORD_STREAK_SINGLE, 0xff); + BattleFrontierSave *frontier = SaveData_GetBattleFrontier(saveData); + u16 frontierStats = BattleFrontierSave_GetStat(frontier, STAT_TOWER_RECORD_STREAK_SINGLE, 0xff); if (frontierStats < 20) { return 0;