From 50d93ee84da4e1d320c6986f8ba0ed28f2a8346e Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 8 Apr 2025 15:12:29 -0400 Subject: [PATCH] BallSeals --- include/struct_decls/struct_0202CA1C_decl.h | 2 +- include/struct_defs/struct_0202CA1C.h | 4 ++-- include/struct_defs/struct_02097F18.h | 2 +- include/unk_0202C9F4.h | 22 +++++++++---------- src/overlay007/shop_menu.c | 2 +- src/scrcmd.c | 10 ++++----- src/unk_0202C9F4.c | 24 ++++++++++----------- src/unk_0204B830.c | 4 ++-- src/unk_0207CB08.c | 4 ++-- src/unk_02097B18.c | 2 +- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/include/struct_decls/struct_0202CA1C_decl.h b/include/struct_decls/struct_0202CA1C_decl.h index d73b3e51e6..780922d723 100644 --- a/include/struct_decls/struct_0202CA1C_decl.h +++ b/include/struct_decls/struct_0202CA1C_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_0202CA1C_DECL_H #define POKEPLATINUM_STRUCT_0202CA1C_DECL_H -typedef struct UnkStruct_0202CA1C_t UnkStruct_0202CA1C; +typedef struct BallSeals_t BallSeals; #endif // POKEPLATINUM_STRUCT_0202CA1C_DECL_H diff --git a/include/struct_defs/struct_0202CA1C.h b/include/struct_defs/struct_0202CA1C.h index d712772fa4..0fa16bc0d1 100644 --- a/include/struct_defs/struct_0202CA1C.h +++ b/include/struct_defs/struct_0202CA1C.h @@ -4,9 +4,9 @@ #include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_0202CA88.h" -typedef struct UnkStruct_0202CA1C_t { +typedef struct BallSeals_t { UnkStruct_0202CA28 unk_00[12]; UnkStruct_0202CA88 unk_120; -} UnkStruct_0202CA1C; +} BallSeals; #endif // POKEPLATINUM_STRUCT_0202CA1C_H diff --git a/include/struct_defs/struct_02097F18.h b/include/struct_defs/struct_02097F18.h index 72f24094ed..dfa03d5c3d 100644 --- a/include/struct_defs/struct_02097F18.h +++ b/include/struct_defs/struct_02097F18.h @@ -12,7 +12,7 @@ typedef struct { int unk_00; Pokemon *unk_04[6]; Party *unk_1C; - UnkStruct_0202CA1C *unk_20; + BallSeals *unk_20; Options *unk_24; SaveData *unk_28; u8 unk_2C; diff --git a/include/unk_0202C9F4.h b/include/unk_0202C9F4.h index cc68d5ce57..ce874e97a7 100644 --- a/include/unk_0202C9F4.h +++ b/include/unk_0202C9F4.h @@ -9,24 +9,24 @@ #include "savedata.h" int BallSeal_SaveSize(void); -void BallSeal_Init(UnkStruct_0202CA1C *param0); +void BallSeal_Init(BallSeals *param0); void sub_0202CA10(const UnkStruct_0202CA28 *param0, UnkStruct_0202CA28 *param1); -UnkStruct_0202CA1C *sub_0202CA1C(SaveData *param0); -UnkStruct_0202CA28 *sub_0202CA28(UnkStruct_0202CA1C *param0, int param1); -void sub_0202CA40(UnkStruct_0202CA1C *param0, UnkStruct_0202CA28 *param1, int param2); +BallSeals *SaveData_GetBallSeals(SaveData *param0); +UnkStruct_0202CA28 *sub_0202CA28(BallSeals *param0, int param1); +void sub_0202CA40(BallSeals *param0, UnkStruct_0202CA28 *param1, int param2); UnkStruct_0202CA64 *sub_0202CA64(UnkStruct_0202CA28 *param0, int param1); u8 sub_0202CA7C(const UnkStruct_0202CA64 *param0); u8 sub_0202CA80(const UnkStruct_0202CA64 *param0); u8 sub_0202CA84(const UnkStruct_0202CA64 *param0); -UnkStruct_0202CA88 *sub_0202CA88(UnkStruct_0202CA1C *param0); +UnkStruct_0202CA88 *sub_0202CA88(BallSeals *param0); u8 sub_0202CA90(const UnkStruct_0202CA88 *param0, int param1); BOOL sub_0202CA94(const UnkStruct_0202CA28 *param0, int param1); -int sub_0202CAB0(const UnkStruct_0202CA1C *param0, int param1); +int sub_0202CAB0(const BallSeals *param0, int param1); void sub_0202CADC(UnkStruct_0202CA88 *param0, int param1, int param2); -BOOL sub_0202CAE0(UnkStruct_0202CA1C *param0, int param1, s16 param2); -BOOL sub_0202CB20(UnkStruct_0202CA1C *param0, int param1, s16 param2); -BOOL sub_0202CB70(UnkStruct_0202CA1C *param0, int param1, s16 param2); -int sub_0202CBA8(const UnkStruct_0202CA1C *param0); -int sub_0202CBC8(const UnkStruct_0202CA1C *param0, int param1); +BOOL sub_0202CAE0(BallSeals *param0, int param1, s16 param2); +BOOL sub_0202CB20(BallSeals *param0, int param1, s16 param2); +BOOL sub_0202CB70(BallSeals *param0, int param1, s16 param2); +int sub_0202CBA8(const BallSeals *param0); +int sub_0202CBC8(const BallSeals *param0, int param1); #endif // POKEPLATINUM_UNK_0202C9F4_H diff --git a/src/overlay007/shop_menu.c b/src/overlay007/shop_menu.c index edfb67ef16..ff19f5c26a 100644 --- a/src/overlay007/shop_menu.c +++ b/src/overlay007/shop_menu.c @@ -259,7 +259,7 @@ void Shop_Start(FieldTask *task, FieldSystem *fieldSystem, u16 *shopItems, u8 ma } else if (shopMenu->martType == MART_TYPE_DECOR) { shopMenu->destInventory = SaveData_GetUndergroundData(fieldSystem->saveData); } else { - shopMenu->destInventory = sub_0202CA1C(fieldSystem->saveData); + shopMenu->destInventory = SaveData_GetBallSeals(fieldSystem->saveData); } Shop_SetItemsForSale(shopMenu, shopItems); diff --git a/src/scrcmd.c b/src/scrcmd.c index 55030ab025..1b7129e39b 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -3454,10 +3454,10 @@ static BOOL ScrCmd_06E(ScriptContext *ctx) static BOOL ScrCmd_2AB(ScriptContext *ctx) { - UnkStruct_0202CA1C *v0; + BallSeals *v0; u16 *v1 = ScriptContext_GetVarPointer(ctx); - v0 = sub_0202CA1C(ctx->fieldSystem->saveData); + v0 = SaveData_GetBallSeals(ctx->fieldSystem->saveData); *v1 = sub_0202CBA8(v0); return 0; @@ -3465,11 +3465,11 @@ static BOOL ScrCmd_2AB(ScriptContext *ctx) static BOOL ScrCmd_093(ScriptContext *ctx) { - UnkStruct_0202CA1C *v0; + BallSeals *v0; u16 v1 = ScriptContext_GetVar(ctx); u16 *v2 = ScriptContext_GetVarPointer(ctx); - v0 = sub_0202CA1C(ctx->fieldSystem->saveData); + v0 = SaveData_GetBallSeals(ctx->fieldSystem->saveData); *v2 = sub_0202CBC8(v0, v1); return 0; @@ -3480,7 +3480,7 @@ static BOOL ScrCmd_094(ScriptContext *ctx) u16 v0 = ScriptContext_GetVar(ctx); u16 v1 = ScriptContext_GetVar(ctx); - sub_0202CAE0(sub_0202CA1C(ctx->fieldSystem->saveData), v0, v1); + sub_0202CAE0(SaveData_GetBallSeals(ctx->fieldSystem->saveData), v0, v1); return 0; } diff --git a/src/unk_0202C9F4.c b/src/unk_0202C9F4.c index 667dcf8478..8138c3d607 100644 --- a/src/unk_0202C9F4.c +++ b/src/unk_0202C9F4.c @@ -12,10 +12,10 @@ int BallSeal_SaveSize(void) { - return sizeof(UnkStruct_0202CA1C); + return sizeof(BallSeals); } -void BallSeal_Init(UnkStruct_0202CA1C *param0) +void BallSeal_Init(BallSeals *param0) { int v0 = BallSeal_SaveSize(); MI_CpuFill8(param0, 0, v0); @@ -26,18 +26,18 @@ void sub_0202CA10(const UnkStruct_0202CA28 *param0, UnkStruct_0202CA28 *param1) MI_CpuCopy8(param0, param1, sizeof(UnkStruct_0202CA28)); } -UnkStruct_0202CA1C *sub_0202CA1C(SaveData *saveData) +BallSeals *SaveData_GetBallSeals(SaveData *saveData) { return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_BALL_SEALS); } -UnkStruct_0202CA28 *sub_0202CA28(UnkStruct_0202CA1C *param0, int param1) +UnkStruct_0202CA28 *sub_0202CA28(BallSeals *param0, int param1) { GF_ASSERT(param1 < 12); return ¶m0->unk_00[param1]; } -void sub_0202CA40(UnkStruct_0202CA1C *param0, UnkStruct_0202CA28 *param1, int param2) +void sub_0202CA40(BallSeals *param0, UnkStruct_0202CA28 *param1, int param2) { UnkStruct_0202CA28 *v0; @@ -68,7 +68,7 @@ u8 sub_0202CA84(const UnkStruct_0202CA64 *param0) return param0->unk_02; } -UnkStruct_0202CA88 *sub_0202CA88(UnkStruct_0202CA1C *param0) +UnkStruct_0202CA88 *sub_0202CA88(BallSeals *param0) { return ¶m0->unk_120; } @@ -91,7 +91,7 @@ BOOL sub_0202CA94(const UnkStruct_0202CA28 *param0, int param1) return 0; } -int sub_0202CAB0(const UnkStruct_0202CA1C *param0, int param1) +int sub_0202CAB0(const BallSeals *param0, int param1) { int v0, v1; int v2 = 0; @@ -112,7 +112,7 @@ void sub_0202CADC(UnkStruct_0202CA88 *param0, int param1, int param2) param0->unk_00[param1] = param2; } -BOOL sub_0202CAE0(UnkStruct_0202CA1C *param0, int param1, s16 param2) +BOOL sub_0202CAE0(BallSeals *param0, int param1, s16 param2) { int v0; int v1; @@ -137,7 +137,7 @@ BOOL sub_0202CAE0(UnkStruct_0202CA1C *param0, int param1, s16 param2) return 1; } -BOOL sub_0202CB20(UnkStruct_0202CA1C *param0, int param1, s16 param2) +BOOL sub_0202CB20(BallSeals *param0, int param1, s16 param2) { int v0; int v1; @@ -166,7 +166,7 @@ BOOL sub_0202CB20(UnkStruct_0202CA1C *param0, int param1, s16 param2) return 1; } -BOOL sub_0202CB70(UnkStruct_0202CA1C *param0, int param1, s16 param2) +BOOL sub_0202CB70(BallSeals *param0, int param1, s16 param2) { int v0; int v1; @@ -191,7 +191,7 @@ BOOL sub_0202CB70(UnkStruct_0202CA1C *param0, int param1, s16 param2) return 1; } -int sub_0202CBA8(const UnkStruct_0202CA1C *param0) +int sub_0202CBA8(const BallSeals *param0) { int v0; int v1 = 0; @@ -205,7 +205,7 @@ int sub_0202CBA8(const UnkStruct_0202CA1C *param0) return v1; } -int sub_0202CBC8(const UnkStruct_0202CA1C *param0, int param1) +int sub_0202CBC8(const BallSeals *param0, int param1) { int v0; int v1; diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c index 0da7c4513e..46482f5445 100644 --- a/src/unk_0204B830.c +++ b/src/unk_0204B830.c @@ -471,7 +471,7 @@ static BOOL sub_0204C044(FieldSystem *fieldSystem, void *param1) switch (v1) { case 1: - return sub_0202CB70(sub_0202CA1C(fieldSystem->saveData), v2, 1); + return sub_0202CB70(SaveData_GetBallSeals(fieldSystem->saveData), v2, 1); case 2: return 1; case 3: @@ -489,7 +489,7 @@ static void sub_0204C07C(FieldSystem *fieldSystem, void *param1) switch (v1) { case 1: - sub_0202CAE0(sub_0202CA1C(fieldSystem->saveData), v2, 1); + sub_0202CAE0(SaveData_GetBallSeals(fieldSystem->saveData), v2, 1); break; case 2: sub_02029E2C(sub_02029D04(sub_0202A750(fieldSystem->saveData)), v2, 1); diff --git a/src/unk_0207CB08.c b/src/unk_0207CB08.c index 6b30207202..069878dd83 100644 --- a/src/unk_0207CB08.c +++ b/src/unk_0207CB08.c @@ -103,10 +103,10 @@ static u32 sub_0207CBB4(SaveData *param0) static u32 sub_0207CBC0(SaveData *param0) { - UnkStruct_0202CA1C *v0; + BallSeals *v0; u32 v1, v2; - v0 = sub_0202CA1C(param0); + v0 = SaveData_GetBallSeals(param0); v2 = 0; for (v1 = 1; v1 <= 80; v1++) { diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c index ecd8f2f00f..12fe0799dc 100644 --- a/src/unk_02097B18.c +++ b/src/unk_02097B18.c @@ -314,7 +314,7 @@ static BOOL sub_02097F38(FieldTask *param0) case 0: FieldTransition_FinishMap(param0); - v1->unk_20 = sub_0202CA1C(v0->unk_10); + v1->unk_20 = SaveData_GetBallSeals(v0->unk_10); sub_02097F20(v1, 0); {