diff --git a/src/data/trainers/evil-admin-trainer-pools.ts b/src/data/trainers/evil-admin-trainer-pools.ts
index ecbd5952143..421562ed23f 100644
--- a/src/data/trainers/evil-admin-trainer-pools.ts
+++ b/src/data/trainers/evil-admin-trainer-pools.ts
@@ -5,90 +5,99 @@ import { Species } from "#enums/species";
 /** Team Rocket's admin trainer pool. */
 const ROCKET: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    Species.RATICATE,
-    Species.ARBOK,
+    Species.RATTATA,
+    Species.SPEAROW,
     Species.VILEPLUME,
-    Species.ARCANINE,
-    Species.GENGAR,
-    Species.HYPNO,
-    Species.ELECTRODE,
-    Species.EXEGGUTOR,
+    Species.DIGLETT,
+    Species.GROWLITHE,
+    Species.GRIMER,
+    Species.DROWZEE,
+    Species.VOLTORB,
+    Species.EXEGGCUTE,
     Species.CUBONE,
-    Species.KOFFING,
-    Species.GYARADOS,
-    Species.CROBAT,
-    Species.STEELIX,
-    Species.HOUNDOOM,
-    Species.HONCHKROW,
+    Species.MAGIKARP,
+    Species.ONIX,
+    Species.HOUNDOUR,
+    Species.MURKROW,
   ],
   [TrainerPoolTier.UNCOMMON]: [
-    Species.OMASTAR,
-    Species.KABUTOPS,
-    Species.MAGNEZONE,
-    Species.ELECTIVIRE,
-    Species.MAGMORTAR,
-    Species.PORYGON_Z,
-    Species.ANNIHILAPE,
-    Species.ALOLA_SANDSLASH,
-    Species.ALOLA_PERSIAN,
-    Species.ALOLA_GOLEM,
-    Species.ALOLA_MUK,
+    Species.ABRA,
+    Species.GASTLY,
+    Species.OMANYTE,
+    Species.KABUTO,
+    Species.PORYGON,
+    Species.MANKEY,
+    Species.SCYTHER,
+    Species.ELEKID,
+    Species.MAGBY,
+    Species.ALOLA_SANDSHREW,
+    Species.ALOLA_MEOWTH,
+    Species.ALOLA_GEODUDE,
+    Species.ALOLA_GRIMER,
     Species.PALDEA_TAUROS,
   ],
-  [TrainerPoolTier.RARE]: [Species.DRAGONITE, Species.TYRANITAR],
+  [TrainerPoolTier.RARE]: [Species.DRATINI, Species.LARVITAR],
 };
 
 /** Team Magma's admin trainer pool */
 const MAGMA: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    Species.ARCANINE,
-    Species.MAGCARGO,
-    Species.HOUNDOOM,
+    Species.DIGLETT,
+    Species.GROWLITHE,
+    Species.VULPIX,
+    Species.KOFFING,
+    Species.RHYHORN,
+    Species.SLUGMA,
+    Species.HOUNDOUR,
+    Species.POOCHEYENA,
     Species.TORKOAL,
+    Species.ZANGOOSE,
     Species.SOLROCK,
-    Species.CLAYDOL,
-    Species.HIPPOWDON,
-    Species.MAGMORTAR,
-    Species.GLISCOR,
-    Species.COALOSSAL,
+    Species.BALTOY,
+    Species.ROLYCOLY,
   ],
   [TrainerPoolTier.UNCOMMON]: [
-    Species.AGGRON,
-    Species.FLYGON,
-    Species.CRADILY,
-    Species.ARMALDO,
-    Species.RHYPERIOR,
+    Species.MAGBY,
+    Species.TRAPINCH,
+    Species.LILEEP,
+    Species.ANORITH,
+    Species.GOLETT,
+    Species.FLETCHLING,
+    Species.SALANDIT,
     Species.TURTONATOR,
-    Species.SANDACONDA,
-    Species.TOEDSCRUEL,
-    Species.HISUI_ARCANINE,
+    Species.TOEDSCOOL,
+    Species.CAPSAKID,
+    Species.HISUI_GROWLITHE,
   ],
