diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-29 05:10:38 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-29 05:10:38 +0200 |
| commit | c63421db4153c56970d1788742f9a75c451e4003 (patch) | |
| tree | 7d5ddad4c7716c0610048bde469f6942b3c5c3ed /src/pokemon_3.c | |
| parent | 5f98ce78e4908b820ce18e033d181ae74401010e (diff) | |
| parent | d7a6ff0e4dab0c96ac49975a0695014bff2b9654 (diff) | |
Merge branch 'master' into decompile_pokemon_menu
Diffstat (limited to 'src/pokemon_3.c')
| -rw-r--r-- | src/pokemon_3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pokemon_3.c b/src/pokemon_3.c index e449af0a1..d7cc39546 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -457,7 +457,7 @@ u16 HoennToNationalOrder(u16 hoennNum) return gHoennToNationalOrder[hoennNum - 1]; } -u32 SpeciesToCryId(u16 species) +u16 SpeciesToCryId(u16 species) { if (species <= 250) return species; |