diff --git a/src/pokemon.c b/src/pokemon.c
index a91138dac6..0fa76a55b2 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1264,6 +1264,113 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
     SPECIES_TO_NATIONAL(OVERQWIL),
     SPECIES_TO_NATIONAL(ENAMORUS),
 #endif
+#if P_GEN_9_POKEMON == TRUE
+    SPECIES_TO_NATIONAL(SPRIGATITO),
+    SPECIES_TO_NATIONAL(FLORAGATO),
+    SPECIES_TO_NATIONAL(MEOWSCARADA),
+    SPECIES_TO_NATIONAL(FUECOCO),
+    SPECIES_TO_NATIONAL(CROCALOR),
+    SPECIES_TO_NATIONAL(SKELEDIRGE),
+    SPECIES_TO_NATIONAL(QUAXLY),
+    SPECIES_TO_NATIONAL(QUAXWELL),
+    SPECIES_TO_NATIONAL(QUAQUAVAL),
+    SPECIES_TO_NATIONAL(LECHONK),
+    SPECIES_TO_NATIONAL(OINKOLOGNE),
+    SPECIES_TO_NATIONAL(TAROUNTULA),
+    SPECIES_TO_NATIONAL(SPIDOPS),
+    SPECIES_TO_NATIONAL(NYMBLE),
+    SPECIES_TO_NATIONAL(LOKIX),
+    SPECIES_TO_NATIONAL(PAWMI),
+    SPECIES_TO_NATIONAL(PAWMO),
+    SPECIES_TO_NATIONAL(PAWMOT),
+    SPECIES_TO_NATIONAL(TANDEMAUS),
+    SPECIES_TO_NATIONAL(MAUSHOLD),
+    SPECIES_TO_NATIONAL(FIDOUGH),
+    SPECIES_TO_NATIONAL(DACHSBUN),
+    SPECIES_TO_NATIONAL(SMOLIV),
+    SPECIES_TO_NATIONAL(DOLLIV),
+    SPECIES_TO_NATIONAL(ARBOLIVA),
+    SPECIES_TO_NATIONAL(SQUAWKABILLY),
+    SPECIES_TO_NATIONAL(NACLI),
+    SPECIES_TO_NATIONAL(NACLSTACK),
+    SPECIES_TO_NATIONAL(GARGANACL),
+    SPECIES_TO_NATIONAL(CHARCADET),
+    SPECIES_TO_NATIONAL(ARMAROUGE),
+    SPECIES_TO_NATIONAL(CERULEDGE),
+    SPECIES_TO_NATIONAL(TADBULB),
+    SPECIES_TO_NATIONAL(BELLIBOLT),
+    SPECIES_TO_NATIONAL(WATTREL),
+    SPECIES_TO_NATIONAL(KILOWATTREL),
+    SPECIES_TO_NATIONAL(MASCHIFF),
+    SPECIES_TO_NATIONAL(MABOSSTIFF),
+    SPECIES_TO_NATIONAL(SHROODLE),
+    SPECIES_TO_NATIONAL(GRAFAIAI),
+    SPECIES_TO_NATIONAL(BRAMBLIN),
+    SPECIES_TO_NATIONAL(BRAMBLEGHAST),
+    SPECIES_TO_NATIONAL(TOEDSCOOL),
+    SPECIES_TO_NATIONAL(TOEDSCRUEL),
+    SPECIES_TO_NATIONAL(KLAWF),
+    SPECIES_TO_NATIONAL(CAPSAKID),
+    SPECIES_TO_NATIONAL(SCOVILLAIN),
+    SPECIES_TO_NATIONAL(RELLOR),
+    SPECIES_TO_NATIONAL(RABSCA),
+    SPECIES_TO_NATIONAL(FLITTLE),
+    SPECIES_TO_NATIONAL(ESPATHRA),
+    SPECIES_TO_NATIONAL(TINKATINK),
+    SPECIES_TO_NATIONAL(TINKATUFF),
+    SPECIES_TO_NATIONAL(TINKATON),
+    SPECIES_TO_NATIONAL(WIGLETT),
+    SPECIES_TO_NATIONAL(WUGTRIO),
+    SPECIES_TO_NATIONAL(BOMBIRDIER),
+    SPECIES_TO_NATIONAL(FINIZEN),
+    SPECIES_TO_NATIONAL(PALAFIN),
+    SPECIES_TO_NATIONAL(VAROOM),
+    SPECIES_TO_NATIONAL(REVAVROOM),
+    SPECIES_TO_NATIONAL(CYCLIZAR),
+    SPECIES_TO_NATIONAL(ORTHWORM),
+    SPECIES_TO_NATIONAL(GLIMMET),
+    SPECIES_TO_NATIONAL(GLIMMORA),
+    SPECIES_TO_NATIONAL(GREAVARD),
+    SPECIES_TO_NATIONAL(HOUNDSTONE),
+    SPECIES_TO_NATIONAL(FLAMIGO),
+    SPECIES_TO_NATIONAL(CETODDLE),
+    SPECIES_TO_NATIONAL(CETITAN),
+    SPECIES_TO_NATIONAL(VELUZA),
+    SPECIES_TO_NATIONAL(DONDOZO),
+    SPECIES_TO_NATIONAL(TATSUGIRI),
+    SPECIES_TO_NATIONAL(ANNIHILAPE),
+    SPECIES_TO_NATIONAL(CLODSIRE),
+    SPECIES_TO_NATIONAL(FARIGIRAF),
+    SPECIES_TO_NATIONAL(DUDUNSPARCE),
+    SPECIES_TO_NATIONAL(KINGAMBIT),
+    SPECIES_TO_NATIONAL(GREAT_TUSK),
+    SPECIES_TO_NATIONAL(SCREAM_TAIL),
+    SPECIES_TO_NATIONAL(BRUTE_BONNET),
+    SPECIES_TO_NATIONAL(FLUTTER_MANE),
+    SPECIES_TO_NATIONAL(SLITHER_WING),
+    SPECIES_TO_NATIONAL(SANDY_SHOCKS),
+    SPECIES_TO_NATIONAL(IRON_TREADS),
+    SPECIES_TO_NATIONAL(IRON_BUNDLE),
+    SPECIES_TO_NATIONAL(IRON_HANDS),
+    SPECIES_TO_NATIONAL(IRON_JUGULIS),
+    SPECIES_TO_NATIONAL(IRON_MOTH),
+    SPECIES_TO_NATIONAL(IRON_THORNS),
+    SPECIES_TO_NATIONAL(FRIGIBAX),
+    SPECIES_TO_NATIONAL(ARCTIBAX),
+    SPECIES_TO_NATIONAL(BAXCALIBUR),
+    SPECIES_TO_NATIONAL(GIMMIGHOUL),
+    SPECIES_TO_NATIONAL(GHOLDENGO),
+    SPECIES_TO_NATIONAL(WO_CHIEN),
+    SPECIES_TO_NATIONAL(CHIEN_PAO),
+    SPECIES_TO_NATIONAL(TING_LU),
+    SPECIES_TO_NATIONAL(CHI_YU),
+    SPECIES_TO_NATIONAL(ROARING_MOON),
+    SPECIES_TO_NATIONAL(IRON_VALIANT),
+    SPECIES_TO_NATIONAL(KORAIDON),
+    SPECIES_TO_NATIONAL(MIRAIDON),
+    SPECIES_TO_NATIONAL(WALKING_WAKE),
+    SPECIES_TO_NATIONAL(IRON_LEAVES),
+#endif
 
     // Megas
     [SPECIES_VENUSAUR_MEGA - 1] = NATIONAL_DEX_VENUSAUR,
