diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-02 00:24:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-02 00:24:16 -0500 |
| commit | 64460e01aede2bbcaa8d1dd18dd3fab590fa4a6e (patch) | |
| tree | 58be3a15322f5c0972b71525f5cd22149bb67696 /include/pokemon.h | |
| parent | 7e26aa3d21f55e1375bfde6ffbc70210170fdc37 (diff) | |
| parent | 3fd5e143a986334985c2c786c324663dbba2db9b (diff) | |
Merge pull request #1314 from GriffinRichards/doc-controllers
Document battle controllers, misc other battle
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 0ff635a3f..654af3031 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -266,7 +266,7 @@ extern const u8 gPPUpSetMask[]; extern const u8 gPPUpAddMask[]; extern const u8 gStatStageRatios[MAX_STAT_STAGE + 1][2]; extern const u16 gLinkPlayerFacilityClasses[]; -extern const struct SpriteTemplate gUnknown_08329D98[]; +extern const struct SpriteTemplate gBattlerSpriteTemplates[]; extern const s8 gNatureStatTable[][5]; void ZeroBoxMonData(struct BoxPokemon *boxMon); @@ -287,7 +287,7 @@ void CreateApprenticeMon(struct Pokemon *mon, const struct Apprentice *src, u8 m void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId); void ConvertPokemonToBattleTowerPokemon(struct Pokemon *mon, struct BattleTowerPokemon *dest); void CreateObedientMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId); -bool8 sub_80688F8(u8 caseId, u8 battlerId); +bool8 ShouldIgnoreDeoxysForm(u8 caseId, u8 battlerId); void SetDeoxysStats(void); u16 GetUnionRoomTrainerPic(void); u16 GetUnionRoomTrainerClass(void); |