link.c through InitLocalLinkPlayer

2019-10-05 15:49:05 -04:00
parent b4b509f684
commit b01da1a592
26 changed files with 332 additions and 412 deletions
@@ -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;
 }