From 3761ccf539f66d3a12e81b71fbc77507cc7fd466 Mon Sep 17 00:00:00 2001
From: Blitzy <118096277+Blitz425@users.noreply.github.com>
Date: Fri, 8 Aug 2025 19:17:17 -0500
Subject: [PATCH 1/4] Update trainer-config.ts

---
 src/data/trainers/trainer-config.ts | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts
index 0f047157174..587ebf110bb 100644
--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
@@ -1866,27 +1866,37 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(
       0,
       getRandomPartyMemberFunc([
+        SpeciesId.METAPOD,
+        SpeciesId.CLEFFA,
+        SpeciesId.WOOPER,
+        SpeciesId.SILCOON,
         SpeciesId.PLUSLE,
         SpeciesId.VOLBEAT,
-        SpeciesId.PACHIRISU,
-        SpeciesId.SILCOON,
-        SpeciesId.METAPOD,
-        SpeciesId.IGGLYBUFF,
+        SpeciesId.BONSLY,
         SpeciesId.PETILIL,
-        SpeciesId.EEVEE,
+        SpeciesId.SPRITZEE,
+        SpeciesId.ROCKRUFF,
+        SpeciesId.APPLIN,
+        SpeciesId.TAROUNTULA,
+        SpeciesId.PICHU,
       ]),
     )
     .setPartyMemberFunc(
       1,
       getRandomPartyMemberFunc(
         [
+          SpeciesId.KAKUNA,
+          SpeciesId.IGGLYBUFF,
+          SpeciesId.PALDEA_WOOPER,
+          SpeciesId.CASCOON,
           SpeciesId.MINUN,
           SpeciesId.ILLUMISE,
-          SpeciesId.EMOLGA,
-          SpeciesId.CASCOON,
-          SpeciesId.KAKUNA,
-          SpeciesId.CLEFFA,
+          SpeciesId.MIME_JR,
           SpeciesId.COTTONEE,
+          SpeciesId.SWIRLIX,
+          SpeciesId.YAMPER,
+          SpeciesId.APPLIN,
+          SpeciesId.NYMBLE,
           SpeciesId.EEVEE,
         ],
         TrainerSlot.TRAINER_PARTNER,

From 5b620fc84697e48f3123fe9502646dc8bbbaf6a7 Mon Sep 17 00:00:00 2001
From: Blitzy <118096277+Blitz425@users.noreply.github.com>
Date: Fri, 8 Aug 2025 19:28:09 -0500
Subject: [PATCH 2/4] Update trainer-config.ts

---
 src/data/trainers/trainer-config.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts
index 587ebf110bb..597f4298add 100644
--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
@@ -1867,6 +1867,7 @@ export const trainerConfigs: TrainerConfigs = {
       0,
       getRandomPartyMemberFunc([
         SpeciesId.METAPOD,
+        SpeciesId.LEDYBA,
         SpeciesId.CLEFFA,
         SpeciesId.WOOPER,
         SpeciesId.SILCOON,
@@ -1886,6 +1887,7 @@ export const trainerConfigs: TrainerConfigs = {
       getRandomPartyMemberFunc(
         [
           SpeciesId.KAKUNA,
+          SpeciesId.SPINARAK,
           SpeciesId.IGGLYBUFF,
           SpeciesId.PALDEA_WOOPER,
           SpeciesId.CASCOON,

From 8b9a37137e2484760b0b2df5726f6ab8051440b7 Mon Sep 17 00:00:00 2001
From: Blitzy <118096277+Blitz425@users.noreply.github.com>
Date: Fri, 8 Aug 2025 23:48:53 -0500
Subject: [PATCH 3/4] Update trainer-config.ts

---
 src/data/trainers/trainer-config.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts
index 597f4298add..400b71199ab 100644
--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
@@ -1870,15 +1870,15 @@ export const trainerConfigs: TrainerConfigs = {
         SpeciesId.LEDYBA,
         SpeciesId.CLEFFA,
         SpeciesId.WOOPER,
+        SpeciesId.TEDDIURSA,
+        SpeciesId.HOUNDOUR,
         SpeciesId.SILCOON,
         SpeciesId.PLUSLE,
         SpeciesId.VOLBEAT,
         SpeciesId.BONSLY,
         SpeciesId.PETILIL,
         SpeciesId.SPRITZEE,
-        SpeciesId.ROCKRUFF,
-        SpeciesId.APPLIN,
-        SpeciesId.TAROUNTULA,
+        SpeciesId.MILCERY,
         SpeciesId.PICHU,
       ]),
     )
@@ -1890,15 +1890,15 @@ export const trainerConfigs: TrainerConfigs = {
           SpeciesId.SPINARAK,
           SpeciesId.IGGLYBUFF,
           SpeciesId.PALDEA_WOOPER,
+          SpeciesId.PHANPY,
+          SpeciesId.ELECTRIKE,
           SpeciesId.CASCOON,
           SpeciesId.MINUN,
           SpeciesId.ILLUMISE,
           SpeciesId.MIME_JR,
           SpeciesId.COTTONEE,
           SpeciesId.SWIRLIX,
-          SpeciesId.YAMPER,
-          SpeciesId.APPLIN,
-          SpeciesId.NYMBLE,
+          SpeciesId.FIDOUGH,
           SpeciesId.EEVEE,
         ],
         TrainerSlot.TRAINER_PARTNER,

From 845ed61ee8bfa2740f9577e3df620f750a79dcd8 Mon Sep 17 00:00:00 2001
From: Blitzy <118096277+Blitz425@users.noreply.github.com>
Date: Sat, 9 Aug 2025 13:48:25 -0500
Subject: [PATCH 4/4] Update trainer-config.ts

---
 src/data/trainers/trainer-config.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts
index 400b71199ab..ddfdcbb7b25 100644
--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
@@ -1871,10 +1871,12 @@ export const trainerConfigs: TrainerConfigs = {
         SpeciesId.CLEFFA,
         SpeciesId.WOOPER,
         SpeciesId.TEDDIURSA,
+        SpeciesId.REMORAID,
         SpeciesId.HOUNDOUR,
         SpeciesId.SILCOON,
         SpeciesId.PLUSLE,
         SpeciesId.VOLBEAT,
+        SpeciesId.SPINDA,
         SpeciesId.BONSLY,
         SpeciesId.PETILIL,
         SpeciesId.SPRITZEE,
@@ -1891,10 +1893,12 @@ export const trainerConfigs: TrainerConfigs = {
           SpeciesId.IGGLYBUFF,
           SpeciesId.PALDEA_WOOPER,
           SpeciesId.PHANPY,
+          SpeciesId.MANTYKE,
           SpeciesId.ELECTRIKE,
           SpeciesId.CASCOON,
           SpeciesId.MINUN,
           SpeciesId.ILLUMISE,
+          SpeciesId.SPINDA,
           SpeciesId.MIME_JR,
           SpeciesId.COTTONEE,
           SpeciesId.SWIRLIX,