From 79fe26b4e1f547bca677feb93879f7907dde700e Mon Sep 17 00:00:00 2001 From: Trainer Riley Date: Fri, 21 Jun 2024 12:48:39 -0700 Subject: [PATCH] Rename all PoketchData variables in the codebase --- include/overlay006/battle_params.h | 2 +- include/struct_defs/battle_system.h | 2 +- include/struct_defs/struct_0207AE68_t.h | 2 +- include/unk_0207AE68.h | 2 +- src/battle/ov16_0223B140.c | 6 +++--- src/battle/ov16_0223DF00.c | 4 ++-- src/overlay005/ov5_021DDAE4.c | 4 ++-- src/overlay005/ov5_021EA714.c | 12 ++++++------ src/overlay025/ov25_02254560.c | 16 ++++++++-------- src/overlay031/ov31_022561C0.c | 18 +++++++++--------- src/overlay036/ov36_022561C0.c | 10 +++++----- src/overlay045/ov45_022561C0.c | 10 +++++----- src/overlay047/ov47_022561C0.c | 8 ++++---- src/overlay049/ov49_022561C0.c | 8 ++++---- src/overlay050/ov50_022561C0.c | 12 ++++++------ src/overlay054/ov54_022561C0.c | 10 +++++----- src/scrcmd.c | 4 ++-- src/unk_02048DD8.c | 4 ++-- src/unk_0204B830.c | 8 ++++---- src/unk_02051D8C.c | 4 ++-- src/unk_0207AE68.c | 10 +++++----- 21 files changed, 78 insertions(+), 78 deletions(-) diff --git a/include/overlay006/battle_params.h b/include/overlay006/battle_params.h index 4daca6e269..f4e5ea0da1 100644 --- a/include/overlay006/battle_params.h +++ b/include/overlay006/battle_params.h @@ -31,7 +31,7 @@ typedef struct { PokedexData * unk_E8; PCBoxes * unk_EC; ChatotCry * unk_F0[4]; - PoketchData * unk_100; + PoketchData *poketchData; UnkStruct_0202C878 * unk_104; Options * unk_108; UnkStruct_0206D140 * unk_10C; diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index a07f277270..a927398c21 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -69,7 +69,7 @@ struct BattleSystem { UnkStruct_ov12_0221FCDC * unk_8C; SpriteRenderer * unk_90; SpriteGfxHandler * unk_94; - PoketchData * unk_98; + PoketchData *poketchData; UnkStruct_0206D140 * unk_9C; u16 trainerIDs[4]; u8 unk_A8[4]; diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h index 8d85c62bd9..11db538115 100644 --- a/include/struct_defs/struct_0207AE68_t.h +++ b/include/struct_defs/struct_0207AE68_t.h @@ -43,7 +43,7 @@ struct UnkStruct_0207AE68_t { PokedexData * unk_48; Bag * unk_4C; UnkStruct_0202CD88 * unk_50; - PoketchData * unk_54; + PoketchData *poketchData; void * unk_58; int unk_5C; u16 unk_60; diff --git a/include/unk_0207AE68.h b/include/unk_0207AE68.h index 48de245f64..b90ad5a867 100644 --- a/include/unk_0207AE68.h +++ b/include/unk_0207AE68.h @@ -10,7 +10,7 @@ #include "struct_decls/struct_0207AE68_decl.h" #include "bag.h" -UnkStruct_0207AE68 * sub_0207AE68(Party * param0, Pokemon * param1, int param2, Options * param3, int param4, PokedexData * param5, Bag * param6, UnkStruct_0202CD88 * param7, PoketchData * param8, int param9, int param10, int param11); +UnkStruct_0207AE68 * sub_0207AE68(Party * param0, Pokemon * param1, int param2, Options * param3, int param4, PokedexData * param5, Bag * param6, UnkStruct_0202CD88 * param7, PoketchData *poketchData, int param9, int param10, int param11); BOOL sub_0207B0D0(UnkStruct_0207AE68 * param0); void sub_0207B0E0(UnkStruct_0207AE68 * param0); diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index f3441d4eda..ef83aa8070 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -273,7 +273,7 @@ BOOL Battle_Main (OverlayManager * param0, int * param1) if (v2) { Heap_Create(3, 73, 0x30000); v4 = Party_GetPokemonBySlotIndex(v0->parties[0], v1); - v0->unk_170 = sub_0207AE68(v0->parties[0], v4, v2, v0->unk_108, v0->unk_140, v0->unk_E8, v0->unk_E0, v0->unk_11C, v0->unk_100, v3, 0x1 | 0x2, 73); + v0->unk_170 = sub_0207AE68(v0->parties[0], v4, v2, v0->unk_108, v0->unk_140, v0->unk_E8, v0->unk_E0, v0->unk_11C, v0->poketchData, v3, 0x1 | 0x2, 73); *param1 = 14; } else { *param1 = 15; @@ -745,7 +745,7 @@ static void ov16_0223BCB4 (OverlayManager * param0) v1->unk_EC = v0->pcBoxes; v1->unk_E4 = v0->unk_5C; v1->unk_190 = v0->unk_1BC; - v1->unk_100 = v0->unk_98; + v1->poketchData = v0->poketchData; v1->unk_10C = v0->unk_9C; v1->unk_168 = v0->safariBalls; v1->unk_14 = v0->resultMask & (0xc0 ^ 0xff); @@ -1100,7 +1100,7 @@ static void ov16_0223C2C0 (BattleSystem * param0, BattleParams * param1) param0->unk_1B4 = param1->unk_124; param0->unk_5C = param1->unk_E4; param0->unk_1BC = param1->unk_190; - param0->unk_98 = param1->unk_100; + param0->poketchData = param1->poketchData; param0->unk_2420 = param1->unk_13C; param0->unk_9C = param1->unk_10C; param0->safariBalls = param1->unk_168; diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 4f172936e7..b4b4c704fc 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -1121,8 +1121,8 @@ void ov16_0223EF2C (BattleSystem * param0, int param1, int param2) void ov16_0223EF48 (BattleSystem * param0, Pokemon * param1) { - if (param0->unk_98) { - PoketchData_PokemonHistoryEnqueue(param0->unk_98, Pokemon_GetBoxPokemon(param1)); + if (param0->poketchData) { + PoketchData_PokemonHistoryEnqueue(param0->poketchData, Pokemon_GetBoxPokemon(param1)); } } diff --git a/src/overlay005/ov5_021DDAE4.c b/src/overlay005/ov5_021DDAE4.c index f0403aec39..04b6cfc58e 100644 --- a/src/overlay005/ov5_021DDAE4.c +++ b/src/overlay005/ov5_021DDAE4.c @@ -41,11 +41,11 @@ static BOOL ov5_021DDAE4 (TaskManager * param0) break; case 2: if (ov24_02253DB4(fieldSystem->unk_08)) { - PoketchData * v2 = SaveData_PoketchData(fieldSystem->saveData); + PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); Overlay_UnloadByID(FS_OVERLAY_ID(overlay24)); Overlay_LoadByID(FS_OVERLAY_ID(overlay25), 2); - PoketchData_Enable(v2); + PoketchData_Enable(poketchData); PoketchSystem_Create(fieldSystem, &fieldSystem->unk_04->poketchSys, fieldSystem->saveData, fieldSystem->unk_08, sub_0200A914(1)); v1->unk_00++; } diff --git a/src/overlay005/ov5_021EA714.c b/src/overlay005/ov5_021EA714.c index 8f81ad93dc..510e8bea1c 100644 --- a/src/overlay005/ov5_021EA714.c +++ b/src/overlay005/ov5_021EA714.c @@ -26,10 +26,10 @@ void ov5_021EA714 (FieldSystem * fieldSystem, int param1, u32 param2) void ov5_021EA728 (FieldSystem * fieldSystem) { - PoketchData * v0 = SaveData_PoketchData(fieldSystem->saveData); + PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); VarsFlags * v1 = SaveData_GetVarsFlags(fieldSystem->saveData); - if (PoketchData_IsEnabled(v0) + if (PoketchData_IsEnabled(poketchData) && (sub_0206AE2C(v1) == 0)) { Overlay_LoadByID(FS_OVERLAY_ID(overlay25), 2); PoketchSystem_Create(fieldSystem, &fieldSystem->unk_04->poketchSys, fieldSystem->saveData, fieldSystem->unk_08, sub_0200A914(1)); @@ -41,10 +41,10 @@ void ov5_021EA728 (FieldSystem * fieldSystem) void ov5_021EA790 (FieldSystem * fieldSystem) { - PoketchData * v0 = SaveData_PoketchData(fieldSystem->saveData); + PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); VarsFlags * v1 = SaveData_GetVarsFlags(fieldSystem->saveData); - if (PoketchData_IsEnabled(v0) + if (PoketchData_IsEnabled(poketchData) && (sub_0206AE2C(v1) == 0)) { PoketchSystem_StartShutdown(fieldSystem->unk_04->poketchSys); } else { @@ -54,10 +54,10 @@ void ov5_021EA790 (FieldSystem * fieldSystem) u8 ov5_021EA7CC (FieldSystem * fieldSystem) { - PoketchData * v0 = SaveData_PoketchData(fieldSystem->saveData); + PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); VarsFlags * v1 = SaveData_GetVarsFlags(fieldSystem->saveData); - if (PoketchData_IsEnabled(v0) + if (PoketchData_IsEnabled(poketchData) && (sub_0206AE2C(v1) == 0)) { if (PoketchSystem_IsSystemShutdown(fieldSystem->unk_04->poketchSys)) { fieldSystem->unk_04->poketchSys = NULL; diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index aff2f62831..80a44c4230 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -166,8 +166,8 @@ static void ov25_02254684 (UnkStruct_ov25_02254560 * param0) void ov25_022546B8 (u32 param0, u32 param1) { UnkStruct_ov25_02254560 * v0 = ov25_02254418(); - PoketchData * v1 = PoketchSystem_GetPoketchData(v0->poketchSys); - u32 v2 = PoketchData_CurrentScreenColor(v1); + PoketchData *poketchData = PoketchSystem_GetPoketchData(v0->poketchSys); + u32 v2 = PoketchData_CurrentScreenColor(poketchData); GXS_LoadBGPltt(&v0->unk_200[v2 * 32], param0 * 0x20, 0x20); GXS_LoadOBJPltt(&v0->unk_200[v2 * 32], param1, 0x20); @@ -176,8 +176,8 @@ void ov25_022546B8 (u32 param0, u32 param1) void ov25_022546F0 (u32 param0, u32 param1) { UnkStruct_ov25_02254560 * v0 = ov25_02254418(); - PoketchData * v1 = PoketchSystem_GetPoketchData(v0->poketchSys); - u32 v2 = PoketchData_CurrentScreenColor(v1); + PoketchData *poketchData = PoketchSystem_GetPoketchData(v0->poketchSys); + u32 v2 = PoketchData_CurrentScreenColor(poketchData); GXS_LoadBGPltt(&v0->unk_200[v2 * 32 + 16], 0, 0x20); GXS_LoadOBJPltt(&v0->unk_200[v2 * 32 + 16], 0, 0x20); @@ -186,8 +186,8 @@ void ov25_022546F0 (u32 param0, u32 param1) void ov25_02254728 (u16 * param0) { UnkStruct_ov25_02254560 * v0 = ov25_02254418(); - PoketchData * v1 = PoketchSystem_GetPoketchData(v0->poketchSys); - u32 v2 = PoketchData_CurrentScreenColor(v1); + PoketchData *poketchData = PoketchSystem_GetPoketchData(v0->poketchSys); + u32 v2 = PoketchData_CurrentScreenColor(poketchData); MI_CpuCopy16(&v0->unk_200[v2 * 32], param0, 0x20); } @@ -608,8 +608,8 @@ static void ov25_02254DE0 (UnkStruct_ov25_02254560 * param0, UnkStruct_ov25_0225 static void ov25_02254E84 (UnkStruct_ov25_02254560 * param0, u32 param1) { - PoketchData * v1 = PoketchSystem_GetPoketchData(param0->poketchSys); - u32 v2 = PoketchData_CurrentScreenColor(v1); + PoketchData *poketchData = PoketchSystem_GetPoketchData(param0->poketchSys); + u32 v2 = PoketchData_CurrentScreenColor(poketchData); ov25_02254728(param0->unk_400); diff --git a/src/overlay031/ov31_022561C0.c b/src/overlay031/ov31_022561C0.c index 3d537ec181..c295d0b0ef 100644 --- a/src/overlay031/ov31_022561C0.c +++ b/src/overlay031/ov31_022561C0.c @@ -36,8 +36,8 @@ static BOOL ov31_02256228(UnkStruct_ov31_02256228 * param0, PoketchSystem *poket static void ov31_02256268(UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1); static inline u8 inline_ov31_02256298(const u8 * param0, int param1); static inline void inline_ov31_022562EC(u8 * param0, int param1, int param2); -static void ov31_02256298(UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1, PoketchData * param2); -static void ov31_022562EC(UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1, PoketchData * param2); +static void ov31_02256298(UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1, PoketchData *poketchData); +static void ov31_022562EC(UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1, PoketchData *poketchData); static void ov31_0225635C(UnkStruct_ov31_02256554_1 * param0); static void ov31_02256384(UnkStruct_ov31_02256228 * param0); static void ov31_022563B0(void * param0); @@ -92,10 +92,10 @@ static BOOL ov31_02256228 (UnkStruct_ov31_02256228 * param0, PoketchSystem *poke static void ov31_02256268 (UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1) { - PoketchData * v0 = PoketchSystem_GetPoketchData(param0->poketchSys); + PoketchData *poketchData = PoketchSystem_GetPoketchData(param0->poketchSys); - if (PoketchData_DotArtModified(v0)) { - ov31_02256298(param0, param1, v0); + if (PoketchData_DotArtModified(poketchData)) { + ov31_02256298(param0, param1, poketchData); } else { ov31_0225635C(param1); } @@ -111,11 +111,11 @@ static inline void inline_ov31_022562EC (u8 * param0, int param1, int param2) param0[(param1 / 4)] |= ((param2 & 3) << ((param1 & 3) * 2)); } -static void ov31_02256298 (UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1, PoketchData * param2) +static void ov31_02256298 (UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1, PoketchData *poketchData) { int v0, v1, v2; - PoketchData_CopyDotArtData(param2, param0->unk_1F4); + PoketchData_CopyDotArtData(poketchData, param0->unk_1F4); v2 = 0; @@ -126,7 +126,7 @@ static void ov31_02256298 (UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_0225 } } -static void ov31_022562EC (UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1, PoketchData * param2) +static void ov31_022562EC (UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1, PoketchData *poketchData) { int v0, v1, v2; @@ -140,7 +140,7 @@ static void ov31_022562EC (UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_0225 } } - PoketchData_ModifyDotArtData(param2, param0->unk_1F4); + PoketchData_ModifyDotArtData(poketchData, param0->unk_1F4); } static void ov31_0225635C (UnkStruct_ov31_02256554_1 * param0) diff --git a/src/overlay036/ov36_022561C0.c b/src/overlay036/ov36_022561C0.c index 40df255da0..85e9c7f9d6 100644 --- a/src/overlay036/ov36_022561C0.c +++ b/src/overlay036/ov36_022561C0.c @@ -23,7 +23,7 @@ typedef struct { PoketchSystem *poketchSys; PoketchButtonManager * unk_14; u32 unk_18; - PoketchData * unk_1C; + PoketchData *poketchData; } UnkStruct_ov36_0225621C; static void NitroStaticInit(void); @@ -74,9 +74,9 @@ static BOOL ov36_0225621C (UnkStruct_ov36_0225621C * param0, PoketchSystem *poke }; param0->poketchSys = poketchSys; - param0->unk_1C = PoketchSystem_GetPoketchData(poketchSys); + param0->poketchData = PoketchSystem_GetPoketchData(poketchSys); param0->unk_04.unk_04 = 1; - param0->unk_04.unk_00 = PoketchData_StepCount(param0->unk_1C); + param0->unk_04.unk_00 = PoketchData_StepCount(param0->poketchData); if (ov36_02256404(&(param0->unk_0C), &(param0->unk_04), param2)) { param0->unk_00 = 0; @@ -184,7 +184,7 @@ static BOOL ov36_02256330 (UnkStruct_ov36_0225621C * param0) } if (PoketchSystem_PedometerUpdated(param0->poketchSys)) { - v0->unk_00 = PoketchData_StepCount(param0->unk_1C); + v0->unk_00 = PoketchData_StepCount(param0->poketchData); ov36_0225653C(param0->unk_0C, 3); break; } @@ -204,7 +204,7 @@ static BOOL ov36_02256330 (UnkStruct_ov36_0225621C * param0) v0->unk_04 = 1; v0->unk_00 = 0; - PoketchData_SetStepCount(param0->unk_1C, 0); + PoketchData_SetStepCount(param0->poketchData, 0); ov36_0225653C(param0->unk_0C, 2); ov36_0225653C(param0->unk_0C, 3); diff --git a/src/overlay045/ov45_022561C0.c b/src/overlay045/ov45_022561C0.c index 20a9c2e944..51f7bd5ff8 100644 --- a/src/overlay045/ov45_022561C0.c +++ b/src/overlay045/ov45_022561C0.c @@ -24,7 +24,7 @@ typedef struct { UnkStruct_ov45_022566EC_1 unk_03; UnkStruct_ov45_022566EC * unk_08; PoketchSystem *poketchSys; - PoketchData * unk_10; + PoketchData *poketchData; PoketchButtonManager * unk_14; u32 unk_18; u32 unk_1C; @@ -88,10 +88,10 @@ static BOOL ov45_0225621C (UnkStruct_ov45_022561D4 * param0, PoketchSystem *poke }; u32 v1, v2; - param0->unk_10 = PoketchSystem_GetPoketchData(poketchSys); - param0->unk_03.unk_00 = PoketchData_IsAlarmSet(param0->unk_10); + param0->poketchData = PoketchSystem_GetPoketchData(poketchSys); + param0->unk_03.unk_00 = PoketchData_IsAlarmSet(param0->poketchData); - PoketchData_AlarmTime(param0->unk_10, &v1, &v2); + PoketchData_AlarmTime(param0->poketchData, &v1, &v2); param0->unk_03.unk_03 = v1; param0->unk_03.unk_04 = v2; @@ -229,7 +229,7 @@ static BOOL ov45_022563C0 (UnkStruct_ov45_022561D4 * param0) if ((param0->unk_1C == 1) && (param0->unk_18 == 0)) { param0->unk_03.unk_00 = 1; ov45_022562C0(¶m0->unk_03); - PoketchData_SetAlarm(param0->unk_10, 1, param0->unk_03.unk_03, param0->unk_03.unk_04); + PoketchData_SetAlarm(param0->poketchData, 1, param0->unk_03.unk_03, param0->unk_03.unk_04); ov45_02256918(param0->unk_08, 2); param0->unk_1C = 0; param0->unk_01++; diff --git a/src/overlay047/ov47_022561C0.c b/src/overlay047/ov47_022561C0.c index c7b04bf6b5..146201b60b 100644 --- a/src/overlay047/ov47_022561C0.c +++ b/src/overlay047/ov47_022561C0.c @@ -28,7 +28,7 @@ typedef struct { UnkStruct_ov47_02256634_1 unk_04; UnkStruct_ov47_02256634 * unk_70; PoketchSystem *poketchSys; - PoketchData * unk_78; + PoketchData *poketchData; UnkStruct_0206C638 * unk_7C[6]; u8 unk_94[6]; u8 unk_9A; @@ -76,13 +76,13 @@ static BOOL ov47_0225621C (UnkStruct_ov47_0225621C * param0, PoketchSystem *poke { int v0; - param0->unk_78 = PoketchSystem_GetPoketchData(poketchSys); + param0->poketchData = PoketchSystem_GetPoketchData(poketchSys); for (v0 = 0; v0 < 6; v0++) { param0->unk_04.unk_0C[v0].unk_03 = 1; param0->unk_04.unk_0C[v0].unk_02 = v0; - PoketchData_MapMarkerPos(param0->unk_78, v0, &(param0->unk_04.unk_0C[v0].unk_00), &(param0->unk_04.unk_0C[v0].unk_01)); + PoketchData_MapMarkerPos(param0->poketchData, v0, &(param0->unk_04.unk_0C[v0].unk_00), &(param0->unk_04.unk_0C[v0].unk_01)); param0->unk_04.unk_0C[v0].unk_00 += 16; param0->unk_04.unk_0C[v0].unk_01 += 16; @@ -130,7 +130,7 @@ static void ov47_0225634C (UnkStruct_ov47_0225621C * param0) int v0; for (v0 = 0; v0 < 6; v0++) { - PoketchData_SetMapMarker(param0->unk_78, v0, (param0->unk_04.unk_0C[v0].unk_00 - 16), (param0->unk_04.unk_0C[v0].unk_01 - 16)); + PoketchData_SetMapMarker(param0->poketchData, v0, (param0->unk_04.unk_0C[v0].unk_00 - 16), (param0->unk_04.unk_0C[v0].unk_01 - 16)); } ov47_02256670(param0->unk_70); diff --git a/src/overlay049/ov49_022561C0.c b/src/overlay049/ov49_022561C0.c index 1c1fef5008..084c9cc62c 100644 --- a/src/overlay049/ov49_022561C0.c +++ b/src/overlay049/ov49_022561C0.c @@ -23,7 +23,7 @@ typedef struct { UnkStruct_ov49_022563D4_1 unk_04; UnkStruct_ov49_022563D4 * unk_08; PoketchSystem *poketchSys; - PoketchData * unk_10; + PoketchData *poketchData; } UnkStruct_ov49_0225621C; static void NitroStaticInit(void); @@ -64,8 +64,8 @@ static BOOL ov49_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para static BOOL ov49_0225621C (UnkStruct_ov49_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) { - param0->unk_10 = PoketchSystem_GetPoketchData(poketchSys); - param0->unk_04.unk_00 = PoketchData_CurrentScreenColor(param0->unk_10); + param0->poketchData = PoketchSystem_GetPoketchData(poketchSys); + param0->unk_04.unk_00 = PoketchData_CurrentScreenColor(param0->poketchData); param0->unk_03 = param0->unk_04.unk_00; if (ov49_022563D4(&(param0->unk_08), &(param0->unk_04), param2)) { @@ -179,7 +179,7 @@ static BOOL ov49_02256348 (UnkStruct_ov49_0225621C * param0) if (v2 != param0->unk_03) { param0->unk_04.unk_00 = v2; param0->unk_03 = v2; - PoketchData_SetScreenColor(param0->unk_10, v2); + PoketchData_SetScreenColor(param0->poketchData, v2); return 1; } } diff --git a/src/overlay050/ov50_022561C0.c b/src/overlay050/ov50_022561C0.c index ed1011b9f8..f8458a5dda 100644 --- a/src/overlay050/ov50_022561C0.c +++ b/src/overlay050/ov50_022561C0.c @@ -24,7 +24,7 @@ typedef struct { UnkStruct_ov50_02256510_1 unk_04; UnkStruct_ov50_02256510 * unk_90; PoketchSystem *poketchSys; - PoketchData * unk_98; + PoketchData *poketchData; PoketchButtonManager * unk_9C; u32 unk_A0; u32 unk_A4; @@ -113,7 +113,7 @@ static BOOL ov50_0225621C (UnkStruct_ov50_022561D4 * param0, PoketchSystem *poke RTCDate v1; GetCurrentDate(&v1); - param0->unk_98 = PoketchSystem_GetPoketchData(poketchSys); + param0->poketchData = PoketchSystem_GetPoketchData(poketchSys); ov50_022562AC(&(param0->unk_04), param0, &v1); param0->unk_A8 = param0->unk_04.unk_0C[0].unk_02; @@ -158,7 +158,7 @@ static void ov50_022562AC (UnkStruct_ov50_02256510_1 * param0, UnkStruct_ov50_02 for (v1 = 0; v1 < (param0->unk_04); v1++) { param0->unk_0C[v1].unk_00 = v1 + 1; - param0->unk_0C[v1].unk_03 = PoketchData_CalendarMarked(param1->unk_98, param0->unk_00, v1 + 1); + param0->unk_0C[v1].unk_03 = PoketchData_CalendarMarked(param1->poketchData, param0->unk_00, v1 + 1); param0->unk_0C[v1].unk_02 = v2 + v1; } } @@ -250,10 +250,10 @@ static BOOL ov50_02256418 (UnkStruct_ov50_022561D4 * param0) if ((param0->unk_A4 >= param0->unk_A8) && (param0->unk_A4 <= param0->unk_AC)) { int v0 = (param0->unk_A4 - param0->unk_A8); - if (PoketchData_CalendarMarked(param0->unk_98, param0->unk_04.unk_00, v0 + 1)) { - PoketchData_ClearCalendarMark(param0->unk_98, param0->unk_04.unk_00, v0 + 1); + if (PoketchData_CalendarMarked(param0->poketchData, param0->unk_04.unk_00, v0 + 1)) { + PoketchData_ClearCalendarMark(param0->poketchData, param0->unk_04.unk_00, v0 + 1); } else { - PoketchData_SetCalendarMark(param0->unk_98, param0->unk_04.unk_00, v0 + 1); + PoketchData_SetCalendarMark(param0->poketchData, param0->unk_04.unk_00, v0 + 1); } param0->unk_04.unk_0C[v0].unk_03 ^= 1; diff --git a/src/overlay054/ov54_022561C0.c b/src/overlay054/ov54_022561C0.c index bfe1e0907f..f9d4a1f6dc 100644 --- a/src/overlay054/ov54_022561C0.c +++ b/src/overlay054/ov54_022561C0.c @@ -140,15 +140,15 @@ static BOOL ov54_0225621C (UnkStruct_ov54_0225621C * param0, PoketchSystem *poke ((48 + 40 * 0) + (48 / 2)) } }; - PoketchData * v1; + PoketchData *poketchData; int v2; - v1 = PoketchSystem_GetPoketchData(poketchSys); - param0->unk_04.unk_90 = PoketchData_PokemonHistorySize(v1); + poketchData = PoketchSystem_GetPoketchData(poketchSys); + param0->unk_04.unk_90 = PoketchData_PokemonHistorySize(poketchData); for (v2 = 0; v2 < param0->unk_04.unk_90; v2++) { - PoketchData_PokemonHistorySpeciesAndIcon(v1, v2, &(param0->unk_04.unk_00[v2].unk_00), &(param0->unk_04.unk_00[v2].unk_08)); - param0->unk_04.unk_00[v2].unk_04 = PoketchData_PokemonHistoryForm(v1, v2); + PoketchData_PokemonHistorySpeciesAndIcon(poketchData, v2, &(param0->unk_04.unk_00[v2].unk_00), &(param0->unk_04.unk_00[v2].unk_08)); + param0->unk_04.unk_00[v2].unk_04 = PoketchData_PokemonHistoryForm(poketchData, v2); } if (ov54_0225642C(&(param0->unk_98), &(param0->unk_04), param2)) { diff --git a/src/scrcmd.c b/src/scrcmd.c index 0966518001..f2d2a91de1 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -5213,10 +5213,10 @@ static BOOL ScrCmd_131 (ScriptContext * ctx) static BOOL ScrCmd_132 (ScriptContext * ctx) { - PoketchData * v0 = SaveData_PoketchData(ctx->fieldSystem->saveData); + PoketchData *poketchData = SaveData_PoketchData(ctx->fieldSystem->saveData); u16 * v1 = ScriptContext_GetVarPointer(ctx); - *v1 = PoketchData_IsEnabled(v0); + *v1 = PoketchData_IsEnabled(poketchData); return 0; } diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c index 47376ea7f2..0fab2b4185 100644 --- a/src/unk_02048DD8.c +++ b/src/unk_02048DD8.c @@ -338,8 +338,8 @@ static BOOL sub_02049348 (FieldSystem * fieldSystem) static BOOL sub_02049358 (FieldSystem * fieldSystem) { - PoketchData * v0 = SaveData_PoketchData(fieldSystem->saveData); - return PoketchData_IsEnabled(v0); + PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); + return PoketchData_IsEnabled(poketchData); } static BOOL sub_02049368 (FieldSystem * fieldSystem) diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c index 44445243d4..d5d5d167a0 100644 --- a/src/unk_0204B830.c +++ b/src/unk_0204B830.c @@ -725,18 +725,18 @@ static void sub_0204C428 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param static BOOL sub_0204C458 (FieldSystem * fieldSystem, void * param1) { - PoketchData * v0 = SaveData_PoketchData(fieldSystem->saveData); + PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); - return PoketchData_IsEnabled(v0); + return PoketchData_IsEnabled(poketchData); } static void sub_0204C474 (FieldSystem * fieldSystem, void * param1) { - PoketchData * v0 = SaveData_PoketchData(fieldSystem->saveData); + PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); - PoketchData_RegisterApp(v0, v1->val6.unk_00); + PoketchData_RegisterApp(poketchData, v1->val6.unk_00); } static void sub_0204C494 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c index 55e166264c..21941d99cb 100644 --- a/src/unk_02051D8C.c +++ b/src/unk_02051D8C.c @@ -285,7 +285,7 @@ void sub_020521B8 (BattleParams * param0, const FieldSystem * fieldSystem, SaveD param0->unk_14C = FieldOverworldState_GetWeather(v6); param0->unk_E4 = param5; param0->unk_190 = param6; - param0->unk_100 = SaveData_PoketchData(param2); + param0->poketchData = SaveData_PoketchData(param2); param0->unk_104 = sub_0202C878(param2); param0->unk_11C = sub_0202CD88(param2); param0->unk_120 = param4; @@ -342,7 +342,7 @@ void sub_02052348 (BattleParams * param0, const FieldSystem * fieldSystem, int p param0->unk_138 = sub_02055BA8(fieldSystem); param0->unk_E4 = fieldSystem->unk_98; param0->unk_190 = fieldSystem->unk_BC; - param0->unk_100 = SaveData_PoketchData(fieldSystem->saveData); + param0->poketchData = SaveData_PoketchData(fieldSystem->saveData); param0->unk_104 = sub_0202C878(fieldSystem->saveData); param0->unk_11C = sub_0202CD88(fieldSystem->saveData); param0->unk_120 = fieldSystem->unk_9C; diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 333c486f49..0eec9a0d58 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -65,7 +65,7 @@ #include "bag.h" #include "pokemon_summary_app.h" -UnkStruct_0207AE68 * sub_0207AE68(Party * param0, Pokemon * param1, int param2, Options * param3, int param4, PokedexData * param5, Bag * param6, UnkStruct_0202CD88 * param7, PoketchData * param8, int param9, int param10, int param11); +UnkStruct_0207AE68 * sub_0207AE68(Party * param0, Pokemon * param1, int param2, Options * param3, int param4, PokedexData * param5, Bag * param6, UnkStruct_0202CD88 * param7, PoketchData *poketchData, int param9, int param10, int param11); static void sub_0207B0A0(SysTask * param0, void * param1); BOOL sub_0207B0D0(UnkStruct_0207AE68 * param0); void sub_0207B0E0(UnkStruct_0207AE68 * param0); @@ -95,7 +95,7 @@ static const u8 Unk_020F0A2C[] = { 0x8 }; -UnkStruct_0207AE68 * sub_0207AE68 (Party * param0, Pokemon * param1, int param2, Options * param3, int param4, PokedexData * param5, Bag * param6, UnkStruct_0202CD88 * param7, PoketchData * param8, int param9, int param10, int param11) +UnkStruct_0207AE68 * sub_0207AE68 (Party * param0, Pokemon * param1, int param2, Options * param3, int param4, PokedexData * param5, Bag * param6, UnkStruct_0202CD88 * param7, PoketchData *poketchData, int param9, int param10, int param11) { UnkStruct_0207AE68 * v0; ArchivedSprite v1; @@ -154,7 +154,7 @@ UnkStruct_0207AE68 * sub_0207AE68 (Party * param0, Pokemon * param1, int param2, v0->unk_48 = param5; v0->unk_4C = param6; v0->unk_50 = param7; - v0->unk_54 = param8; + v0->poketchData = poketchData; v0->unk_78 = param9; v0->unk_7C = param10; @@ -417,7 +417,7 @@ static void sub_0207B180 (UnkStruct_0207AE68 * param0) sub_0202736C(param0->unk_48, param0->unk_28); sub_0202CF28(param0->unk_50, (1 + 11)); sub_0202CFEC(param0->unk_50, 22); - PoketchData_PokemonHistoryEnqueue(param0->unk_54, Pokemon_GetBoxPokemon(param0->unk_28)); + PoketchData_PokemonHistoryEnqueue(param0->poketchData, Pokemon_GetBoxPokemon(param0->unk_28)); if (Pokemon_GetValue(param0->unk_28, MON_DATA_HAS_NICKNAME, NULL) == 0) { Pokemon_SetValue(param0->unk_28, 179, NULL); @@ -749,7 +749,7 @@ static void sub_0207C028 (UnkStruct_0207AE68 * param0) sub_0202736C(param0->unk_48, v1); sub_0202CF28(param0->unk_50, (1 + 11)); sub_0202CFEC(param0->unk_50, 22); - PoketchData_PokemonHistoryEnqueue(param0->unk_54, Pokemon_GetBoxPokemon(v1)); + PoketchData_PokemonHistoryEnqueue(param0->poketchData, Pokemon_GetBoxPokemon(v1)); Heap_FreeToHeap(v1); Bag_TryRemoveItem(param0->unk_4C, 4, 1, param0->unk_5C); }