Label functions used by trainer_data.c

This commit is contained in:
lhearachel 2023-10-26 17:47:00 -07:00
parent c07da37106
commit 1d626d412c
19 changed files with 42 additions and 42 deletions

View File

@ -256,7 +256,7 @@ BOOL BoxPokemon_EnterDecryptionContext(BoxPokemon *boxMon);
*/
BOOL BoxPokemon_ExitDecryptionContext(BoxPokemon *boxMon, BOOL encrypt);
void sub_02073D80(Pokemon *mon, int monSpecies, int monLevel, int monIVs, BOOL useMonPersonalityParam, u32 monPersonality, int monOTIDSource, u32 monOTID);
void Pokemon_InitWith(Pokemon *mon, int monSpecies, int monLevel, int monIVs, BOOL useMonPersonalityParam, u32 monPersonality, int monOTIDSource, u32 monOTID);
void sub_02074044(Pokemon *mon, u16 monSpecies, u8 monLevel, u8 monIVs, u8 monNature);
void sub_02074088(Pokemon *mon, u16 monSpecies, u8 monLevel, u8 monIVs, u8 param4, u8 param5, u8 param6);
u32 sub_02074128(u16 monSpecies, u8 param1, u8 param2);
@ -862,7 +862,7 @@ void sub_02078A4C(NARC *narc, u8 *param1, u16 param2, u16 param3);
void sub_02078A80(NARC *narc, s8 *param1, u16 param2);
void sub_02078AA4(NARC *narc, s8 *param1, u16 param2);
void sub_02078AC8(NARC *narc, u8 *param1, u16 param2);
BOOL sub_02078AEC(int param0, Pokemon *mon, int heapID);
BOOL Pokemon_SetBallSeal(int param0, Pokemon *mon, int heapID);
void sub_02078B40(Pokemon *mon, UnkStruct_02078B40 *param1);
void sub_02078E0C(UnkStruct_02078B40 *param0, Pokemon *mon);

View File

@ -11,10 +11,10 @@
int MiscSaveBlock_SaveSize(void);
void MiscSaveBlock_Init(UnkStruct_0202783C * param0);
UnkStruct_0202783C * sub_0202783C(SaveData * param0);
const UnkStruct_0202783C * sub_02027848(const SaveData * param0);
const UnkStruct_0202783C * Save_MiscRO(const SaveData * param0);
UnkStruct_02027854 * sub_02027854(SaveData * param0);
UnkStruct_02027860 * sub_02027860(SaveData * param0);
const u16 * sub_02027870(const UnkStruct_0202783C * param0);
const u16 * MiscSave_RivalName(const UnkStruct_0202783C * param0);
void sub_0202787C(UnkStruct_0202783C * param0, Strbuf *param1);
const u16 * sub_02027894(const UnkStruct_0202783C * param0);
void sub_020278A0(UnkStruct_0202783C * param0, Strbuf *param1);

View File

@ -2604,7 +2604,7 @@ void ov5_021E6CF0 (Pokemon * param0, u16 param1, u8 param2, TrainerInfo * param3
u8 v4 = PokemonPersonalData_GetSpeciesValue(param1, 19);
Strbuf* v5;
sub_02073D80(param0, param1, 1, 32, 0, 0, 0, 0);
Pokemon_InitWith(param0, param1, 1, 32, 0, 0, 0, 0);
v0 = 0;
v3 = 4;
@ -2664,7 +2664,7 @@ void ov5_021E6DE8 (Pokemon * param0, u16 param1, UnkStruct_02026310 * param2, u3
}
}
sub_02073D80(param0, param1, 1, 32, 1, v2, 0, 0);
Pokemon_InitWith(param0, param1, 1, 32, 1, v2, 0, 0);
v0 = 0;
v1 = 4;
@ -3072,7 +3072,7 @@ static void ov5_021E742C (Pokemon * param0, int param1)
}
}
sub_02073D80(v16, v0, 1, 32, 1, v3, 0, 0);
Pokemon_InitWith(v16, v0, 1, 32, 1, v3, 0, 0);
for (v7 = 0; v7 < 4; v7++) {
Pokemon_SetValue(v16, 54 + v7, &(v1[v7]));

View File

@ -1188,7 +1188,7 @@ static void ov6_02241BAC (const u16 param0, const u8 param1, const int param2, c
} while (TRUE);
}
sub_02073D80(v5, param0, param1, 32, 1, v1, 1, param4->unk_00);
Pokemon_InitWith(v5, param0, param1, 32, 1, v1, 1, param4->unk_00);
v0 = ov6_02242514(param2, param4, v5, param6);
GF_ASSERT(v0);