-  [TrainerPoolTier.RARE]: [Species.CHARCADET, Species.SCOVILLAIN],
+  [TrainerPoolTier.RARE]: [Species.CHARCADET, Species.ARON],
 };
 
 const AQUA: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    Species.TENTACRUEL,
-    Species.LANTURN,
-    Species.AZUMARILL,
-    Species.QUAGSIRE,
-    Species.OCTILLERY,
-    Species.LUDICOLO,
-    Species.PELIPPER,
-    Species.WAILORD,
-    Species.WHISCASH,
-    Species.CRAWDAUNT,
-    Species.WALREIN,
+    Species.TENTACOOL,
+    Species.GRIMER,
+    Species.AZURILL,
+    Species.CHINCHOU,
+    Species.REMORAID,
+    Species.POOCHEYENA,
+    Species.LOTAD,
+    Species.WINGULL,
+    Species.WAILMER,
+    Species.SEVIPER,
+    Species.BARBOACH,
+    Species.CORPHISH,
+    Species.SPHEAL,
     Species.CLAMPERL,
+    Species.WIGLETT,
   ],
   [TrainerPoolTier.UNCOMMON]: [
-    Species.QUAGSIRE,
-    Species.MANTINE,
-    Species.KINGDRA,
-    Species.MILOTIC,
-    Species.DRAGALGE,
-    Species.DHELMISE,
-    Species.BARRASKEWDA,
+    Species.MANTYKE,
+    Species.HORSEA,
+    Species.FEEBAS,
+    Species.TYMPOLE,
+    Species.SKRELP,
+    Species.WIMPOD,
+    Species.ARROKUDA,
     Species.GRAPPLOCT,
     Species.OVERQWIL,
   ],
@@ -97,306 +106,315 @@ const AQUA: TrainerTierPools = {
 
 const GALACTIC: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    Species.ELECTRODE,
-    Species.GYARADOS,
-    Species.CROBAT,
-    Species.HONCHKROW,
-    Species.BRONZONG,
-    Species.DRAPION,
+    Species.MAGNEMITE,
+    Species.RHYHORN,
+    Species.ELEKID,
+    Species.MAGBY,
+    Species.MURKROW,
+    Species.DRIFLOON,
+    Species.BRONZOR,
+    Species.SKORUPI,
     Species.LICKILICKY,
     Species.TANGROWTH,
-    Species.ELECTIVIRE,
-    Species.MAGMORTAR,
     Species.YANMEGA,
     Species.MAMOSWINE,
   ],
   [TrainerPoolTier.UNCOMMON]: [
-    Species.ALAKAZAM,
-    Species.WEAVILE,
+    Species.ABRA,
+    Species.SNEASEL,
+    Species.DUSKULL,
     Species.GLISCOR,
-    Species.DUSKNOIR,
-    Species.ROTOM,
+    Species.KLEAVOR,
     Species.OVERQWIL,
-    Species.HISUI_ARCANINE,
-    Species.HISUI_ELECTRODE,
   ],
-  [TrainerPoolTier.RARE]: [Species.SPIRITOMB, Species.URSALUNA, Species.SNEASLER, Species.HISUI_LILLIGANT],
+  [TrainerPoolTier.RARE]: [Species.SPIRITOMB, Species.URSALUNA, Species.HISUI_SNEASEL, Species.HISUI_LILLIGANT],
 };
 
 const PLASMA_ZINZOLIN: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    Species.GIGALITH,
