diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-29 17:17:35 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-29 17:17:35 -0400 |
| commit | a62fbd6ec1d34ccba25e117e0db60fd4100bfd8d (patch) | |
| tree | d28f0320009ff4cf4955e84b4555519a1ab55b69 /include/pokemon.h | |
| parent | b73b15dc9c10ace5145e3d4b339ca833413a1522 (diff) | |
| parent | 8d82578d3a101b06f9d2ced31738021007c4e533 (diff) | |
Merge branch 'master' into pokeblock
Diffstat (limited to 'include/pokemon.h')
| -rwxr-xr-x[-rw-r--r--] | include/pokemon.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index be8e4e56d..46366511d 100644..100755 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -409,6 +409,7 @@ extern u8 gStatStageRatios[][2]; extern struct Pokemon gPlayerParty[PARTY_SIZE]; extern struct Pokemon gEnemyParty[PARTY_SIZE]; +extern struct PokemonStorage gPokemonStorage; void ZeroBoxMonData(struct BoxPokemon *boxMon); void ZeroMonData(struct Pokemon *mon); @@ -511,5 +512,6 @@ void sub_8040B8C(void); void SetWildMonHeldItem(void); u8 *sub_8040D08(); bool32 sub_8040D3C(u16 species, u8 *name, u8 language); +u16 GetMonEVCount(struct Pokemon *); #endif // GUARD_POKEMON_H |