From 57c00a74866f0363956a0b6db99f9e23dbaded22 Mon Sep 17 00:00:00 2001 From: Daniel McBane Date: Sat, 9 May 2026 12:38:22 -0400 Subject: [PATCH] changed teams of first three trainers in viridian forest --- src/data/trainer_parties.h | 63 ++++++++++++++++++++++++++++---------- src/data/trainers.h | 18 +++++------ 2 files changed, 56 insertions(+), 25 deletions(-) diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index 2e5780022..d1aaabc6c 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -270,34 +270,45 @@ static const struct TrainerMonNoItemDefaultMoves sParty_YoungsterBen2[] = { }, }; -static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherRick[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BugCatcherRick[] = { { .iv = 0, - .lvl = 6, + .lvl = 9, .species = SPECIES_WEEDLE, + .moves = {MOVE_LEECH_LIFE, MOVE_POISON_STING, MOVE_TACKLE, MOVE_NONE}, }, { .iv = 0, - .lvl = 6, + .lvl = 9, .species = SPECIES_CATERPIE, + .moves = {MOVE_LEECH_LIFE, MOVE_STRING_SHOT, MOVE_TACKLE, MOVE_NONE}, + }, + { + .iv = 0, + .lvl = 9, + .species = SPECIES_PARAS, + .moves = {MOVE_FURY_CUTTER, MOVE_NONE, MOVE_NONE, MOVE_NONE}, }, }; -static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherDoug[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BugCatcherDoug[] = { { .iv = 0, - .lvl = 7, - .species = SPECIES_WEEDLE, - }, - { - .iv = 0, - .lvl = 7, + .lvl = 10, .species = SPECIES_KAKUNA, + .moves = {MOVE_LEECH_LIFE, MOVE_IRON_DEFENSE, MOVE_POISON_STING, MOVE_NONE}, }, { .iv = 0, - .lvl = 7, - .species = SPECIES_WEEDLE, + .lvl = 10, + .species = SPECIES_METAPOD, + .moves = {MOVE_LEECH_LIFE, MOVE_IRON_DEFENSE, MOVE_REST, MOVE_SNORE}, + }, + { + .iv = 0, + .lvl = 10, + .species = SPECIES_SHELLDER, + .moves = {MOVE_IRON_DEFENSE, MOVE_CLAMP, MOVE_NONE, MOVE_NONE}, }, }; @@ -7344,16 +7355,36 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BikerGoon3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_Biker2[] = {DUMMY_TRAINER_MON}; -static const struct TrainerMonNoItemDefaultMoves sParty_BugCatcherAnthony[] = { +static const struct TrainerMonNoItemCustomMoves sParty_BugCatcherAnthony[] = { { .iv = 0, - .lvl = 7, + .lvl = 10, .species = SPECIES_CATERPIE, + .moves = {MOVE_LEECH_LIFE, MOVE_STRING_SHOT, MOVE_NONE, MOVE_NONE}, }, { .iv = 0, - .lvl = 8, - .species = SPECIES_CATERPIE, + .lvl = 10, + .species = SPECIES_WEEDLE, + .moves = {MOVE_LEECH_LIFE, MOVE_POISON_STING, MOVE_NONE, MOVE_NONE}, + }, + { + .iv = 0, + .lvl = 10, + .species = SPECIES_PARAS, + .moves = {MOVE_FURY_CUTTER, MOVE_STUN_SPORE, MOVE_NONE, MOVE_NONE}, + }, + { + .iv = 0, + .lvl = 10, + .species = SPECIES_VENONAT, + .moves = {MOVE_LEECH_LIFE, MOVE_POISON_STING, MOVE_CONFUSION, MOVE_NONE}, + }, + { + .iv = 0, + .lvl = 8, + .species = SPECIES_SCYTHER, + .moves = {MOVE_FURY_CUTTER, MOVE_GUST, MOVE_NONE, MOVE_NONE}, }, }; diff --git a/src/data/trainers.h b/src/data/trainers.h index 02afbfd16..92a646168 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -1019,8 +1019,8 @@ const struct Trainer gTrainers[] = { .trainerName = _("RICK"), .items = {}, .doubleBattle = FALSE, - .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_BugCatcherRick), + .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, + .party = NO_ITEM_CUSTOM_MOVES(sParty_BugCatcherRick), }, [TRAINER_BUG_CATCHER_DOUG] = { .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -1029,8 +1029,8 @@ const struct Trainer gTrainers[] = { .trainerName = _("DOUG"), .items = {}, .doubleBattle = FALSE, - .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_BugCatcherDoug), + .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, + .party = NO_ITEM_CUSTOM_MOVES(sParty_BugCatcherDoug), }, [TRAINER_BUG_CATCHER_SAMMY] = { .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -1039,7 +1039,7 @@ const struct Trainer gTrainers[] = { .trainerName = _("SAMMY"), .items = {}, .doubleBattle = FALSE, - .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, + .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, .party = NO_ITEM_DEFAULT_MOVES(sParty_BugCatcherSammy), }, [TRAINER_BUG_CATCHER_COLTON] = { @@ -1419,7 +1419,7 @@ const struct Trainer gTrainers[] = { .trainerName = _("LIAM"), .items = {}, .doubleBattle = FALSE, - .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, + .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, .party = NO_ITEM_CUSTOM_MOVES(sParty_CamperLiam), }, [TRAINER_CAMPER_SHANE] = { @@ -5309,8 +5309,8 @@ const struct Trainer gTrainers[] = { .trainerName = _("ANTHONY"), .items = {}, .doubleBattle = FALSE, - .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_BugCatcherAnthony), + .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, + .party = NO_ITEM_CUSTOM_MOVES(sParty_BugCatcherAnthony), }, [TRAINER_BUG_CATCHER_CHARLIE] = { .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -5319,7 +5319,7 @@ const struct Trainer gTrainers[] = { .trainerName = _("CHARLIE"), .items = {}, .doubleBattle = FALSE, - .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, + .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, .party = NO_ITEM_DEFAULT_MOVES(sParty_BugCatcherCharlie), }, [TRAINER_TWINS_ELI_ANNE_2] = {