diff --git a/src/data/balance/signature-species.ts b/src/data/balance/signature-species.ts
index a1b73af40cd..0b350a4bc53 100644
--- a/src/data/balance/signature-species.ts
+++ b/src/data/balance/signature-species.ts
@@ -11,59 +11,59 @@ export type SignatureSpecies = {
  */
 export const signatureSpecies: SignatureSpecies = {
   // Gym Leaders- Kanto
-  BROCK: [Species.GEODUDE, Species.ONIX],
+  BROCK: [Species.ONIX, Species.GEODUDE],
   MISTY: [Species.STARYU, Species.PSYDUCK],
-  LT_SURGE: [Species.VOLTORB, Species.PIKACHU, Species.ELECTABUZZ],
+  LT_SURGE: [Species.PIKACHU, Species.ELEKID, Species.VOLTORB],
   ERIKA: [Species.ODDISH, Species.BELLSPROUT, Species.TANGELA, Species.HOPPIP],
   JANINE: [Species.VENONAT, Species.SPINARAK, Species.ZUBAT],
   SABRINA: [Species.ABRA, Species.MR_MIME, Species.ESPEON],
-  BLAINE: [Species.GROWLITHE, Species.PONYTA, Species.MAGMAR],
-  GIOVANNI: [Species.SANDILE, Species.MURKROW, Species.NIDORAN_M, Species.NIDORAN_F],
+  BLAINE: [Species.GROWLITHE, Species.PONYTA, Species.MAGBY],
+  GIOVANNI: [Species.RHYHORN, Species.NIDORAN_M, Species.NIDORAN_F, Species.MEOWTH],
   // Gym Leaders- Johto
   FALKNER: [Species.PIDGEY, Species.HOOTHOOT, Species.DODUO],
-  BUGSY: [Species.SCYTHER, Species.HERACROSS, Species.SHUCKLE, Species.PINSIR],
+  BUGSY: [Species.SCYTHER, Species.PINECO],
   WHITNEY: [Species.JIGGLYPUFF, Species.MILTANK, Species.AIPOM, Species.GIRAFARIG],
-  MORTY: [Species.GASTLY, Species.MISDREAVUS, Species.SABLEYE],
+  MORTY: [Species.GASTLY, Species.MISDREAVUS],
   CHUCK: [Species.POLIWRATH, Species.MANKEY],
-  JASMINE: [Species.MAGNEMITE, Species.STEELIX],
-  PRYCE: [Species.SEEL, Species.SWINUB],
+  JASMINE: [Species.STEELIX, Species.MAGNEMITE],
+  PRYCE: [Species.SWINUB, Species.SEEL],
   CLAIR: [Species.DRATINI, Species.HORSEA, Species.GYARADOS],
   // Gym Leaders- Hoenn
-  ROXANNE: [Species.GEODUDE, Species.NOSEPASS],
-  BRAWLY: [Species.MACHOP, Species.MAKUHITA],
-  WATTSON: [Species.MAGNEMITE, Species.VOLTORB, Species.ELECTRIKE],
-  FLANNERY: [Species.SLUGMA, Species.TORKOAL, Species.NUMEL],
+  ROXANNE: [Species.NOSEPASS, Species.GEODUDE],
+  BRAWLY: [Species.MAKUHITA, Species.MACHOP, Species.MEDITITE],
+  WATTSON: [Species.ELECTRIKE, Species.MAGNEMITE, Species.VOLTORB],
+  FLANNERY: [Species.TORKOAL, Species.SLUGMA, Species.NUMEL],
   NORMAN: [Species.SLAKOTH, Species.SPINDA, Species.ZIGZAGOON, Species.KECLEON],
   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.RELICANTH],
   // Gym Leaders- Sinnoh
-  ROARK: [Species.CRANIDOS, Species.LARVITAR, Species.GEODUDE],
-  GARDENIA: [Species.ROSELIA, Species.TANGELA, Species.TURTWIG],
+  ROARK: [Species.CRANIDOS, Species.GEODUDE, Species.LARVITAR],
+  GARDENIA: [Species.ROSELIA, Species.CHERUBI, Species.TURTWIG, Species.TANGELA],
   MAYLENE: [Species.LUCARIO, Species.MEDITITE, Species.CHIMCHAR],
   CRASHER_WAKE: [Species.BUIZEL, Species.WOOPER, Species.PIPLUP, Species.MAGIKARP],
-  FANTINA: [Species.MISDREAVUS, Species.DRIFLOON, Species.SPIRITOMB],
-  BYRON: [Species.SHIELDON, Species.BRONZOR, Species.AGGRON],
+  FANTINA: [Species.MISDREAVUS, Species.DRIFLOON, Species.DUSKULL],
+  BYRON: [Species.SHIELDON, Species.BRONZOR, Species.ARON],
   CANDICE: [Species.SNEASEL, Species.SNOVER, Species.SNORUNT],
-  VOLKNER: [Species.SHINX, Species.CHINCHOU, Species.ROTOM],
+  VOLKNER: [Species.SHINX, Species.ELEKID, Species.JOLTEON, Species.REMORAID],
   // Gym Leaders- Unova
   CILAN: [Species.PANSAGE, Species.FOONGUS, Species.PETILIL],
   CHILI: [Species.PANSEAR, Species.DARUMAKA, Species.NUMEL],
   CRESS: [Species.PANPOUR, Species.TYMPOLE, Species.SLOWPOKE],
   CHEREN: [Species.LILLIPUP, Species.MINCCINO, Species.PIDOVE],
   LENORA: [Species.PATRAT, Species.DEERLING, Species.AUDINO],
-  ROXIE: [Species.VENIPEDE, Species.TRUBBISH, Species.SKORUPI],
+  ROXIE: [Species.VENIPEDE, Species.KOFFING, Species.TRUBBISH],
   BURGH: [Species.SEWADDLE, Species.SHELMET, Species.KARRABLAST],
   ELESA: [Species.EMOLGA, Species.BLITZLE, Species.JOLTIK],
   CLAY: [Species.DRILBUR, Species.SANDILE, Species.GOLETT],
   SKYLA: [Species.DUCKLETT, Species.WOOBAT, Species.RUFFLET],
   BRYCEN: [Species.CRYOGONAL, Species.VANILLITE, Species.CUBCHOO],
-  DRAYDEN: [Species.DRUDDIGON, Species.AXEW, Species.DEINO],
-  MARLON: [Species.WAILMER, Species.FRILLISH, Species.TIRTOUGA],
+  DRAYDEN: [Species.AXEW, Species.DRUDDIGON, Species.DEINO],
+  MARLON: [Species.FRILLISH, Species.WAILMER, Species.TIRTOUGA],
   // Gym Leaders- Kalos
-  VIOLA: [Species.SURSKIT, Species.SCATTERBUG],
-  GRANT: [Species.AMAURA, Species.TYRUNT],
+  VIOLA: [Species.SCATTERBUG, Species.SURSKIT],
+  GRANT: [Species.TYRUNT, Species.AMAURA],
   KORRINA: [Species.HAWLUCHA, Species.LUCARIO, Species.MIENFOO],
   RAMOS: [Species.SKIDDO, Species.HOPPIP, Species.BELLSPROUT],
   CLEMONT: [Species.HELIOPTILE, Species.MAGNEMITE, Species.EMOLGA],
@@ -71,17 +71,17 @@ export const signatureSpecies: SignatureSpecies = {
   OLYMPIA: [Species.ESPURR, Species.SIGILYPH, Species.SLOWKING],
   WULFRIC: [Species.BERGMITE, Species.SNOVER, Species.CRYOGONAL],
   // Gym Leaders- Galar
-  MILO: [Species.GOSSIFLEUR, Species.APPLIN, Species.BOUNSWEET],
+  MILO: [Species.APPLIN, Species.GOSSIFLEUR, Species.BOUNSWEET],
   NESSA: [Species.CHEWTLE, Species.ARROKUDA, Species.WIMPOD],
-  KABU: [Species.SIZZLIPEDE, Species.VULPIX, Species.TORKOAL],
-  BEA: [Species.GALAR_FARFETCHD, Species.MACHOP, Species.CLOBBOPUS],
+  KABU: [Species.SIZZLIPEDE, Species.GROWLITHE, Species.TORKOAL],
+  BEA: [Species.GALAR_FARFETCHD, Species.CLOBBOPUS, Species.MACHOP],
   ALLISTER: [Species.GALAR_YAMASK, Species.GALAR_CORSOLA, Species.GASTLY],
   OPAL: [Species.MILCERY, Species.TOGETIC, Species.GALAR_WEEZING],
   BEDE: [Species.HATENNA, Species.GALAR_PONYTA, Species.GARDEVOIR],
-  GORDIE: [Species.ROLYCOLY, Species.STONJOURNER, Species.BINACLE],
-  MELONY: [Species.SNOM, Species.GALAR_DARUMAKA, Species.GALAR_MR_MIME],
+  GORDIE: [Species.ROLYCOLY, Species.STONJOURNER, Species.SHUCKLE, Species.BINACLE],
+  MELONY: [Species.SNOM, Species.GALAR_DARUMAKA, Species.GALAR_MR_MIME, Species.LAPRAS],
   PIERS: [Species.GALAR_ZIGZAGOON, Species.SCRAGGY, Species.INKAY],
-  MARNIE: [Species.IMPIDIMP, Species.PURRLOIN, Species.MORPEKO],
+  MARNIE: [Species.MORPEKO, Species.IMPIDIMP, Species.PURRLOIN],
   RAIHAN: [Species.DURALUDON, Species.TURTONATOR, Species.GOOMY],
   // Gym Leaders- Paldea; First slot is Tera
   KATY: [Species.TEDDIURSA, Species.NYMBLE, Species.TAROUNTULA], // Tera Bug Teddiursa
@@ -102,53 +102,53 @@ export const signatureSpecies: SignatureSpecies = {
   ],
   BRUNO: [Species.MACHAMP, Species.HITMONCHAN, Species.HITMONLEE, [Species.GOLEM, Species.ALOLA_GOLEM]],
   AGATHA: [Species.GENGAR, [Species.ARBOK, Species.WEEZING], Species.CROBAT, Species.ALOLA_MAROWAK],
-  LANCE: [Species.DRAGONITE, Species.GYARADOS, Species.AERODACTYL, Species.ALOLA_EXEGGUTOR],
+  LANCE: [Species.DRAGONITE, Species.GYARADOS, Species.AERODACTYL, [Species.KINGDRA, Species.ALOLA_EXEGGUTOR]],
   // Elite Four- Johto (Bruno included)
   WILL: [Species.XATU, Species.JYNX, [Species.SLOWBRO, Species.SLOWKING], Species.EXEGGUTOR],
-  KOGA: [[Species.MUK, Species.WEEZING], [Species.VENOMOTH, Species.ARIADOS], Species.CROBAT, Species.TENTACRUEL],
+  KOGA: [Species.CROBAT, [Species.MUK, Species.WEEZING], [Species.VENOMOTH, Species.ARIADOS], Species.TENTACRUEL],
   KAREN: [Species.UMBREON, Species.HONCHKROW, Species.HOUNDOOM, Species.WEAVILE],
   // Elite Four- Hoenn
   SIDNEY: [
+    Species.ABSOL,
     [Species.SHIFTRY, Species.CACTURNE],
     [Species.SHARPEDO, Species.CRAWDAUNT],
-    Species.ABSOL,
     Species.MIGHTYENA,
   ],
-  PHOEBE: [Species.SABLEYE, Species.DUSKNOIR, Species.BANETTE, [Species.DRIFBLIM, Species.MISMAGIUS]],
+  PHOEBE: [Species.DUSKNOIR, Species.SABLEYE, Species.BANETTE, [Species.DRIFBLIM, Species.MISMAGIUS]],
   GLACIA: [Species.GLALIE, Species.WALREIN, Species.FROSLASS, Species.ABOMASNOW],
-  DRAKE: [Species.ALTARIA, Species.SALAMENCE, Species.FLYGON, Species.KINGDRA],
+  DRAKE: [Species.SALAMENCE, Species.FLYGON, Species.ALTARIA, Species.KINGDRA],
   // Elite Four- Sinnoh
-  AARON: [[Species.SCIZOR, Species.KLEAVOR], Species.HERACROSS, [Species.VESPIQUEN, Species.YANMEGA], Species.DRAPION],
-  BERTHA: [Species.WHISCASH, Species.HIPPOWDON, Species.GLISCOR, Species.RHYPERIOR],
+  AARON: [Species.DRAPION, [Species.SCIZOR, Species.KLEAVOR], Species.HERACROSS, [Species.VESPIQUEN, Species.YANMEGA]],
+  BERTHA: [Species.RHYPERIOR, Species.HIPPOWDON, Species.GLISCOR, Species.WHISCASH],
   FLINT: [
-    [Species.RAPIDASH, Species.FLAREON],
+    Species.INFERNAPE,
     Species.MAGMORTAR,
     [Species.STEELIX, Species.LOPUNNY],
-    Species.INFERNAPE,
+    [Species.RAPIDASH, Species.FLAREON],
   ], // Tera Fire Steelix or Lopunny
-  LUCIAN: [Species.MR_MIME, Species.GALLADE, Species.BRONZONG, [Species.ALAKAZAM, Species.ESPEON]],
+  LUCIAN: [Species.GALLADE, Species.BRONZONG, Species.MR_MIME, [Species.ALAKAZAM, Species.ESPEON]],
   // Elite Four- Unova
-  SHAUNTAL: [Species.COFAGRIGUS, Species.CHANDELURE, Species.GOLURK, Species.JELLICENT],
+  SHAUNTAL: [Species.CHANDELURE, Species.GOLURK, Species.JELLICENT, Species.COFAGRIGUS],
   MARSHAL: [Species.CONKELDURR, Species.MIENSHAO, Species.THROH, Species.SAWK],
-  GRIMSLEY: [Species.LIEPARD, Species.KINGAMBIT, Species.SCRAFTY, Species.KROOKODILE],
-  CAITLIN: [Species.MUSHARNA, Species.GOTHITELLE, Species.SIGILYPH, Species.REUNICLUS],
+  GRIMSLEY: [Species.KINGAMBIT, Species.SCRAFTY, Species.KROOKODILE, Species.LIEPARD],
+  CAITLIN: [Species.GOTHITELLE, Species.SIGILYPH, Species.REUNICLUS, Species.MUSHARNA],
   // Elite Four- Kalos
-  MALVA: [Species.PYROAR, Species.TORKOAL, Species.CHANDELURE, Species.TALONFLAME],
-  SIEBOLD: [Species.CLAWITZER, Species.GYARADOS, Species.BARBARACLE, Species.STARMIE],
-  WIKSTROM: [Species.KLEFKI, Species.PROBOPASS, Species.SCIZOR, Species.AEGISLASH],
-  DRASNA: [Species.DRAGALGE, Species.DRUDDIGON, Species.ALTARIA, Species.NOIVERN],
+  MALVA: [Species.TALONFLAME, Species.TORKOAL, Species.CHANDELURE, Species.PYROAR],
+  SIEBOLD: [Species.BARBARACLE, Species.GYARADOS, Species.STARMIE, Species.CLAWITZER],
+  WIKSTROM: [Species.AEGISLASH, Species.PROBOPASS, Species.SCIZOR, Species.KLEFKI],
+  DRASNA: [Species.NOIVERN, Species.DRUDDIGON, Species.ALTARIA, Species.DRAGALGE],
   // Elite Four- Alola
-  HALA: [Species.HARIYAMA, Species.BEWEAR, Species.CRABOMINABLE, [Species.POLIWRATH, Species.ANNIHILAPE]],
-  MOLAYNE: [Species.KLEFKI, Species.MAGNEZONE, Species.METAGROSS, Species.ALOLA_DUGTRIO],
-  OLIVIA: [Species.RELICANTH, Species.CARBINK, Species.ALOLA_GOLEM, Species.LYCANROC],
-  ACEROLA: [[Species.BANETTE, Species.DRIFBLIM], Species.MIMIKYU, Species.DHELMISE, Species.PALOSSAND],
-  KAHILI: [[Species.BRAVIARY, Species.MANDIBUZZ], Species.HAWLUCHA, Species.ORICORIO, Species.TOUCANNON],
+  HALA: [Species.CRABOMINABLE, Species.BEWEAR, Species.HARIYAMA, [Species.POLIWRATH, Species.ANNIHILAPE]],
+  MOLAYNE: [Species.ALOLA_DUGTRIO, Species.MAGNEZONE, Species.METAGROSS, Species.KLEFKI],
+  OLIVIA: [Species.LYCANROC, Species.RELICANTH, Species.CARBINK, Species.ALOLA_GOLEM],
+  ACEROLA: [Species.PALOSSAND, [Species.FROSLASS, Species.DRIFBLIM], Species.MIMIKYU, Species.DHELMISE],
+  KAHILI: [Species.TOUCANNON, [Species.BRAVIARY, Species.MANDIBUZZ], Species.HAWLUCHA, Species.ORICORIO],
   // Elite Four- Galar
-  MARNIE_ELITE: [Species.MORPEKO, Species.LIEPARD, [Species.TOXICROAK, Species.SCRAFTY], Species.GRIMMSNARL],
-  NESSA_ELITE: [Species.GOLISOPOD, [Species.QUAGSIRE, Species.PELIPPER], Species.TOXAPEX, Species.DREDNAW],
-  BEA_ELITE: [Species.HAWLUCHA, [Species.GRAPPLOCT, Species.SIRFETCHD], Species.FALINKS, Species.MACHAMP],
-  ALLISTER_ELITE: [Species.DUSKNOIR, [Species.POLTEAGEIST, Species.RUNERIGUS], Species.CURSOLA, Species.GENGAR],
-  RAIHAN_ELITE: [Species.GOODRA, [Species.TORKOAL, Species.TURTONATOR], Species.FLYGON, Species.ARCHALUDON],
+  MARNIE_ELITE: [Species.GRIMMSNARL, Species.MORPEKO, [Species.TOXICROAK, Species.SCRAFTY], Species.LIEPARD],
+  NESSA_ELITE: [Species.DREDNAW, Species.BARRASKEWDA, [Species.TOXAPEX, Species.PELIPPER], Species.GOLISOPOD],
+  BEA_ELITE: [Species.SIRFETCHD, Species.GRAPPLOCT, Species.FALINKS, Species.MACHAMP],
+  ALLISTER_ELITE: [Species.CURSOLA, Species.RUNERIGUS, Species.POLTEAGEIST, Species.GENGAR],
+  RAIHAN_ELITE: [Species.ARCHALUDON, [Species.TORKOAL, Species.TURTONATOR], Species.FLYGON, Species.GOODRA],
   // Elite Four- Paldea
   RIKA: [Species.CLODSIRE, [Species.DUGTRIO, Species.DONPHAN], Species.CAMERUPT, Species.WHISCASH], // Tera Ground Clodsire
   POPPY: [Species.TINKATON, Species.BRONZONG, Species.CORVIKNIGHT, Species.COPPERAJAH], // Tera Steel Tinkaton