View File

@ -158,7 +158,7 @@ static void ov6_0224630C (Pokemon * param0, UnkStruct_ov6_0224630C * param1, u32
u8 v1;
u32 v2;
sub_02073D80(param0, param1->unk_00, param2, 32, 1, param1->unk_38, 1, param1->unk_20);
Pokemon_InitWith(param0, param1->unk_00, param2, 32, 1, param1->unk_38, 1, param1->unk_20);
v0 = ov6_022462E4(param4, param3);

View File

@ -551,7 +551,7 @@ static void ov87_021D1970 (UnkStruct_ov87_021D106C * param0)
v2 = param0->unk_04;
for (v3 = 0; v3 < v2->unk_14; v3++) {
sub_02073D80(param0->unk_1FC, v2->unk_20[v3].unk_10, v2->unk_20[v3].unk_12, 32, 1, v2->unk_20[v3].unk_08, 1, v2->unk_20[v3].unk_0C);
Pokemon_InitWith(param0->unk_1FC, v2->unk_20[v3].unk_10, v2->unk_20[v3].unk_12, 32, 1, v2->unk_20[v3].unk_08, 1, v2->unk_20[v3].unk_0C);
Pokemon_SetValue(param0->unk_1FC, 112, (void *)(&(v2->unk_20[v3].unk_13)));
sub_02075EF4(&v1, param0->unk_1FC, 2);
sub_02013720(v1.unk_00, v1.unk_02, 61, &v0, param0->unk_200, v2->unk_20[v3].unk_08, 0, 2, v2->unk_20[v3].unk_10);

View File

@ -274,7 +274,7 @@ void ov104_0222DF40 (const UnkStruct_ov104_0223A348_sub2 * param0, Pokemon * par
v1 = (param0->unk_14_val2 & 0x3FFFFFFF);
sub_02073D80(param1, param0->unk_00_val1_0, v4, v1, 1, param0->unk_10, 2, 0);
Pokemon_InitWith(param1, param0->unk_00_val1_0, v4, v1, 1, param0->unk_10, 2, 0);
Pokemon_SetValue(param1, 175, &v1);
Pokemon_CalcLevelAndStats(param1);

View File

@ -228,7 +228,7 @@ BOOL BoxPokemon_ExitDecryptionContext(BoxPokemon *boxMon, BOOL encrypt)
return wasEncrypted;
}
void sub_02073D80(Pokemon *mon, int monSpecies, int monLevel, int monIVs, BOOL useMonPersonalityParam, u32 monPersonality, int monOTIDSource, u32 monOTID)
void Pokemon_InitWith(Pokemon *mon, int monSpecies, int monLevel, int monIVs, BOOL useMonPersonalityParam, u32 monPersonality, int monOTIDSource, u32 monOTID)
{
Pokemon_Init(mon);
@ -351,7 +351,7 @@ void sub_02074044(Pokemon *mon, u16 monSpecies, u8 monLevel, u8 monIVs, u8 monNa
} while (monNature != Pokemon_GetNatureOf(monPersonality));
// TODO monOTIDSource probably an enum?
sub_02073D80(mon, monSpecies, monLevel, monIVs, TRUE, monPersonality, 0, 0);
Pokemon_InitWith(mon, monSpecies, monLevel, monIVs, TRUE, monPersonality, 0, 0);
}
void sub_02074088(Pokemon *mon, u16 monSpecies, u8 monLevel, u8 monIVs, u8 param4, u8 param5, u8 param6)
@ -370,7 +370,7 @@ void sub_02074088(Pokemon *mon, u16 monSpecies, u8 monLevel, u8 monIVs, u8 param
}
// TODO monOTIDSource probably an enum?
sub_02073D80(mon, monSpecies, monLevel, monIVs, TRUE, monPersonality, 0, 0);
Pokemon_InitWith(mon, monSpecies, monLevel, monIVs, TRUE, monPersonality, 0, 0);
}
static enum PokemonGenderRatio {
@ -407,7 +407,7 @@ u32 sub_02074128(u16 monSpecies, u8 param1, u8 param2)
void sub_02074158(Pokemon *mon, u16 monSpecies, u8 monLevel, u32 monCombinedIVs, u32 monPersonality)
{
// TODO monOTIDSource probably an enum?
sub_02073D80(mon, monSpecies, monLevel, 0, TRUE, monPersonality, 0, 0);
Pokemon_InitWith(mon, monSpecies, monLevel, 0, TRUE, monPersonality, 0, 0);
Pokemon_SetValue(mon, MON_DATA_COMBINED_IVS, &monCombinedIVs);
Pokemon_CalcLevelAndStats(mon);
}
@ -4691,7 +4691,7 @@ void sub_02078AC8(NARC *narc, u8 *param1, u16 param2)
*param1 = v0.unk_58;
}
BOOL sub_02078AEC(int param0, Pokemon *mon, int heapID)
BOOL Pokemon_SetBallSeal(int param0, Pokemon *mon, int heapID)
{
int v0 = param0;

View File

@ -292,7 +292,7 @@ void RoamingPokemon_ActivateSlot (SaveData * saveData, const u8 slot)
v0 = Pokemon_New(4);
Pokemon_Init(v0);
sub_02073D80(v0, species, level, 32, 0, 0, 1, TrainerInfo_ID_LowHalf(v4));
Pokemon_InitWith(v0, species, level, 32, 0, 0, 1, TrainerInfo_ID_LowHalf(v4));
sub_0202D980(v1, 7, 0);
sub_0202D980(v1, 8, 1);
sub_0202D980(v1, 2, Pokemon_GetValue(v0, MON_DATA_COMBINED_IVS, NULL));

View File

@ -23,7 +23,7 @@
#include "trainer_data.h"
#include "party.h"
static void sub_020793B8(BattleParams * param0, int param1, int param2);
static void TrainerData_BuildParty(BattleParams * param0, int param1, int param2);
void TrainerData_Encounter (BattleParams * param0, const SaveData * param1, int param2)
{
@ -31,7 +31,7 @@ void TrainerData_Encounter (BattleParams * param0, const SaveData * param1, int
int v1;
MessageLoader * v2 = MessageLoader_Init(1, 26, 618, param2);
Strbuf *v3;
const u16 * v4 = sub_02027870(sub_02027848(param1));
const u16 * v4 = MiscSave_RivalName(Save_MiscRO(param1));
for (v1 = 0; v1 < 4; v1++) {
if (param0->unk_18[v1]) {
@ -46,7 +46,7 @@ void TrainerData_Encounter (BattleParams * param0, const SaveData * param1, int
Strbuf_Free(v3);
}
sub_020793B8(param0, v1, param2);
TrainerData_BuildParty(param0, v1, param2);
}
}
@ -170,7 +170,7 @@ u8 TrainerClass_Gender (int param0)
return sTrainerClassGender[param0];
}
static void sub_020793B8 (BattleParams * param0, int param1, int param2)
static void TrainerData_BuildParty (BattleParams * param0, int param1, int param2)
{
void * v0;
int v1, v2;
@ -217,8 +217,8 @@ static void sub_020793B8 (BattleParams * param0, int param1, int param2)
v4 = (v4 << 8) + v3;
v6 = v8[v1].dv * 31 / 255;
sub_02073D80(v7, v9, v8[v1].level, v6, 1, v4, 2, 0);
sub_02078AEC(v8[v1].cbSeal, v7, param2);
Pokemon_InitWith(v7, v9, v8[v1].level, v6, 1, v4, 2, 0);
Pokemon_SetBallSeal(v8[v1].cbSeal, v7, param2);
Pokemon_SetValue(v7, 112, &v10);
Party_AddPokemon(param0->parties[param1], v7);
}
@ -246,13 +246,13 @@ static void sub_020793B8 (BattleParams * param0, int param1, int param2)
v4 = (v4 << 8) + v3;
v6 = v11[v1].dv * 31 / 255;
sub_02073D80(v7, v12, v11[v1].level, v6, 1, v4, 2, 0);
Pokemon_InitWith(v7, v12, v11[v1].level, v6, 1, v4, 2, 0);
for (v2 = 0; v2 < 4; v2++) {
Pokemon_SetMoveSlot(v7, v11[v1].moves[v2], v2);
}
sub_02078AEC(v11[v1].cbSeal, v7, param2);
Pokemon_SetBallSeal(v11[v1].cbSeal, v7, param2);
Pokemon_SetValue(v7, 112, &v13);
Party_AddPokemon(param0->parties[param1], v7);
}
@ -280,9 +280,9 @@ static void sub_020793B8 (BattleParams * param0, int param1, int param2)
v4 = (v4 << 8) + v3;
v6 = v14[v1].dv * 31 / 255;
sub_02073D80(v7, v15, v14[v1].level, v6, 1, v4, 2, 0);
Pokemon_InitWith(v7, v15, v14[v1].level, v6, 1, v4, 2, 0);
Pokemon_SetValue(v7, 6, (u8 *)&v14[v1].item);
sub_02078AEC(v14[v1].cbSeal, v7, param2);
Pokemon_SetBallSeal(v14[v1].cbSeal, v7, param2);
Pokemon_SetValue(v7, 112, &v16);
Party_AddPokemon(param0->parties[param1], v7);
}
@ -310,14 +310,14 @@ static void sub_020793B8 (BattleParams * param0, int param1, int param2)
v4 = (v4 << 8) + v3;
v6 = v17[v1].dv * 31 / 255;
sub_02073D80(v7, v18, v17[v1].level, v6, 1, v4, 2, 0);
Pokemon_InitWith(v7, v18, v17[v1].level, v6, 1, v4, 2, 0);
Pokemon_SetValue(v7, 6, (u8 *)&v17[v1].item);
for (v2 = 0; v2 < 4; v2++) {
Pokemon_SetMoveSlot(v7, v17[v1].moves[v2], v2);
}
sub_02078AEC(v17[v1].cbSeal, v7, param2);
Pokemon_SetBallSeal(v17[v1].cbSeal, v7, param2);
Pokemon_SetValue(v7, 112, &v19);
Party_AddPokemon(param0->parties[param1], v7);
}

