diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc
index 119472d75b..7e45906452 100644
--- a/sound/cry_tables.inc
+++ b/sound/cry_tables.inc
@@ -2251,9 +2251,6 @@ gCryTable::
 	cry Cry_Dudunsparce
 	@ Gimmighoul
 	cry Cry_Gimmighoul
-	@ Tauros-Paldea
-	cry Cry_Tauros
-	cry Cry_Tauros
 .else
 	@ Oinkologne
 	cry Cry_Unown
@@ -2272,10 +2269,10 @@ gCryTable::
 	cry Cry_Unown
 	@ Gimmighoul
 	cry Cry_Unown
-	@ Tauros-Paldea
-	cry Cry_Unown
-	cry Cry_Unown
 .endif
+@ Tauros-Paldea
+cry Cry_Tauros
+cry Cry_Tauros
 
 	.align 2
 gCryTable_Reverse::
@@ -4476,9 +4473,6 @@ gCryTable_Reverse::
 	cry_reverse Cry_Dudunsparce
 	@ Gimmighoul
 	cry_reverse Cry_Gimmighoul
-	@ Tauros-Paldea
-	cry_reverse Cry_Tauros
-	cry_reverse Cry_Tauros
 .else
 	@ Oinkologne
 	cry_reverse Cry_Unown
@@ -4497,7 +4491,7 @@ gCryTable_Reverse::
 	cry_reverse Cry_Unown
 	@ Gimmighoul
 	cry_reverse Cry_Unown
-	@ Tauros-Paldea
-	cry_reverse Cry_Unown
-	cry_reverse Cry_Unown
 .endif
+@ Tauros-Paldea
+cry_reverse Cry_Tauros
+cry_reverse Cry_Tauros
diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h
index 81b90d666f..0d57b9150c 100644
--- a/src/data/pokemon/level_up_learnset_pointers.h
+++ b/src/data/pokemon/level_up_learnset_pointers.h
@@ -1463,8 +1463,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
     [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceLevelUpLearnset,
     // Gimmighoul
     [SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulLevelUpLearnset,
+#endif
     // Tauros-Paldea
     [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosPaldeanBlazeBreedLevelUpLearnset,
     [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sTaurosPaldeanAquaBreedLevelUpLearnset,
-#endif
 };
diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h
index 20ef74c574..92fcae3899 100644
--- a/src/data/pokemon/teachable_learnset_pointers.h
+++ b/src/data/pokemon/teachable_learnset_pointers.h
@@ -1463,8 +1463,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
     [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceTeachableLearnset,
     // Gimmighoul
     [SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulTeachableLearnset,
+#endif
     // Tauros-Paldea
     [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosPaldeanBlazeBreedTeachableLearnset,
     [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sTaurosPaldeanAquaBreedTeachableLearnset,
-#endif
 };
diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h
index 122b367248..468cd1227f 100644
--- a/src/data/pokemon_graphics/front_pic_anims.h
+++ b/src/data/pokemon_graphics/front_pic_anims.h
@@ -13277,8 +13277,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] =
     [SPECIES_TATSUGIRI_STRETCHY] = sAnims_Tatsugiri,
     [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sAnims_Dudunsparce,
     [SPECIES_GIMMIGHOUL_ROAMING] = sAnims_Gimmighoul,
+#endif
     [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sAnims_TaurosPaldean,
     [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sAnims_TaurosPaldean,
-#endif
     [SPECIES_EGG]         = sAnims_Egg,
 };
diff --git a/src/pokemon.c b/src/pokemon.c
index 0fa76a55b2..998f6a9163 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1810,10 +1810,10 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
     [SPECIES_DUDUNSPARCE_THREE_SEGMENT - 1] = NATIONAL_DEX_DUDUNSPARCE,
     // Gimmighoul
     [SPECIES_GIMMIGHOUL_ROAMING - 1] = NATIONAL_DEX_GIMMIGHOUL,
+#endif
     // 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