diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts
index 558a616aef1..72bd374506e 100644
--- a/src/data/trainer-config.ts
+++ b/src/data/trainer-config.ts
@@ -940,12 +940,12 @@ export const signatureSpecies: SignatureSpecies = {
   BRAWLY: [Species.MACHOP, Species.MEDITITE, Species.MAKUHITA],
   WATTSON: [Species.MAGNEMITE, Species.VOLTORB, Species.ELECTRIKE],
   FLANNERY: [Species.SLUGMA, Species.TORKOAL, Species.NUMEL],
-  NORMAN: [Species.SLAKOTH, Species.SPINDA, Species.ZIGZAGOON],
+  NORMAN: [Species.SLAKOTH, Species.KECLEON, Species.KANGASKHAN],
   WINONA: [Species.SWABLU, Species.WINGULL, Species.TROPIUS, Species.SKARMORY],
   TATE: [Species.SOLROCK, Species.NATU, Species.CHIMECHO, Species.GALLADE],
   LIZA: [Species.LUNATONE, Species.SPOINK, Species.BALTOY, Species.GARDEVOIR],
   JUAN: [Species.HORSEA, Species.BARBOACH, Species.SPHEAL, Species.CORPHISH],
-  ROARK: [Species.CRANIDOS, Species.GEODUDE, Species.LARVITAR],
+  ROARK: [Species.CRANIDOS, Species.LARVITAR, Species.GEODUDE],
   GARDENIA: [Species.ROSELIA, Species.CHERUBI, Species.TURTWIG],
   MAYLENE: [Species.LUCARIO, Species.MEDITITE, Species.CROAGUNK],
   CRASHER_WAKE: [Species.BUIZEL, Species.MAGIKARP, Species.WOOPER],
@@ -955,13 +955,13 @@ export const signatureSpecies: SignatureSpecies = {
   VOLKNER: [Species.SHINX, Species.JOLTEON, Species.REMORAID, Species.ELECTABUZZ],
   CILAN: [Species.PANSAGE, Species.FERROSEED, Species.MARACTUS],
   CHILI: [Species.PANSEAR, Species.DARUMAKA, Species.HEATMOR],
-  CRESS: [Species.PANPOUR, Species.DUCKLETT, Species.BASCULIN],
+  CRESS: [Species.PANPOUR, Species.FRILLISH, Species.BASCULIN],
   CHEREN: [Species.LILLIPUP, Species.MINCCINO, Species.PIDOVE],
-  LENORA: [Species.PATRAT, Species.DEERLING, Species.AUDINO],
+  LENORA: [Species.PATRAT, Species.DEERLING, Species.CHANSEY],
   ROXIE: [Species.VENIPEDE, Species.TRUBBISH, Species.KOFFING],
   BURGH: [Species.SEWADDLE, Species.DWEBBLE, Species.SHELMET, Species.KARRABLAST],
   ELESA: [Species.EMOLGA, Species.BLITZLE, Species.JOLTIK],
-  CLAY: [Species.DRILBUR, Species.TYMPOLE, Species.GOLETT],
+  CLAY: [Species.DRILBUR, Species.SANDILE, Species.TYMPOLE],
   SKYLA: [Species.DUCKLETT, Species.WOOBAT, Species.RUFFLET],
   BRYCEN: [Species.CRYOGONAL, Species.VANILLITE, Species.CUBCHOO],
   DRAYDEN: [Species.DRUDDIGON, Species.AXEW, Species.DEINO],
@@ -971,7 +971,7 @@ export const signatureSpecies: SignatureSpecies = {
   KORRINA: [Species.HAWLUCHA, Species.LUCARIO, Species.MIENFOO],
   RAMOS: [Species.SKIDDO, Species.HOPPIP, Species.BELLSPROUT],
   CLEMONT: [Species.HELIOPTILE, Species.MAGNEMITE, Species.ROTOM],
-  VALERIE: [Species.SYLVEON, Species.MAWILE, Species.MR_MIME],
+  VALERIE: [Species.SYLVEON, Species.MARILL, Species.MR_MIME],
   OLYMPIA: [Species.ESPURR, Species.SIGILYPH, Species.SLOWKING],
   WULFRIC: [Species.BERGMITE, Species.SNOVER, Species.CRYOGONAL],
   MILO: [Species.GOSSIFLEUR, Species.APPLIN, Species.BOUNSWEET],
@@ -987,11 +987,11 @@ export const signatureSpecies: SignatureSpecies = {
   MARNIE: [Species.IMPIDIMP, Species.PURRLOIN, Species.MORPEKO],
   RAIHAN: [Species.DURALUDON, Species.TRAPINCH, Species.TURTONATOR],
   KATY: [Species.NYMBLE, Species.TAROUNTULA, Species.FIDOUGH],
-  BRASSIUS: [Species.SMOLIV, Species.BRAMBLIN, Species.BONSLY],
+  BRASSIUS: [Species.SMOLIV, Species.BRAMBLIN, Species.SUDOWOODO],
   IONO: [Species.TADBULB, Species.WATTREL, Species.MISDREAVUS],
   KOFU: [Species.VELUZA, Species.WIGLETT, Species.CRABRAWLER],
   LARRY: [Species.STARLY, Species.DUNSPARCE, Species.KOMALA],
-  RYME: [Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU, Species.TOXEL],
+  RYME: [Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU, Species.TOXTRICITY],
   TULIP: [Species.GIRAFARIG, Species.FLITTLE, Species.FLABEBE],
   GRUSHA: [Species.CETODDLE, Species.ALOLA_VULPIX, Species.CUBCHOO, Species.SWABLU],
   LORELEI: [Species.JYNX, [Species.SLOWBRO, Species.GALAR_SLOWBRO], Species.LAPRAS, [Species.ALOLA_SANDSLASH, Species.CLOYSTER]],
@@ -1026,7 +1026,7 @@ export const signatureSpecies: SignatureSpecies = {
   NESSA_ELITE: [Species.GOLISOPOD, [Species.PELIPPER, Species.QUAGSIRE], Species.TOXAPEX, Species.DREDNAW],
   BEA_ELITE: [[Species.HAWLUCHA, Species.MACHAMP], Species.GRAPPLOCT, Species.SIRFETCHD, Species.FALINKS],
   ALLISTER_ELITE:[[Species.DUSKNOIR, Species.GENGAR], Species.POLTEAGEIST, Species.RUNERIGUS, Species.CURSOLA],
-  RAIHAN_ELITE: [Species.GOODRA, [Species.TORKOAL, Species.TURTONATOR], Species.FLYGON, Species.ARCHALUDON],
+  RAIHAN_ELITE: [[Species.GOODRA, Species.HISUI_GOODRA], [Species.GIGALITH, Species.TURTONATOR], Species.FLYGON, Species.ARCHALUDON],
   RIKA: [Species.WHISCASH, [Species.DONPHAN, Species.DUGTRIO], Species.CAMERUPT, Species.CLODSIRE],
   POPPY: [Species.COPPERAJAH, Species.BRONZONG, Species.CORVIKNIGHT, Species.TINKATON],
   LARRY_ELITE: [Species.STARAPTOR, Species.FLAMIGO, Species.ALTARIA, Species.TROPIUS],