-    Species.CONKELDURR,
-    Species.SEISMITOAD,
-    Species.KROOKODILE,
-    Species.DARMANITAN,
-    Species.COFAGRIGUS,
-    Species.VANILLUXE,
-    Species.AMOONGUSS,
-    Species.JELLICENT,
-    Species.GALVANTULA,
-    Species.FERROTHORN,
-    Species.BEARTIC,
+    Species.ROGGENROLA,
+    Species.TIMBURR,
+    Species.TYMPOLE,
+    Species.SANDILE,
+    Species.DARUMAKA,
+    Species.YAMASK,
+    Species.VANILLITE,
+    Species.FOONGUS,
+    Species.FRILLISH,
+    Species.JOLTIK,
+    Species.FERROSEED,
+    Species.CUBCHOO,
   ],
   [TrainerPoolTier.UNCOMMON]: [
-    Species.EXCADRILL,
+    Species.DRILBUR,
     Species.SIGILYPH,
-    Species.ZOROARK,
-    Species.KLINKLANG,
-    Species.EELEKTROSS,
-    Species.MIENSHAO,
-    Species.GOLURK,
-    Species.BISHARP,
-    Species.MANDIBUZZ,
+    Species.ZORUA,
+    Species.TYNAMO,
+    Species.MIENFOO,
+    Species.GOLETT,
+    Species.PAWNIARD,
+    Species.VULLABY,
     Species.DURANT,
-    Species.GALAR_DARMANITAN,
+    Species.GALAR_DARUMAKA,
   ],
-  [TrainerPoolTier.RARE]: [Species.HAXORUS, Species.HYDREIGON, Species.HISUI_ZOROARK, Species.HISUI_BRAVIARY],
+  [TrainerPoolTier.RARE]: [Species.AXEW, Species.DEINO, Species.HISUI_ZORUA, Species.HISUI_BRAVIARY],
 };
 
 const PLASMA_COLRESS: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    Species.MUK,
-    Species.ELECTRODE,
-    Species.BRONZONG,
-    Species.MAGNEZONE,
-    Species.PORYGON_Z,
-    Species.MUSHARNA,
-    Species.REUNICLUS,
-    Species.GALVANTULA,
-    Species.FERROTHORN,
-    Species.EELEKTROSS,
-    Species.BEHEEYEM,
+    Species.MAGNEMITE,
+    Species.GRIMER,
+    Species.VOLTORB,
+    Species.PORYGON,
+    Species.BRONZOR,
+    Species.MUNNA,
+    Species.FERROSEED,
+    Species.TYNAMO,
+    Species.ELGYEM,
   ],
   [TrainerPoolTier.UNCOMMON]: [
-    Species.METAGROSS,
-    Species.ROTOM,
-    Species.CARRACOSTA,
-    Species.ARCHEOPS,
-    Species.GOLURK,
-    Species.DURANT,
-    Species.VIKAVOLT,
-    Species.ORBEETLE,
-    Species.REVAVROOM,
-    Species.ALOLA_MUK,
-    Species.HISUI_ELECTRODE,
+    Species.BELDUM,
+    Species.SIGILYPH,
+    Species.TIRTOUGA,
+    Species.ARCEN,
+    Species.GOLETT,
+    Species.BLIPBUG,
+    Species.VAROOM,
+    Species.ALOLA_GRIMER,
+    Species.HISUI_VOLTORB,
   ],
   [TrainerPoolTier.RARE]: [Species.ELECTIVIRE, Species.MAGMORTAR, Species.BISHARP, Species.ARCHALUDON],
 };
 
 const FLARE: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    Species.MANECTRIC,
-    Species.DRAPION,
-    Species.LIEPARD,
-    Species.AMOONGUSS,
-    Species.DIGGERSBY,
-    Species.TALONFLAME,
-    Species.PYROAR,
+    Species.ELECTRIKE,
+    Species.SKORUPI,
+    Species.PURRLOIN,
+    Species.FOONGUS,
+    Species.BUNNELBY,
+    Species.FLETCHLING,
+    Species.LITLEO,
     Species.PANGORO,