@@ -1387,6 +1494,8 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
 #if P_GEN_7_POKEMON == TRUE
     [SPECIES_DECIDUEYE_HISUIAN - 1] = NATIONAL_DEX_DECIDUEYE,
 #endif
+    [SPECIES_WOOPER_PALDEAN - 1] = NATIONAL_DEX_WOOPER,
+    [SPECIES_TAUROS_PALDEAN - 1] = NATIONAL_DEX_TAUROS,
     // Cosplay Pikachu
     [SPECIES_PIKACHU_COSPLAY - 1] = NATIONAL_DEX_PIKACHU,
     [SPECIES_PIKACHU_ROCK_STAR - 1] = NATIONAL_DEX_PIKACHU,
@@ -1683,6 +1792,28 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
     [SPECIES_ENAMORUS_THERIAN - 1] = NATIONAL_DEX_ENAMORUS,
     [SPECIES_BASCULEGION_FEMALE - 1] = NATIONAL_DEX_BASCULEGION,
 #endif
+#if P_GEN_9_POKEMON == TRUE
+    // Oinkologne
+    [SPECIES_OINKOLOGNE_FEMALE - 1] = NATIONAL_DEX_OINKOLOGNE,
+    // Maushold
+    [SPECIES_MAUSHOLD_FAMILY_OF_THREE - 1] = NATIONAL_DEX_MAUSHOLD,
+    // Squawkabilly
+    [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE - 1] = NATIONAL_DEX_SQUAWKABILLY,
+    [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE - 1] = NATIONAL_DEX_SQUAWKABILLY,
+    [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE - 1] = NATIONAL_DEX_SQUAWKABILLY,
+    // Palafin
+    [SPECIES_PALAFIN_HERO - 1] = NATIONAL_DEX_PALAFIN,
+    // Tatsugiri
+    [SPECIES_TATSUGIRI_DROOPY - 1] = NATIONAL_DEX_TATSUGIRI,
+    [SPECIES_TATSUGIRI_STRETCHY - 1] = NATIONAL_DEX_TATSUGIRI,
+    // Dudunsparce
+    [SPECIES_DUDUNSPARCE_THREE_SEGMENT - 1] = NATIONAL_DEX_DUDUNSPARCE,
+    // Gimmighoul
+    [SPECIES_GIMMIGHOUL_ROAMING - 1] = NATIONAL_DEX_GIMMIGHOUL,
+    // Tauros-Paldea
+    [SPECIES_TAUROS_PALDEAN_BLAZE_BREED - 1] = NATIONAL_DEX_TAUROS,
+    [SPECIES_TAUROS_PALDEAN_AQUA_BREED - 1] = NATIONAL_DEX_TAUROS,
+#endif
 };
 
 // Assigns all Hoenn Dex Indexes to a National Dex Index