diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-18 19:31:04 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-18 19:54:27 -0600 |
| commit | 2592803460fcaeb2dd804080eb8770c85613773e (patch) | |
| tree | ba53079591d9629dcf4672b544f13651f346d425 /src/pokemon.c | |
| parent | cd994f4935b9de81383d8e0a17d790414652a4d6 (diff) | |
| parent | b2ac3b6d6f06ed4a2d64af90e97796c66bcdeb5f (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into trade
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) |