-    Species.MEOWSTIC,
-    Species.MALAMAR,
-    Species.CLAWITZER,
-    Species.HELIOLISK,
+    Species.ESPURR,
+    Species.INKAY,
+    Species.CLAUNCHER,
+    Species.HELIOPTILE,
   ],
   [TrainerPoolTier.UNCOMMON]: [
-    Species.HOUNDOOM,
-    Species.WEAVILE,
-    Species.CHANDELURE,
-    Species.AEGISLASH,
-    Species.BARBARACLE,
-    Species.DRAGALGE,
-    Species.GOODRA,
-    Species.TREVENANT,
-    Species.GOURGEIST,
+    Species.HOUNDOUR,
+    Species.SNEASEL,
+    Species.LITWICK,
+    Species.HONEDGE,
+    Species.BINACLE,
+    Species.SKRELP,
+    Species.NOIBAT,
+    Species.PHANTUMP,
+    Species.PUMPKABOO,,
   ],
-  [TrainerPoolTier.RARE]: [Species.NOIVERN, Species.HISUI_GOODRA, Species.HISUI_AVALUGG],
+  [TrainerPoolTier.RARE]: [Species.SLIGGOO, Species.HISUI_SLIGGOO, Species.HISUI_AVALUGG],
 };
 
 const AETHER: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    Species.ALAKAZAM,
-    Species.SLOWBRO,
+    Species.ABRA,
+    Species.SLOWPOKE,
+    Species.MAGNEMITE,
     Species.EXEGGUTOR,
-    Species.XATU,
-    Species.CLAYDOL,
-    Species.BEHEEYEM,
-    Species.ORANGURU,
+    Species.NATU,
+    Species.BALTOY,
+    Species.MIME_JR,
+    Species.ELGYEM,
+    Species.INKAY,
     Species.BRUXISH,
-    Species.ORBEETLE,
-    Species.FARIGIRAF,
+    Species.BLIPBUG,
     Species.ALOLA_RAICHU,
   ],
   [TrainerPoolTier.UNCOMMON]: [
-    Species.KIRLIA,
-    Species.MEDICHAM,
-    Species.METAGROSS,
-    Species.MALAMAR,
-    Species.HATTERENE,
-    Species.MR_RIME,
-    Species.GALAR_SLOWKING,
+    Species.RALTS,
+    Species.MEDITITE,
+    Species.BELDUM,
+    Species.SOLOSIS,
+    Species.HATENNA,
+    Species.WYRDEER,
+    Species.FARIGIRAF,
+    Species.ALOLA_GRIMER,
+    Species.GALAR_SLOWPOKE,
   ],
-  [TrainerPoolTier.RARE]: [Species.PORYGON_Z, Species.ARMAROUGE, Species.HISUI_BRAVIARY],
+  [TrainerPoolTier.RARE]: [Species.PORYGON, Species.ARMAROUGE],
 };
 
 const SKULL: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    Species.NIDOQUEEN,
-    Species.GENGAR,
+    Species.GASTLY,
     Species.KOFFING,
-    Species.CROBAT,
-    Species.ROSERADE,
-    Species.SKUNTANK,
-    Species.TOXICROAK,
-    Species.SCOLIPEDE,
-    Species.TOXAPEX,
-    Species.LURANTIS,
-    Species.ALOLA_MUK,
+    Species.ZUBAT,
+    Species.VENONAT,
+    Species.STUNKY,
+    Species.CROAGUNK,
+    Species.VENIPEDE,
+    Species.SCRAGGY,
+    Species.MAREANIE,
+    Species.FOMANTIS,
+    Species.ALOLA_GRIMER,
   ],
   [TrainerPoolTier.UNCOMMON]: [
-    Species.DRAPION,
-    Species.MANDIBUZZ,
-    Species.OVERQWIL,
-    Species.GLIMMORA,
-    Species.CLODSIRE,
-    Species.GALAR_SLOWBRO,
+    Species.NIDORAN_F,
+    Species.SKORUPI,
+    Species.PAWNIARD,
+    Species.VULLABY,
+    Species.TOXEL,
+    Species.GLIMMET,
+    Species.GALAR_WOOPER,
+    Species.GALAR_SLOWPOKE,
   ],
-  [TrainerPoolTier.RARE]: [Species.DRAGALGE, Species.SNEASLER],
+  [TrainerPoolTier.RARE]: [Species.SKRELP, Species.HISUI_SNEASEL],
 };
 
 const MACRO_COSMOS: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    Species.NINETALES,
