atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
DizzyEggg 2023-02-08 12:48:48 +01:00
parent 896b575c07
commit 84d7024add
2 changed files with 6 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/data/trainer_parties.h
View file

@ -1706,36 +1706,12 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica5[] = {
}
};
static const struct TrainerMonItemCustomMoves sParty_Winston1[] = {
static const struct TrainerMonItemDefaultMoves sParty_Winston1[] = {
{
.iv = 0,
.lvl = 10,
.species = SPECIES_EMOLGA,
.heldItem = ITEM_NONE,
.moves = {MOVE_VOLT_SWITCH, MOVE_NONE, MOVE_NONE, MOVE_NONE},
},
/*
{
.iv = 0,
.lvl = 4,
.species = SPECIES_ABRA,
.heldItem = ITEM_NONE,
.moves = {MOVE_VOLT_SWITCH, MOVE_NONE, MOVE_NONE, MOVE_NONE},
},
{
.iv = 0,
.lvl = 8,
.species = SPECIES_KADABRA,
.heldItem = ITEM_NONE,
.moves = {MOVE_VOLT_SWITCH, MOVE_NONE, MOVE_NONE, MOVE_NONE},
},
*/
{
.iv = 250,
.lvl = 24,
.species = SPECIES_ZEBSTRIKA,
.heldItem = ITEM_SITRUS_BERRY,
.moves = {MOVE_VOLT_SWITCH, MOVE_VOLT_SWITCH, MOVE_VOLT_SWITCH, MOVE_VOLT_SWITCH},
.lvl = 7,
.species = SPECIES_ZIGZAGOON,
.heldItem = ITEM_NUGGET
}
};

4
src/data/trainers.h
View file

@ -1641,8 +1641,8 @@ const struct Trainer gTrainers[] = {
.trainerName = _("WINSTON"),
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_ACE_POKEMON,
.party = ITEM_CUSTOM_MOVES(sParty_Winston1),
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_DEFAULT_MOVES(sParty_Winston1),
},
[TRAINER_MOLLIE] =