diff options
Diffstat (limited to 'src/pokemon_3.c')
| -rw-r--r-- | src/pokemon_3.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 68c894b..251a69f 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -49,10 +49,10 @@ extern s32 gUnknown_810AC90[10]; extern void AddSprite(u16 *, u32, u32, u32); -extern void xxx_save_poke_sub_4_80902F4(struct unkStruct_8094924*, struct unkPokeSubStruct_4*); +extern void SaveDungeonLocation(struct unkStruct_8094924*, struct DungeonLocation*); extern void xxx_save_poke_sub_c_808F41C(struct unkStruct_8094924*, struct unkPokeSubStruct_C*); extern void SavePokemonMoves(struct unkStruct_8094924*, struct PokemonMove*); -void xxx_restore_poke_sub_4_8090314(struct unkStruct_8094924*, struct unkPokeSubStruct_4*); +void RestoreDungeonLocation(struct unkStruct_8094924*, struct DungeonLocation*); void xxx_restore_poke_sub_c_808F410(struct unkStruct_8094924*, struct unkPokeSubStruct_C*); void RestorePokemonMoves(struct unkStruct_8094924*, struct PokemonMove*); @@ -685,7 +685,7 @@ s32 SaveRecruitedPokemon(u8 *a1, s32 a2) if (pokemon->unk0 & 2) { buffer[count++] = i; } - if (pokemon->unk2) { + if (pokemon->isLeader) { data_s16 = i; } } @@ -745,7 +745,7 @@ s32 RestoreRecruitedPokemon(u8 *a1, s32 a2) } RestoreIntegerBits(&backup, &data_s16, 16); if ((u16)data_s16 < NUM_SPECIES) { - gRecruitedPokemonRef->pokemon[data_s16].unk2 = 1; + gRecruitedPokemonRef->pokemon[data_s16].isLeader = 1; } nullsub_102(&backup); return backup.unk8; @@ -755,7 +755,7 @@ void SavePokemonStruct(struct unkStruct_8094924* a1, struct PokemonStruct* pokem { SaveIntegerBits(a1, &pokemon->unkHasNextStage, 7); SaveIntegerBits(a1, &pokemon->speciesNum, 9); - xxx_save_poke_sub_4_80902F4(a1, &pokemon->unk4); + SaveDungeonLocation(a1, &pokemon->unk4); xxx_save_poke_sub_c_808F41C(a1, &pokemon->unkC[0]); xxx_save_poke_sub_c_808F41C(a1, &pokemon->unkC[1]); SaveIntegerBits(a1, &pokemon->IQ, 10); @@ -776,13 +776,13 @@ void RestorePokemonStruct(struct unkStruct_8094924* a1, struct PokemonStruct* po { memset(pokemon, 0, sizeof(struct PokemonStruct)); pokemon->unk0 = 0; - pokemon->unk2 = 0; + pokemon->isLeader = 0; RestoreIntegerBits(a1, &pokemon->unkHasNextStage, 7); if (pokemon->unkHasNextStage) { pokemon->unk0 |= 1; } RestoreIntegerBits(a1, &pokemon->speciesNum, 9); - xxx_restore_poke_sub_4_8090314(a1, &pokemon->unk4); + RestoreDungeonLocation(a1, &pokemon->unk4); xxx_restore_poke_sub_c_808F410(a1, &pokemon->unkC[0]); xxx_restore_poke_sub_c_808F410(a1, &pokemon->unkC[1]); RestoreIntegerBits(a1, &pokemon->IQ, 10); @@ -814,10 +814,10 @@ s32 SavePokemonStruct2(u8* a1, s32 size) struct PokemonStruct2* pokemon2 = &gRecruitedPokemonRef->pokemon2[i]; SaveIntegerBits(&backup, &pokemon2->unk0, 2); - SaveIntegerBits(&backup, pokemon2->unk2 ? &data_u8_neg1 : &data_u8_zero, 1); + SaveIntegerBits(&backup, pokemon2->isLeader ? &data_u8_neg1 : &data_u8_zero, 1); SaveIntegerBits(&backup, &pokemon2->unkHasNextStage, 7); - xxx_save_poke_sub_4_80902F4(&backup, &pokemon2->unk4); + SaveDungeonLocation(&backup, &pokemon2->unk4); SaveIntegerBits(&backup, &pokemon2->IQ, 10); SaveIntegerBits(&backup, &pokemon2->unkA, 16); SaveIntegerBits(&backup, &pokemon2->unkC, 16); @@ -858,14 +858,14 @@ s32 RestorePokemonStruct2(u8* a1, s32 size) RestoreIntegerBits(&backup, &unk2, 1); if (unk2 & 1) { - pokemon2->unk2 = TRUE; + pokemon2->isLeader = TRUE; } else { - pokemon2->unk2 = FALSE; + pokemon2->isLeader = FALSE; } RestoreIntegerBits(&backup, &pokemon2->unkHasNextStage, 7); - xxx_restore_poke_sub_4_8090314(&backup, &pokemon2->unk4); + RestoreDungeonLocation(&backup, &pokemon2->unk4); RestoreIntegerBits(&backup, &pokemon2->IQ, 10); RestoreIntegerBits(&backup, &pokemon2->unkA, 16); RestoreIntegerBits(&backup, &pokemon2->unkC, 16); |