From d7766a9971799ac30fbf47e84df49cd701ef7da5 Mon Sep 17 00:00:00 2001
From: Daniel McBane <daniel.g.mcbane@gmail.com>
Date: Sat, 9 May 2026 14:46:57 -0400
Subject: [PATCH] changed final two viridian forest teams

---
 src/data/trainer_parties.h | 52 +++++++++++++++++++++++++++++++-------
 src/data/trainers.h        |  4 +--
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index d1aaabc6c..e0967e0e9 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -312,11 +312,36 @@ static const struct TrainerMonNoItemCustomMoves sParty_BugCatcherDoug[] = {
     },
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherSammy[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_BugCatcherSammy[] = {
     {
         .iv = 0,
-        .lvl = 9,
-        .species = SPECIES_WEEDLE,
+        .lvl = 11,
+        .species = SPECIES_BEEDRILL,
+	.moves = {MOVE_TWINEEDLE, MOVE_POISON_TAIL, MOVE_NONE, MOVE_NONE},
+    },
+    {
+	.iv = 0,
+	.lvl = 11,
+	.species = SPECIES_BUTTERFREE,
+	.moves = {MOVE_SILVER_WIND, MOVE_SLEEP_POWDER, MOVE_GUST, MOVE_NONE},
+    },
+    {
+	.iv = 0,
+	.lvl = 11,
+	.species = SPECIES_VENOMOTH,
+	.moves = {MOVE_POISON_POWDER, MOVE_SILVER_WIND, MOVE_GUST, MOVE_NONE},
+    },
+    {
+	.iv = 0,
+	.lvl = 9,
+	.species = SPECIES_SCYTHER,
+	.moves = {MOVE_FURY_CUTTER, MOVE_GUST, MOVE_NONE, MOVE_NONE},
+    },
+    {
+	.iv = 0,
+	.lvl = 9,
+	.species = SPECIES_PINSIR,
+	.moves = {MOVE_VICE_GRIP, MOVE_HORN_ATTACK, MOVE_NONE, MOVE_NONE},
     },
 };
 
@@ -7388,21 +7413,30 @@ static const struct TrainerMonNoItemCustomMoves sParty_BugCatcherAnthony[] = {
     },
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherCharlie[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_BugCatcherCharlie[] = {
     {
         .iv = 0,
-        .lvl = 7,
-        .species = SPECIES_METAPOD,
+        .lvl = 11,
+        .species = SPECIES_PARAS,
+	.moves = {MOVE_SLEEP_POWDER, MOVE_FURY_CUTTER, MOVE_LEECH_SEED, MOVE_NONE},
     },
     {
         .iv = 0,
-        .lvl = 7,
-        .species = SPECIES_CATERPIE,
+        .lvl = 11,
+        .species = SPECIES_VENONAT,
+	.moves = {MOVE_POISON_POWDER, MOVE_LEECH_LIFE, MOVE_NONE, MOVE_NONE},
     },
     {
         .iv = 0,
-        .lvl = 7,
+        .lvl = 11,
         .species = SPECIES_METAPOD,
+	.moves = {MOVE_IRON_DEFENSE, MOVE_LEECH_LIFE, MOVE_REST, MOVE_SLEEP_TALK},
+    },
+    {
+	.iv = 0,
+	.lvl = 11,
+	.species = SPECIES_KAKUNA,
+	.moves = {MOVE_PROTECT, MOVE_TOXIC, MOVE_LEECH_LIFE},
     },
 };
 
diff --git a/src/data/trainers.h b/src/data/trainers.h
index 92a646168..d1eab0f83 100644
--- a/src/data/trainers.h
+++ b/src/data/trainers.h
@@ -1040,7 +1040,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BugCatcherSammy),
+        .party = NO_ITEM_CUSTOM_MOVES(sParty_BugCatcherSammy),
     },
     [TRAINER_BUG_CATCHER_COLTON] = {
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -5320,7 +5320,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BugCatcherCharlie),
+        .party = NO_ITEM_CUSTOM_MOVES(sParty_BugCatcherCharlie),
     },
     [TRAINER_TWINS_ELI_ANNE_2] = {
         .trainerClass = TRAINER_CLASS_TWINS,