From eaa141c612dd1689936a21bd57018a55ff686b69 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sun, 23 May 2021 16:19:35 -0500 Subject: Keep on keepin on (#38) * end of may dump of work * move save text to src * decomp a little more --- src/pokemon.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'src/pokemon.c') diff --git a/src/pokemon.c b/src/pokemon.c index 90a0c00..e87c8c6 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1,25 +1,46 @@ #include "global.h" #include "pokemon.h" #include "file_system.h" +#include "constants/species.h" -extern u32 *gRecruitedPokemonRef; -extern u32 gRecruitedPokemon; +extern struct unkStruct_203B45C gRecruitedPokemon[]; extern struct FileArchive gSystemFileArchive; extern const char gUnknown_81075F4; extern struct OpenedFile *gMonsterParametersFile; extern u16 gLevelCurrentPokeId; extern struct gPokemon *gMonsterParameters; +extern struct unkStruct_203B45C *gRecruitedPokemonRef; void LoadMonsterParameters(void) { - gRecruitedPokemonRef = &gRecruitedPokemon; + gRecruitedPokemonRef = gRecruitedPokemon; gMonsterParametersFile = OpenFileAndGetFileDataPtr(&gUnknown_81075F4, &gSystemFileArchive); gMonsterParameters = (struct gPokemon *)gMonsterParametersFile->data; gLevelCurrentPokeId = 0; } -u32 *sub_808CE00(void) +struct unkStruct_203B45C *GetRecruitedPokemon(void) { - return &gRecruitedPokemon; + return gRecruitedPokemon; } +void InitializeRecruitedPokemon(void) +{ + s32 iVar3; + + for(iVar3 = 0; iVar3 < NUM_SPECIES; iVar3++) + { + gRecruitedPokemonRef->pokemon[iVar3].unk0 = 0; + } + + for(iVar3 = 0; iVar3 < 4; iVar3++) + { + gRecruitedPokemonRef->pokemon2[iVar3].unk0 = 0; + } + + for(iVar3 = 0; iVar3 < 4; iVar3++) + { + gRecruitedPokemonRef->pokemon3[iVar3].unk8 = 0; + gRecruitedPokemonRef->pokemon3[iVar3].unk0 = 0; + } +} -- cgit v1.2.3