From 5e8de8f41467472726c365841020ad53c6c528bd Mon Sep 17 00:00:00 2001
From: Blitzy <118096277+Blitz425@users.noreply.github.com>
Date: Sat, 29 Mar 2025 01:02:51 -0500
Subject: [PATCH] Update trainer-config.ts

---
 src/data/trainers/trainer-config.ts | 51 ++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts
index f23027ffee8..0e53cd71add 100644
--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
@@ -1898,19 +1898,21 @@ export const trainerConfigs: TrainerConfigs = {
         Species.MANKEY,
         Species.GROWLITHE,
         Species.MAGNEMITE,
-        Species.GASTLY,
+        Species.ONIX,
         Species.VOLTORB,
         Species.EXEGGCUTE,
         Species.CUBONE,
         Species.LICKITUNG,
-        Species.SCYTHER,
         Species.TAUROS,
-        Species.GYARADOS,
+        Species.MAGIKARP,
         Species.MURKROW,
         Species.ELEKID,
         Species.MAGBY,
       ],
       [TrainerPoolTier.RARE]: [
+        Species.ABRA,
+        Species.GASTLY,
+        Species.SCYTHER,
         Species.PORYGON,
         Species.OMANYTE,
         Species.KABUTO,
@@ -1969,7 +1971,6 @@ export const trainerConfigs: TrainerConfigs = {
         Species.DIGLETT,
         Species.GROWLITHE,
         Species.SLUGMA,
-        Species.MAGBY,
         Species.POOCHYENA,
         Species.ZIGZAGOON,
         Species.NUMEL,
@@ -1978,24 +1979,24 @@ export const trainerConfigs: TrainerConfigs = {
       ],
       [TrainerPoolTier.UNCOMMON]: [
         Species.RHYHORN,
-        Species.GLIGAR,
         Species.PHANPY,
+        Species.MAGBY,
+        Species.ZANGOOSE,
         Species.SOLROCK,
-        Species.HIPPOPOTAS,
         Species.HEATMOR,
         Species.ROLYCOLY,
-        Species.SILICOBRA,
+        Species.CAPSAKID,
       ],
       [TrainerPoolTier.RARE]: [
-        Species.ARON,
         Species.TRAPINCH,
         Species.LILEEP,
         Species.ANORITH,
+        Species.GOLETT,
         Species.TURTONATOR,
         Species.TOEDSCOOL,
         Species.HISUI_GROWLITHE,
       ],
-      [TrainerPoolTier.SUPER_RARE]: [Species.CHARCADET, Species.CAPSAKID],
+      [TrainerPoolTier.SUPER_RARE]: [Species.CHARCADET, Species.ARON],
     }),
   [TrainerType.TABITHA]: new TrainerConfig(++t)
     .setMoneyMultiplier(1.5)
