Skip to content

Commit

Permalink
More trainer changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Pseurae committed Oct 20, 2024
1 parent 030df17 commit 2b9f5f0
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions src/data/trainers.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tomas[2] = {
const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vitruvio[1] = {
{
.iv = 200,
.level = 24,
.level = 20,
.species = SPECIES_PERSIAN,
},
};
Expand Down Expand Up @@ -859,7 +859,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola[2] = {
const struct TrainerMonNoItemCustomMoves gTrainerParty_Buccha[1] = {
{
.iv = 200,
.level = 28,
.level = 24,
.species = SPECIES_LINOONE,
.moves = { MOVE_ROAR, MOVE_SAND_ATTACK, MOVE_SUPER_FANG, MOVE_STRENGTH },
},
Expand Down Expand Up @@ -2006,12 +2006,12 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vegas[3] = {
const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pekabo[2] = {
{
.iv = 0,
.level = 24,
.level = 20,
.species = SPECIES_QWILFISH,
},
{
.iv = 0,
.level = 24,
.level = 20,
.species = SPECIES_QWILFISH,
},
};
Expand Down Expand Up @@ -3656,6 +3656,12 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Roxanne[2] = {
};

const struct TrainerMonNoItemCustomMoves gTrainerParty_Haruko[6] = {
{
.iv = 255,
.level = 16,
.species = SPECIES_SHINX,
.moves = { MOVE_BITE, MOVE_THUNDER_SHOCK, MOVE_BULK_UP, MOVE_NONE },
},
{
.iv = 150,
.level = 18,
Expand All @@ -3682,16 +3688,10 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Haruko[6] = {
},
{
.iv = 255,
.level = 25,
.level = 23,
.species = SPECIES_LUXRAY,
.moves = { MOVE_BITE, MOVE_THUNDER_SHOCK, MOVE_BULK_UP, MOVE_NONE },
},
{
.iv = 255,
.level = 1,
.species = SPECIES_KINGMADIO,
.moves = { MOVE_NIGHT_SHADE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
},
}
};

const struct TrainerMonNoItemCustomMoves gTrainerParty_Wattson3[3] = {
Expand Down Expand Up @@ -4840,17 +4840,17 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Footman8[4] = {
const struct TrainerMonNoItemDefaultMoves gTrainerParty_SmashShot[3] = {
{
.iv = 0,
.level = 20,
.level = 18,
.species = SPECIES_MAKUHITA,
},
{
.iv = 0,
.level = 20,
.level = 18,
.species = SPECIES_MAKUHITA,
},
{
.iv = 0,
.level = 24,
.level = 20,
.species = SPECIES_HITMONTOP,
},
};
Expand Down Expand Up @@ -5433,9 +5433,9 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxine[4] = {
const struct TrainerMonNoItemCustomMoves gTrainerParty_Meteor3[1] = {
{
.iv = 200,
.level = 22,
.level = 18,
.species = SPECIES_DRAGON,
.moves = { MOVE_DIG, MOVE_FIRE_PUMP, MOVE_DRAGON_BREATH, MOVE_FLY },
.moves = { MOVE_DIG, MOVE_EMBER, MOVE_FLY },
},
};

Expand Down Expand Up @@ -8575,21 +8575,21 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kent[2] = {
const struct TrainerMonItemCustomMoves gTrainerParty_Pestilence[3] = {
{
.iv = 50,
.level = 16,
.level = 13,
.species = SPECIES_MOULDER,
.heldItem = ITEM_SNAKE_EYES,
.moves = { MOVE_HARDEN, MOVE_ACID, MOVE_POUND, MOVE_DISABLE },
},
{
.iv = 50,
.level = 17,
.level = 14,
.species = SPECIES_MOULDER,
.heldItem = ITEM_SNAKE_EYES,
.moves = { MOVE_ACID, MOVE_HARDEN, MOVE_POUND, MOVE_TOXIC },
},
{
.iv = 100,
.level = 18,
.level = 16,
.species = SPECIES_QWILFISH,
.heldItem = ITEM_SNAKE_EYES,
.moves = { MOVE_TOXIC, MOVE_POISON_STING, MOVE_PIN_MISSILE, MOVE_WATER_GUN },
Expand Down

0 comments on commit 2b9f5f0

Please sign in to comment.