Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-26 00:32:20 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Poffin name cleanup (#522)

Browse Source 
* Poffin cleanup

* Review changes
This commit is contained in:
Eduardo Quezada 2025-05-26 14:57:50 -04:00 committed by GitHub
parent 3267cab139
commit ff257ab7e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/poffin.h
View File

@ -47,15 +47,15 @@ int sub_0202A9E4(Poffin *poffin, u8 *param1, u8 param2, BOOL isFoul);
void Poffin_StoreAttributesToArray(Poffin *poffin, u8 *dest);
u8 Poffin_CalcLevel(Poffin *poffin);
PoffinCase *SaveData_GetPoffinCase(SaveData *saveData);
int Poffin_SaveSize(void);
void Poffin_Init(PoffinCase *poffinCase);
u16 Poffin_GetEmptyCaseSlot(PoffinCase *poffinCase);
u16 Poffin_AddToCase(PoffinCase *poffinCase, Poffin *poffin);
BOOL Poffin_ClearCaseSlot(PoffinCase *poffinCase, u16 slot);
void Poffin_CompactCase(PoffinCase *poffinCase);
void Poffin_CopyToCaseSlot(PoffinCase *poffinCase, u16 destSlot, Poffin *poffin);
Poffin *Poffin_AllocateForCaseSlot(PoffinCase *poffinCase, u16 destSlot, int heapID);
u16 Poffin_GetNumberOfFilledSlots(PoffinCase *poffinCase);
u16 Poffin_GetNumberOfEmptySlots(PoffinCase *poffinCase);
int PoffinCase_SaveSize(void);
void PoffinCase_Init(PoffinCase *poffinCase);
u16 PoffinCase_GetEmptySlot(PoffinCase *poffinCase);
u16 PoffinCase_AddPoffin(PoffinCase *poffinCase, Poffin *poffin);
BOOL PoffinCase_ClearSlot(PoffinCase *poffinCase, u16 slot);
void PoffinCase_Compact(PoffinCase *poffinCase);
void PoffinCase_CopyPoffinToSlot(PoffinCase *poffinCase, u16 destSlot, Poffin *poffin);
Poffin *PoffinCase_AllocateForSlot(PoffinCase *poffinCase, u16 destSlot, int heapID);
u16 PoffinCase_CountFilledSlots(PoffinCase *poffinCase);
u16 PoffinCase_CountEmptySlots(PoffinCase *poffinCase);
#endif // POKEPLATINUM_POFFIN_H

2
include/struct_defs/struct_0203D9B8.h
View File

@ -16,7 +16,7 @@ typedef struct {
u8 unk_03;
u16 unk_04;
u16 unk_06;
PoffinCase *unk_08;
PoffinCase *poffinCase;
TrainerInfo *unk_0C;
Party *unk_10;
Bag *unk_14;

2
src/overlay065/ov65_0222DCE0.c
View File

@ -3788,7 +3788,7 @@ static u32 ov65_022319B8(UnkStruct_ov65_0222EBE0 *param0)
return 3;
}
if (Poffin_GetNumberOfFilledSlots(SaveData_GetPoffinCase(param0->saveData)) >= MAX_POFFINS) {
if (PoffinCase_CountFilledSlots(SaveData_GetPoffinCase(param0->saveData)) >= MAX_POFFINS) {
return 2;
}

4
src/overlay083/ov83_0223B5A0.c
View File

@ -712,7 +712,7 @@ static int ov83_0223BF74(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
if ((v0 == 1) || (v0 == 2)) {
if (v0 == 1) {
if (Poffin_GetNumberOfFilledSlots(param0->unk_10->poffinCase) >= MAX_POFFINS) {
if (PoffinCase_CountFilledSlots(param0->unk_10->poffinCase) >= MAX_POFFINS) {
ov83_0223EC8C(&param1->unk_6A0, 2);
(*param2) = 10;
param1->unk_1C = (30 * 5);
@ -1091,7 +1091,7 @@ static BOOL ov83_0223C8B0(UnkStruct_ov83_0223C344 *param0, Poffin *param1, int p
TVBroadcast *v4 = SaveData_GetTVBroadcast(param0->unk_10->saveData);
for (v0 = 0; v0 < param2; v0++) {
v1 = Poffin_AddToCase(param0->unk_10->poffinCase, param1);
v1 = PoffinCase_AddPoffin(param0->unk_10->poffinCase, param1);
if (v1 == POFFIN_NONE) {
v3 = 0;

2
src/overlay084/ov84_0223F040.c
View File

@ -687,7 +687,7 @@ void ov84_02240328(UnkStruct_ov84_0223B5A0 *param0)
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 109);
StringTemplate_SetNumber(param0->unk_118, 0, Poffin_GetNumberOfFilledSlots(SaveData_GetPoffinCase(param0->unk_C4->saveData)), 3, 1, 1);
StringTemplate_SetNumber(param0->unk_118, 0, PoffinCase_CountFilledSlots(SaveData_GetPoffinCase(param0->unk_C4->saveData)), 3, 1, 1);
StringTemplate_Format(param0->unk_118, param0->unk_3F8, v1);
Strbuf_Free(v1);

42
src/poffin.c
View File

@ -100,7 +100,7 @@ static void Poffin_MakeFoul(Poffin *poffin, u8 param1)
int sub_0202A9E4(Poffin *poffin, u8 *param1, u8 param2, BOOL isFoul)
{
int v0, v1 = 0;
int i, v1 = 0;
u8 v2[5];
u8 v3 = 0, v4 = 0;
@ -111,13 +111,13 @@ int sub_0202A9E4(Poffin *poffin, u8 *param1, u8 param2, BOOL isFoul)
return v4;
}
for (v0 = 0; v0 < 5; v0++) {
if (param1[v0]) {
if (param1[v0] >= 50) {
for (i = 0; i < 5; i++) {
if (param1[i]) {
if (param1[i] >= 50) {
v3 = 1;
}
v2[v1++] = v0;
v2[v1++] = i;
}
}
@ -148,8 +148,8 @@ int sub_0202A9E4(Poffin *poffin, u8 *param1, u8 param2, BOOL isFoul)
v4 = 28;
}
for (v0 = 0; v0 < 5; v0++) {
poffin->attributes[v0 + 1] = param1[v0];
for (i = 0; i < 5; i++) {
poffin->attributes[i + 1] = param1[i];
}
poffin->flavor = v4;
@ -226,12 +226,12 @@ PoffinCase *SaveData_GetPoffinCase(SaveData *saveData)
return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_POFFINS);
}
int Poffin_SaveSize(void)
int PoffinCase_SaveSize(void)
{
return sizeof(Poffin) * 100;
return sizeof(PoffinCase);
}
void Poffin_Init(PoffinCase *poffinCase)
void PoffinCase_Init(PoffinCase *poffinCase)
{
int i;
@ -240,7 +240,7 @@ void Poffin_Init(PoffinCase *poffinCase)
}
}
u16 Poffin_GetEmptyCaseSlot(PoffinCase *poffinCase)
u16 PoffinCase_GetEmptySlot(PoffinCase *poffinCase)
{
u16 i;
@ -253,9 +253,9 @@ u16 Poffin_GetEmptyCaseSlot(PoffinCase *poffinCase)
return POFFIN_NONE;
}
u16 Poffin_AddToCase(PoffinCase *poffinCase, Poffin *poffin)
u16 PoffinCase_AddPoffin(PoffinCase *poffinCase, Poffin *poffin)
{
u16 slotId = Poffin_GetEmptyCaseSlot(poffinCase);
u16 slotId = PoffinCase_GetEmptySlot(poffinCase);
if (slotId == POFFIN_NONE) {
return slotId;
@ -265,7 +265,7 @@ u16 Poffin_AddToCase(PoffinCase *poffinCase, Poffin *poffin)
return slotId;
}
BOOL Poffin_ClearCaseSlot(PoffinCase *poffinCase, u16 slot)
BOOL PoffinCase_ClearSlot(PoffinCase *poffinCase, u16 slot)
{
if (slot >= MAX_POFFINS) {
return FALSE;
@ -275,7 +275,7 @@ BOOL Poffin_ClearCaseSlot(PoffinCase *poffinCase, u16 slot)
return TRUE;
}
static u16 Poffin_GetFirstValidPoffin(PoffinCase *poffinCase, u16 startingSlot)
static u16 PoffinCase_GetFirstValidPoffin(PoffinCase *poffinCase, u16 startingSlot)
{
u16 i;
@ -288,7 +288,7 @@ static u16 Poffin_GetFirstValidPoffin(PoffinCase *poffinCase, u16 startingSlot)
return POFFIN_NONE;
}
void Poffin_CompactCase(PoffinCase *poffinCase)
void PoffinCase_Compact(PoffinCase *poffinCase)
{
u16 i, unused;
u16 nextValidSlotNum, emptySlotNum, targetSlotNum;
@ -302,7 +302,7 @@ void Poffin_CompactCase(PoffinCase *poffinCase)
// found an empty slot, proceed
emptySlotNum = i;
nextValidSlotNum = Poffin_GetFirstValidPoffin(poffinCase, emptySlotNum); // find the next valid poffin
nextValidSlotNum = PoffinCase_GetFirstValidPoffin(poffinCase, emptySlotNum); // find the next valid poffin
if (nextValidSlotNum == POFFIN_NONE) {
break;
@ -320,7 +320,7 @@ void Poffin_CompactCase(PoffinCase *poffinCase)
}
}
void Poffin_CopyToCaseSlot(PoffinCase *poffinCase, u16 destSlot, Poffin *poffin)
void PoffinCase_CopyPoffinToSlot(PoffinCase *poffinCase, u16 destSlot, Poffin *poffin)
{
if (destSlot >= MAX_POFFINS) {
Poffin_Clear(poffin);
@ -331,7 +331,7 @@ void Poffin_CopyToCaseSlot(PoffinCase *poffinCase, u16 destSlot, Poffin *poffin)
return;
}
Poffin *Poffin_AllocateForCaseSlot(PoffinCase *poffinCase, u16 destSlot, int heapID)
Poffin *PoffinCase_AllocateForSlot(PoffinCase *poffinCase, u16 destSlot, int heapID)
{
Poffin *poffin = Poffin_New(heapID);
@ -344,7 +344,7 @@ Poffin *Poffin_AllocateForCaseSlot(PoffinCase *poffinCase, u16 destSlot, int hea
return poffin;
}
u16 Poffin_GetNumberOfFilledSlots(PoffinCase *poffinCase)
u16 PoffinCase_CountFilledSlots(PoffinCase *poffinCase)
{
u16 j = 0, i;
@ -357,7 +357,7 @@ u16 Poffin_GetNumberOfFilledSlots(PoffinCase *poffinCase)
return j;
}
u16 Poffin_GetNumberOfEmptySlots(PoffinCase *poffinCase)
u16 PoffinCase_CountEmptySlots(PoffinCase *poffinCase)
{
u16 i, j = 0;

2
src/savedata/save_table.c
View File

@ -62,7 +62,7 @@ const SaveTableEntry gSaveTable[] = {
{ SAVE_TABLE_ENTRY_REGULATION_BATTLES, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)RegulationBattles_SaveSize, (SaveEntryInitFunc)RegulationBattles_Init },
{ SAVE_TABLE_ENTRY_IMAGE_CLIPS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)ImageClip_SaveSize, (SaveEntryInitFunc)ImageClip_Init },
{ SAVE_TABLE_ENTRY_MAILBOX, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)MailBox_SaveSize, (SaveEntryInitFunc)MailBox_Init },
{ SAVE_TABLE_ENTRY_POFFINS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Poffin_SaveSize, (SaveEntryInitFunc)Poffin_Init },
{ SAVE_TABLE_ENTRY_POFFINS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)PoffinCase_SaveSize, (SaveEntryInitFunc)PoffinCase_Init },
{ SAVE_TABLE_ENTRY_RECORD_MIXED_RNG, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)RecordMixedRNG_SaveSize, (SaveEntryInitFunc)RecordMixedRNG_Init },
{ SAVE_TABLE_ENTRY_JOURNAL, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Journal_SaveSize, (SaveEntryInitFunc)Journal_Init10 },
{ SAVE_TABLE_ENTRY_TRAINER_CARD, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)TrainerCard_SaveSize, (SaveEntryInitFunc)TrainerCard_Init },

18
src/scrcmd.c
View File

@ -4106,7 +4106,7 @@ static BOOL ScrCmd_1D8(ScriptContext *ctx)
return FALSE;
}
if (Poffin_GetNumberOfFilledSlots(SaveData_GetPoffinCase(ctx->fieldSystem->saveData)) >= MAX_POFFINS) {
if (PoffinCase_CountFilledSlots(SaveData_GetPoffinCase(ctx->fieldSystem->saveData)) >= MAX_POFFINS) {
*v0 = 2;
return FALSE;
}
@ -7063,14 +7063,14 @@ static BOOL ScrCmd_289(ScriptContext *ctx)
}
u8 v4 = ScriptContext_GetVar(ctx);
Poffin *v0 = Poffin_New(HEAP_ID_FIELD);
int v1 = sub_0202A9E4(v0, v3, v4, FALSE);
PoffinCase *v2 = SaveData_GetPoffinCase(ctx->fieldSystem->saveData);
u16 v5 = Poffin_AddToCase(v2, v0);
Poffin *poffin = Poffin_New(HEAP_ID_FIELD);
int v1 = sub_0202A9E4(poffin, v3, v4, FALSE);
PoffinCase *poffinCase = SaveData_GetPoffinCase(ctx->fieldSystem->saveData);
u16 slotId = PoffinCase_AddPoffin(poffinCase, poffin);
Heap_FreeToHeap(v0);
Heap_FreeToHeap(poffin);
if (v5 == POFFIN_NONE) {
if (slotId == POFFIN_NONE) {
*v6 = 0xffff;
} else {
*v6 = v1;
@ -7084,7 +7084,7 @@ static BOOL ScrCmd_28A(ScriptContext *ctx)
u16 *v1 = ScriptContext_GetVarPointer(ctx);
PoffinCase *poffinCase = SaveData_GetPoffinCase(ctx->fieldSystem->saveData);
if (Poffin_GetEmptyCaseSlot(poffinCase) == POFFIN_NONE) {
if (PoffinCase_GetEmptySlot(poffinCase) == POFFIN_NONE) {
*v1 = 0;
} else {
*v1 = 1;
@ -7097,7 +7097,7 @@ static BOOL ScrCmd_307(ScriptContext *ctx)
{
u16 *v1 = ScriptContext_GetVarPointer(ctx);
PoffinCase *poffinCase = SaveData_GetPoffinCase(ctx->fieldSystem->saveData);
*v1 = Poffin_GetNumberOfEmptySlots(poffinCase);
*v1 = PoffinCase_CountEmptySlots(poffinCase);
return FALSE;
}

12
src/unk_020989DC.c
View File

@ -102,7 +102,7 @@ UnkStruct_0203D9B8 *sub_020989DC(SaveData *saveData, int heapID)
v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0203D9B8));
MI_CpuClear8(v0, sizeof(UnkStruct_0203D9B8));
v0->unk_08 = SaveData_GetPoffinCase(saveData);
v0->poffinCase = SaveData_GetPoffinCase(saveData);
v0->unk_0C = SaveData_GetTrainerInfo(saveData);
v0->unk_10 = SaveData_GetParty(saveData);
v0->unk_14 = SaveData_GetBag(saveData);
@ -112,7 +112,7 @@ UnkStruct_0203D9B8 *sub_020989DC(SaveData *saveData, int heapID)
v3 = StringTemplate_New(1, 32, heapID);
for (v5 = 0; v5 < MAX_POFFINS; v5++) {
Poffin_CopyToCaseSlot(v0->unk_08, v5, v1);
PoffinCase_CopyPoffinToSlot(v0->poffinCase, v5, v1);
if (!Poffin_HasValidFlavor(v1)) {
continue;
@ -242,7 +242,7 @@ static void sub_02098BE4(UnkStruct_02098BE4 *param0)
v2 = &param0->unk_0C->unk_1C[v0];
if (v2->unk_04_val1_6) {
Poffin_ClearCaseSlot(param0->unk_0C->unk_08, v2->unk_00);
PoffinCase_ClearSlot(param0->unk_0C->poffinCase, v2->unk_00);
v1 = 1;
}
}
@ -251,7 +251,7 @@ static void sub_02098BE4(UnkStruct_02098BE4 *param0)
return;
}
Poffin_CompactCase(param0->unk_0C->unk_08);
PoffinCase_Compact(param0->unk_0C->poffinCase);
}
static int sub_02098C2C(UnkStruct_02098BE4 *param0)
@ -379,7 +379,7 @@ static int sub_02098D7C(UnkStruct_02098BE4 *param0)
MI_CpuClear8(v1, sizeof(UnkStruct_02098DE8));
v1->unk_08 = param0->unk_0C->unk_1C[param0->unk_0C->unk_01].unk_02;
v1->unk_04 = Poffin_AllocateForCaseSlot(param0->unk_0C->unk_08, param0->unk_0C->unk_1C[param0->unk_0C->unk_01].unk_00, param0->heapID);
v1->unk_04 = PoffinCase_AllocateForSlot(param0->unk_0C->poffinCase, param0->unk_0C->unk_1C[param0->unk_0C->unk_01].unk_00, param0->heapID);
v1->unk_00 = Party_GetPokemonBySlotIndex(param0->unk_0C->unk_10, param0->unk_08);
v1->unk_0A = Options_TextFrameDelay(param0->unk_0C->unk_18);
v1->unk_0B = Options_Frame(param0->unk_0C->unk_18);
@ -416,7 +416,7 @@ static int sub_02098E0C(UnkStruct_02098BE4 *param0)
};
v1 = Heap_AllocFromHeap(param0->heapID, sizeof(PokemonSummary));
v2 = Poffin_AllocateForCaseSlot(param0->unk_0C->unk_08, param0->unk_0C->unk_1C[param0->unk_0C->unk_01].unk_00, param0->heapID);
v2 = PoffinCase_AllocateForSlot(param0->unk_0C->poffinCase, param0->unk_0C->unk_1C[param0->unk_0C->unk_01].unk_00, param0->heapID);
v1->monData = param0->unk_0C->unk_10;
v1->options = param0->unk_0C->unk_18;