Sync pokedex constants

src/menu2.c

@@ -3,6 +3,11 @@
 #include "task.h"
 #include "wild_encounter.h"
 
+// Not actually "old" given these were introduced in Gen 3,
+// but they're used as equivalents here alongside the other OLD_UNOWN
+#define SPECIES_OLD_UNOWN_EMARK (NUM_SPECIES + 0)
+#define SPECIES_OLD_UNOWN_QMARK (NUM_SPECIES + 1)
+
 static void Task_SmoothBlendLayers(u8 taskId);
 
 static const u8 sMonSpriteAnchorCoords[][5] = {

src/pokemon.c

@@ -94,6 +94,9 @@ static const struct CombinedMove sCombinedMoves[2] =
     {0xFFFF, 0xFFFF, 0xFFFF}
 };
 
+// NOTE: The order of the elements in the 3 arrays below is irrelevant.
+// To reorder the pokedex, see the values in include/constants/pokedex.h.
+
 static const u16 sSpeciesToHoennPokedexNum[] = // Assigns all species to the Hoenn Dex Index (Summary No. for Hoenn Dex)
 {
     SPECIES_TO_HOENN(BULBASAUR),
@@ -5008,7 +5011,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem)
                 if (gEvolutionTable[species][i].param == heldItem)
                 {
                     targetSpecies = gEvolutionTable[species][i].targetSpecies;
-                    if (IsNationalPokedexEnabled() || targetSpecies <= 151)
+                    if (IsNationalPokedexEnabled() || targetSpecies <= KANTO_SPECIES_END)
                     {
                         heldItem = 0;
                         SetMonData(mon, MON_DATA_HELD_ITEM, &heldItem);
@@ -5664,7 +5667,7 @@ u16 SpeciesToPokedexNum(u16 species)
 {
     species = SpeciesToNationalPokedexNum(species);
 
-    if (!IsNationalPokedexEnabled() && species > 151)
+    if (!IsNationalPokedexEnabled() && species > KANTO_SPECIES_END)
         return 0xFFFF;
     return species;
 }

src/prof_pc.c

@@ -84,7 +84,7 @@ static const u8 *GetProfOaksRatingMessageByCount(u16 count)
     if (count < 150)
         return PokedexRating_Text_LessThan150;
 
-    if (count == 150)
+    if (count == KANTO_DEX_COUNT - 1)
     {
         // Mew doesn't count for completing the pokedex
         if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_MEW), 1))
@@ -94,7 +94,7 @@ static const u8 *GetProfOaksRatingMessageByCount(u16 count)
         return PokedexRating_Text_Complete;
     }
 
-    if (count == 151)
+    if (count == KANTO_DEX_COUNT)
     {
         gSpecialVar_Result = TRUE;
         return PokedexRating_Text_Complete;