-    Species.BELLOSSOM,
-    Species.MILOTIC,
+    Species.VULPIX,
+    Species.FEEBAS,
+    Species.MAWILE,
     Species.FROSLASS,
-    Species.GOTHITELLE,
-    Species.JELLICENT,
-    Species.SALAZZLE,
+    Species.GOTHITA,
+    Species.FLABEBE,
+    Species.SALANDIT,
     Species.TSAREENA,
-    Species.POLTEAGEIST,
-    Species.HATTERENE,
-    Species.GALAR_RAPIDASH,
+    Species.SINISTEA,
+    Species.HATENNA,
+    Species.INDEEDEE,
+    Species.GALAR_PONYTA,
   ],
   [TrainerPoolTier.UNCOMMON]: [
-    Species.TOGEKISS,
-    Species.MANDIBUZZ,
-    Species.TOXAPEX,
-    Species.APPLETUN,
-    Species.CURSOLA,
-    Species.ALOLA_NINETALES,
+    Species.TOGEPI,
+    Species.VULLABY,
+    Species.MAREANIE,
+    Species.CUFANT,
+    Species.TINKATINK,
+    Species.ALOLA_VULPIX,
+    Species.GALAR_CORSOLA,
   ],
-  [TrainerPoolTier.RARE]: [Species.TINKATON, Species.HISUI_LILLIGANT],
+  [TrainerPoolTier.RARE]: [Species.APPLIN, Species.HISUI_LILLIGANT],
 };
 
 const STAR_DARK: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    Species.SHIFTRY,
-    Species.CACTURNE,
-    Species.HONCHKROW,
-    Species.SKUNTANK,
-    Species.KROOKODILE,
-    Species.OBSTAGOON,
-    Species.LOKIX,
-    Species.MABOSSTIFF,
+    Species.MURKROW,
+    Species.SEEDOT,
+    Species.SABLEYE,
+    Species.CACNEA,
+    Species.STUNKY,
+    Species.SANDILE,
+    Species.INKAY,
+    Species.NYMBLE,
+    Species.MASCHIFF,
   ],
   [TrainerPoolTier.UNCOMMON]: [
     Species.UMBREON,
-    Species.CRAWDAUNT,
-    Species.WEAVILE,
-    Species.ZOROARK,
-    Species.MALAMAR,
+    Species.CORPHISH,
+    Species.SNEASEL,
+    Species.ZORUA,
+    Species.IMPIDIMP,
     Species.BOMBIRDIER,
+    Species.GALAR_ZIGZAGOON,
   ],
-  [TrainerPoolTier.RARE]: [Species.HYDREIGON, Species.MEOWSCARADA],
+  [TrainerPoolTier.RARE]: [Species.DEINO, Species.SPRIGATITO],
 };
 
 const STAR_FIRE: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    Species.ARCANINE,
-    Species.HOUNDOOM,
-    Species.CAMERUPT,
-    Species.CHANDELURE,
-    Species.TALONFLAME,
-    Species.PYROAR,
-    Species.COALOSSAL,
-    Species.SCOVILLAIN,
+    Species.GROWLITHE,
+    Species.HOUNDOUR,
+    Species.NUMEL,
+    Species.TORKOAL,
+    Species.FLETCHLING,
+    Species.LITLEO,
+    Species.SIZZLIPEDE,
+    Species.ROLYCOLY,
+    Species.CAPSAKID,
   ],
   [TrainerPoolTier.UNCOMMON]: [
-    Species.RAPIDASH,
+    Species.PONYTA,
     Species.FLAREON,
-    Species.TORKOAL,
-    Species.MAGMORTAR,
-    Species.SALAZZLE,
+    Species.MAGMAR,
+    Species.DARUMAKA,
+    Species.LITWICK,
+    Species.SALANDIT,
     Species.TURTONATOR,
   ],
