diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-12-15 18:06:42 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-15 18:06:42 -0600 |
| commit | fb9a365dc6ddfebde03ac1ea3e770b30dbb5dbf2 (patch) | |
| tree | 0960d1d78a4c4b758008cf7fbcab8048d1c371de /src/pokemon.c | |
| parent | 1ca3656d74faf8565e0f61b31a1cd3ab22a44706 (diff) | |
| parent | 1d09216e4b776ed03daa83c66fd6600bc43f8d25 (diff) | |
Merge pull request #448 from Meowsy/pokedex-documentation
Pokedex Documentation
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index de3eaba75..14b4ea388 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5858,10 +5858,10 @@ u16 HoennPokedexNumToSpecies(u16 hoennNum) species = 0; - while (species < 411 && gSpeciesToHoennPokedexNum[species] != hoennNum) + while (species < (NUM_SPECIES - 1) && gSpeciesToHoennPokedexNum[species] != hoennNum) species++; - if (species == 411) + if (species == NUM_SPECIES - 1) return 0; return species + 1; @@ -5876,10 +5876,10 @@ u16 NationalPokedexNumToSpecies(u16 nationalNum) species = 0; - while (species < 411 && gSpeciesToNationalPokedexNum[species] != nationalNum) + while (species < (NUM_SPECIES - 1) && gSpeciesToNationalPokedexNum[species] != nationalNum) species++; - if (species == 411) + if (species == NUM_SPECIES - 1) return 0; return species + 1; @@ -5894,10 +5894,10 @@ u16 NationalToHoennOrder(u16 nationalNum) hoennNum = 0; - while (hoennNum < 411 && gHoennToNationalOrder[hoennNum] != nationalNum) + while (hoennNum < (NUM_SPECIES - 1) && gHoennToNationalOrder[hoennNum] != nationalNum) hoennNum++; - if (hoennNum == 411) + if (hoennNum == NUM_SPECIES - 1) return 0; return hoennNum + 1; @@ -6578,15 +6578,15 @@ u16 SpeciesToPokedexNum(u16 species) else { species = SpeciesToHoennPokedexNum(species); - if (species <= 202) + if (species <= HOENN_DEX_COUNT) return species; return 0xFFFF; } } -bool32 sub_806E3F8(u16 species) +bool32 IsSpeciesInHoennDex(u16 species) { - if (SpeciesToHoennPokedexNum(species) > 202) + if (SpeciesToHoennPokedexNum(species) > HOENN_DEX_COUNT) return FALSE; else return TRUE; |