diff --git a/include/field_battle_data_transfer.h b/include/field_battle_data_transfer.h index 47d6d064ce..b1086470ef 100644 --- a/include/field_battle_data_transfer.h +++ b/include/field_battle_data_transfer.h @@ -7,10 +7,10 @@ #include "struct_decls/pc_boxes_decl.h" #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_02027F8C_decl.h" -#include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_0206D140_decl.h" #include "struct_defs/chatot_cry.h" #include "struct_defs/trainer.h" +#include "struct_defs/wi_fi_history.h" #include "field/field_system_decl.h" @@ -43,7 +43,7 @@ typedef struct FieldBattleDTO { PCBoxes *pcBoxes; ChatotCry *chatotCries[MAX_BATTLERS]; Poketch *poketch; - UnkStruct_0202C878 *unk_104; + WiFiHistory *wiFiHistory; Options *options; UnkStruct_0206D140 *unk_10C; BattleRecords battleRecords; diff --git a/include/overlay088/struct_ov88_0223C370.h b/include/overlay088/struct_ov88_0223C370.h index 732553c8cf..fc80ce887c 100644 --- a/include/overlay088/struct_ov88_0223C370.h +++ b/include/overlay088/struct_ov88_0223C370.h @@ -3,7 +3,7 @@ #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_02027F8C_decl.h" -#include "struct_decls/struct_0202C878_decl.h" +#include "struct_defs/wi_fi_history.h" #include "field/field_system_decl.h" @@ -21,7 +21,7 @@ typedef struct { Party *unk_08; PalPad *unk_0C; SaveData *saveData; - UnkStruct_0202C878 *unk_14; + WiFiHistory *wiFiHistory; Options *unk_18; JournalEntry *unk_1C; GameRecords *records; diff --git a/include/struct_decls/struct_0202C878_decl.h b/include/struct_decls/struct_0202C878_decl.h deleted file mode 100644 index 30b66622f3..0000000000 --- a/include/struct_decls/struct_0202C878_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_0202C878_DECL_H -#define POKEPLATINUM_STRUCT_0202C878_DECL_H - -typedef struct UnkStruct_0202C878_t UnkStruct_0202C878; - -#endif // POKEPLATINUM_STRUCT_0202C878_DECL_H diff --git a/include/struct_defs/struct_0202C878.h b/include/struct_defs/struct_0202C878.h deleted file mode 100644 index 26e06c09ac..0000000000 --- a/include/struct_defs/struct_0202C878.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_0202C878_H -#define POKEPLATINUM_STRUCT_0202C878_H - -typedef struct UnkStruct_0202C878_t { - u32 unk_00; - u8 unk_04; - u8 unk_05; - u8 unk_06; - u8 unk_07[4080]; -} UnkStruct_0202C878; - -#endif // POKEPLATINUM_STRUCT_0202C878_H diff --git a/include/struct_defs/struct_0203E0FC.h b/include/struct_defs/struct_0203E0FC.h index 621a208605..46026a2d77 100644 --- a/include/struct_defs/struct_0203E0FC.h +++ b/include/struct_defs/struct_0203E0FC.h @@ -4,8 +4,8 @@ #include "struct_decls/pc_boxes_decl.h" #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_0202B370_decl.h" -#include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_0202DA40_decl.h" +#include "struct_defs/wi_fi_history.h" #include "bag.h" #include "game_options.h" @@ -23,7 +23,7 @@ typedef struct { PCBoxes *unk_0C; Pokedex *unk_10; WiFiList *unk_14; - UnkStruct_0202C878 *unk_18; + WiFiHistory *wiFiHistory; TrainerInfo *unk_1C; SaveData *saveData; Options *unk_24; diff --git a/include/struct_defs/wi_fi_history.h b/include/struct_defs/wi_fi_history.h new file mode 100644 index 0000000000..52449766e9 --- /dev/null +++ b/include/struct_defs/wi_fi_history.h @@ -0,0 +1,12 @@ +#ifndef POKEPLATINUM_STRUCT_WI_FI_HISTORY_H +#define POKEPLATINUM_STRUCT_WI_FI_HISTORY_H + +typedef struct WiFiHistory { + u32 unk_00; + u8 unk_04; + u8 country; + u8 unk_06; + u8 unk_07[4080]; +} WiFiHistory; + +#endif // POKEPLATINUM_STRUCT_WI_FI_HISTORY_H diff --git a/include/unk_0202C858.h b/include/unk_0202C858.h index 0a6f634938..8b2d9d0cfc 100644 --- a/include/unk_0202C858.h +++ b/include/unk_0202C858.h @@ -1,20 +1,20 @@ #ifndef POKEPLATINUM_UNK_0202C858_H #define POKEPLATINUM_UNK_0202C858_H -#include "struct_decls/struct_0202C878_decl.h" +#include "struct_defs/wi_fi_history.h" #include "savedata.h" int WiFiHistory_SaveSize(void); -void WiFiHistory_Init(UnkStruct_0202C878 *param0); -UnkStruct_0202C878 *sub_0202C878(SaveData *saveData); -void sub_0202C88C(UnkStruct_0202C878 *param0, int param1, int param2); -int sub_0202C8C0(const UnkStruct_0202C878 *param0); -int sub_0202C8C4(const UnkStruct_0202C878 *param0); -int sub_0202C8C8(const UnkStruct_0202C878 *param0, int param1, int param2); -void sub_0202C918(UnkStruct_0202C878 *param0, int param1, int param2, int param3); -BOOL sub_0202C990(const UnkStruct_0202C878 *param0); -void sub_0202C994(UnkStruct_0202C878 *param0, BOOL param1); -void sub_0202C9A0(UnkStruct_0202C878 *param0); +void WiFiHistory_Init(WiFiHistory *wiFiHistory); +WiFiHistory *SaveData_WiFiHistory(SaveData *saveData); +void sub_0202C88C(WiFiHistory *wiFiHistory, int param1, int param2); +int WiFiHistory_GetCountry(const WiFiHistory *wiFiHistory); +int sub_0202C8C4(const WiFiHistory *wiFiHistory); +int sub_0202C8C8(const WiFiHistory *wiFiHistory, int param1, int param2); +void sub_0202C918(WiFiHistory *wiFiHistory, int param1, int param2, int param3); +BOOL sub_0202C990(const WiFiHistory *wiFiHistory); +void sub_0202C994(WiFiHistory *wiFiHistory, BOOL param1); +void sub_0202C9A0(WiFiHistory *wiFiHistory); #endif // POKEPLATINUM_UNK_0202C858_H diff --git a/include/unk_02038F8C.h b/include/unk_02038F8C.h index 30edc94836..4904e100be 100644 --- a/include/unk_02038F8C.h +++ b/include/unk_02038F8C.h @@ -1,9 +1,9 @@ #ifndef POKEPLATINUM_UNK_02038F8C_H #define POKEPLATINUM_UNK_02038F8C_H -#include "struct_decls/struct_0202C878_decl.h" +#include "struct_defs/wi_fi_history.h" -void sub_02038F8C(UnkStruct_0202C878 *param0); -void sub_02038FDC(UnkStruct_0202C878 *param0, int param1, int param2, int param3); +void sub_02038F8C(WiFiHistory *wiFiHistory); +void sub_02038FDC(WiFiHistory *wiFiHistory, int param1, int param2, int param3); #endif // POKEPLATINUM_UNK_02038F8C_H diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 57d36dc38f..9cbd8f50db 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -179,7 +179,7 @@ BOOL Battle_Main(OverlayManager *param0, int *param1) break; case 1: ov16_0223D10C(param0, v0); - sub_02038F8C(v0->unk_104); + sub_02038F8C(v0->wiFiHistory); if (!sub_020389B8()) { GameRecords_IncrementRecordValue(v0->records, RECORD_UNK_020); diff --git a/src/communication_information.c b/src/communication_information.c index eedcde2978..77dfb4038c 100644 --- a/src/communication_information.c +++ b/src/communication_information.c @@ -7,8 +7,8 @@ #include "constants/heap.h" #include "struct_decls/struct_0202B370_decl.h" -#include "struct_decls/struct_0202C878_decl.h" #include "struct_defs/struct_0202610C.h" +#include "struct_defs/wi_fi_history.h" #include "communication_system.h" #include "heap.h" @@ -119,7 +119,7 @@ void CommInfo_SendBattleRegulation(void) const u16 *v2; RecordMixedRNG *v3 = SaveData_GetRecordMixedRNG(sCommInfo->saveData); WiFiList *v4 = SaveData_GetWiFiList(sCommInfo->saveData); - UnkStruct_0202C878 *v5 = sub_0202C878(sCommInfo->saveData); + WiFiHistory *wiFiHistory = SaveData_WiFiHistory(sCommInfo->saveData); if (sCommInfo->personalTrainerInfo) { trainerInfo = sCommInfo->personalTrainerInfo; @@ -134,8 +134,8 @@ void CommInfo_SendBattleRegulation(void) MI_CpuCopy8(v2, sCommInfo->playerInfo[netId].unk_4C, sizeof(sCommInfo->playerInfo[netId].unk_4C)); - sCommInfo->playerInfo[netId].country = sub_0202C8C0(v5); - sCommInfo->playerInfo[netId].region = sub_0202C8C4(v5); + sCommInfo->playerInfo[netId].country = WiFiHistory_GetCountry(wiFiHistory); + sCommInfo->playerInfo[netId].region = sub_0202C8C4(wiFiHistory); sCommInfo->playerInfo[netId].unk_65 = sub_02028810(sCommInfo->saveData); sCommInfo->playerInfo[netId].unk_65 = 1 - sCommInfo->playerInfo[netId].unk_65; diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c index 97bc63898a..a886154c46 100644 --- a/src/field_battle_data_transfer.c +++ b/src/field_battle_data_transfer.c @@ -108,7 +108,7 @@ FieldBattleDTO *FieldBattleDTO_New(enum HeapId heapID, u32 battleType) dto->bagCursor = NULL; dto->subscreenCursorOn = NULL; dto->countSafariBalls = 0; - dto->unk_104 = NULL; + dto->wiFiHistory = NULL; dto->records = NULL; dto->journalEntry = NULL; dto->rulesetMask = 0; @@ -272,7 +272,7 @@ void FieldBattleDTO_InitFromGameState(FieldBattleDTO *dto, const FieldSystem *fi dto->bagCursor = bagCursor; dto->subscreenCursorOn = subscreenCursorOn; dto->poketch = SaveData_GetPoketch(saveData); - dto->unk_104 = sub_0202C878(saveData); + dto->wiFiHistory = SaveData_WiFiHistory(saveData); dto->records = SaveData_GetGameRecords(saveData); dto->journalEntry = journalEntry; dto->unk_124 = SaveData_GetPalPad(saveData); @@ -327,7 +327,7 @@ void FieldBattleDTO_InitWithNormalizedMonLevels(FieldBattleDTO *dto, const Field dto->bagCursor = fieldSystem->bagCursor; dto->subscreenCursorOn = fieldSystem->battleSubscreenCursorOn; dto->poketch = SaveData_GetPoketch(fieldSystem->saveData); - dto->unk_104 = sub_0202C878(fieldSystem->saveData); + dto->wiFiHistory = SaveData_WiFiHistory(fieldSystem->saveData); dto->records = SaveData_GetGameRecords(fieldSystem->saveData); dto->journalEntry = fieldSystem->journalEntry; dto->unk_124 = SaveData_GetPalPad(fieldSystem->saveData); @@ -392,7 +392,7 @@ void FieldBattleDTO_InitWithPartyOrder(FieldBattleDTO *dto, const FieldSystem *f dto->timeOfDay = FieldSystem_GetTimeOfDay(fieldSystem); dto->bagCursor = fieldSystem->bagCursor; dto->subscreenCursorOn = fieldSystem->battleSubscreenCursorOn; - dto->unk_104 = sub_0202C878(fieldSystem->saveData); + dto->wiFiHistory = SaveData_WiFiHistory(fieldSystem->saveData); dto->records = SaveData_GetGameRecords(fieldSystem->saveData); dto->journalEntry = fieldSystem->journalEntry; dto->mapHeaderID = fieldSystem->location->mapId; diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index d4f8e8f74d..6ef3f003b7 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -8,10 +8,10 @@ #include "generated/species.h" #include "struct_decls/struct_020216E0_decl.h" -#include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_020308A0_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" +#include "struct_defs/wi_fi_history.h" #include "field/field_system.h" #include "overlay005/ov5_021EB1A0.h" @@ -1121,9 +1121,9 @@ BOOL ScrCmd_339(ScriptContext *ctx) BOOL ScrCmd_330(ScriptContext *ctx) { - UnkStruct_0202C878 *v0 = sub_0202C878(ctx->fieldSystem->saveData); + WiFiHistory *wiFiHistory = SaveData_WiFiHistory(ctx->fieldSystem->saveData); - sub_02038F8C(v0); + sub_02038F8C(wiFiHistory); return 1; } diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index bf14814339..5b04d90bf7 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -9,8 +9,8 @@ #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_02012B20_decl.h" #include "struct_decls/struct_0202B370_decl.h" -#include "struct_decls/struct_0202C878_decl.h" #include "struct_defs/battle_frontier.h" +#include "struct_defs/wi_fi_history.h" #include "struct_defs/struct_020127E8.h" #include "struct_defs/struct_0207DFAC.h" #include "struct_defs/struct_0207E060.h" @@ -1790,7 +1790,7 @@ static void ov65_0222F4C4(UnkStruct_ov65_0222EBE0 *param0, int param1) TrainerInfo *v0 = SaveData_GetTrainerInfo(param0->saveData); Pokedex *v1 = SaveData_GetPokedex(param0->saveData); Party *v2 = SaveData_GetParty(param0->saveData); - UnkStruct_0202C878 *v3 = sub_0202C878(param0->saveData); + WiFiHistory *wiFiHistory = SaveData_WiFiHistory(param0->saveData); int v4, v5; GF_ASSERT((sizeof(UnkStruct_0207E060)) == sizeof(UnkStruct_0207E060)); @@ -1814,8 +1814,8 @@ static void ov65_0222F4C4(UnkStruct_ov65_0222EBE0 *param0, int param1) param0->unk_04->unk_00.unk_1C = 0; param0->unk_04->unk_00.unk_1D = TrainerInfo_Appearance(v0); param0->unk_04->unk_00.unk_1E = TrainerInfo_Gender(v0); - param0->unk_04->unk_00.unk_1F = sub_0202C8C0(v3); - param0->unk_04->unk_00.unk_20 = sub_0202C8C4(v3); + param0->unk_04->unk_00.unk_1F = WiFiHistory_GetCountry(wiFiHistory); + param0->unk_04->unk_00.unk_20 = sub_0202C8C4(wiFiHistory); param0->unk_04->unk_00.unk_21 = 1; param0->unk_04->unk_00.unk_22 = 1; diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c index 05e6d9de17..38566fd972 100644 --- a/src/overlay066/ov66_0222DDF0.c +++ b/src/overlay066/ov66_0222DDF0.c @@ -11,9 +11,9 @@ #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_02014FB0_decl.h" -#include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_02030EC4_decl.h" #include "struct_decls/struct_0207E060_decl.h" +#include "struct_defs/wi_fi_history.h" #include "overlay066/ov66_02231428.h" #include "overlay066/ov66_0223177C.h" @@ -2277,7 +2277,7 @@ static void ov66_0222F7C8(UnkStruct_ov66_0222F6C4 *param0, SaveData *saveData, u { TrainerInfo *v0; Party *v1; - UnkStruct_0202C878 *v2; + WiFiHistory *wiFiHistory; Pokedex *v3; GameTime *v4; @@ -2285,7 +2285,7 @@ static void ov66_0222F7C8(UnkStruct_ov66_0222F6C4 *param0, SaveData *saveData, u v0 = SaveData_GetTrainerInfo(saveData); v1 = SaveData_GetParty(saveData); v3 = SaveData_GetPokedex(saveData); - v2 = sub_0202C878(saveData); + wiFiHistory = SaveData_WiFiHistory(saveData); v4 = SaveData_GetGameTime(saveData); } @@ -2325,8 +2325,8 @@ static void ov66_0222F7C8(UnkStruct_ov66_0222F6C4 *param0, SaveData *saveData, u param0->unk_20.unk_39 = TrainerInfo_RegionCode(v0); param0->unk_20.unk_3A = TrainerInfo_Appearance(v0); param0->unk_20.unk_3A = ov66_02230C0C(param0->unk_20.unk_3A); - param0->unk_20.unk_3C = sub_0202C8C0(v2); - param0->unk_20.unk_3E = sub_0202C8C4(v2); + param0->unk_20.unk_3C = WiFiHistory_GetCountry(wiFiHistory); + param0->unk_20.unk_3E = sub_0202C8C4(wiFiHistory); param0->unk_20.unk_3F = Pokedex_IsNationalDexObtained(v3); param0->unk_20.unk_40 = TrainerInfo_IsMainStoryCleared(v0); param0->unk_20.unk_41 = 0xff; diff --git a/src/overlay066/ov66_022324F0.c b/src/overlay066/ov66_022324F0.c index cc8bd0691a..b108d1e408 100644 --- a/src/overlay066/ov66_022324F0.c +++ b/src/overlay066/ov66_022324F0.c @@ -6,7 +6,7 @@ #include #include "struct_decls/struct_0202B370_decl.h" -#include "struct_decls/struct_0202C878_decl.h" +#include "struct_defs/wi_fi_history.h" #include "overlay004/ov4_021D0D80.h" #include "overlay066/struct_ov66_02232B20.h" @@ -58,7 +58,7 @@ typedef struct { typedef struct { SaveData *saveData; WiFiList *unk_04; - UnkStruct_0202C878 *unk_08; + WiFiHistory *wiFiHistory; UnkStruct_ov66_022324F0 unk_0C; void *unk_20; u8 *unk_24; @@ -162,7 +162,7 @@ void ov66_022324F0(u32 heapID, SaveData *saveData, u32 param2, const UnkStruct_o Unk_ov66_0225B6C0->saveData = saveData; Unk_ov66_0225B6C0->unk_04 = SaveData_GetWiFiList(saveData); - Unk_ov66_0225B6C0->unk_08 = sub_0202C878(saveData); + Unk_ov66_0225B6C0->wiFiHistory = SaveData_WiFiHistory(saveData); Unk_ov66_0225B6C0->unk_0C = *param3; Unk_ov66_0225B6C0->unk_20 = param4; @@ -1164,8 +1164,8 @@ static BOOL ov66_022336C4(UnkStruct_ov66_022336C4 *param0) int v2; PPW_LOBBY_RESULT v3; - v0 = sub_0202C8C0(param0->unk_08); - v1 = sub_0202C8C4(param0->unk_08); + v0 = WiFiHistory_GetCountry(param0->wiFiHistory); + v1 = sub_0202C8C4(param0->wiFiHistory); if (v0 == 0) { return 0; diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index c025853198..e49d3a2431 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -6,10 +6,10 @@ #include "constants/screen.h" #include "struct_decls/struct_02015920_decl.h" -#include "struct_decls/struct_0202C878_decl.h" #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" +#include "struct_defs/wi_fi_history.h" #include "overlay066/ov66_0222DDF0.h" #include "overlay066/ov66_02231428.h" @@ -247,7 +247,7 @@ typedef struct { u16 unk_00; u16 unk_02; UnkStruct_ov69_0225DA74 unk_04; - UnkStruct_0202C878 *unk_0C; + WiFiHistory *wiFiHistory; Options *unk_10; int unk_14; int unk_18; @@ -684,10 +684,10 @@ int ov69_0225C700(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov69_0225CE64), HEAP_ID_105); memset(v0, 0, sizeof(UnkStruct_ov69_0225CE64)); - v0->unk_0C = sub_0202C878(v1->saveData); + v0->wiFiHistory = SaveData_WiFiHistory(v1->saveData); v0->unk_10 = SaveData_GetOptions(v1->saveData); - v0->unk_14 = sub_0202C8C0(v0->unk_0C); - v0->unk_18 = sub_0202C8C4(v0->unk_0C); + v0->unk_14 = WiFiHistory_GetCountry(v0->wiFiHistory); + v0->unk_18 = sub_0202C8C4(v0->wiFiHistory); v0->unk_1C = v1->unk_08; ov69_0225D2A8(v0, v1); diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index fb967eb36c..387acac601 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -1145,7 +1145,7 @@ static void ov88_0223C370(UnkStruct_02095E80 *param0, OverlayManager *param1) param0->unk_18C = TrainerInfo_NameNewStrbuf(v0->unk_04, 26); param0->unk_190 = MessageLoader_GetNewStrbuf(param0->unk_184, 42); - sub_02038F8C(v0->unk_14); + sub_02038F8C(v0->wiFiHistory); } static void ov88_0223C44C(BgConfig *param0) diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index 29c2092d6c..ce4e810c00 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -5,8 +5,8 @@ #include "constants/screen.h" -#include "struct_decls/struct_0202C878_decl.h" #include "struct_defs/struct_02099F80.h" +#include "struct_defs/wi_fi_history.h" #include "overlay092/struct_ov92_021D28C0.h" #include "overlay115/camera_angle.h" @@ -67,7 +67,7 @@ typedef struct { typedef struct { int heapID; - UnkStruct_0202C878 *unk_04; + WiFiHistory *wiFiHistory; Options *unk_08; UnkStruct_ov92_021D1B24_sub1 unk_0C; BgConfig *unk_B810; @@ -327,10 +327,10 @@ int ov92_021D0D80(OverlayManager *param0, int *param1) { SaveData *saveData = OverlayManager_Args(param0); - v0->unk_04 = sub_0202C878(saveData); - v0->unk_BB14 = sub_0202C8C0(v0->unk_04); - v0->unk_BB18 = sub_0202C8C4(v0->unk_04); - v0->unk_BB24 = sub_0202C990(v0->unk_04); + v0->wiFiHistory = SaveData_WiFiHistory(saveData); + v0->unk_BB14 = WiFiHistory_GetCountry(v0->wiFiHistory); + v0->unk_BB18 = sub_0202C8C4(v0->wiFiHistory); + v0->unk_BB24 = sub_0202C990(v0->wiFiHistory); v0->unk_08 = SaveData_GetOptions(saveData); } @@ -545,7 +545,7 @@ int ov92_021D0EB8(OverlayManager *param0, int *param1) switch (v9) { case 0: ov92_021D1F74(v0); - sub_0202C88C(v0->unk_04, v0->unk_BB1C, v0->unk_BB20); + sub_0202C88C(v0->wiFiHistory, v0->unk_BB1C, v0->unk_BB20); v0->unk_BB14 = v0->unk_BB1C; v0->unk_BB18 = v0->unk_BB20; @@ -794,7 +794,7 @@ static void ov92_021D1634(UnkStruct_ov92_021D1B24 *param0, u32 param1, s16 param ov92_021D23E8(&v0, &v1); param0->unk_0C.unk_04[param1].unk_04 = v0; - param0->unk_0C.unk_04[param1].unk_28 = sub_0202C8C8(param0->unk_04, param4, param5); + param0->unk_0C.unk_04[param1].unk_28 = sub_0202C8C8(param0->wiFiHistory, param4, param5); param0->unk_0C.unk_04[param1].unk_2A = param4; param0->unk_0C.unk_04[param1].unk_2C = param5; } diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index 9147a0c9a8..3e0390f7ec 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -1048,8 +1048,8 @@ void ov94_022425A8(UnkStruct_ov94_0223BA88 *param0, UnkStruct_ov94_0223FD4C *par CharCode_CopyNumChars(param0->unk_10C, TrainerInfo_Name(param1->unk_00->unk_1C), 8); param0->unk_11C = TrainerInfo_ID_LowHalf(param1->unk_00->unk_1C); - param0->unk_11E = sub_0202C8C0(param1->unk_00->unk_18); - param0->unk_11F = sub_0202C8C4(param1->unk_00->unk_18); + param0->unk_11E = WiFiHistory_GetCountry(param1->unk_00->wiFiHistory); + param0->unk_11F = sub_0202C8C4(param1->unk_00->wiFiHistory); param0->unk_120 = TrainerInfo_Appearance(param1->unk_00->unk_1C); param0->unk_F6 = TrainerInfo_Gender(param1->unk_00->unk_1C); param0->unk_122 = GAME_VERSION; diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index 2c08464422..8931b31ad8 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -9,9 +9,9 @@ #include "generated/trainer_score_events.h" #include "struct_decls/struct_0202440C_decl.h" -#include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_0202DA40_decl.h" #include "struct_defs/chatot_cry.h" +#include "struct_defs/wi_fi_history.h" #include "overlay094/ov94_0223B140.h" #include "overlay094/ov94_0223BCB0.h" @@ -61,7 +61,7 @@ static void ov94_02242D84(UnkStruct_ov94_0223FD4C *param0); static void ov94_02242D98(UnkStruct_ov94_0223FD4C *param0); static void ov94_02243E48(JournalEntry *param0, UnkStruct_ov94_0223BA88 *param1); static void ov94_0224362C(UnkStruct_ov94_0223FD4C *param0); -static void ov94_02243E2C(UnkStruct_0202C878 *param0, UnkStruct_ov94_0223BA88 *param1); +static void ov94_02243E2C(WiFiHistory *wiFiHistory, UnkStruct_ov94_0223BA88 *param1); static void ov94_02243CE4(UnkStruct_ov94_0223FD4C *param0, Pokemon *param1, int param2); static void ov94_02243DE8(GlobalTrade *param0, int param1); static int ov94_02243E84(UnkStruct_ov94_0223FD4C *param0, UnkStruct_ov94_0223BA88 *param1); @@ -653,7 +653,7 @@ static int ov94_022431F0(UnkStruct_ov94_0223FD4C *param0) ov94_02243B08(param0, 0); ov94_02243CE4(param0, (Pokemon *)param0->unk_A4C.unk_00.unk_00, param0->unk_110); - ov94_02243E2C(param0->unk_00->unk_18, ¶m0->unk_A4C); + ov94_02243E2C(param0->unk_00->wiFiHistory, ¶m0->unk_A4C); GameRecords_IncrementTrainerScore(param0->unk_00->records, TRAINER_SCORE_EVENT_UNK_25); ov94_02243E48(param0->unk_00->unk_2C, ¶m0->unk_A4C); GameRecords_IncrementRecordValue(param0->unk_00->records, RECORD_UNK_024); @@ -931,7 +931,7 @@ static void ov94_0224362C(UnkStruct_ov94_0223FD4C *param0) static int ov94_02243658(UnkStruct_ov94_0223FD4C *param0) { ov94_02243BC4(param0, (Pokemon *)param0->unk_12C.unk_00.unk_00, sub_0202DAAC(param0->unk_00->unk_00), param0->unk_12C.unk_121); - ov94_02243E2C(param0->unk_00->unk_18, ¶m0->unk_12C); + ov94_02243E2C(param0->unk_00->wiFiHistory, ¶m0->unk_12C); GameRecords_IncrementTrainerScore(param0->unk_00->records, TRAINER_SCORE_EVENT_UNK_25); ov94_02243E48(param0->unk_00->unk_2C, ¶m0->unk_12C); @@ -1388,9 +1388,9 @@ static void ov94_02243DE8(GlobalTrade *param0, int param1) } } -static void ov94_02243E2C(UnkStruct_0202C878 *param0, UnkStruct_ov94_0223BA88 *param1) +static void ov94_02243E2C(WiFiHistory *wiFiHistory, UnkStruct_ov94_0223BA88 *param1) { - sub_02038FDC(param0, param1->unk_11E, param1->unk_11F, param1->unk_123); + sub_02038FDC(wiFiHistory, param1->unk_11E, param1->unk_11F, param1->unk_123); } static void ov94_02243E48(JournalEntry *journalEntry, UnkStruct_ov94_0223BA88 *param1) diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c index 60888c626c..edd6784707 100644 --- a/src/overlay104/ov104_0222DCE0.c +++ b/src/overlay104/ov104_0222DCE0.c @@ -5,10 +5,10 @@ #include "generated/species_data_params.h" -#include "struct_decls/struct_0202C878_decl.h" #include "struct_defs/sentence.h" #include "struct_defs/struct_0204B184.h" #include "struct_defs/struct_0204B1E8.h" +#include "struct_defs/wi_fi_history.h" #include "overlay104/struct_ov104_0223A348.h" #include "overlay104/struct_ov104_0223A348_sub1.h" @@ -636,8 +636,8 @@ int ov104_0222E5F0(const TrainerInfo *param0) void ov104_0222E630(SaveData *saveData) { - UnkStruct_0202C878 *v0 = sub_0202C878(saveData); + WiFiHistory *wiFiHistory = SaveData_WiFiHistory(saveData); - sub_02038F8C(v0); + sub_02038F8C(wiFiHistory); return; } diff --git a/src/unk_0202C858.c b/src/unk_0202C858.c index 46a1980d3f..b8dc522161 100644 --- a/src/unk_0202C858.c +++ b/src/unk_0202C858.c @@ -3,50 +3,50 @@ #include #include -#include "struct_defs/struct_0202C878.h" +#include "struct_defs/wi_fi_history.h" #include "savedata.h" int WiFiHistory_SaveSize(void) { - return sizeof(UnkStruct_0202C878); + return sizeof(WiFiHistory); } -void WiFiHistory_Init(UnkStruct_0202C878 *param0) +void WiFiHistory_Init(WiFiHistory *wiFiHistory) { - MI_CpuClear32(param0, sizeof(UnkStruct_0202C878)); + MI_CpuClear32(wiFiHistory, sizeof(WiFiHistory)); SaveData_SetChecksum(SAVE_TABLE_ENTRY_WIFI_HISTORY); } -UnkStruct_0202C878 *sub_0202C878(SaveData *saveData) +WiFiHistory *SaveData_WiFiHistory(SaveData *saveData) { SaveData_Checksum(SAVE_TABLE_ENTRY_WIFI_HISTORY); return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_WIFI_HISTORY); } -void sub_0202C88C(UnkStruct_0202C878 *param0, int param1, int param2) +void sub_0202C88C(WiFiHistory *wiFiHistory, int param1, int param2) { GF_ASSERT(param1 < 256); GF_ASSERT(param2 < 64); - param0->unk_05 = param1; - param0->unk_06 = param2; + wiFiHistory->country = param1; + wiFiHistory->unk_06 = param2; - sub_0202C918(param0, param1, param2, 3); + sub_0202C918(wiFiHistory, param1, param2, 3); SaveData_SetChecksum(SAVE_TABLE_ENTRY_WIFI_HISTORY); } -int sub_0202C8C0(const UnkStruct_0202C878 *param0) +int WiFiHistory_GetCountry(const WiFiHistory *wiFiHistory) { - return param0->unk_05; + return wiFiHistory->country; } -int sub_0202C8C4(const UnkStruct_0202C878 *param0) +int sub_0202C8C4(const WiFiHistory *wiFiHistory) { - return param0->unk_06; + return wiFiHistory->unk_06; } -int sub_0202C8C8(const UnkStruct_0202C878 *param0, int param1, int param2) +int sub_0202C8C8(const WiFiHistory *wiFiHistory, int param1, int param2) { int v0; @@ -57,12 +57,12 @@ int sub_0202C8C8(const UnkStruct_0202C878 *param0, int param1, int param2) return 0; } - v0 = (param0->unk_07[(param1 - 1) * 16 + param2 / 4] >> ((param2 % 4) * 2)) & 3; + v0 = (wiFiHistory->unk_07[(param1 - 1) * 16 + param2 / 4] >> ((param2 % 4) * 2)) & 3; return v0; } -void sub_0202C918(UnkStruct_0202C878 *param0, int param1, int param2, int param3) +void sub_0202C918(WiFiHistory *wiFiHistory, int param1, int param2, int param3) { u8 *v0; u8 v1 = 3; @@ -76,36 +76,36 @@ void sub_0202C918(UnkStruct_0202C878 *param0, int param1, int param2, int param3 return; } - v0 = ¶m0->unk_07[(param1 - 1) * 16 + param2 / 4]; + v0 = &wiFiHistory->unk_07[(param1 - 1) * 16 + param2 / 4]; *v0 &= ((v1 << ((param2 % 4) * 2)) ^ 0xff); *v0 |= param3 << ((param2 % 4) * 2); if (param1 != 103) { - sub_0202C994(param0, 1); + sub_0202C994(wiFiHistory, 1); } SaveData_SetChecksum(SAVE_TABLE_ENTRY_WIFI_HISTORY); } -BOOL sub_0202C990(const UnkStruct_0202C878 *param0) +BOOL sub_0202C990(const WiFiHistory *wiFiHistory) { - return param0->unk_04; + return wiFiHistory->unk_04; } -void sub_0202C994(UnkStruct_0202C878 *param0, BOOL param1) +void sub_0202C994(WiFiHistory *wiFiHistory, BOOL param1) { - param0->unk_04 = param1; + wiFiHistory->unk_04 = param1; SaveData_SetChecksum(SAVE_TABLE_ENTRY_WIFI_HISTORY); } -void sub_0202C9A0(UnkStruct_0202C878 *param0) +void sub_0202C9A0(WiFiHistory *wiFiHistory) { int v0, v1; u8 v2; for (v0 = 0; v0 < (256 - 1) * 16; v0++) { - v2 = param0->unk_07[v0]; + v2 = wiFiHistory->unk_07[v0]; for (v1 = 0; v1 < 8; v1 += 2) { if (((v2 >> v1) & 3) == 1) { @@ -114,7 +114,7 @@ void sub_0202C9A0(UnkStruct_0202C878 *param0) } } - param0->unk_07[v0] = v2; + wiFiHistory->unk_07[v0] = v2; } SaveData_SetChecksum(SAVE_TABLE_ENTRY_WIFI_HISTORY); diff --git a/src/unk_02030A80.c b/src/unk_02030A80.c index 930f3c7dc2..14725e9532 100644 --- a/src/unk_02030A80.c +++ b/src/unk_02030A80.c @@ -3,10 +3,10 @@ #include #include -#include "struct_decls/struct_0202C878_decl.h" #include "struct_defs/sentence.h" #include "struct_defs/struct_0202F298_sub1.h" #include "struct_defs/struct_02030A80.h" +#include "struct_defs/wi_fi_history.h" #include "charcode_util.h" #include "heap.h" @@ -39,7 +39,7 @@ void sub_02030A98(UnkStruct_02030A80 *param0) void sub_02030AA0(UnkStruct_02030A80 *param0, SaveData *saveData) { TrainerInfo *v0 = SaveData_GetTrainerInfo(saveData); - UnkStruct_0202C878 *v1 = sub_0202C878(saveData); + WiFiHistory *wiFiHistory = SaveData_WiFiHistory(saveData); SystemData *v2 = SaveData_GetSystemData(saveData); const MiscSaveBlock *v3 = SaveData_MiscSaveBlockConst(saveData); int v4, v5, v6; @@ -57,8 +57,8 @@ void sub_02030AA0(UnkStruct_02030A80 *param0, SaveData *saveData) param0->unk_1C = v4; param0->unk_1B_1 = v5; param0->unk_1B_0 = v6; - param0->unk_17 = sub_0202C8C0(v1); - param0->unk_18 = sub_0202C8C4(v1); + param0->unk_17 = WiFiHistory_GetCountry(wiFiHistory); + param0->unk_18 = sub_0202C8C4(wiFiHistory); for (v7 = 0; v7 < 40; v7++) { param0->unk_20_val2[v7] = 0xffff; diff --git a/src/unk_02030CE8.c b/src/unk_02030CE8.c index 8b0efcbb18..5c0e4dc0c7 100644 --- a/src/unk_02030CE8.c +++ b/src/unk_02030CE8.c @@ -3,8 +3,8 @@ #include #include -#include "struct_decls/struct_0202C878_decl.h" #include "struct_defs/struct_02030CEC.h" +#include "struct_defs/wi_fi_history.h" #include "overlay096/struct_ov96_0223B574.h" @@ -104,7 +104,7 @@ u32 sub_02030D98(SaveData *saveData, int param1) static void sub_02030DD0(SaveData *saveData, UnkStruct_ov96_0223B574 *param1) { - UnkStruct_0202C878 *v0 = sub_0202C878(saveData); + WiFiHistory *wiFiHistory = SaveData_WiFiHistory(saveData); TrainerInfo *v1 = SaveData_GetTrainerInfo(saveData); char *v2 = sub_02030D50(saveData); @@ -112,8 +112,8 @@ static void sub_02030DD0(SaveData *saveData, UnkStruct_ov96_0223B574 *param1) param1->unk_00 = GAME_VERSION; param1->unk_01 = GAME_LANGUAGE; - param1->unk_02 = sub_0202C8C0(v0); - param1->unk_03 = sub_0202C8C4(v0); + param1->unk_02 = WiFiHistory_GetCountry(wiFiHistory); + param1->unk_03 = sub_0202C8C4(wiFiHistory); param1->unk_04 = TrainerInfo_ID(v1); CharCode_Copy(param1->unk_08, TrainerInfo_Name(v1)); diff --git a/src/unk_02038F8C.c b/src/unk_02038F8C.c index 38e955ccca..6ce75e8b45 100644 --- a/src/unk_02038F8C.c +++ b/src/unk_02038F8C.c @@ -3,14 +3,14 @@ #include #include -#include "struct_decls/struct_0202C878_decl.h" +#include "struct_defs/wi_fi_history.h" #include "communication_information.h" #include "communication_system.h" #include "trainer_info.h" #include "unk_0202C858.h" -void sub_02038F8C(UnkStruct_0202C878 *param0) +void sub_02038F8C(WiFiHistory *wiFiHistory) { int v0; int v1, v2, v3; @@ -28,14 +28,14 @@ void sub_02038F8C(UnkStruct_0202C878 *param0) v4 = CommInfo_TrainerInfo(v0); v3 = TrainerInfo_RegionCode(v4); - sub_02038FDC(param0, v1, v2, v3); + sub_02038FDC(wiFiHistory, v1, v2, v3); } } } -void sub_02038FDC(UnkStruct_0202C878 *param0, int param1, int param2, int param3) +void sub_02038FDC(WiFiHistory *wiFiHistory, int param1, int param2, int param3) { - if (sub_0202C8C8(param0, param1, param2) == 0) { - sub_0202C918(param0, param1, param2, 1); + if (sub_0202C8C8(wiFiHistory, param1, param2) == 0) { + sub_0202C918(wiFiHistory, param1, param2, 1); } } diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index abfd2161aa..1db576b930 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -963,7 +963,7 @@ static void sub_0203DB38(UnkStruct_ov88_0223C370 *param0, FieldSystem *fieldSyst param0->unk_04 = SaveData_GetTrainerInfo(fieldSystem->saveData); param0->unk_08 = SaveData_GetParty(fieldSystem->saveData); param0->unk_0C = SaveData_SaveTable(fieldSystem->saveData, SAVE_TABLE_ENTRY_PAL_PAD); - param0->unk_14 = sub_0202C878(fieldSystem->saveData); + param0->wiFiHistory = SaveData_WiFiHistory(fieldSystem->saveData); param0->unk_18 = SaveData_GetOptions(fieldSystem->saveData); param0->unk_24 = SaveData_GetPokedex(fieldSystem->saveData); param0->unk_30 = SaveData_GetDexMode(fieldSystem->saveData); @@ -1354,7 +1354,7 @@ void sub_0203E0FC(FieldSystem *fieldSystem, int param1) v0->unk_0C = SaveData_GetPCBoxes(fieldSystem->saveData); v0->unk_10 = SaveData_GetPokedex(fieldSystem->saveData); v0->unk_14 = SaveData_GetWiFiList(fieldSystem->saveData); - v0->unk_18 = sub_0202C878(fieldSystem->saveData); + v0->wiFiHistory = SaveData_WiFiHistory(fieldSystem->saveData); v0->unk_1C = SaveData_GetTrainerInfo(fieldSystem->saveData); v0->unk_24 = SaveData_GetOptions(fieldSystem->saveData); v0->records = SaveData_GetGameRecords(fieldSystem->saveData); diff --git a/src/unk_020559DC.c b/src/unk_020559DC.c index d44e211bc7..30bb96d1fa 100644 --- a/src/unk_020559DC.c +++ b/src/unk_020559DC.c @@ -123,7 +123,7 @@ static void sub_02055AC0(FieldSystem *fieldSystem, s32 param1) SystemVars_UpdateVillaVisitor(fieldSystem->saveData); FieldSystem_ClearDailyHiddenItemFlags(fieldSystem); sub_0206C008(fieldSystem->saveData); - sub_0202C9A0(sub_0202C878(fieldSystem->saveData)); + sub_0202C9A0(SaveData_WiFiHistory(fieldSystem->saveData)); sub_0206F2F0(fieldSystem->saveData); } diff --git a/src/unk_02073700.c b/src/unk_02073700.c index eb1237d204..4b2671f4db 100644 --- a/src/unk_02073700.c +++ b/src/unk_02073700.c @@ -1,9 +1,9 @@ #include #include -#include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_0202D750_decl.h" #include "struct_defs/struct_0202D314.h" +#include "struct_defs/wi_fi_history.h" #include "overlay096/struct_ov96_0223B450_sub1.h" @@ -18,7 +18,7 @@ void sub_02073700(SaveData *saveData, int param1, UnkStruct_ov96_0223B450_sub1 * { int v0; TrainerInfo *v1 = SaveData_GetTrainerInfo(saveData); - UnkStruct_0202C878 *v2 = sub_0202C878(saveData); + WiFiHistory *wiFiHistory = SaveData_WiFiHistory(saveData); UnkStruct_0202D750 *v3 = sub_0202D750(saveData); MI_CpuClear8(param2, sizeof(UnkStruct_ov96_0223B450_sub1)); @@ -27,8 +27,8 @@ void sub_02073700(SaveData *saveData, int param1, UnkStruct_ov96_0223B450_sub1 * param2->unk_B8 = gGameVersion; param2->unk_B9 = gGameLanguage; - param2->unk_BA = (u8)sub_0202C8C0(v2); - param2->unk_BB = (u8)sub_0202C8C4(v2); + param2->unk_BA = (u8)WiFiHistory_GetCountry(wiFiHistory); + param2->unk_BB = (u8)sub_0202C8C4(wiFiHistory); param2->unk_C8_val1_1 = TrainerInfo_Gender(v1); param2->unk_C9 = sub_0205CA14(param2->unk_C8_val1_1, TrainerInfo_Appearance(v1), 1);