From 71e96aaa083460cd800344014fc147fed4eaf11c Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 3 Mar 2025 11:02:45 -0300 Subject: [PATCH] Review changes --- include/overlay094/ov94_022414B8.h | 2 +- src/overlay005/ov5_021E622C.c | 6 +++--- src/overlay019/ov19_021D0D80.c | 4 +--- src/overlay094/ov94_0223D0C4.c | 2 +- src/overlay094/ov94_0223E46C.c | 8 ++------ src/overlay094/ov94_0223FB48.c | 22 ++++++++++---------- src/overlay094/ov94_022414B8.c | 32 ++++++++++++++---------------- src/roaming_pokemon.c | 2 +- 8 files changed, 35 insertions(+), 43 deletions(-) diff --git a/include/overlay094/ov94_022414B8.h b/include/overlay094/ov94_022414B8.h index 2983da4e77..d816c6ec66 100644 --- a/include/overlay094/ov94_022414B8.h +++ b/include/overlay094/ov94_022414B8.h @@ -19,7 +19,7 @@ int ov94_022414B8(UnkStruct_ov94_0223FD4C *param0, int param1); int ov94_02241548(UnkStruct_ov94_0223FD4C *param0, int param1); int ov94_02241568(UnkStruct_ov94_0223FD4C *param0, int param1); -int ov94_02241B80(UnkStruct_ov94_0223BA88_sub3 *param0, int param1); +int ov94_02241B80(UnkStruct_ov94_0223BA88_sub3 *param0, int genderRatio); void ov94_02242158(Window *param0, MessageLoader *param1, int param2, int param3, int param4, TextColor param5); void ov94_0224218C(Window *param0, MessageLoader *param1, MessageLoader *param2, int param3, int param4, int param5, TextColor param6); void ov94_02242204(Window *param0, MessageLoader *param1, int param2, int param3, int param4, int param5, u32 param6); diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c index 8f80ddbd72..c649711602 100644 --- a/src/overlay005/ov5_021E622C.c +++ b/src/overlay005/ov5_021E622C.c @@ -2098,7 +2098,7 @@ static void ov5_021E63E0(Pokemon *param0) static int ov5_021E6444(Party *param0, UnkStruct_02026218 *param1, StringTemplate *param2) { - Pokemon *v0 = Pokemon_New(4); + Pokemon *v0 = Pokemon_New(HEAP_ID_FIELD); BoxPokemon *v1 = sub_02026220(param1); UnkStruct_02026224 *v2 = sub_02026224(param1); u32 v3; @@ -2140,7 +2140,7 @@ u16 ov5_021E64F8(Party *param0, StringTemplate *param1, UnkStruct_02026310 *para int BoxPokemon_GiveExperience(BoxPokemon *boxMon, u32 givenExp) { - Pokemon *mon = Pokemon_New(4); + Pokemon *mon = Pokemon_New(HEAP_ID_FIELD); BoxPokemon *boxMonRef = Pokemon_GetBoxPokemon(mon); int level; u32 exp; @@ -2683,7 +2683,7 @@ void ov5_021E6EA8(UnkStruct_02026310 *param0, Party *param1, TrainerInfo *param2 { u16 v0; u8 v1[2], v2; - Pokemon *v3 = Pokemon_New(4); + Pokemon *v3 = Pokemon_New(HEAP_ID_FIELD); v0 = ov5_021E6C20(param0, v1); v0 = ov5_021E6B54(v0, param0); diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index cc2074fde6..69b13b4faf 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -2305,9 +2305,7 @@ static BOOL BoxPokemon_HasMove(BoxPokemon *boxMon, u16 move) BOOL reencrypt = BoxPokemon_EnterDecryptionContext(boxMon); if (BoxPokemon_GetValue(boxMon, MON_DATA_EGG_EXISTS, NULL) == FALSE) { - int i; - - for (i = 0; i < LEARNED_MOVES_MAX; i++) { + for (int i = 0; i < LEARNED_MOVES_MAX; i++) { if (BoxPokemon_GetValue(boxMon, MON_DATA_MOVE1 + i, NULL) == move) { hasMove = TRUE; break; diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c index fd6fc8295e..8c2dd35e83 100644 --- a/src/overlay094/ov94_0223D0C4.c +++ b/src/overlay094/ov94_0223D0C4.c @@ -540,7 +540,7 @@ void ov94_0223D910(MessageLoader *param0, MessageLoader *param1, StringTemplate ov94_02245900(¶m3[0], v4, 0, 0, 0, TEXT_COLOR(15, 2, 0)); - if (gender != 3) { + if (gender != GENDER_NONE + 1) { ov94_02245900(¶m3[0], v1, 70, 0, 0, Unk_ov94_022467FC[gender]); } diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index 69b0e541c6..9af989b491 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -1125,13 +1125,9 @@ static void ov94_0223F9FC(Window *param0, Window *param1, MessageLoader *param2) static int ov94_0223FB0C(const UnkStruct_ov94_0223BA88_sub3 *param0, const UnkStruct_ov94_0223BA88_sub3 *param1, int param2, int param3) { - if ((param0->species == param1->species) + return (param0->species == param1->species) && (param0->gender == param1->gender) && (param0->level == param1->level) && (param0->level2 == param1->level2) - && (param2 == param3)) { - return 1; - } - - return 0; + && (param2 == param3); } diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index 4088f1b9fe..e258d19df7 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -91,8 +91,8 @@ static int ov94_0224121C(Party *param0, PCBoxes *param1, int param2, int param3) static int ov94_022412F4(Party *param0, PCBoxes *param1, int param2, int param3); static int ov94_02240BB0(UnkStruct_ov94_0223FD4C *param0); static int BoxPokemon_HasUnusedRibbons(BoxPokemon *boxMon); -static int ov94_02241278(BoxPokemon *boxMon); -static int ov94_022412C8(BoxPokemon *boxMon); +static BOOL BoxPokemon_FormNotInDP(BoxPokemon *boxMon); +static BOOL BoxPokemon_HeldItemNotInDP(BoxPokemon *boxMon); static int (*Unk_ov94_022468DC[])(UnkStruct_ov94_0223FD4C *) = { ov94_022402A8, @@ -724,10 +724,10 @@ static int ov94_02240688(UnkStruct_ov94_0223FD4C *param0) if (BoxPokemon_HasUnusedRibbons(v0)) { ov94_02240D58(param0, 37, TEXT_SPEED_FAST, 0, 0xf0f, 1); ov94_0223C3F4(param0, 4, 1); - } else if (ov94_02241278(v0)) { + } else if (BoxPokemon_FormNotInDP(v0)) { ov94_02240D58(param0, 170, TEXT_SPEED_FAST, 0, 0xf0f, 1); ov94_0223C3F4(param0, 4, 1); - } else if (ov94_022412C8(v0)) { + } else if (BoxPokemon_HeldItemNotInDP(v0)) { ov94_02240D58(param0, 171, TEXT_SPEED_FAST, 0, 0xf0f, 1); ov94_0223C3F4(param0, 4, 1); } else { @@ -796,7 +796,7 @@ static int ov94_02240830(UnkStruct_ov94_0223FD4C *param0) static int ov94_022408E8(UnkStruct_ov94_0223FD4C *param0) { - BoxPokemon *v0; + BoxPokemon *boxMon; switch (Menu_ProcessInput(param0->unk_10D4)) { case 1: @@ -811,15 +811,15 @@ static int ov94_022408E8(UnkStruct_ov94_0223FD4C *param0) StringList_Free(param0->unk_10CC); Window_EraseStandardFrame(¶m0->unk_F9C[0], 0); - v0 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112); + boxMon = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112); - if (BoxPokemon_HasUnusedRibbons(v0)) { + if (BoxPokemon_HasUnusedRibbons(boxMon)) { ov94_02240D58(param0, 37, TEXT_SPEED_FAST, 0, 0xf0f, 1); ov94_0223C3F4(param0, 4, 1); - } else if (ov94_02241278(v0)) { + } else if (BoxPokemon_FormNotInDP(boxMon)) { ov94_02240D58(param0, 170, TEXT_SPEED_FAST, 0, 0xf0f, 1); ov94_0223C3F4(param0, 4, 1); - } else if (ov94_022412C8(v0)) { + } else if (BoxPokemon_HeldItemNotInDP(boxMon)) { ov94_02240D58(param0, 171, TEXT_SPEED_FAST, 0, 0xf0f, 1); ov94_0223C3F4(param0, 4, 1); } else { @@ -1260,7 +1260,7 @@ static int BoxPokemon_HasUnusedRibbons(BoxPokemon *boxMon) return FALSE; } -static int ov94_02241278(BoxPokemon *boxMon) +static BOOL BoxPokemon_FormNotInDP(BoxPokemon *boxMon) { int reencrypt = BoxPokemon_EnterDecryptionContext(boxMon); int species = BoxPokemon_GetValue(boxMon, MON_DATA_SPECIES, NULL); @@ -1280,7 +1280,7 @@ static int ov94_02241278(BoxPokemon *boxMon) return FALSE; } -static int ov94_022412C8(BoxPokemon *boxMon) +static BOOL BoxPokemon_HeldItemNotInDP(BoxPokemon *boxMon) { int reencrypt = BoxPokemon_EnterDecryptionContext(boxMon); int item = BoxPokemon_GetValue(boxMon, MON_DATA_HELD_ITEM, NULL); diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index 938f2bc4e2..d942153834 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -5,6 +5,7 @@ #include #include "constants/species.h" +#include "generated/gender_ratios.h" #include "generated/species_data_params.h" #include "struct_decls/pokedexdata_decl.h" @@ -594,21 +595,18 @@ static int ov94_02241B2C(UnkStruct_ov94_0223FD4C *param0) return 3; } -int ov94_02241B80(UnkStruct_ov94_0223BA88_sub3 *param0, int param1) +int ov94_02241B80(UnkStruct_ov94_0223BA88_sub3 *param0, int genderRatio) { - switch (param1) { - case 0: - param0->gender = 0 + 1; + switch (genderRatio) { + case GENDER_RATIO_MALE_ONLY: + param0->gender = GENDER_MALE + 1; return 1; - break; - case 254: - param0->gender = 1 + 1; + case GENDER_RATIO_FEMALE_ONLY: + param0->gender = GENDER_FEMALE + 1; return 1; - break; - case 255: - param0->gender = 2 + 1; + case GENDER_RATIO_NO_GENDER: + param0->gender = GENDER_NONE + 1; return 1; - break; } return 0; @@ -979,7 +977,7 @@ static void ov94_022423FC(MessageLoader *param0, StringTemplate *param1, Window StringTemplate_SetNumber(param1, 3, level, 3, 0, 1); v1 = MessageUtil_ExpandedStrbuf(param1, param0, 102, 62); - if (gender != 3) { + if (gender != GENDER_NONE + 1) { MessageLoader_GetStrbuf(param0, Unk_ov94_02245FD8[gender], v3); } @@ -991,7 +989,7 @@ static void ov94_022423FC(MessageLoader *param0, StringTemplate *param1, Window ov94_02245900(¶m2[1], v2, 0, 0, 0, TEXT_COLOR(15, 2, 0)); ov94_02245900(¶m2[2], v1, 0, 0, 2, TEXT_COLOR(15, 2, 0)); - if (gender != 3) { + if (gender != GENDER_NONE + 1) { ov94_02245900(¶m2[1], v3, 70, 0, 0, Unk_ov94_02246920[gender - 1]); } @@ -1265,7 +1263,7 @@ void ov94_02242934(UnkStruct_ov94_0223BA88_sub3 *param0, int param1, int param2) int ov94_02242970(int param0, int param1, int param2) { - int v0; + int i; int v1; const UnkStruct_ov94_022460AC *v2; @@ -1277,9 +1275,9 @@ int ov94_02242970(int param0, int param1, int param2) v1 = (NELEMS(Unk_ov94_022460AC)); } - for (v0 = 0; v0 < v1; v0++) { - if ((v2[v0].level == param0) && (v2[v0].level2 == param1)) { - return v0; + for (i = 0; i < v1; i++) { + if ((v2[i].level == param0) && (v2[i].level2 == param1)) { + return i; } } diff --git a/src/roaming_pokemon.c b/src/roaming_pokemon.c index 42560504ee..f1919efa32 100644 --- a/src/roaming_pokemon.c +++ b/src/roaming_pokemon.c @@ -318,7 +318,7 @@ void RoamingPokemon_ActivateSlot(SaveData *saveData, const u8 slot) Roamer_SetData(newRoamer, ROAMER_DATA_LEVEL, level); trainer = SaveData_GetTrainerInfo(saveData); - roamerMonData = Pokemon_New(4); + roamerMonData = Pokemon_New(HEAP_ID_FIELD); Pokemon_Init(roamerMonData); Pokemon_InitWith(roamerMonData, species, level, INIT_IVS_RANDOM, FALSE, 0, OTID_SET, TrainerInfo_ID_LowHalf(trainer));