@@ -2028,6 +2029,7 @@ export const trainerConfigs: TrainerConfigs = {
         Species.REMORAID,
         Species.ZIGZAGOON,
         Species.LOTAD,
+        Species.WINGULL,
         Species.CARVANHA,
         Species.WAILMER,
         Species.BARBOACH,
@@ -2039,16 +2041,18 @@ export const trainerConfigs: TrainerConfigs = {
         Species.HORSEA,
         Species.CHINCHOU,
         Species.WOOPER,
-        Species.WINGULL,
         Species.AZURILL,
+        Species.SEVIPER,
         Species.CLAMPERL,
+        Species.WIMPOD,
         Species.CLOBBOPUS,
       ],
       [TrainerPoolTier.RARE]: [
         Species.MANTYKE,
+        Species.TYMPOLE,
         Species.SKRELP,
-        Species.DHELMISE,
         Species.ARROKUDA,
+        Species.WIGLETT,
         Species.HISUI_QWILFISH,
         Species.PALDEA_WOOPER,
       ],
@@ -2103,6 +2107,7 @@ export const trainerConfigs: TrainerConfigs = {
       ],
       [TrainerPoolTier.RARE]: [
         Species.SNEASEL,
+        Species.TEDDIURSA,
         Species.ELEKID,
         Species.MAGBY,
         Species.DUSKULL,
@@ -2206,10 +2211,11 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyTemplateFunc(() => getEvilGruntPartyTemplate())
     .setSpeciesPools({
       [TrainerPoolTier.COMMON]: [
-        Species.PONYTA,
         Species.HOUNDOUR,
+        Species.GULPIN,
         Species.SKORUPI,
         Species.CROAGUNK,
+        Species.PURRLOIN,
         Species.SCRAGGY,
         Species.FLETCHLING,
         Species.SCATTERBUG,
@@ -2220,7 +2226,6 @@ export const trainerConfigs: TrainerConfigs = {
       [TrainerPoolTier.UNCOMMON]: [
         Species.POOCHYENA,
         Species.ELECTRIKE,
-        Species.PURRLOIN,
         Species.FOONGUS,
         Species.PANCHAM,
         Species.BINACLE,
@@ -2230,8 +2235,13 @@ export const trainerConfigs: TrainerConfigs = {
         Species.PHANTUMP,
         Species.PUMPKABOO,
       ],
-      [TrainerPoolTier.RARE]: [Species.SNEASEL, Species.LITWICK, Species.PAWNIARD, Species.SLIGGOO],
-      [TrainerPoolTier.SUPER_RARE]: [Species.NOIBAT, Species.HISUI_SLIGGOO, Species.HISUI_AVALUGG],
+      [TrainerPoolTier.RARE]: [
+        Species.SNEASEL, 
+        Species.LITWICK, 
+        Species.PAWNIARD, 
+        Species.NOIBAT,
+      ],
+      [TrainerPoolTier.SUPER_RARE]: [Species.SLIGGOO, Species.HISUI_SLIGGOO, Species.HISUI_AVALUGG],
     }),
   [TrainerType.BRYONY]: new TrainerConfig(++t)
     .setMoneyMultiplier(1.5)
@@ -2286,14 +2296,13 @@ export const trainerConfigs: TrainerConfigs = {
         Species.ORANGURU,
         Species.PASSIMIAN,
         Species.PYUKUMUKU,
-        Species.MINIOR,
         Species.BRUXISH,
         Species.ALOLA_SANDSHREW,
         Species.ALOLA_VULPIX,
         Species.ALOLA_MAROWAK,
       ],
       [TrainerPoolTier.RARE]: [
-        Species.MAGNEMITE,
+        Species.MINIOR,
         Species.TURTONATOR,
         Species.MIMIKYU,
         Species.DRAMPA,
@@ -2321,6 +2330,7 @@ export const trainerConfigs: TrainerConfigs = {
     .setSpeciesPools({
       [TrainerPoolTier.COMMON]: [
         Species.EKANS,
+        Species.VENONAT,
         Species.DROWZEE,
         Species.KOFFING,
         Species.SPINARAK,
@@ -2379,7 +2389,7 @@ export const trainerConfigs: TrainerConfigs = {
         Species.KLINK,
         Species.SKWOVET,
         Species.ROOKIDEE,
-        Species.CRAMORANT,
+        Species.ROLYCOLY,
         Species.CUFANT,
         Species.GALAR_MEOWTH,
         Species.GALAR_ZIGZAGOON,
@@ -2389,9 +2399,11 @@ export const trainerConfigs: TrainerConfigs = {
         Species.RIOLU,
         Species.DRILBUR,
         Species.APPLIN,
+        Species.CRAMORANT,
         Species.ARROKUDA,
         Species.SINISTEA,
         Species.HATENNA,
+        Species.FALINKS,
         Species.GALAR_PONYTA,
         Species.GALAR_YAMASK,
       ],
@@ -2399,7 +2411,6 @@ export const trainerConfigs: TrainerConfigs = {
         Species.SCIZOR,
         Species.BELDUM,
         Species.HONEDGE,
-        Species.FALINKS,
         Species.GALAR_FARFETCHD,
         Species.GALAR_MR_MIME,
         Species.GALAR_DARUMAKA,
@@ -4833,7 +4844,7 @@ export const trainerConfigs: TrainerConfigs = {
         p.formIndex = Utils.randSeedInt(4, 1); // Shock, Burn, Chill, or Douse Drive
         if (!p.moveset.some(move => !Utils.isNullOrUndefined(move) && move.moveId === Moves.TECHNO_BLAST)) {
           // Check if Techno Blast is in the moveset, if not, replace the first move with Techno Blast.
-          p.moveset[0] = new PokemonMove(Moves.TECHNO_BLAST);
+          p.moveset[2] = new PokemonMove(Moves.TECHNO_BLAST);
         }
       }),
     )