diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-07 13:15:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-07 13:15:34 -0400 |
| commit | 2a7205dec677c98d087cb8ba191370de464c8bf0 (patch) | |
| tree | bbad1ce5b07b922803f25dfdcb3feee909c513c9 /src/pokemon.c | |
| parent | fb9b695f9a366f662b5262f440d77c770b131d0d (diff) | |
| parent | 13468377bc85b2daa309b049e3d9f733dadce440 (diff) | |
Merge pull request #111 from PikalaxALT/link
Port link from Emerald
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 152e8e1df..4685dcbcd 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -4961,7 +4961,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) if (gEvolutionTable[species][i].param == heldItem) { targetSpecies = gEvolutionTable[species][i].targetSpecies; - if (sub_806E25C() || targetSpecies <= 151) + if (IsNationalPokedexEnabled() || targetSpecies <= 151) { heldItem = 0; SetMonData(mon, MON_DATA_HELD_ITEM, &heldItem); @@ -5629,7 +5629,7 @@ u16 sub_8043F90(u16 species) { species = SpeciesToNationalPokedexNum(species); - if (!sub_806E25C() && species > 151) + if (!IsNationalPokedexEnabled() && species > 151) return 0xFFFF; return species; } |