-  [TrainerPoolTier.RARE]: [Species.VOLCARONA, Species.SKELEDIRGE],
+  [TrainerPoolTier.RARE]: [Species.LARVESTA, Species.FUECOCO],
 };
 
 const STAR_POISON: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    Species.MUK,
-    Species.CROBAT,
-    Species.SKUNTANK,
-    Species.AMOONGUSS,
-    Species.TOXAPEX,
-    Species.TOXTRICITY,
+    Species.GRIMER,
+    Species.VENONAT,
+    Species.SEVIPER,
+    Species.STUNKY,
+    Species.FOONGUS,
+    Species.MAREANIE,
+    Species.TOXEL,
     Species.GRAFAIAI,
-    Species.CLODSIRE,
+    Species.GALAR_WOOPER,
   ],
   [TrainerPoolTier.UNCOMMON]: [
-    Species.GENGAR,
-    Species.SEVIPER,
-    Species.DRAGALGE,
+    Species.ZUBAT,
+    Species.GASTLY,
+    Species.SKRELP,
     Species.OVERQWIL,
-    Species.ALOLA_MUK,
-    Species.GALAR_SLOWBRO,
+    Species.ALOLA_GRIMER,
+    Species.GALAR_SLOWPOKE,
   ],
-  [TrainerPoolTier.RARE]: [Species.GLIMMORA, Species.VENUSAUR],
+  [TrainerPoolTier.RARE]: [Species.GLIMMET, Species.BULBASAUR],
 };
 
 const STAR_FAIRY: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    Species.CLEFABLE,
-    Species.WIGGLYTUFF,
-    Species.AZUMARILL,
-    Species.WHIMSICOTT,
-    Species.FLORGES,
-    Species.HATTERENE,
-    Species.GRIMMSNARL,
-    Species.TINKATON,
+    Species.IGGLYBUFF,
+    Species.AZURILL,
+    Species.COTTONEE,
+    Species.FLABEBE,
+    Species.KLEFKI,
+    Species.CUTIEFLY,
+    Species.HATENNA,
+    Species.TINKATINK,
   ],
   [TrainerPoolTier.UNCOMMON]: [
-    Species.TOGEKISS,
+    Species.CLEFFA,
+    Species.TOGEPI,
     Species.GARDEVOIR,
     Species.SYLVEON,
-    Species.KLEFKI,
     Species.MIMIKYU,
-    Species.ALOLA_NINETALES,
+    Species.IMPIDIMP,
+    Species.ALOLA_VULPIX,
   ],
-  [TrainerPoolTier.RARE]: [Species.GALAR_RAPIDASH, Species.PRIMARINA],
+  [TrainerPoolTier.RARE]: [Species.GALAR_WEEZING, Species.POPPLIO],
 };
 
 const STAR_FIGHTING: TrainerTierPools = {
   [TrainerPoolTier.COMMON]: [
-    Species.BRELOOM,
-    Species.HARIYAMA,
-    Species.MEDICHAM,
-    Species.TOXICROAK,
-    Species.SCRAFTY,
-    Species.MIENSHAO,
-    Species.PAWMOT,
-    Species.PALDEA_TAUROS,
+    Species.TYROGUE,
+    Species.SHROOMISH,
+    Species.MAKUHITA,
+    Species.RIOLU,
+    Species.CROAGUNK,
+    Species.SCRAGGY,
+    Species.MIENFOO,
+    Species.PASSIMIAN,
+    Species.PAWMI,
   ],
   [TrainerPoolTier.UNCOMMON]: [
-    Species.LUCARIO,
-    Species.CONKELDURR,
+    Species.MEDITITE,
+    Species.GALLADE,
+    Species.TIMBURR,
     Species.HAWLUCHA,
-    Species.PASSIMIAN,
+    Species.STUFFUL,
     Species.FALINKS,
     Species.FLAMIGO,
+    Species.PALDEA_TAUROS,
   ],
-  [TrainerPoolTier.RARE]: [Species.KOMMO_O, Species.QUAQUAVAL],
+  [TrainerPoolTier.RARE]: [Species.JANGMO_O, Species.QUAXLY],
 };
 
 export type EvilTeam =