From 4904cb5026566341beba3feeda0ed7171a4a73b7 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 8 Apr 2025 15:08:41 -0400 Subject: [PATCH] PalPad --- include/field_battle_data_transfer.h | 2 +- include/overlay088/struct_ov88_0223C370.h | 2 +- include/struct_decls/struct_02027F8C_decl.h | 2 +- include/struct_defs/battle_system.h | 2 +- include/struct_defs/struct_02027F8C.h | 4 ++-- include/struct_defs/struct_0205C22C.h | 2 +- include/struct_defs/struct_0207A778.h | 2 +- include/struct_defs/struct_02095E80_t.h | 4 ++-- include/unk_02027F84.h | 14 ++++++------- src/field_battle_data_transfer.c | 6 +++--- src/overlay056/ov56_022561C0.c | 6 +++--- src/overlay088/ov88_0223B140.c | 6 +++--- src/unk_02027F84.c | 22 ++++++++++----------- src/unk_0205C22C.c | 8 ++++---- src/unk_0207A6DC.c | 12 +++++------ src/unk_02095CD4.c | 4 ++-- 16 files changed, 49 insertions(+), 49 deletions(-) diff --git a/include/field_battle_data_transfer.h b/include/field_battle_data_transfer.h index 1b5a3ead88..47d6d064ce 100644 --- a/include/field_battle_data_transfer.h +++ b/include/field_battle_data_transfer.h @@ -49,7 +49,7 @@ typedef struct FieldBattleDTO { BattleRecords battleRecords; GameRecords *records; JournalEntry *journalEntry; - UnkStruct_02027F8C *unk_124; + PalPad *unk_124; int background; enum BattleTerrain terrain; int mapLabelTextID; diff --git a/include/overlay088/struct_ov88_0223C370.h b/include/overlay088/struct_ov88_0223C370.h index 0f2ba199dc..7d8638e52a 100644 --- a/include/overlay088/struct_ov88_0223C370.h +++ b/include/overlay088/struct_ov88_0223C370.h @@ -19,7 +19,7 @@ typedef struct { FieldSystem *fieldSystem; TrainerInfo *unk_04; Party *unk_08; - UnkStruct_02027F8C *unk_0C; + PalPad *unk_0C; SaveData *unk_10; UnkStruct_0202C878 *unk_14; Options *unk_18; diff --git a/include/struct_decls/struct_02027F8C_decl.h b/include/struct_decls/struct_02027F8C_decl.h index ed7991ecb6..def6b3f6dc 100644 --- a/include/struct_decls/struct_02027F8C_decl.h +++ b/include/struct_decls/struct_02027F8C_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_02027F8C_DECL_H #define POKEPLATINUM_STRUCT_02027F8C_DECL_H -typedef struct UnkStruct_02027F8C_t UnkStruct_02027F8C; +typedef struct PalPad_t PalPad; #endif // POKEPLATINUM_STRUCT_02027F8C_DECL_H diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index bc46193c61..84f156b3f6 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -78,7 +78,7 @@ struct BattleSystem { UnkStruct_0200C440 *unk_1A8; void *unk_1AC; Options *unk_1B0; - UnkStruct_02027F8C *unk_1B4; + PalPad *unk_1B4; void *unk_1B8; u8 *unk_1BC; UnkStruct_ov10_0221F800 *unk_1C0; diff --git a/include/struct_defs/struct_02027F8C.h b/include/struct_defs/struct_02027F8C.h index c71c265340..23fa9497b9 100644 --- a/include/struct_defs/struct_02027F8C.h +++ b/include/struct_defs/struct_02027F8C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_02027F8C_H #define POKEPLATINUM_STRUCT_02027F8C_H -typedef struct UnkStruct_02027F8C_t { +typedef struct PalPad_t { u16 unk_00[8]; u32 unk_10; u8 unk_14; @@ -12,6 +12,6 @@ typedef struct UnkStruct_02027F8C_t { u8 unk_58[16]; u8 unk_68[16]; u8 unk_78[16]; -} UnkStruct_02027F8C; +} PalPad; #endif // POKEPLATINUM_STRUCT_02027F8C_H diff --git a/include/struct_defs/struct_0205C22C.h b/include/struct_defs/struct_0205C22C.h index ebd3de1428..2ce6e7d3d0 100644 --- a/include/struct_defs/struct_0205C22C.h +++ b/include/struct_defs/struct_0205C22C.h @@ -17,7 +17,7 @@ typedef struct UnkStruct_0205C22C_t { PlayerAvatar *playerAvatar; UnkStruct_0205C680 unk_0C[50 + 1]; FieldSystem *fieldSystem; - UnkStruct_02027F8C *unk_474; + PalPad *unk_474; UnkStruct_0205C95C *unk_478; int unk_47C; int unk_480; diff --git a/include/struct_defs/struct_0207A778.h b/include/struct_defs/struct_0207A778.h index f3a0c06b76..a3505cf18a 100644 --- a/include/struct_defs/struct_0207A778.h +++ b/include/struct_defs/struct_0207A778.h @@ -12,7 +12,7 @@ typedef struct { BgConfig *unk_04; Window *unk_08; PaletteData *unk_0C; - UnkStruct_02027F8C *unk_10[4]; + PalPad *unk_10[4]; u8 unk_20[0x1000]; u8 unk_1020; u8 unk_1021; diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h index 8161f14c32..7429e8dd1f 100644 --- a/include/struct_defs/struct_02095E80_t.h +++ b/include/struct_defs/struct_02095E80_t.h @@ -108,8 +108,8 @@ struct UnkStruct_02095E80_t { Party *unk_2270; Party *unk_2274; ChatotCry *unk_2278; - UnkStruct_02027F8C *unk_227C; - UnkStruct_02027F8C unk_2280; + PalPad *unk_227C; + PalPad unk_2280; int unk_2308; int unk_230C; int unk_2310; diff --git a/include/unk_02027F84.h b/include/unk_02027F84.h index 7fab392c43..6210d3a617 100644 --- a/include/unk_02027F84.h +++ b/include/unk_02027F84.h @@ -6,12 +6,12 @@ #include "savedata.h" int PalPad_SaveSize(void); -UnkStruct_02027F8C *sub_02027F8C(SaveData *saveData); -void PalPad_Init(UnkStruct_02027F8C *param0); -const u16 *sub_02027FBC(const UnkStruct_02027F8C *param0, int param1); -u8 sub_02027FC4(const UnkStruct_02027F8C *param0, int param1); -BOOL sub_02027FCC(const UnkStruct_02027F8C *param0, const UnkStruct_02027F8C *param1); -void sub_02027FEC(UnkStruct_02027F8C *param0, UnkStruct_02027F8C *param1, int param2, int heapID); -int sub_020280E0(UnkStruct_02027F8C *param0, u32 param1); +PalPad *SaveData_PalPad(SaveData *saveData); +void PalPad_Init(PalPad *param0); +const u16 *sub_02027FBC(const PalPad *param0, int param1); +u8 sub_02027FC4(const PalPad *param0, int param1); +BOOL sub_02027FCC(const PalPad *param0, const PalPad *param1); +void sub_02027FEC(PalPad *param0, PalPad *param1, int param2, int heapID); +int sub_020280E0(PalPad *param0, u32 param1); #endif // POKEPLATINUM_UNK_02027F84_H diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c index 483646d704..a8d5667232 100644 --- a/src/field_battle_data_transfer.c +++ b/src/field_battle_data_transfer.c @@ -275,7 +275,7 @@ void FieldBattleDTO_InitFromGameState(FieldBattleDTO *dto, const FieldSystem *fi dto->unk_104 = sub_0202C878(save); dto->records = SaveData_GetGameRecords(save); dto->journalEntry = journalEntry; - dto->unk_124 = sub_02027F8C(save); + dto->unk_124 = SaveData_PalPad(save); dto->mapHeaderID = mapHeaderID; dto->saveData = save; } @@ -330,7 +330,7 @@ void FieldBattleDTO_InitWithNormalizedMonLevels(FieldBattleDTO *dto, const Field dto->unk_104 = sub_0202C878(fieldSystem->saveData); dto->records = SaveData_GetGameRecords(fieldSystem->saveData); dto->journalEntry = fieldSystem->journalEntry; - dto->unk_124 = sub_02027F8C(fieldSystem->saveData); + dto->unk_124 = SaveData_PalPad(fieldSystem->saveData); dto->mapHeaderID = fieldSystem->location->mapId; dto->saveData = fieldSystem->saveData; @@ -396,7 +396,7 @@ void FieldBattleDTO_InitWithPartyOrder(FieldBattleDTO *dto, const FieldSystem *f dto->records = SaveData_GetGameRecords(fieldSystem->saveData); dto->journalEntry = fieldSystem->journalEntry; dto->mapHeaderID = fieldSystem->location->mapId; - dto->unk_124 = sub_02027F8C(fieldSystem->saveData); + dto->unk_124 = SaveData_PalPad(fieldSystem->saveData); dto->saveData = fieldSystem->saveData; if (sub_020326C4(sub_0203895C())) { diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c index 9f67e13a57..e3132d2573 100644 --- a/src/overlay056/ov56_022561C0.c +++ b/src/overlay056/ov56_022561C0.c @@ -116,7 +116,7 @@ static int ov56_02256A68(UnkStruct_ov56_02256468 *param0); static int ov56_02256BC0(UnkStruct_ov56_02256468 *param0); static void ov56_02257100(UnkStruct_ov56_02256468 *param0); static void ov56_02257048(UnkStruct_ov56_02256468 *param0, TrainerInfo *param1, Sentence *param2, u32 param3); -static Strbuf *ov56_02256E5C(UnkStruct_02027F8C *param0, u32 param1, StringTemplate *param2, MessageLoader *param3, TrainerInfo *param4); +static Strbuf *ov56_02256E5C(PalPad *param0, u32 param1, StringTemplate *param2, MessageLoader *param3, TrainerInfo *param4); static void ov56_02256D64(BgConfig *param0, NNSG2dScreenData *param1, UnkStruct_ov56_022562EC *param2, int param3, int param4, int *param5); static void ov56_0225710C(UnkStruct_ov56_02256468 *param0); static void ov56_0225712C(UnkStruct_ov56_02256468 *param0); @@ -753,7 +753,7 @@ static void ov56_02256D64(BgConfig *param0, NNSG2dScreenData *param1, UnkStruct_ Bg_CopyTilemapBufferRangeToVRAM(param0, 7, Bg_GetTilemapBuffer(param0, 7), 32 * 24 * 2, 0); } -static Strbuf *ov56_02256E5C(UnkStruct_02027F8C *param0, u32 param1, StringTemplate *param2, MessageLoader *param3, TrainerInfo *param4) +static Strbuf *ov56_02256E5C(PalPad *param0, u32 param1, StringTemplate *param2, MessageLoader *param3, TrainerInfo *param4) { Strbuf *v0 = NULL; Strbuf *v1; @@ -785,7 +785,7 @@ static Strbuf *ov56_02256E5C(UnkStruct_02027F8C *param0, u32 param1, StringTempl static void ov56_02256EE8(UnkStruct_ov56_02256468 *param0, u32 param1, Sentence *param2, TrainerInfo *param3) { UnkStruct_0205C95C *v0 = param0->unk_2D4; - UnkStruct_02027F8C *v1 = param0->unk_04->unk_474; + PalPad *v1 = param0->unk_04->unk_474; int *v2; if (v0->unk_348 == 30) { diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index decf06588d..c3e1ed02d6 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -160,7 +160,7 @@ static int ov88_0223D7AC(UnkStruct_02095E80 *param0); static int ov88_0223D854(UnkStruct_02095E80 *param0); static int ov88_0223D69C(UnkStruct_02095E80 *param0); static void ov88_0223D1EC(UnkStruct_02095E80 *param0, int param1); -static void ov88_0223D0D4(TrainerInfo *param0, UnkStruct_02027F8C *param1, UnkStruct_02027F8C *param2); +static void ov88_0223D0D4(TrainerInfo *param0, PalPad *param1, PalPad *param2); static void ov88_0223C488(NARC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); static const int Unk_ov88_0223EF9C[][2] = { @@ -1646,7 +1646,7 @@ static void ov88_0223D0C0(SaveData *param0) CommSys_SendData(32, v0, 14); } -static void ov88_0223D0D4(TrainerInfo *param0, UnkStruct_02027F8C *param1, UnkStruct_02027F8C *param2) +static void ov88_0223D0D4(TrainerInfo *param0, PalPad *param1, PalPad *param2) { int v0; @@ -1664,7 +1664,7 @@ static void ov88_0223D0D4(TrainerInfo *param0, UnkStruct_02027F8C *param1, UnkSt param2->unk_78[v0] = param1[v0].unk_16; } - CommSys_SendDataHuge(28, param2, sizeof(UnkStruct_02027F8C)); + CommSys_SendDataHuge(28, param2, sizeof(PalPad)); } static void ov88_0223D140(ChatotCry *param0) diff --git a/src/unk_02027F84.c b/src/unk_02027F84.c index a4c85e39cf..9243020145 100644 --- a/src/unk_02027F84.c +++ b/src/unk_02027F84.c @@ -11,35 +11,35 @@ int PalPad_SaveSize(void) { - return sizeof(UnkStruct_02027F8C) * 16; + return sizeof(PalPad) * 16; } -UnkStruct_02027F8C *sub_02027F8C(SaveData *saveData) +PalPad *SaveData_PalPad(SaveData *saveData) { return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_PAL_PAD); } -void PalPad_Init(UnkStruct_02027F8C *param0) +void PalPad_Init(PalPad *param0) { int v0; for (v0 = 0; v0 < 16; v0++) { - memset(¶m0[v0], 0, sizeof(UnkStruct_02027F8C)); + memset(¶m0[v0], 0, sizeof(PalPad)); param0[v0].unk_00[0] = 0xffff; } } -const u16 *sub_02027FBC(const UnkStruct_02027F8C *param0, int param1) +const u16 *sub_02027FBC(const PalPad *param0, int param1) { return param0[param1].unk_00; } -u8 sub_02027FC4(const UnkStruct_02027F8C *param0, int param1) +u8 sub_02027FC4(const PalPad *param0, int param1) { return param0->unk_68[param1]; } -BOOL sub_02027FCC(const UnkStruct_02027F8C *param0, const UnkStruct_02027F8C *param1) +BOOL sub_02027FCC(const PalPad *param0, const PalPad *param1) { if (0 == CharCode_Compare(param0->unk_00, param1->unk_00)) { if (param0->unk_10 == param1->unk_10) { @@ -50,11 +50,11 @@ BOOL sub_02027FCC(const UnkStruct_02027F8C *param0, const UnkStruct_02027F8C *pa return 0; } -void sub_02027FEC(UnkStruct_02027F8C *param0, UnkStruct_02027F8C *param1, int param2, int heapID) +void sub_02027FEC(PalPad *param0, PalPad *param1, int param2, int heapID) { int v0, v1, v2; int v3[5]; - UnkStruct_02027F8C *v4 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02027F8C) * 16); + PalPad *v4 = Heap_AllocFromHeap(heapID, sizeof(PalPad) * 16); PalPad_Init(v4); for (v0 = 0; v0 < param2; v0++) { @@ -90,11 +90,11 @@ void sub_02027FEC(UnkStruct_02027F8C *param0, UnkStruct_02027F8C *param1, int pa } } - memcpy(param0, v4, sizeof(UnkStruct_02027F8C) * 16); + memcpy(param0, v4, sizeof(PalPad) * 16); Heap_FreeToHeap(v4); } -int sub_020280E0(UnkStruct_02027F8C *param0, u32 param1) +int sub_020280E0(PalPad *param0, u32 param1) { int v0, v1; diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c index b9623fee6f..540d2590f5 100644 --- a/src/unk_0205C22C.c +++ b/src/unk_0205C22C.c @@ -38,8 +38,8 @@ #include "constdata/const_020ED570.h" static void sub_0205C304(SysTask *param0, void *param1); -static void sub_0205C44C(UnkStruct_0205C22C *param0, UnkStruct_0205B43C *param1, MapObjectManager *param2, UnkStruct_02027F8C *param3); -static int sub_0205C340(UnkStruct_0205C22C *param0, int param1, WMBssDesc *param2, UnkStruct_02027F8C *param3); +static void sub_0205C44C(UnkStruct_0205C22C *param0, UnkStruct_0205B43C *param1, MapObjectManager *param2, PalPad *param3); +static int sub_0205C340(UnkStruct_0205C22C *param0, int param1, WMBssDesc *param2, PalPad *param3); static void sub_0205C51C(UnkStruct_0205C22C *param0, MapObjectManager *param1); static void sub_0205C680(UnkStruct_0205C680 *param0, int param1); static void sub_0205C6BC(UnkStruct_0205C680 *param0); @@ -118,7 +118,7 @@ static void sub_0205C304(SysTask *task, void *param1) } } -static int sub_0205C340(UnkStruct_0205C22C *param0, int param1, WMBssDesc *param2, UnkStruct_02027F8C *param3) +static int sub_0205C340(UnkStruct_0205C22C *param0, int param1, WMBssDesc *param2, PalPad *param3) { int v0, v1, v2 = 0; UnkStruct_0203330C *v3; @@ -186,7 +186,7 @@ static void sub_0205C444(UnkStruct_0205C680 param0[], int param1, int param2) param0[param1].unk_00 = param2; } -static void sub_0205C44C(UnkStruct_0205C22C *param0, UnkStruct_0205B43C *param1, MapObjectManager *param2, UnkStruct_02027F8C *param3) +static void sub_0205C44C(UnkStruct_0205C22C *param0, UnkStruct_0205B43C *param1, MapObjectManager *param2, PalPad *param3) { WMBssDesc *v0; int v1; diff --git a/src/unk_0207A6DC.c b/src/unk_0207A6DC.c index 02a52fd9bd..ed46f053d1 100644 --- a/src/unk_0207A6DC.c +++ b/src/unk_0207A6DC.c @@ -75,7 +75,7 @@ static void sub_0207ADB4(int param0, int param1, void *param2, void *param3); static void sub_0207ACB4(SysTask *param0, void *param1); static void sub_0207AD40(SysTask *param0, void *param1); static void sub_0207AE34(int param0, int param1, void *param2, void *param3); -static void sub_0207ADD4(TrainerInfo *param0, UnkStruct_02027F8C *param1, UnkStruct_02027F8C *param2); +static void sub_0207ADD4(TrainerInfo *param0, PalPad *param1, PalPad *param2); static const CommCmdTable Unk_020F099C[] = { { sub_0207ADB4, sub_02032944, NULL }, @@ -440,14 +440,14 @@ BOOL sub_0207AAC8(UnkStruct_0207A778 *param0) BOOL sub_0207AAFC(UnkStruct_0207A778 *param0) { - UnkStruct_02027F8C *v0; + PalPad *v0; TrainerInfo *v1; if (CommSys_SendRingRemainingSize() != 264) { return 0; } - v0 = (UnkStruct_02027F8C *)¶m0->unk_20[0]; + v0 = (PalPad *)¶m0->unk_20[0]; if (param0->unk_00->battleType & BATTLE_TYPE_FRONTIER) { v1 = param0->unk_00->trainerInfo[CommSys_CurNetId() * 2]; @@ -455,7 +455,7 @@ BOOL sub_0207AAFC(UnkStruct_0207A778 *param0) v1 = param0->unk_00->trainerInfo[CommSys_CurNetId()]; } - sub_0207ADD4(v1, param0->unk_00->unk_124, (UnkStruct_02027F8C *)param0->unk_20); + sub_0207ADD4(v1, param0->unk_00->unk_124, (PalPad *)param0->unk_20); { int v2; @@ -651,7 +651,7 @@ static void sub_0207ADB4(int param0, int param1, void *param2, void *param3) ov16_0223F350(v0, 1); } -static void sub_0207ADD4(TrainerInfo *param0, UnkStruct_02027F8C *param1, UnkStruct_02027F8C *param2) +static void sub_0207ADD4(TrainerInfo *param0, PalPad *param1, PalPad *param2) { int v0; @@ -675,7 +675,7 @@ void sub_0207AE34(int param0, int param1, void *param2, void *param3) UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3; if (CommSys_CurNetId() != param0) { - sub_02027FEC(v0->unk_00->unk_124, (UnkStruct_02027F8C *)param2, 1, HEAP_ID_BATTLE); + sub_02027FEC(v0->unk_00->unk_124, (PalPad *)param2, 1, HEAP_ID_BATTLE); } v0->unk_1020++; diff --git a/src/unk_02095CD4.c b/src/unk_02095CD4.c index edbbab9612..3050705225 100644 --- a/src/unk_02095CD4.c +++ b/src/unk_02095CD4.c @@ -156,7 +156,7 @@ void sub_02095DFC(int param0, int param1, void *param2, void *param3) UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88; if (CommSys_CurNetId() != param0) { - sub_02027FEC(v0->unk_227C, (UnkStruct_02027F8C *)param2, 1, HEAP_ID_26); + sub_02027FEC(v0->unk_227C, (PalPad *)param2, 1, HEAP_ID_26); v0->unk_54 = 3; } } @@ -189,7 +189,7 @@ static int sub_02095E70(void) static int sub_02095E74(void) { - return sizeof(UnkStruct_02027F8C); + return sizeof(PalPad); } static int sub_02095E78(void)