diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-18 14:27:01 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 14:27:01 -0600 |
| commit | 2c7948bae8cbe58882c1d4ad0669f33d56dac76b (patch) | |
| tree | 71bae050175d7ea03df5be89d9bc62075c1d2fd6 /src/pokemon.c | |
| parent | c74468fd11b551e1babf18a4d320e114fe495bd8 (diff) | |
| parent | d6b31346c3441d4d99f1fbf7d4c4de8573450872 (diff) | |
Merge pull request #452 from Meowsy/pokemon-adding-easer
Add macros to simplify defining front animations and still pics.
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 14b4ea388..640d70776 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5929,13 +5929,13 @@ u16 HoennToNationalOrder(u16 hoennNum) u16 SpeciesToCryId(u16 species) { - if (species <= 250) + if (species <= SPECIES_CELEBI - 1) return species; - if (species < 276) - return 200; + if (species < SPECIES_TREECKO - 1) + return SPECIES_UNOWN - 1; - return gSpeciesIdToCryId[species - 276]; + return gSpeciesIdToCryId[species - (SPECIES_TREECKO - 1)]; } void sub_806D544(u16 species, u32 personality, u8 *dest) |