View File

@ -180,7 +180,7 @@ void sub_0200B498 (UnkStruct_0200B358 * param0, u32 param1, const TrainerInfo *
void sub_0200B4BC (UnkStruct_0200B358 * param0, u32 param1, const SaveData * param2)
{
const u16 * v0 = sub_02027870(sub_02027848(param2));
const u16 * v0 = MiscSave_RivalName(Save_MiscRO(param2));
Strbuf_CopyChars(param0->unk_0C, v0);
sub_0200B448(param0, param1, param0->unk_0C, NULL);

View File

@ -75,7 +75,7 @@ UnkStruct_0202783C * sub_0202783C (SaveData * param0)
return SaveData_Get(param0, 10);
}
const UnkStruct_0202783C * sub_02027848 (const SaveData * param0)
const UnkStruct_0202783C * Save_MiscRO (const SaveData * param0)
{
return sub_020245E0(param0, 10);
}
@ -96,7 +96,7 @@ UnkStruct_02027860 * sub_02027860 (SaveData * param0)
return &v0->unk_680;
}
const u16 * sub_02027870 (const UnkStruct_0202783C * param0)
const u16 * MiscSave_RivalName (const UnkStruct_0202783C * param0)
{
return param0->unk_6A4;
}

View File

@ -153,7 +153,7 @@ static void sub_020299C0 (UnkStruct_0202A138 * param0, const Strbuf *param1, int
static void sub_020299D8 (const UnkStruct_0202A138 * param0, Pokemon * param1)
{
sub_02073D80(param1, param0->unk_08, 0, 0, 1, param0->unk_00, 1, param0->unk_04);
Pokemon_InitWith(param1, param0->unk_08, 0, 0, 1, param0->unk_00, 1, param0->unk_04);
Pokemon_SetValue(param1, 117, param0->unk_0A);
Pokemon_SetValue(param1, 112, &param0->unk_33);
}

View File

@ -48,7 +48,7 @@ void sub_02030AA0 (UnkStruct_02030A80 * param0, SaveData * param1)
TrainerInfo * v0 = sub_02025E38(param1);
UnkStruct_0202C878 * v1 = sub_0202C878(param1);
UnkStruct_02025CCC * v2 = sub_02025CCC(param1);
const UnkStruct_0202783C * v3 = sub_02027848(param1);
const UnkStruct_0202783C * v3 = Save_MiscRO(param1);
int v4, v5, v6;
int v7;
OSOwnerInfo v8;

View File

@ -6903,7 +6903,7 @@ static void sub_020451B4 (UnkStruct_0203CDB0 * param0, u16 param1)
Pokemon * v1 = Pokemon_New(32);
Pokemon_Init(v1);
sub_02073D80(v1, param1, 50, 32, 0, 0, 0, 0);
Pokemon_InitWith(v1, param1, 50, 32, 0, 0, 0, 0);
sub_020272A4(v0, v1);
Heap_FreeToHeap(v1);

View File

@ -180,9 +180,9 @@ BattleParams * sub_02051F4C (int param0, const UnkStruct_0203CDB0 * param1)
sub_0207D570(v4->unk_E0, 4, 20, param0);
v5 = Pokemon_New(param0);
sub_02073D80(v5, sub_0206B08C(sub_020507E4(param1->unk_0C)), 5, 32, 0, 0, 2, 0);
Pokemon_InitWith(v5, sub_0206B08C(sub_020507E4(param1->unk_0C)), 5, 32, 0, 0, 2, 0);
Party_AddPokemon(v4->parties[0], v5);
sub_02073D80(v5, 399, 2, 32, 0, 0, 2, 0);
Pokemon_InitWith(v5, 399, 2, 32, 0, 0, 2, 0);
Party_AddPokemon(v4->parties[1], v5);
Heap_FreeToHeap(v5);

View File

@ -40,7 +40,7 @@ BOOL sub_020548B0 (int param0, SaveData * param1, u16 param2, u8 param3, u16 par
v1 = Pokemon_New(param0);
Pokemon_Init(v1);
sub_02073D80(v1, param2, param3, 32, 0, 0, 0, 0);
Pokemon_InitWith(v1, param2, param3, 32, 0, 0, 0, 0);
sub_02077E64(v1, v4, 4, param5, param6, param0);
v2 = param4;

View File

@ -1142,7 +1142,7 @@ static int sub_02086F3C (UnkStruct_020067E8 * param0, int * param1)
Pokemon * v4;
v4 = Pokemon_New(18);
sub_02073D80(v4, v0->unk_04, 5, 10, 10, 10, 10, 10);
Pokemon_InitWith(v4, v0->unk_04, 5, 10, 10, 10, 10, 10);
Heap_FreeToHeap(v4);
}
@ -1420,7 +1420,7 @@ static void sub_0208737C (UnkStruct_02087A10 * param0, UnkStruct_020067E8 * para
Pokemon * v1;
v1 = Pokemon_New(18);
sub_02073D80(v1, param0->unk_04, 5, 10, 10, 10, 10, 10);
Pokemon_InitWith(v1, param0->unk_04, 5, 10, 10, 10, 10, 10);
sub_0200B538(param0->unk_168, 0, Pokemon_GetBoxPokemon(v1));
Heap_FreeToHeap(v1);
}
@ -1487,7 +1487,7 @@ static void sub_02087544 (UnkStruct_02087A10 * param0, UnkStruct_020067E8 * para
if ((param0->unk_158 == 0) || sub_02086F14(param0->unk_D8)) {
Pokemon * v4 = Pokemon_New(18);
sub_02073D80(v4, param0->unk_04, 1, 0, 0, 0, 0, 0);
Pokemon_InitWith(v4, param0->unk_04, 1, 0, 0, 0, 0, 0);
sub_0200B538(param0->unk_168, 0, Pokemon_GetBoxPokemon(v4));
Heap_FreeToHeap(v4);
} else {

View File

@ -624,7 +624,7 @@ void sub_02095380 (const UnkStruct_ov6_02248BE8 * param0, Pokemon * param1, int
u32 v2;
v2 = sub_02074128(param0->unk_14, param0->unk_20_12, 0);
sub_02073D80(param1, param0->unk_14, 10, 32, 1, v2, 2, 0xf0f0f0f);
Pokemon_InitWith(param1, param0->unk_14, 10, 32, 1, v2, 2, 0xf0f0f0f);
for (v0 = 0; v0 < 4; v0++) {
v1 = param0->unk_0C[v0];