From 3fc8fb7003d4348f9eec308a6ccc596152eb58db Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 3 Apr 2023 22:14:26 -0400 Subject: [PATCH] Applied review changes --- include/constants/pokemon.h | 2 +- include/overlay097/box_pokemon_gba.h | 2 +- include/unk_02073C2C.h | 4 ++-- src/overlay005/ov5_021E622C.c | 8 ++++---- src/overlay006/ov6_02240C9C.c | 6 +++--- src/overlay006/ov6_02246184.c | 2 +- src/overlay006/ov6_022489E4.c | 8 ++++---- src/overlay012/is_form_symmetrical.c | 3 ++- src/overlay016/ov16_0225177C.c | 2 +- src/overlay016/ov16_0225CBB8.c | 2 +- src/overlay019/ov19_021D0D80.c | 2 +- src/overlay022/ov22_0225AF8C.c | 4 ++-- src/overlay022/ov22_0225B660.c | 2 +- src/overlay081/ov81_021D1610.c | 2 +- src/overlay087/ov87_021D106C.c | 2 +- src/overlay088/ov88_0223B140.c | 4 ++-- src/overlay094/ov94_022414B8.c | 2 +- src/overlay094/ov94_02242AD0.c | 6 +++--- src/overlay094/ov94_022444C8.c | 4 ++-- src/overlay097/ov97_02233B18.c | 9 +++++---- src/overlay097/ov97_02236380.c | 2 +- src/overlay104/ov104_0222ECE8.c | 16 ++++++++-------- src/overlay104/ov104_022332B4.c | 4 ++-- src/overlay104/ov104_022339B4.c | 10 +++++----- src/overlay104/ov104_02234DB4.c | 2 +- src/overlay104/ov104_022361B4.c | 2 +- src/overlay104/ov104_02237DD8.c | 2 +- src/overlay104/ov104_0223A0C4.c | 4 ++-- src/overlay104/ov104_0223A7F4.c | 10 +++++----- src/overlay104/ov104_0223AF58.c | 6 +++--- src/overlay104/ov104_0223B6F4.c | 8 ++++---- src/overlay104/ov104_0223BCBC.c | 8 ++++---- src/unk_0202F1D4.c | 2 +- src/unk_0203F6C4.c | 2 +- src/unk_0204B830.c | 2 +- src/unk_0204C500.c | 4 ++-- src/unk_0204CFFC.c | 2 +- src/unk_02051D8C.c | 6 +++--- src/unk_02054884.c | 4 ++-- src/unk_020562F8.c | 4 ++-- src/unk_0206C33C.c | 2 +- src/unk_0206C660.c | 4 ++-- src/unk_02073C2C.c | 10 +++++----- src/unk_02079170.c | 2 +- src/unk_0207AE68.c | 4 ++-- src/unk_0208694C.c | 6 +++--- src/unk_0208C324.c | 4 ++-- src/unk_0208FCF8.c | 2 +- src/unk_020933F8.c | 2 +- src/unk_02097B18.c | 2 +- 50 files changed, 108 insertions(+), 106 deletions(-) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index d09b922cda..e2b1e36268 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -184,4 +184,4 @@ enum { MON_DATA_179, }; -#endif // POKEPLATINUM_CONSTANTS_POKEMON_H \ No newline at end of file +#endif // POKEPLATINUM_CONSTANTS_POKEMON_H diff --git a/include/overlay097/box_pokemon_gba.h b/include/overlay097/box_pokemon_gba.h index 0113b6eef9..cf9962f2dd 100644 --- a/include/overlay097/box_pokemon_gba.h +++ b/include/overlay097/box_pokemon_gba.h @@ -7,7 +7,7 @@ typedef struct { u32 experience; u8 ppBonuses; u8 friendship; - u16 filler; + u16 padding; } PokemonGBASubstruct0; typedef struct { diff --git a/include/unk_02073C2C.h b/include/unk_02073C2C.h index b9ac77c110..0eebc14bde 100644 --- a/include/unk_02073C2C.h +++ b/include/unk_02073C2C.h @@ -23,8 +23,8 @@ void ZeroMonData(Pokemon * param0); void ZeroBoxMonData(BoxPokemon * param0); -int SizeOfStructPokemon(void); -Pokemon * AllocMonZeroed(u32 param0); +int PokemonStructSize(void); +Pokemon * CallocMon(u32 param0); BOOL sub_02073C88(Pokemon * param0); BOOL sub_02073CD4(Pokemon * param0, BOOL param1); BOOL sub_02073D20(BoxPokemon * param0); diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c index 93f3e4a441..cc43f7c609 100644 --- a/src/overlay005/ov5_021E622C.c +++ b/src/overlay005/ov5_021E622C.c @@ -2100,7 +2100,7 @@ static void ov5_021E63E0 (Pokemon * param0) static int ov5_021E6444 (Party * param0, UnkStruct_02026218 * param1, UnkStruct_0200B358 * param2) { - Pokemon * v0 = AllocMonZeroed(4); + Pokemon * v0 = CallocMon(4); BoxPokemon * v1 = sub_02026220(param1); UnkStruct_02026224 * v2 = sub_02026224(param1); u32 v3; @@ -2142,7 +2142,7 @@ u16 ov5_021E64F8 (Party * param0, UnkStruct_0200B358 * param1, UnkStruct_0202631 int ov5_021E6520 (BoxPokemon * param0, u32 param1) { - Pokemon * v0 = AllocMonZeroed(4); + Pokemon * v0 = CallocMon(4); BoxPokemon * v1 = sub_02076B10(v0); int v2; u32 v3; @@ -2685,7 +2685,7 @@ void ov5_021E6EA8 (UnkStruct_02026310 * param0, Party * param1, UnkStruct_02025E { u16 v0; u8 v1[2], v2; - Pokemon * v3 = AllocMonZeroed(4); + Pokemon * v3 = CallocMon(4); v0 = ov5_021E6C20(param0, v1); v0 = ov5_021E6B54(v0, param0); @@ -3036,7 +3036,7 @@ static void ov5_021E742C (Pokemon * param0, int param1) u8 v5[6], v6; u8 v7, v8, v9, v10, v11, v12, v13, v14; UnkStruct_02023790 * v15 = sub_02023790(7 + 1, param1); - Pokemon * v16 = AllocMonZeroed(param1); + Pokemon * v16 = CallocMon(param1); v0 = GetMonData(param0, MON_DATA_SPECIES, NULL); diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c index a661d483e5..da9e4d4d88 100644 --- a/src/overlay006/ov6_02240C9C.c +++ b/src/overlay006/ov6_02240C9C.c @@ -1131,7 +1131,7 @@ static void ov6_02241BAC (const u16 param0, const u8 param1, const int param2, c u8 v4; Pokemon * v5; - v5 = AllocMonZeroed(11); + v5 = CallocMon(11); ZeroMonData(v5); v2 = 0; @@ -1202,7 +1202,7 @@ static void ov6_02241CC0 (u16 param0, u8 param1, const int param2, const UnkStru BOOL v2; Pokemon * v3; - v3 = AllocMonZeroed(11); + v3 = CallocMon(11); ZeroMonData(v3); v0 = 1; @@ -1620,7 +1620,7 @@ static void ov6_0224239C (const u32 param0, UnkStruct_0206C638 * param1, UnkStru BOOL v6; Pokemon * v7; - v7 = AllocMonZeroed(4); + v7 = CallocMon(4); v0 = sub_0202D93C(param1, 4); v1 = sub_0202D93C(param1, 6); v2 = sub_0202D93C(param1, 2); diff --git a/src/overlay006/ov6_02246184.c b/src/overlay006/ov6_02246184.c index 047bf49447..9ffc8b0992 100644 --- a/src/overlay006/ov6_02246184.c +++ b/src/overlay006/ov6_02246184.c @@ -73,7 +73,7 @@ UnkStruct_ov6_02246204 * ov6_02246184 (u32 param0, u32 param1) v0->unk_00 = sub_02006FE8(115, param1, 0, param0, 0); v0->unk_10 = param0; v0->unk_0C = param1; - v0->unk_04 = AllocMonZeroed(param0); + v0->unk_04 = CallocMon(param0); v0->unk_08 = sub_02025E6C(param0); sub_02025E8C(v0->unk_08); diff --git a/src/overlay006/ov6_022489E4.c b/src/overlay006/ov6_022489E4.c index 64badacc55..82e2fd5802 100644 --- a/src/overlay006/ov6_022489E4.c +++ b/src/overlay006/ov6_022489E4.c @@ -85,7 +85,7 @@ void ov6_02248AC8 (int param0, int param1, void * param2, void * param3) int v2; u8 * v3; - v1 = SizeOfStructPokemon(); + v1 = PokemonStructSize(); v3 = param2; v2 = v3[v1]; @@ -100,7 +100,7 @@ BOOL ov6_02248AF0 (UnkStruct_02095C48 * param0, int param1, const Pokemon * para int v1; int v2; - v1 = SizeOfStructPokemon(); + v1 = PokemonStructSize(); v0 = Heap_AllocFromHeap(20, v1 + 1); MI_CpuCopy8(param2, v0, v1); v0[v1] = param1; @@ -122,7 +122,7 @@ void ov6_02248B30 (int param0, int param1, void * param2, void * param3) u8 * v3; int v4; - v1 = SizeOfStructPokemon(); + v1 = PokemonStructSize(); v2 = v1 * 4; v3 = param2; @@ -140,7 +140,7 @@ BOOL ov6_02248B70 (UnkStruct_02095C48 * param0, Pokemon ** param1) int v3; int v4; - v1 = SizeOfStructPokemon(); + v1 = PokemonStructSize(); v2 = v1 * 4; v0 = param0->unk_569; diff --git a/src/overlay012/is_form_symmetrical.c b/src/overlay012/is_form_symmetrical.c index dcbfd3b5bd..bdbd4242fa 100644 --- a/src/overlay012/is_form_symmetrical.c +++ b/src/overlay012/is_form_symmetrical.c @@ -24,8 +24,9 @@ BOOL IsFormSymmetrical (u32 species, u32 formId) case SPECIES_KINGLER: return FALSE; case SPECIES_SHAYMIN: - if (formId == 1) + if (formId == 1) { return FALSE; + } break; } diff --git a/src/overlay016/ov16_0225177C.c b/src/overlay016/ov16_0225177C.c index 2aef5061f8..927433361f 100644 --- a/src/overlay016/ov16_0225177C.c +++ b/src/overlay016/ov16_0225177C.c @@ -6186,7 +6186,7 @@ BOOL ov16_02259B9C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param int v4; int v5; - v3 = AllocMonZeroed(5); + v3 = CallocMon(5); if (ov16_0223DF0C(param0) & 0x2) { v4 = param1->unk_21A8[param1->unk_118][1]; diff --git a/src/overlay016/ov16_0225CBB8.c b/src/overlay016/ov16_0225CBB8.c index a511f120c2..135fc30678 100644 --- a/src/overlay016/ov16_0225CBB8.c +++ b/src/overlay016/ov16_0225CBB8.c @@ -4289,7 +4289,7 @@ static void ov16_02261E8C (UnkStruct_0201CD38 * param0, void * param1) v7 = v0->unk_09; } - v9 = AllocMonZeroed(5); + v9 = CallocMon(5); for (v3 = 0; v3 < 6; v3++) { Party_AddPokemon(v0->unk_04->unk_00, v9); diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index 61c1fd96bc..edb7a98e6a 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -3322,7 +3322,7 @@ static void ov19_021D4BE0 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_02042434 param0->unk_194 = sub_0200B144(0, 26, 202, 9); param0->unk_198 = sub_0200B144(0, 26, 610, 9); param0->unk_19C = sub_0200B358(9); - param0->unk_1A0 = Heap_AllocFromHeap(9, SizeOfStructPokemon()); + param0->unk_1A0 = Heap_AllocFromHeap(9, PokemonStructSize()); GF_ASSERT(param0->unk_19C); param0->unk_128 = sub_0208712C(9, 2, 0, 8, param0->unk_1A4); diff --git a/src/overlay022/ov22_0225AF8C.c b/src/overlay022/ov22_0225AF8C.c index 98c345bb1c..863931f805 100644 --- a/src/overlay022/ov22_0225AF8C.c +++ b/src/overlay022/ov22_0225AF8C.c @@ -243,7 +243,7 @@ static UnkStruct_ov22_0225B1BC * ov22_0225B1BC (const UnkStruct_ov22_0225B4E4 * memset(v0, 0, sizeof(UnkStruct_ov22_0225B1BC)); v0->unk_29C = param0->unk_68; - v0->unk_298 = AllocMonZeroed(param0->unk_68); + v0->unk_298 = CallocMon(param0->unk_68); sub_0202A61C(param0->unk_00, v0->unk_298); ov22_0225B2D4(v0, param0); @@ -273,7 +273,7 @@ static UnkStruct_ov22_0225B1BC * ov22_0225B258 (const UnkStruct_ov22_0225B4E4 * memset(v0, 0, sizeof(UnkStruct_ov22_0225B1BC)); v0->unk_29C = param0->unk_68; - v0->unk_298 = AllocMonZeroed(param0->unk_68); + v0->unk_298 = CallocMon(param0->unk_68); sub_0202A61C(param0->unk_00, v0->unk_298); diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c index 89352fc7c0..5914356977 100644 --- a/src/overlay022/ov22_0225B660.c +++ b/src/overlay022/ov22_0225B660.c @@ -350,7 +350,7 @@ static void ov22_0225BC18 (UnkStruct_ov22_0225B85C * param0) sub_0202A524(param0->unk_04, v2); sub_0200B48C(v1, 3, v2, v4, 1, GAME_LANGUAGE); - v5 = AllocMonZeroed(13); + v5 = CallocMon(13); sub_0202A560(param0->unk_04, v5); v6 = sub_02076B10(v5); sub_0200B5CC(v1, 4, v6); diff --git a/src/overlay081/ov81_021D1610.c b/src/overlay081/ov81_021D1610.c index 6beff753be..15e201cf8d 100644 --- a/src/overlay081/ov81_021D1610.c +++ b/src/overlay081/ov81_021D1610.c @@ -822,7 +822,7 @@ static void ov81_021D285C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D28C8 (UnkStruct_ov81_021D1610 * param0, u16 param1, u8 param2, u8 param3) { - Pokemon * v0 = AllocMonZeroed(42); + Pokemon * v0 = CallocMon(42); sub_02074088(v0, param1, 1, 32, param2, 0, 0); sub_0200B538(param0->unk_54, param3, sub_02076B10(v0)); diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index 5b3bb5d495..a16f09cc44 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -114,7 +114,7 @@ UnkStruct_ov87_021D106C * ov87_021D106C (UnkStruct_ov87_021D0D80 * param0, const v0->unk_1F0 = sub_0200B358(61); v0->unk_1F4 = sub_02023790(256, 61); v0->unk_1F8 = sub_02023790(256, 61); - v0->unk_1FC = AllocMonZeroed(61); + v0->unk_1FC = CallocMon(61); sub_02017798(ov87_021D11AC, v0); } diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 847475de5d..e932453c4c 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -2496,8 +2496,8 @@ static void ov88_0223E694 (Party * param0, Party * param1, int param2, int param { Pokemon * v0, * v1; - v0 = AllocMonZeroed(26); - v1 = AllocMonZeroed(26); + v0 = CallocMon(26); + v1 = CallocMon(26); sub_020775EC(Party_GetPokemonBySlotIndex(param0, param2), v0); sub_020775EC(Party_GetPokemonBySlotIndex(param1, param3), v1); diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index d1a502ae7a..95cc849482 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -1088,7 +1088,7 @@ void ov94_022425A8 (UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * if (ov94_022411D0(param1->unk_110)) { SetShayminForm((Pokemon *)(param1->unk_114), 0); - MI_CpuCopyFast(param1->unk_114, param0->unk_00.unk_00, SizeOfStructPokemon()); + MI_CpuCopyFast(param1->unk_114, param0->unk_00.unk_00, PokemonStructSize()); } else { SetBoxShayminForm(param1->unk_114, 0); sub_020774C8(param1->unk_114, (Pokemon *)param0->unk_00.unk_00); diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index 9bc5f85888..fa1a039948 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -794,7 +794,7 @@ static int ov94_02243398 (UnkStruct_ov94_0223FD4C * param0) param0->unk_36 = 0; if (sub_0202DA60(param0->unk_00->unk_00)) { - Pokemon * v1 = AllocMonZeroed(62); + Pokemon * v1 = CallocMon(62); sub_0202DA70(param0->unk_00->unk_00, v1); sub_0200B5CC(param0->unk_B8C, 0, sub_02076B10(v1)); @@ -814,7 +814,7 @@ static int ov94_02243398 (UnkStruct_ov94_0223FD4C * param0) param0->unk_36 = 0; if (sub_0202DA60(param0->unk_00->unk_00)) { - Pokemon * v2 = AllocMonZeroed(62); + Pokemon * v2 = CallocMon(62); sub_0202DA70(param0->unk_00->unk_00, v2); sub_0200B5CC(param0->unk_B8C, 0, sub_02076B10(v2)); @@ -1250,7 +1250,7 @@ static int ov94_02243AE8 (UnkStruct_ov94_0223FD4C * param0) static void ov94_02243B08 (UnkStruct_ov94_0223FD4C * param0, int param1) { if (param0->unk_110 != 18) { - Pokemon * v0 = AllocMonZeroed(62); + Pokemon * v0 = CallocMon(62); sub_020774C8(sub_02079C9C(param0->unk_00->unk_0C, param0->unk_110, param0->unk_112), v0); sub_0202DA7C(param0->unk_00->unk_00, v0, param0->unk_110); diff --git a/src/overlay094/ov94_022444C8.c b/src/overlay094/ov94_022444C8.c index 89d39ffa9c..332cfbbfc3 100644 --- a/src/overlay094/ov94_022444C8.c +++ b/src/overlay094/ov94_022444C8.c @@ -38,7 +38,7 @@ static const UnkStruct_0208BE5C Unk_ov94_0224636C = { int ov94_022444C8 (UnkStruct_ov94_0223FD4C * param0, int param1) { - param0->unk_1104 = AllocMonZeroed(62); + param0->unk_1104 = CallocMon(62); switch (param0->unk_24) { case 7: @@ -110,7 +110,7 @@ int ov94_02244678 (UnkStruct_ov94_0223FD4C * param0, int param1) } } else if ((param0->unk_24 == 8) || (param0->unk_24 == 10)) { Pokemon * v1 = ov94_022448AC(param0, param0->unk_24); - Pokemon * v5 = AllocMonZeroed(62); + Pokemon * v5 = CallocMon(62); sub_0202DA70(param0->unk_00->unk_00, v5); diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index ffd6cd87cd..f6f7be1793 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -237,14 +237,15 @@ static int Unk_ov97_0223EAB8[] = { static BOOL IsGBASpeciesInvalid (int speciesGBA) { - if (speciesGBA <= SPECIES_NONE) + if (speciesGBA <= SPECIES_NONE) { return TRUE; - else if (speciesGBA <= SPECIES_CELEBI) + } else if (speciesGBA <= SPECIES_CELEBI) { return FALSE; - else if (speciesGBA < GBA_SPECIES_TREECKO) + } else if (speciesGBA < GBA_SPECIES_TREECKO) { return TRUE; - else if (speciesGBA <= GBA_SPECIES_CHIMECHO) + } else if (speciesGBA <= GBA_SPECIES_CHIMECHO) { return FALSE; + } return TRUE; } diff --git a/src/overlay097/ov97_02236380.c b/src/overlay097/ov97_02236380.c index 30a7d0fe8c..530e45764d 100644 --- a/src/overlay097/ov97_02236380.c +++ b/src/overlay097/ov97_02236380.c @@ -1201,7 +1201,7 @@ u32 GetGBABoxMonData (BoxPokemonGBA *boxMonGBA, int field, u8 * param2) if (retVal == SPECIES_NONE) break; - if ((substruct3->isEgg) || (boxMonGBA->isBadEgg)) + if (substruct3->isEgg || boxMonGBA->isBadEgg) retVal = GBA_SPECIES_EGG; break; diff --git a/src/overlay104/ov104_0222ECE8.c b/src/overlay104/ov104_0222ECE8.c index 94b32a3883..6c41f0b4c3 100644 --- a/src/overlay104/ov104_0222ECE8.c +++ b/src/overlay104/ov104_0222ECE8.c @@ -285,7 +285,7 @@ BOOL ov104_0222EE60 (UnkStruct_ov104_0223B5C0 * param0) v1 = 0; v3 = 512; - v4 = SizeOfStructPokemon(); + v4 = PokemonStructSize(); v6 = Party_GetFromSavedata(param0->unk_6FC); v5 = Party_GetPokemonBySlotIndex(v6, param0->unk_260[0]); @@ -313,7 +313,7 @@ void ov104_0222EEA8 (int param0, int param1, void * param2, void * param3) return; } - v2 = SizeOfStructPokemon(); + v2 = PokemonStructSize(); MI_CpuCopy8(&v4[0], v3->unk_D8C, v2); return; @@ -1081,7 +1081,7 @@ BOOL ov104_0222F758 (UnkStruct_ov104_0223BA10 * param0) v1 = 0; v3 = 512; v5 = ov104_0223B7A8(param0->unk_10, 0); - v4 = SizeOfStructPokemon(); + v4 = PokemonStructSize(); for (v0 = 0; v0 < v5; v0++) { v6 = Party_GetPokemonBySlotIndex(param0->unk_28, v0); @@ -1113,8 +1113,8 @@ void ov104_0222F7BC (int param0, int param1, void * param2, void * param3) } v0 = ov104_0223B7A8(v5->unk_10, 0); - v3 = SizeOfStructPokemon(); - v4 = AllocMonZeroed(11); + v3 = PokemonStructSize(); + v4 = CallocMon(11); for (v1 = 0; v1 < v0; v1++) { MI_CpuCopy8(&v6[v3 * v1], v4, v3); @@ -1380,7 +1380,7 @@ BOOL ov104_0222FAD0 (UnkStruct_ov104_0223BFFC * param0) v1 = 0; v3 = 512; v5 = ov104_0223BD70(param0->unk_10, 0); - v4 = SizeOfStructPokemon(); + v4 = PokemonStructSize(); for (v0 = 0; v0 < v5; v0++) { v6 = Party_GetPokemonBySlotIndex(param0->unk_70, v0); @@ -1412,8 +1412,8 @@ void ov104_0222FB34 (int param0, int param1, void * param2, void * param3) } v0 = ov104_0223BD70(v5->unk_10, 0); - v3 = SizeOfStructPokemon(); - v4 = AllocMonZeroed(11); + v3 = PokemonStructSize(); + v4 = CallocMon(11); for (v1 = 0; v1 < v0; v1++) { MI_CpuCopy8(&v6[v3 * v1], v4, v3); diff --git a/src/overlay104/ov104_022332B4.c b/src/overlay104/ov104_022332B4.c index 7b3e78486b..607ffcd8c6 100644 --- a/src/overlay104/ov104_022332B4.c +++ b/src/overlay104/ov104_022332B4.c @@ -305,7 +305,7 @@ BOOL ov104_022334DC (UnkStruct_ov104_0222E930 * param0) *v15 = v4->unk_3F0[v13].unk_04[v14]; break; case 17: - v3 = AllocMonZeroed(11); + v3 = CallocMon(11); ov104_0222DF40(&v4->unk_3F0[v13], v3, ov104_0223ADA0(v4)); *v15 = GetMonData(v3, MON_DATA_177, NULL); Heap_FreeToHeap(v3); @@ -317,7 +317,7 @@ BOOL ov104_022334DC (UnkStruct_ov104_0222E930 * param0) v0[v10] = 0; } - v3 = AllocMonZeroed(11); + v3 = CallocMon(11); for (v10 = 0; v10 < v5; v10++) { ov104_0222DF40(&v4->unk_3F0[v10], v3, ov104_0223ADA0(v4)); diff --git a/src/overlay104/ov104_022339B4.c b/src/overlay104/ov104_022339B4.c index db92a636ff..285cd55683 100644 --- a/src/overlay104/ov104_022339B4.c +++ b/src/overlay104/ov104_022339B4.c @@ -188,7 +188,7 @@ static void ov104_02233BAC (UnkStruct_ov104_0223ADA0 * param0) } for (v0 = 0; v0 < 6; v0++) { - v4 = AllocMonZeroed(11); + v4 = CallocMon(11); ov104_0222DF40(¶m0->unk_280[v0], v4, ov104_0223ADA0(param0)); ov104_0222E1C0(param0->unk_4F8, param0->unk_4D4, v4); Heap_FreeToHeap(v4); @@ -272,7 +272,7 @@ static void ov104_02233F1C (UnkStruct_ov104_0223ADA0 * param0) ov104_0222E330(v4, v6, v5, v7, NULL, 4, 11, 179); - v1 = AllocMonZeroed(11); + v1 = CallocMon(11); for (v0 = 0; v0 < 4; v0++) { ov104_0222DF40(&v4[v0], v1, ov104_0223ADA0(param0)); @@ -291,7 +291,7 @@ static void ov104_02233F1C (UnkStruct_ov104_0223ADA0 * param0) ov104_0222E330(v4, v6, v5, v7, NULL, 4, 11, 179); - v1 = AllocMonZeroed(11); + v1 = CallocMon(11); for (v0 = 0; v0 < 4; v0++) { ov104_0222DF40(&v4[v0], v1, ov104_0223ADA0(param0)); @@ -499,7 +499,7 @@ void ov104_0223449C (UnkStruct_ov104_0223ADA0 * param0) sub_0207A008(param0->unk_4D4); - v3 = AllocMonZeroed(11); + v3 = CallocMon(11); for (v0 = 0; v0 < v1; v0++) { ov104_0222DF40(¶m0->unk_280[param0->unk_4DC[v0]], v3, ov104_0223ADA0(param0)); @@ -590,7 +590,7 @@ void ov104_0223470C (UnkStruct_ov104_0223ADA0 * param0) sub_0207A008(param0->unk_4D8); - v3 = AllocMonZeroed(11); + v3 = CallocMon(11); for (v0 = 0; v0 < v2; v0++) { ov104_0222DF40(¶m0->unk_3F0[v0], v3, ov104_0223ADA0(param0)); diff --git a/src/overlay104/ov104_02234DB4.c b/src/overlay104/ov104_02234DB4.c index 9aa1f55fe8..a66d352d62 100644 --- a/src/overlay104/ov104_02234DB4.c +++ b/src/overlay104/ov104_02234DB4.c @@ -63,7 +63,7 @@ UnkStruct_ov104_0223B5C0 * ov104_02234DB4 (UnkStruct_021C0794 * param0, u16 para v10->unk_6FC = param0; v10->unk_00 = 11; v10->unk_264 = sub_02079FF4(11); - v10->unk_D8C = AllocMonZeroed(11); + v10->unk_D8C = CallocMon(11); v0 = v10->unk_6F8; v1 = sub_0203026C(param0); diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c index c70708cd24..1100dfe579 100644 --- a/src/overlay104/ov104_022361B4.c +++ b/src/overlay104/ov104_022361B4.c @@ -235,7 +235,7 @@ static void ov104_022365F8 (UnkStruct_ov104_0223BA10 * param0) ov104_0222E330(v4, v6, v5, NULL, v7, 4, 11, 179); - v2 = AllocMonZeroed(11); + v2 = CallocMon(11); for (v1 = 0; v1 < 4; v1++) { ov104_0222DF40(&v4[v1], v2, ov104_0223BA10(param0)); diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c index 9f152a4edc..78605e63c6 100644 --- a/src/overlay104/ov104_02237DD8.c +++ b/src/overlay104/ov104_02237DD8.c @@ -303,7 +303,7 @@ static void ov104_02238114 (UnkStruct_ov104_0223BFFC * param0) ov104_0222E330(v4, v6, v5, NULL, v7, 4, 11, 179); - v2 = AllocMonZeroed(11); + v2 = CallocMon(11); for (v1 = 0; v1 < 4; v1++) { ov104_0222DF40(&v4[v1], v2, ov104_0223BFFC(param0)); diff --git a/src/overlay104/ov104_0223A0C4.c b/src/overlay104/ov104_0223A0C4.c index 1c2da51f1f..821131e955 100644 --- a/src/overlay104/ov104_0223A0C4.c +++ b/src/overlay104/ov104_0223A0C4.c @@ -919,7 +919,7 @@ UnkStruct_ov6_02240D5C * ov104_0223A580 (UnkStruct_0204AFC4 * param0, UnkStruct_ v3->unk_128 = 18; v3->unk_12C = 18; - v6 = AllocMonZeroed(param0->unk_04); + v6 = CallocMon(param0->unk_04); v1 = 50; Party_InitWithCapacity(v3->unk_04[0], param0->unk_0E); @@ -966,7 +966,7 @@ static void ov104_0223A6AC (UnkStruct_ov6_02240D5C * param0, UnkStruct_ov104_022 Pokemon * v2; ov104_0222E284(param0, ¶m1->unk_00, param2, param3, param4); - v2 = AllocMonZeroed(param4); + v2 = CallocMon(param4); for (v0 = 0; v0 < param2; v0++) { ov104_0222DF40(¶m1->unk_30[v0], v2, 120); diff --git a/src/overlay104/ov104_0223A7F4.c b/src/overlay104/ov104_0223A7F4.c index 6b9758b42b..b676ade869 100644 --- a/src/overlay104/ov104_0223A7F4.c +++ b/src/overlay104/ov104_0223A7F4.c @@ -366,7 +366,7 @@ UnkStruct_ov6_02240D5C * ov104_0223ABA0 (UnkStruct_ov104_0223ADA0 * param0, UnkS v4->unk_12C = 19; Party_InitWithCapacity(v4->unk_04[0], v2); - v5 = AllocMonZeroed(11); + v5 = CallocMon(11); for (v0 = 0; v0 < v2; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(param0->unk_4D4, v0), v5); @@ -386,7 +386,7 @@ UnkStruct_ov6_02240D5C * ov104_0223ABA0 (UnkStruct_ov104_0223ADA0 * param0, UnkS v4->unk_28[v0].unk_0C = ov104_0223AEE4(param0); } - v5 = AllocMonZeroed(11); + v5 = CallocMon(11); for (v0 = 0; v0 < v3; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(param0->unk_4D8, v0), v5); @@ -409,7 +409,7 @@ UnkStruct_ov6_02240D5C * ov104_0223ABA0 (UnkStruct_ov104_0223ADA0 * param0, UnkS ov104_0222E284(v4, &v6, v3, 3, 11); Party_InitWithCapacity(v4->unk_04[3], ov104_0223AA74(param0->unk_04, 0)); - v5 = AllocMonZeroed(11); + v5 = CallocMon(11); for (v0 = 0; v0 < v3; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(param0->unk_4D8, (v3 + v0)), v5); @@ -456,7 +456,7 @@ void ov104_0223ADB0 (UnkStruct_ov104_0223ADA0 * param0) ov104_0222E330(param0->unk_280, param0->unk_254, param0->unk_260, param0->unk_268, NULL, 6, 11, 179); sub_0207A008(param0->unk_4D4); - v1 = AllocMonZeroed(11); + v1 = CallocMon(11); for (v0 = 0; v0 < 6; v0++) { ov104_0222DF40(¶m0->unk_280[v0], v1, ov104_0223ADA0(param0)); @@ -482,7 +482,7 @@ void ov104_0223AE30 (UnkStruct_ov104_0223ADA0 * param0) ov104_0222E330(v3, param0->unk_584, param0->unk_590, param0->unk_598, NULL, 2, 11, 179); - v2 = AllocMonZeroed(11); + v2 = CallocMon(11); for (v0 = 0; v0 < 2; v0++) { ov104_0222DF40(&v3[v0], v2, ov104_0223ADA0(param0)); diff --git a/src/overlay104/ov104_0223AF58.c b/src/overlay104/ov104_0223AF58.c index 1a35d2f879..4d4ab63010 100644 --- a/src/overlay104/ov104_0223AF58.c +++ b/src/overlay104/ov104_0223AF58.c @@ -1597,7 +1597,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B250 (UnkStruct_ov104_0223B5C0 * param0, UnkS v8->unk_12C = 22; Party_InitWithCapacity(v8->unk_04[0], v4); - v9 = AllocMonZeroed(11); + v9 = CallocMon(11); for (v1 = 0; v1 < v4; v1++) { sub_020775EC(Party_GetPokemonBySlotIndex(v13, param0->unk_260[v1]), v9); @@ -1627,7 +1627,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B250 (UnkStruct_ov104_0223B5C0 * param0, UnkS ov104_0223B518(¶m0->unk_290[v6], v7, param0->unk_18[v6], ¶m0->unk_268[v6], v5, 11, 180); - v9 = AllocMonZeroed(11); + v9 = CallocMon(11); for (v1 = 0; v1 < v5; v1++) { while (TRUE) { @@ -1658,7 +1658,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B250 (UnkStruct_ov104_0223B5C0 * param0, UnkS ov104_0222E284(v8, &v10, v5, 3, 11); Party_InitWithCapacity(v8->unk_04[3], v5); - v9 = AllocMonZeroed(11); + v9 = CallocMon(11); while (TRUE) { if (ov104_0223B4A4(param0, v6) == 0) { diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c index a0de6c096f..2b389f8ea9 100644 --- a/src/overlay104/ov104_0223B6F4.c +++ b/src/overlay104/ov104_0223B6F4.c @@ -189,7 +189,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B810 (UnkStruct_ov104_0223BA10 * param0, UnkS v4 = 2; } - v6 = AllocMonZeroed(11); + v6 = CallocMon(11); for (v0 = 0; v0 < v2; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(param0->unk_28, (v4 + v0)), v6); @@ -210,7 +210,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B810 (UnkStruct_ov104_0223BA10 * param0, UnkS v5->unk_28[v0].unk_0C = ov104_0223BB10(param0); } - v6 = AllocMonZeroed(11); + v6 = CallocMon(11); for (v0 = 0; v0 < v3; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(param0->unk_2C, v0), v6); @@ -233,7 +233,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B810 (UnkStruct_ov104_0223BA10 * param0, UnkS ov104_0222E284(v5, &v7, v3, 3, 11); Party_InitWithCapacity(v5->unk_04[3], ov104_0223B7DC(param0->unk_10, 0)); - v6 = AllocMonZeroed(11); + v6 = CallocMon(11); for (v0 = 0; v0 < v3; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(param0->unk_2C, (v3 + v0)), v6); @@ -328,7 +328,7 @@ void ov104_0223BAB8 (UnkStruct_ov104_0223BA10 * param0) sub_0207A008(param0->unk_2C); v2 = ov104_0223B7DC(param0->unk_10, 1); - v3 = AllocMonZeroed(11); + v3 = CallocMon(11); for (v0 = 0; v0 < v2; v0++) { ov104_0222DF40(¶m0->unk_288[v0], v3, ov104_0223BA10(param0)); diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c index 46c54412ac..962ea7d789 100644 --- a/src/overlay104/ov104_0223BCBC.c +++ b/src/overlay104/ov104_0223BCBC.c @@ -202,7 +202,7 @@ UnkStruct_ov6_02240D5C * ov104_0223BDD8 (UnkStruct_ov104_0223BFFC * param0, UnkS v4 = 2; } - v6 = AllocMonZeroed(11); + v6 = CallocMon(11); for (v0 = 0; v0 < v2; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(v12, (v4 + v0)), v6); @@ -222,7 +222,7 @@ UnkStruct_ov6_02240D5C * ov104_0223BDD8 (UnkStruct_ov104_0223BFFC * param0, UnkS v5->unk_28[v0].unk_0C = ov104_0223C0D0(param0); } - v6 = AllocMonZeroed(11); + v6 = CallocMon(11); for (v0 = 0; v0 < v3; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(v13, v0), v6); @@ -245,7 +245,7 @@ UnkStruct_ov6_02240D5C * ov104_0223BDD8 (UnkStruct_ov104_0223BFFC * param0, UnkS ov104_0222E284(v5, &v7, v3, 3, 11); Party_InitWithCapacity(v5->unk_04[3], ov104_0223BDA4(param0->unk_10, 0)); - v6 = AllocMonZeroed(11); + v6 = CallocMon(11); for (v0 = 0; v0 < v3; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(v13, (v3 + v0)), v6); @@ -319,7 +319,7 @@ void ov104_0223C04C (UnkStruct_ov104_0223BFFC * param0) sub_0207A008(param0->unk_74); v3 = ov104_0223BDA4(param0->unk_10, 1); - v5 = AllocMonZeroed(11); + v5 = CallocMon(11); for (v1 = 0; v1 < v3; v1++) { ov104_0222DF40(¶m0->unk_330[v1], v5, ov104_0223BFFC(param0)); diff --git a/src/unk_0202F1D4.c b/src/unk_0202F1D4.c index 2a45b71c3d..03c93b536b 100644 --- a/src/unk_0202F1D4.c +++ b/src/unk_0202F1D4.c @@ -601,7 +601,7 @@ static void sub_0202FD30 (UnkStruct_0202FD30 * param0, Party * param1) Pokemon * v1; u8 v2 = 0; - v1 = AllocMonZeroed(11); + v1 = CallocMon(11); Party_InitWithCapacity(param1, param0->unk_00); diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c index 89fd015409..d7225c0734 100644 --- a/src/unk_0203F6C4.c +++ b/src/unk_0203F6C4.c @@ -6901,7 +6901,7 @@ static BOOL sub_02045198 (UnkStruct_0203E724 * param0) static void sub_020451B4 (UnkStruct_0203CDB0 * param0, u16 param1) { UnkStruct_02026324 * v0 = sub_02027560(param0->unk_0C); - Pokemon * v1 = AllocMonZeroed(32); + Pokemon * v1 = CallocMon(32); ZeroMonData(v1); sub_02073D80(v1, param1, 50, 32, 0, 0, 0, 0); diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c index c3e2fe16e2..ffbe9d09cd 100644 --- a/src/unk_0204B830.c +++ b/src/unk_0204B830.c @@ -293,7 +293,7 @@ static void sub_0204BAAC (UnkStruct_0203CDB0 * param0, void * param1) u32 v16 = sub_02025F20(v1); u32 v17 = sub_02025F30(v1); - v6 = AllocMonZeroed(32); + v6 = CallocMon(32); sub_020775EC(v4, v6); sub_02074B30(v6, 145, v15); diff --git a/src/unk_0204C500.c b/src/unk_0204C500.c index 5bddf58b13..e3dd63dadd 100644 --- a/src/unk_0204C500.c +++ b/src/unk_0204C500.c @@ -48,7 +48,7 @@ BOOL sub_0204C500 (UnkStruct_0203E724 * param0) BOOL sub_0204C554 (UnkStruct_0203E724 * param0) { UnkStruct_02024440 * v0 = sub_02024440(param0->unk_34->unk_0C); - Pokemon * v1 = AllocMonZeroed(32); + Pokemon * v1 = CallocMon(32); u16 * v2 = inline_0204FCAC(param0); if (sub_0202F028(v0) == 6) { @@ -65,7 +65,7 @@ BOOL sub_0204C59C (UnkStruct_0203E724 * param0) { UnkStruct_02024440 * v0 = sub_02024440(param0->unk_34->unk_0C); UnkStruct_020797DC * v1 = sub_02024420(param0->unk_34->unk_0C); - Pokemon * v2 = AllocMonZeroed(32); + Pokemon * v2 = CallocMon(32); UnkStruct_02025E6C * v3 = sub_02025E38(param0->unk_34->unk_0C); UnkStruct_02026324 * v4 = sub_02027560(param0->unk_34->unk_0C); BOOL v5; diff --git a/src/unk_0204CFFC.c b/src/unk_0204CFFC.c index 882c5787ab..7a44289879 100644 --- a/src/unk_0204CFFC.c +++ b/src/unk_0204CFFC.c @@ -103,7 +103,7 @@ BOOL sub_0204D154 (UnkStruct_0203E724 * param0) v1 = Party_GetCurrentCount(v3); if (v1 < 6) { - v4 = AllocMonZeroed(11); + v4 = CallocMon(11); ZeroMonData(v4); v0 = sub_02017070(1, v8); diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c index 09e9af5891..3bf3d34298 100644 --- a/src/unk_02051D8C.c +++ b/src/unk_02051D8C.c @@ -178,7 +178,7 @@ UnkStruct_ov6_02240D5C * sub_02051F4C (int param0, const UnkStruct_0203CDB0 * pa v4->unk_138 = sub_02055BA8(param1); sub_0207D570(v4->unk_E0, 4, 20, param0); - v5 = AllocMonZeroed(param0); + v5 = CallocMon(param0); sub_02073D80(v5, sub_0206B08C(sub_020507E4(param1->unk_0C)), 5, 32, 0, 0, 2, 0); Party_AddPokemon(v4->unk_04[0], v5); @@ -319,7 +319,7 @@ void sub_02052348 (UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * p param0->unk_12C = 9; sub_02052184(param0, v2, 0); - v8 = AllocMonZeroed(11); + v8 = CallocMon(11); Party_InitWithCapacity(param0->unk_04[0], Party_GetCurrentCount(v3)); for (v0 = 0; v0 < Party_GetCurrentCount(v3); v0++) { @@ -388,7 +388,7 @@ void sub_020524E4 (UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * p if (v10 == 0) { sub_02052164(param0, param2, 0); } else { - v9 = AllocMonZeroed(11); + v9 = CallocMon(11); Party_InitWithCapacity(param0->unk_04[0], v10); for (v8 = 0; v8 < v10; v8++) { diff --git a/src/unk_02054884.c b/src/unk_02054884.c index 3a380feaad..b485a97882 100644 --- a/src/unk_02054884.c +++ b/src/unk_02054884.c @@ -38,7 +38,7 @@ BOOL sub_020548B0 (int param0, UnkStruct_021C0794 * param1, u16 param2, u8 param v4 = sub_02025E38(param1); v3 = Party_GetFromSavedata(param1); - v1 = AllocMonZeroed(param0); + v1 = CallocMon(param0); ZeroMonData(v1); sub_02073D80(v1, param2, param3, 32, 0, 0, 0, 0); @@ -63,7 +63,7 @@ BOOL sub_02054930 (int param0, UnkStruct_021C0794 * param1, u16 param2, u8 param BOOL v1; UnkStruct_02025E6C * v2 = sub_02025E38(param1); Party * v3 = Party_GetFromSavedata(param1); - Pokemon * v4 = AllocMonZeroed(32); + Pokemon * v4 = CallocMon(32); ZeroMonData(v4); diff --git a/src/unk_020562F8.c b/src/unk_020562F8.c index 2fa02a7bfb..8835c79a09 100644 --- a/src/unk_020562F8.c +++ b/src/unk_020562F8.c @@ -141,7 +141,7 @@ static void sub_0205642C (UnkStruct_0203CDB0 * param0, UnkStruct_020564B4 * para UnkStruct_02024440 * v4; v4 = sub_02024440(param0->unk_0C); - v3 = AllocMonZeroed(4); + v3 = CallocMon(4); for (v0 = 0; v0 < 6; v0++) { param1->unk_30[v0] = 0; @@ -274,7 +274,7 @@ static void sub_02056624 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C * static UnkStruct_ov6_02240D5C * sub_0205664C (UnkStruct_0203CDB0 * param0, UnkStruct_020564B4 * param1) { UnkStruct_ov6_02240D5C * v0; - Pokemon * v1 = AllocMonZeroed(32); + Pokemon * v1 = CallocMon(32); UnkStruct_02024440 * v2 = sub_02024440(param0->unk_0C); int v3 = sub_020563BC(param0); diff --git a/src/unk_0206C33C.c b/src/unk_0206C33C.c index bdbb9d33f7..540eff44bb 100644 --- a/src/unk_0206C33C.c +++ b/src/unk_0206C33C.c @@ -289,7 +289,7 @@ void sub_0206C41C (UnkStruct_021C0794 * param0, const u8 param1) sub_0202D980(v1, 6, v6); v4 = sub_02025E38(param0); - v0 = AllocMonZeroed(4); + v0 = CallocMon(4); ZeroMonData(v0); sub_02073D80(v0, v5, v6, 32, 0, 0, 1, sub_02025F24(v4)); diff --git a/src/unk_0206C660.c b/src/unk_0206C660.c index c163ec6320..13a1088e17 100644 --- a/src/unk_0206C660.c +++ b/src/unk_0206C660.c @@ -97,8 +97,8 @@ void sub_0206C740 (UnkStruct_020508D4 * param0, UnkStruct_ov6_02246204 * param1, v0->unk_04 = 0; v0->unk_00 = param1; v0->unk_08 = param2; - v0->unk_24 = AllocMonZeroed(param3); - v0->unk_28 = AllocMonZeroed(param3); + v0->unk_24 = CallocMon(param3); + v0->unk_28 = CallocMon(param3); sub_02050944(param0, sub_0206C680, v0); } diff --git a/src/unk_02073C2C.c b/src/unk_02073C2C.c index 4e5dcef87b..49c13b53e0 100644 --- a/src/unk_02073C2C.c +++ b/src/unk_02073C2C.c @@ -115,8 +115,8 @@ static const s8 Unk_020F0695[][5] = { void ZeroMonData(Pokemon * param0); void ZeroBoxMonData(BoxPokemon * param0); -int SizeOfStructPokemon(void); -Pokemon * AllocMonZeroed(u32 param0); +int PokemonStructSize(void); +Pokemon * CallocMon(u32 param0); BOOL sub_02073C88(Pokemon * param0); BOOL sub_02073CD4(Pokemon * param0, BOOL param1); BOOL sub_02073D20(BoxPokemon * param0); @@ -262,12 +262,12 @@ void ZeroBoxMonData (BoxPokemon * boxMon) sub_0207822C(boxMon->unk_08, sizeof(PokemonSubstruct0) * 4, boxMon->unk_06); } -int SizeOfStructPokemon (void) +int PokemonStructSize (void) { return sizeof(Pokemon); } -Pokemon * AllocMonZeroed (u32 param0) +Pokemon * CallocMon (u32 param0) { Pokemon * mon = Heap_AllocFromHeap(param0, sizeof(Pokemon)); ZeroMonData(mon); @@ -4531,7 +4531,7 @@ void sub_020780C4 (Pokemon * param0, u32 param1) PokemonSubstruct2 * v7; PokemonSubstruct3 * v8; - v0 = AllocMonZeroed(0); + v0 = CallocMon(0); sub_020775EC(param0, v0); diff --git a/src/unk_02079170.c b/src/unk_02079170.c index 3659e526a1..7cd980e38c 100644 --- a/src/unk_02079170.c +++ b/src/unk_02079170.c @@ -302,7 +302,7 @@ static void sub_020793B8 (UnkStruct_ov6_02240D5C * param0, int param1, int param Party_InitWithCapacity(param0->unk_04[param1], 6); v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov16_022431BC_3) * 6); - v7 = AllocMonZeroed(param2); + v7 = CallocMon(param2); sub_0207939C(param0->unk_18[param1], v0); diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index dd428bd1f2..3edd2a3684 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -705,7 +705,7 @@ static void sub_0207C028 (UnkStruct_0207AE68 * param0) UnkStruct_0202818C * v3; UnkStruct_0202CA28 v4; - v1 = AllocMonZeroed(param0->unk_5C); + v1 = CallocMon(param0->unk_5C); sub_020775EC(param0->unk_28, v1); v2 = 292; @@ -952,7 +952,7 @@ static void sub_0207C498 (UnkStruct_0207AE68 * param0) sub_02075EF4(&v0, param0->unk_28, 2); param0->unk_1C[0] = sub_02007C34(param0->unk_18, &v0, 128, 80, 0, 0, NULL, NULL); - v1 = AllocMonZeroed(param0->unk_5C); + v1 = CallocMon(param0->unk_5C); sub_020775EC(param0->unk_28, v1); sub_02074B30(v1, 5, (u8 *)¶m0->unk_62); diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index dc015f490e..e0a764ab74 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -1141,7 +1141,7 @@ static int sub_02086F3C (UnkStruct_020067E8 * param0, int * param1) u16 v3[10 + 1]; Pokemon * v4; - v4 = AllocMonZeroed(18); + v4 = CallocMon(18); sub_02073D80(v4, v0->unk_04, 5, 10, 10, 10, 10, 10); Heap_FreeToHeap(v4); } @@ -1419,7 +1419,7 @@ static void sub_0208737C (UnkStruct_02087A10 * param0, UnkStruct_020067E8 * para if (param0->unk_00 == 1) { Pokemon * v1; - v1 = AllocMonZeroed(18); + v1 = CallocMon(18); sub_02073D80(v1, param0->unk_04, 5, 10, 10, 10, 10, 10); sub_0200B538(param0->unk_168, 0, sub_02076B10(v1)); Heap_FreeToHeap(v1); @@ -1485,7 +1485,7 @@ static void sub_02087544 (UnkStruct_02087A10 * param0, UnkStruct_020067E8 * para } if ((param0->unk_158 == 0) || sub_02086F14(param0->unk_D8)) { - Pokemon * v4 = AllocMonZeroed(18); + Pokemon * v4 = CallocMon(18); sub_02073D80(v4, param0->unk_04, 1, 0, 0, 0, 0, 0); sub_0200B538(param0->unk_168, 0, sub_02076B10(v4)); diff --git a/src/unk_0208C324.c b/src/unk_0208C324.c index cc9696f764..5913388fab 100644 --- a/src/unk_0208C324.c +++ b/src/unk_0208C324.c @@ -887,7 +887,7 @@ static int sub_0208CF78 (UnkStruct_0208D7BC * param0) if (param0->unk_24C->unk_11 == 2) { v0 = sub_0208DD48(param0); - v1 = AllocMonZeroed(19); + v1 = CallocMon(19); sub_020774C8(v0, v1); } else { v1 = sub_0208DD48(param0); @@ -1012,7 +1012,7 @@ static void sub_0208D1A4 (UnkStruct_0208D7BC * param0) static void sub_0208D1D4 (UnkStruct_0208D7BC * param0, BoxPokemon * param1, UnkStruct_0208D1D4 * param2) { - Pokemon * v0 = AllocMonZeroed(19); + Pokemon * v0 = CallocMon(19); sub_020774C8(param1, v0); sub_0208D200(param0, v0, param2); diff --git a/src/unk_0208FCF8.c b/src/unk_0208FCF8.c index 6313302f96..ed852ba70c 100644 --- a/src/unk_0208FCF8.c +++ b/src/unk_0208FCF8.c @@ -575,7 +575,7 @@ static void sub_020908CC (UnkStruct_0208D7BC * param0) if (param0->unk_24C->unk_11 == 2) { { - Pokemon * v3 = AllocMonZeroed(19); + Pokemon * v3 = CallocMon(19); sub_020774C8(v1, v3); sub_02090800(¶m0->unk_244[0], v3, v2); diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c index 8be5fab499..0c178c41ef 100644 --- a/src/unk_020933F8.c +++ b/src/unk_020933F8.c @@ -442,7 +442,7 @@ UnkStruct_02095C48 * sub_02093800 (const UnkStruct_02093800 * param0) v0->unk_148 = sub_02079FF4(20); for (v2 = 0; v2 < 4; v2++) { - v0->unk_00.unk_00[v2] = AllocMonZeroed(20); + v0->unk_00.unk_00[v2] = CallocMon(20); } for (v2 = 0; v2 < 4; v2++) { diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c index 3a6287516f..c25ef58427 100644 --- a/src/unk_02097B18.c +++ b/src/unk_02097B18.c @@ -94,7 +94,7 @@ static int sub_02097B18 (UnkStruct_020067E8 * param0, int * param1) v1 = sub_02006840(param0); v0->unk_00 = v1; v0->unk_42C = NARC_ctor(147, 53); - v0->unk_428 = AllocMonZeroed(53); + v0->unk_428 = CallocMon(53); v0->unk_D4.unk_00 = 0xFF; v0->unk_418.unk_00 = 0;