ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed TrainerMonNoItemCustomMoves

Browse Source
This commit is contained in:
Eduardo Quezada 2023-07-04 21:22:27 -04:00
parent 1ef56f6ae1
commit 9c961b4fd5
9 changed files with 174 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/constants/trainers.h
View File

@ -374,7 +374,6 @@
// All trainer parties specify the IV, level, and species for each Pokémon in the
// party. Some trainer parties also specify held items and custom moves for each
// Pokémon.
#define F_TRAINER_PARTY_CUSTOM_MOVESET (1 << 0)
#define F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED (1 << 3)
// Trainer party defines

10
include/data.h
View File

@ -59,22 +59,12 @@ struct TrainerMonNoItemDefaultMoves
u16 species;
};
struct TrainerMonNoItemCustomMoves
{
u16 iv;
u8 lvl;
u16 species;
u16 moves[MAX_MON_MOVES];
};
#define NO_ITEM_DEFAULT_MOVES(party) { .NoItemDefaultMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = 0
#define NO_ITEM_CUSTOM_MOVES(party) { .NoItemCustomMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET
#define EVERYTHING_CUSTOMIZED(party) { .EverythingCustomized = party}, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED
union TrainerMonPtr
{
const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves;
const struct TrainerMonCustomized *EverythingCustomized;
};

18
src/battle_main.c
View File

@ -1890,11 +1890,6 @@ static u32 GeneratePartyHash(const struct Trainer *trainer, u32 i)
buffer = (const u8 *) &trainer->party.NoItemDefaultMoves[i];
n = sizeof(*trainer->party.NoItemDefaultMoves);
}
else if (trainer->partyFlags == F_TRAINER_PARTY_CUSTOM_MOVESET)
{
buffer = (const u8 *) &trainer->party.NoItemCustomMoves[i];
n = sizeof(*trainer->party.NoItemCustomMoves);
}
else if (trainer->partyFlags == F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED)
{
buffer = (const u8 *) &trainer->party.EverythingCustomized[i];
@ -1994,19 +1989,6 @@ u8 CreateNPCTrainerPartyFromTrainer(struct Pokemon *party, const struct Trainer
CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0);
break;
}
case F_TRAINER_PARTY_CUSTOM_MOVESET:
{
const struct TrainerMonNoItemCustomMoves *partyData = trainer->party.NoItemCustomMoves;
fixedIV = partyData[i].iv * MAX_PER_STAT_IVS / 255;
CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0);
for (j = 0; j < MAX_MON_MOVES; j++)
{
SetMonData(&party[i], MON_DATA_MOVE1 + j, &partyData[i].moves[j]);
SetMonData(&party[i], MON_DATA_PP1 + j, &gBattleMoves[partyData[i].moves[j]].pp);
}
break;
}
case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
{
const struct TrainerMonCustomized *partyData = trainer->party.EverythingCustomized;

6
src/battle_script_commands.c
View File

@ -7345,12 +7345,6 @@ static u32 GetTrainerMoneyToGive(u16 trainerId)
lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl;
}
break;
case F_TRAINER_PARTY_CUSTOM_MOVESET:
{
const struct TrainerMonNoItemCustomMoves *party = gTrainers[trainerId].party.NoItemCustomMoves;
lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl;
}
break;
case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
{
const struct TrainerMonCustomized *party = gTrainers[trainerId].party.EverythingCustomized;

8
src/battle_setup.c
View File

@ -774,14 +774,6 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
sum += party[i].lvl;
}
break;
case F_TRAINER_PARTY_CUSTOM_MOVESET:
{
const struct TrainerMonNoItemCustomMoves *party;
party = gTrainers[opponentId].party.NoItemCustomMoves;
for (i = 0; i < count; i++)
sum += party[i].lvl;
}
break;
case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
{
const struct TrainerMonCustomized *party;

13
src/battle_tower.c
View File

@ -3063,19 +3063,6 @@ static void FillPartnerParty(u16 trainerId)
CreateMon(&gPlayerParty[i + 3], partyData[i].species, partyData[i].lvl, partyData[i].iv * 31 / 255, TRUE, j, TRUE, otID);
break;
}
case F_TRAINER_PARTY_CUSTOM_MOVESET:
{
const struct TrainerMonNoItemCustomMoves *partyData = gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].party.NoItemCustomMoves;
CreateMon(&gPlayerParty[i + 3], partyData[i].species, partyData[i].lvl, partyData[i].iv * 31 / 255, TRUE, j, TRUE, otID);
for (j = 0; j < 4; j++)
{
SetMonData(&gPlayerParty[i + 3], MON_DATA_MOVE1 + j, &partyData[i].moves[j]);
SetMonData(&gPlayerParty[i + 3], MON_DATA_PP1 + j, &gBattleMoves[partyData[i].moves[j]].pp);
}
break;
}
case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
{
const struct TrainerMonCustomized *partyData = gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].party.EverythingCustomized;

174
src/data/trainer_parties.h
View File

@ -414,7 +414,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rose1[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Felix[] = {
static const struct TrainerMonCustomized sParty_Felix[] = {
{
.iv = 0,
.lvl = 43,
@ -509,7 +509,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rose5[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Dusty1[] = {
static const struct TrainerMonCustomized sParty_Dusty1[] = {
{
.iv = 50,
.lvl = 23,
@ -518,7 +518,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Dusty1[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Chip[] = {
static const struct TrainerMonCustomized sParty_Chip[] = {
{
.iv = 50,
.lvl = 27,
@ -539,7 +539,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Chip[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Foster[] = {
static const struct TrainerMonCustomized sParty_Foster[] = {
{
.iv = 100,
.lvl = 25,
@ -554,7 +554,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Foster[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Dusty2[] = {
static const struct TrainerMonCustomized sParty_Dusty2[] = {
{
.iv = 60,
.lvl = 27,
@ -563,7 +563,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Dusty2[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Dusty3[] = {
static const struct TrainerMonCustomized sParty_Dusty3[] = {
{
.iv = 70,
.lvl = 30,
@ -572,7 +572,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Dusty3[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Dusty4[] = {
static const struct TrainerMonCustomized sParty_Dusty4[] = {
{
.iv = 80,
.lvl = 33,
@ -581,7 +581,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Dusty4[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Dusty5[] = {
static const struct TrainerMonCustomized sParty_Dusty5[] = {
{
.iv = 90,
.lvl = 36,
@ -655,7 +655,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy5[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_GabbyAndTy6[] = {
static const struct TrainerMonCustomized sParty_GabbyAndTy6[] = {
{
.iv = 250,
.lvl = 39,
@ -751,7 +751,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lola5[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Ricky1[] = {
static const struct TrainerMonCustomized sParty_Ricky1[] = {
{
.iv = 10,
.lvl = 13,
@ -781,7 +781,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Charlie[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Ricky2[] = {
static const struct TrainerMonCustomized sParty_Ricky2[] = {
{
.iv = 10,
.lvl = 27,
@ -790,7 +790,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Ricky2[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Ricky3[] = {
static const struct TrainerMonCustomized sParty_Ricky3[] = {
{
.iv = 20,
.lvl = 30,
@ -799,7 +799,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Ricky3[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Ricky4[] = {
static const struct TrainerMonCustomized sParty_Ricky4[] = {
{
.iv = 30,
.lvl = 33,
@ -808,7 +808,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Ricky4[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Ricky5[] = {
static const struct TrainerMonCustomized sParty_Ricky5[] = {
{
.iv = 40,
.lvl = 36,
@ -857,7 +857,7 @@ static const struct TrainerMonCustomized sParty_Berke[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Braxton[] = {
static const struct TrainerMonCustomized sParty_Braxton[] = {
{
.iv = 100,
.lvl = 28,
@ -1139,7 +1139,7 @@ static const struct TrainerMonCustomized sParty_Jody[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Wendy[] = {
static const struct TrainerMonCustomized sParty_Wendy[] = {
{
.iv = 100,
.lvl = 29,
@ -1581,7 +1581,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shirley[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Jessica1[] = {
static const struct TrainerMonCustomized sParty_Jessica1[] = {
{
.iv = 0,
.lvl = 29,
@ -1612,7 +1612,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Bridget[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Olivia[] = {
static const struct TrainerMonCustomized sParty_Olivia[] = {
{
.iv = 100,
.lvl = 35,
@ -1646,7 +1646,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tiffany[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Jessica2[] = {
static const struct TrainerMonCustomized sParty_Jessica2[] = {
{
.iv = 10,
.lvl = 35,
@ -1661,7 +1661,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica2[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Jessica3[] = {
static const struct TrainerMonCustomized sParty_Jessica3[] = {
{
.iv = 20,
.lvl = 38,
@ -1676,7 +1676,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica3[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Jessica4[] = {
static const struct TrainerMonCustomized sParty_Jessica4[] = {
{
.iv = 30,
.lvl = 41,
@ -1691,7 +1691,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica4[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Jessica5[] = {
static const struct TrainerMonCustomized sParty_Jessica5[] = {
{
.iv = 40,
.lvl = 44,
@ -2297,7 +2297,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Atsushi[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Kirk[] = {
static const struct TrainerMonCustomized sParty_Kirk[] = {
{
.iv = 100,
.lvl = 17,
@ -2554,7 +2554,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Bernie5[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Drew[] = {
static const struct TrainerMonCustomized sParty_Drew[] = {
{
.iv = 0,
.lvl = 23,
@ -2563,7 +2563,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Drew[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Beau[] = {
static const struct TrainerMonCustomized sParty_Beau[] = {
{
.iv = 0,
.lvl = 21,
@ -2871,7 +2871,7 @@ static const struct TrainerMonCustomized sParty_Jeffrey5[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Edward[] = {
static const struct TrainerMonCustomized sParty_Edward[] = {
{
.iv = 0,
.lvl = 15,
@ -2995,7 +2995,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cameron5[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Jaclyn[] = {
static const struct TrainerMonCustomized sParty_Jaclyn[] = {
{
.iv = 0,
.lvl = 16,
@ -3161,7 +3161,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Walter2[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Walter3[] = {
static const struct TrainerMonCustomized sParty_Walter3[] = {
{
.iv = 20,
.lvl = 36,
@ -3176,7 +3176,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Walter3[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Walter4[] = {
static const struct TrainerMonCustomized sParty_Walter4[] = {
{
.iv = 30,
.lvl = 39,
@ -3191,7 +3191,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Walter4[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Walter5[] = {
static const struct TrainerMonCustomized sParty_Walter5[] = {
{
.iv = 40,
.lvl = 41,
@ -3776,7 +3776,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Karen5[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_KateAndJoy[] = {
static const struct TrainerMonCustomized sParty_KateAndJoy[] = {
{
.iv = 0,
.lvl = 30,
@ -3791,7 +3791,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_KateAndJoy[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg1[] = {
static const struct TrainerMonCustomized sParty_AnnaAndMeg1[] = {
{
.iv = 0,
.lvl = 15,
@ -3806,7 +3806,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg1[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg2[] = {
static const struct TrainerMonCustomized sParty_AnnaAndMeg2[] = {
{
.iv = 10,
.lvl = 28,
@ -3821,7 +3821,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg2[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg3[] = {
static const struct TrainerMonCustomized sParty_AnnaAndMeg3[] = {
{
.iv = 20,
.lvl = 31,
@ -3836,7 +3836,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg3[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg4[] = {
static const struct TrainerMonCustomized sParty_AnnaAndMeg4[] = {
{
.iv = 30,
.lvl = 34,
@ -3851,7 +3851,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg4[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg5[] = {
static const struct TrainerMonCustomized sParty_AnnaAndMeg5[] = {
{
.iv = 40,
.lvl = 36,
@ -4093,7 +4093,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Timothy1[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Timothy2[] = {
static const struct TrainerMonCustomized sParty_Timothy2[] = {
{
.iv = 210,
.lvl = 33,
@ -4102,7 +4102,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Timothy2[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Timothy3[] = {
static const struct TrainerMonCustomized sParty_Timothy3[] = {
{
.iv = 220,
.lvl = 36,
@ -4111,7 +4111,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Timothy3[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Timothy4[] = {
static const struct TrainerMonCustomized sParty_Timothy4[] = {
{
.iv = 230,
.lvl = 39,
@ -4120,7 +4120,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Timothy4[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Timothy5[] = {
static const struct TrainerMonCustomized sParty_Timothy5[] = {
{
.iv = 240,
.lvl = 42,
@ -4129,7 +4129,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Timothy5[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Vicky[] = {
static const struct TrainerMonCustomized sParty_Vicky[] = {
{
.iv = 200,
.lvl = 18,
@ -4224,7 +4224,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Billy[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Josh[] = {
static const struct TrainerMonCustomized sParty_Josh[] = {
{
.iv = 100,
.lvl = 10,
@ -4254,7 +4254,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Joey[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Ben[] = {
static const struct TrainerMonCustomized sParty_Ben[] = {
{
.iv = 150,
.lvl = 17,
@ -4269,7 +4269,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Ben[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Quincy[] = {
static const struct TrainerMonCustomized sParty_Quincy[] = {
{
.iv = 100,
.lvl = 43,
@ -4284,7 +4284,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Quincy[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Katelynn[] = {
static const struct TrainerMonCustomized sParty_Katelynn[] = {
{
.iv = 100,
.lvl = 43,
@ -5182,7 +5182,7 @@ static const struct TrainerMonCustomized sParty_Nicolas5[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Aaron[] = {
static const struct TrainerMonCustomized sParty_Aaron[] = {
{
.iv = 255,
.lvl = 34,
@ -5443,7 +5443,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jani[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Lao1[] = {
static const struct TrainerMonCustomized sParty_Lao1[] = {
{
.iv = 0,
.lvl = 17,
@ -5477,7 +5477,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lung[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Lao2[] = {
static const struct TrainerMonCustomized sParty_Lao2[] = {
{
.iv = 0,
.lvl = 24,
@ -5504,7 +5504,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Lao2[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Lao3[] = {
static const struct TrainerMonCustomized sParty_Lao3[] = {
{
.iv = 20,
.lvl = 27,
@ -5531,7 +5531,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Lao3[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Lao4[] = {
static const struct TrainerMonCustomized sParty_Lao4[] = {
{
.iv = 30,
.lvl = 30,
@ -5686,7 +5686,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy5[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Madeline1[] = {
static const struct TrainerMonCustomized sParty_Madeline1[] = {
{
.iv = 0,
.lvl = 19,
@ -5708,7 +5708,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Clarissa[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Angelica[] = {
static const struct TrainerMonCustomized sParty_Angelica[] = {
{
.iv = 50,
.lvl = 30,
@ -5717,7 +5717,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Angelica[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Madeline2[] = {
static const struct TrainerMonCustomized sParty_Madeline2[] = {
{
.iv = 10,
.lvl = 29,
@ -5726,7 +5726,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Madeline2[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Madeline3[] = {
static const struct TrainerMonCustomized sParty_Madeline3[] = {
{
.iv = 20,
.lvl = 32,
@ -5735,7 +5735,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Madeline3[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Madeline4[] = {
static const struct TrainerMonCustomized sParty_Madeline4[] = {
{
.iv = 30,
.lvl = 34,
@ -5750,7 +5750,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Madeline4[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Madeline5[] = {
static const struct TrainerMonCustomized sParty_Madeline5[] = {
{
.iv = 40,
.lvl = 37,
@ -6059,7 +6059,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jenny5[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Heidi[] = {
static const struct TrainerMonCustomized sParty_Heidi[] = {
{
.iv = 0,
.lvl = 22,
@ -6074,7 +6074,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Heidi[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Becky[] = {
static const struct TrainerMonCustomized sParty_Becky[] = {
{
.iv = 0,
.lvl = 22,
@ -6146,7 +6146,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Diana1[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Cedric[] = {
static const struct TrainerMonCustomized sParty_Cedric[] = {
{
.iv = 0,
.lvl = 32,
@ -6305,7 +6305,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv3[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_GinaAndMia2[] = {
static const struct TrainerMonCustomized sParty_GinaAndMia2[] = {
{
.iv = 0,
.lvl = 10,
@ -6333,7 +6333,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv4[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_AmyAndLiv5[] = {
static const struct TrainerMonCustomized sParty_AmyAndLiv5[] = {
{
.iv = 30,
.lvl = 33,
@ -6348,7 +6348,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_AmyAndLiv5[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_AmyAndLiv6[] = {
static const struct TrainerMonCustomized sParty_AmyAndLiv6[] = {
{
.iv = 40,
.lvl = 36,
@ -6564,7 +6564,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jazmyn[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Jonas[] = {
static const struct TrainerMonCustomized sParty_Jonas[] = {
{
.iv = 0,
.lvl = 31,
@ -6573,7 +6573,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jonas[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Kayley[] = {
static const struct TrainerMonCustomized sParty_Kayley[] = {
{
.iv = 0,
.lvl = 31,
@ -6748,7 +6748,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Edwin5[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_WallyVR1[] = {
static const struct TrainerMonCustomized sParty_WallyVR1[] = {
{
.iv = 150,
.lvl = 44,
@ -7086,7 +7086,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Davis[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Mitchell[] = {
static const struct TrainerMonCustomized sParty_Mitchell[] = {
{
.iv = 0,
.lvl = 43,
@ -8401,7 +8401,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Eric[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Lucas2[] = {
static const struct TrainerMonCustomized sParty_Lucas2[] = {
{
.iv = 0,
.lvl = 9,
@ -8410,7 +8410,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Lucas2[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Mike1[] = {
static const struct TrainerMonCustomized sParty_Mike1[] = {
{
.iv = 0,
.lvl = 10,
@ -8634,7 +8634,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Johanna[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Gerald[] = {
static const struct TrainerMonCustomized sParty_Gerald[] = {
{
.iv = 100,
.lvl = 23,
@ -8643,7 +8643,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Gerald[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Vivian[] = {
static const struct TrainerMonCustomized sParty_Vivian[] = {
{
.iv = 100,
.lvl = 17,
@ -8658,7 +8658,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Vivian[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Danielle[] = {
static const struct TrainerMonCustomized sParty_Danielle[] = {
{
.iv = 100,
.lvl = 23,
@ -8667,7 +8667,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Danielle[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Hideo[] = {
static const struct TrainerMonCustomized sParty_Hideo[] = {
{
.iv = 0,
.lvl = 25,
@ -8682,7 +8682,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Hideo[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Keigo[] = {
static const struct TrainerMonCustomized sParty_Keigo[] = {
{
.iv = 0,
.lvl = 28,
@ -8697,7 +8697,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Keigo[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Riley[] = {
static const struct TrainerMonCustomized sParty_Riley[] = {
{
.iv = 0,
.lvl = 28,
@ -8751,7 +8751,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_WallyMauville[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_WallyVR2[] = {
static const struct TrainerMonCustomized sParty_WallyVR2[] = {
{
.iv = 150,
.lvl = 47,
@ -8784,7 +8784,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_WallyVR2[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_WallyVR3[] = {
static const struct TrainerMonCustomized sParty_WallyVR3[] = {
{
.iv = 150,
.lvl = 50,
@ -8817,7 +8817,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_WallyVR3[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_WallyVR4[] = {
static const struct TrainerMonCustomized sParty_WallyVR4[] = {
{
.iv = 150,
.lvl = 53,
@ -8850,7 +8850,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_WallyVR4[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_WallyVR5[] = {
static const struct TrainerMonCustomized sParty_WallyVR5[] = {
{
.iv = 150,
.lvl = 56,
@ -9169,7 +9169,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_ToriAndTia[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_KimAndIris[] = {
static const struct TrainerMonCustomized sParty_KimAndIris[] = {
{
.iv = 0,
.lvl = 32,
@ -9184,7 +9184,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_KimAndIris[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_TyraAndIvy[] = {
static const struct TrainerMonCustomized sParty_TyraAndIvy[] = {
{
.iv = 0,
.lvl = 18,
@ -9199,7 +9199,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_TyraAndIvy[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_MelAndPaul[] = {
static const struct TrainerMonCustomized sParty_MelAndPaul[] = {
{
.iv = 0,
.lvl = 27,
@ -9214,7 +9214,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_MelAndPaul[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay1[] = {
static const struct TrainerMonCustomized sParty_JohnAndJay1[] = {
{
.iv = 200,
.lvl = 39,
@ -9229,7 +9229,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay1[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay2[] = {
static const struct TrainerMonCustomized sParty_JohnAndJay2[] = {
{
.iv = 210,
.lvl = 43,
@ -9244,7 +9244,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay2[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay3[] = {
static const struct TrainerMonCustomized sParty_JohnAndJay3[] = {
{
.iv = 220,
.lvl = 46,
@ -9259,7 +9259,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay3[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay4[] = {
static const struct TrainerMonCustomized sParty_JohnAndJay4[] = {
{
.iv = 230,
.lvl = 49,
@ -9274,7 +9274,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay4[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay5[] = {
static const struct TrainerMonCustomized sParty_JohnAndJay5[] = {
{
.iv = 240,
.lvl = 52,
@ -10158,7 +10158,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rachel[] = {
}
};
static const struct TrainerMonNoItemCustomMoves sParty_Leonel[] = {
static const struct TrainerMonCustomized sParty_Leonel[] = {
{
.iv = 100,
.lvl = 30,

174
src/data/trainers.h
View File

@ -466,7 +466,7 @@ const struct Trainer gTrainers[] = {
.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,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Felix),
.party = EVERYTHING_CUSTOMIZED(sParty_Felix),
},
[TRAINER_VIOLET] =
@ -538,7 +538,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Dusty1),
.party = EVERYTHING_CUSTOMIZED(sParty_Dusty1),
},
[TRAINER_CHIP] =
@ -550,7 +550,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Chip),
.party = EVERYTHING_CUSTOMIZED(sParty_Chip),
},
[TRAINER_FOSTER] =
@ -562,7 +562,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Foster),
.party = EVERYTHING_CUSTOMIZED(sParty_Foster),
},
[TRAINER_DUSTY_2] =
@ -574,7 +574,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Dusty2),
.party = EVERYTHING_CUSTOMIZED(sParty_Dusty2),
},
[TRAINER_DUSTY_3] =
@ -586,7 +586,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Dusty3),
.party = EVERYTHING_CUSTOMIZED(sParty_Dusty3),
},
[TRAINER_DUSTY_4] =
@ -598,7 +598,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Dusty4),
.party = EVERYTHING_CUSTOMIZED(sParty_Dusty4),
},
[TRAINER_DUSTY_5] =
@ -610,7 +610,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Dusty5),
.party = EVERYTHING_CUSTOMIZED(sParty_Dusty5),
},
[TRAINER_GABBY_AND_TY_1] =
@ -682,7 +682,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_GabbyAndTy6),
.party = EVERYTHING_CUSTOMIZED(sParty_GabbyAndTy6),
},
[TRAINER_LOLA_1] =
@ -778,7 +778,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Ricky1),
.party = EVERYTHING_CUSTOMIZED(sParty_Ricky1),
},
[TRAINER_SIMON] =
@ -814,7 +814,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Ricky2),
.party = EVERYTHING_CUSTOMIZED(sParty_Ricky2),
},
[TRAINER_RICKY_3] =
@ -826,7 +826,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Ricky3),
.party = EVERYTHING_CUSTOMIZED(sParty_Ricky3),
},
[TRAINER_RICKY_4] =
@ -838,7 +838,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Ricky4),
.party = EVERYTHING_CUSTOMIZED(sParty_Ricky4),
},
[TRAINER_RICKY_5] =
@ -850,7 +850,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Ricky5),
.party = EVERYTHING_CUSTOMIZED(sParty_Ricky5),
},
[TRAINER_RANDALL] =
@ -910,7 +910,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Braxton),
.party = EVERYTHING_CUSTOMIZED(sParty_Braxton),
},
[TRAINER_VINCENT] =
@ -1114,7 +1114,7 @@ const struct Trainer gTrainers[] = {
.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_SETUP_FIRST_TURN,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Wendy),
.party = EVERYTHING_CUSTOMIZED(sParty_Wendy),
},
[TRAINER_KEIRA] =
@ -1534,7 +1534,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Jessica1),
.party = EVERYTHING_CUSTOMIZED(sParty_Jessica1),
},
[TRAINER_CONNIE] =
@ -1570,7 +1570,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Olivia),
.party = EVERYTHING_CUSTOMIZED(sParty_Olivia),
},
[TRAINER_TIFFANY] =
@ -1594,7 +1594,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Jessica2),
.party = EVERYTHING_CUSTOMIZED(sParty_Jessica2),
},
[TRAINER_JESSICA_3] =
@ -1606,7 +1606,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Jessica3),
.party = EVERYTHING_CUSTOMIZED(sParty_Jessica3),
},
[TRAINER_JESSICA_4] =
@ -1618,7 +1618,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Jessica4),
.party = EVERYTHING_CUSTOMIZED(sParty_Jessica4),
},
[TRAINER_JESSICA_5] =
@ -1630,7 +1630,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Jessica5),
.party = EVERYTHING_CUSTOMIZED(sParty_Jessica5),
},
[TRAINER_WINSTON_1] =
@ -2302,7 +2302,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Kirk),
.party = EVERYTHING_CUSTOMIZED(sParty_Kirk),
},
[TRAINER_GRUNT_AQUA_HIDEOUT_7] =
@ -2542,7 +2542,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Drew),
.party = EVERYTHING_CUSTOMIZED(sParty_Drew),
},
[TRAINER_BEAU] =
@ -2554,7 +2554,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Beau),
.party = EVERYTHING_CUSTOMIZED(sParty_Beau),
},
[TRAINER_LARRY] =
@ -2794,7 +2794,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Edward),
.party = EVERYTHING_CUSTOMIZED(sParty_Edward),
},
[TRAINER_PRESTON] =
@ -2926,7 +2926,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Jaclyn),
.party = EVERYTHING_CUSTOMIZED(sParty_Jaclyn),
},
[TRAINER_HANNAH] =
@ -3106,7 +3106,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Walter3),
.party = EVERYTHING_CUSTOMIZED(sParty_Walter3),
},
[TRAINER_WALTER_4] =
@ -3118,7 +3118,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Walter4),
.party = EVERYTHING_CUSTOMIZED(sParty_Walter4),
},
[TRAINER_WALTER_5] =
@ -3130,7 +3130,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Walter5),
.party = EVERYTHING_CUSTOMIZED(sParty_Walter5),
},
[TRAINER_SIDNEY] =
@ -3442,7 +3442,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_KateAndJoy),
.party = EVERYTHING_CUSTOMIZED(sParty_KateAndJoy),
},
[TRAINER_ANNA_AND_MEG_1] =
@ -3454,7 +3454,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_AnnaAndMeg1),
.party = EVERYTHING_CUSTOMIZED(sParty_AnnaAndMeg1),
},
[TRAINER_ANNA_AND_MEG_2] =
@ -3466,7 +3466,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_AnnaAndMeg2),
.party = EVERYTHING_CUSTOMIZED(sParty_AnnaAndMeg2),
},
[TRAINER_ANNA_AND_MEG_3] =
@ -3478,7 +3478,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_AnnaAndMeg3),
.party = EVERYTHING_CUSTOMIZED(sParty_AnnaAndMeg3),
},
[TRAINER_ANNA_AND_MEG_4] =
@ -3490,7 +3490,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_AnnaAndMeg4),
.party = EVERYTHING_CUSTOMIZED(sParty_AnnaAndMeg4),
},
[TRAINER_ANNA_AND_MEG_5] =
@ -3502,7 +3502,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_AnnaAndMeg5),
.party = EVERYTHING_CUSTOMIZED(sParty_AnnaAndMeg5),
},
[TRAINER_VICTOR] =
@ -3706,7 +3706,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Timothy2),
.party = EVERYTHING_CUSTOMIZED(sParty_Timothy2),
},
[TRAINER_TIMOTHY_3] =
@ -3718,7 +3718,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Timothy3),
.party = EVERYTHING_CUSTOMIZED(sParty_Timothy3),
},
[TRAINER_TIMOTHY_4] =
@ -3730,7 +3730,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Timothy4),
.party = EVERYTHING_CUSTOMIZED(sParty_Timothy4),
},
[TRAINER_TIMOTHY_5] =
@ -3742,7 +3742,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Timothy5),
.party = EVERYTHING_CUSTOMIZED(sParty_Timothy5),
},
[TRAINER_VICKY] =
@ -3754,7 +3754,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Vicky),
.party = EVERYTHING_CUSTOMIZED(sParty_Vicky),
},
[TRAINER_SHELBY_1] =
@ -3850,7 +3850,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Josh),
.party = EVERYTHING_CUSTOMIZED(sParty_Josh),
},
[TRAINER_TOMMY] =
@ -3886,7 +3886,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Ben),
.party = EVERYTHING_CUSTOMIZED(sParty_Ben),
},
[TRAINER_QUINCY] =
@ -3898,7 +3898,7 @@ const struct Trainer gTrainers[] = {
.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,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Quincy),
.party = EVERYTHING_CUSTOMIZED(sParty_Quincy),
},
[TRAINER_KATELYNN] =
@ -3910,7 +3910,7 @@ const struct Trainer gTrainers[] = {
.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,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Katelynn),
.party = EVERYTHING_CUSTOMIZED(sParty_Katelynn),
},
[TRAINER_JAYLEN] =
@ -4774,7 +4774,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Aaron),
.party = EVERYTHING_CUSTOMIZED(sParty_Aaron),
},
[TRAINER_PERRY] =
@ -5038,7 +5038,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Lao1),
.party = EVERYTHING_CUSTOMIZED(sParty_Lao1),
},
[TRAINER_LUNG] =
@ -5062,7 +5062,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Lao2),
.party = EVERYTHING_CUSTOMIZED(sParty_Lao2),
},
[TRAINER_LAO_3] =
@ -5074,7 +5074,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Lao3),
.party = EVERYTHING_CUSTOMIZED(sParty_Lao3),
},
[TRAINER_LAO_4] =
@ -5086,7 +5086,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Lao4),
.party = EVERYTHING_CUSTOMIZED(sParty_Lao4),
},
[TRAINER_LAO_5] =
@ -5218,7 +5218,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Madeline1),
.party = EVERYTHING_CUSTOMIZED(sParty_Madeline1),
},
[TRAINER_CLARISSA] =
@ -5242,7 +5242,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Angelica),
.party = EVERYTHING_CUSTOMIZED(sParty_Angelica),
},
[TRAINER_MADELINE_2] =
@ -5254,7 +5254,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Madeline2),
.party = EVERYTHING_CUSTOMIZED(sParty_Madeline2),
},
[TRAINER_MADELINE_3] =
@ -5266,7 +5266,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Madeline3),
.party = EVERYTHING_CUSTOMIZED(sParty_Madeline3),
},
[TRAINER_MADELINE_4] =
@ -5278,7 +5278,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Madeline4),
.party = EVERYTHING_CUSTOMIZED(sParty_Madeline4),
},
[TRAINER_MADELINE_5] =
@ -5290,7 +5290,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Madeline5),
.party = EVERYTHING_CUSTOMIZED(sParty_Madeline5),
},
[TRAINER_BEVERLY] =
@ -5638,7 +5638,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Heidi),
.party = EVERYTHING_CUSTOMIZED(sParty_Heidi),
},
[TRAINER_BECKY] =
@ -5650,7 +5650,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Becky),
.party = EVERYTHING_CUSTOMIZED(sParty_Becky),
},
[TRAINER_CAROL] =
@ -5710,7 +5710,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Cedric),
.party = EVERYTHING_CUSTOMIZED(sParty_Cedric),
},
[TRAINER_IRENE] =
@ -5842,7 +5842,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_GinaAndMia2),
.party = EVERYTHING_CUSTOMIZED(sParty_GinaAndMia2),
},
[TRAINER_AMY_AND_LIV_4] =
@ -5866,7 +5866,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_AmyAndLiv5),
.party = EVERYTHING_CUSTOMIZED(sParty_AmyAndLiv5),
},
[TRAINER_AMY_AND_LIV_6] =
@ -5878,7 +5878,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_AmyAndLiv6),
.party = EVERYTHING_CUSTOMIZED(sParty_AmyAndLiv6),
},
[TRAINER_HUEY] =
@ -6058,7 +6058,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Jonas),
.party = EVERYTHING_CUSTOMIZED(sParty_Jonas),
},
[TRAINER_KAYLEY] =
@ -6070,7 +6070,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Kayley),
.party = EVERYTHING_CUSTOMIZED(sParty_Kayley),
},
[TRAINER_AURON] =
@ -6238,7 +6238,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_WallyVR1),
.party = EVERYTHING_CUSTOMIZED(sParty_WallyVR1),
},
[TRAINER_BRENDAN_ROUTE_103_MUDKIP] =
@ -6490,7 +6490,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Mitchell),
.party = EVERYTHING_CUSTOMIZED(sParty_Mitchell),
},
[TRAINER_ISAAC_2] =
@ -7606,7 +7606,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Lucas2),
.party = EVERYTHING_CUSTOMIZED(sParty_Lucas2),
},
[TRAINER_MIKE_1] =
@ -7618,7 +7618,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Mike1),
.party = EVERYTHING_CUSTOMIZED(sParty_Mike1),
},
[TRAINER_MIKE_2] =
@ -7786,7 +7786,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Gerald),
.party = EVERYTHING_CUSTOMIZED(sParty_Gerald),
},
[TRAINER_VIVIAN] =
@ -7798,7 +7798,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Vivian),
.party = EVERYTHING_CUSTOMIZED(sParty_Vivian),
},
[TRAINER_DANIELLE] =
@ -7810,7 +7810,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Danielle),
.party = EVERYTHING_CUSTOMIZED(sParty_Danielle),
},
[TRAINER_HIDEO] =
@ -7822,7 +7822,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Hideo),
.party = EVERYTHING_CUSTOMIZED(sParty_Hideo),
},
[TRAINER_KEIGO] =
@ -7834,7 +7834,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Keigo),
.party = EVERYTHING_CUSTOMIZED(sParty_Keigo),
},
[TRAINER_RILEY] =
@ -7846,7 +7846,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Riley),
.party = EVERYTHING_CUSTOMIZED(sParty_Riley),
},
[TRAINER_FLINT] =
@ -7894,7 +7894,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_WallyVR2),
.party = EVERYTHING_CUSTOMIZED(sParty_WallyVR2),
},
[TRAINER_WALLY_VR_3] =
@ -7906,7 +7906,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_WallyVR3),
.party = EVERYTHING_CUSTOMIZED(sParty_WallyVR3),
},
[TRAINER_WALLY_VR_4] =
@ -7918,7 +7918,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_WallyVR4),
.party = EVERYTHING_CUSTOMIZED(sParty_WallyVR4),
},
[TRAINER_WALLY_VR_5] =
@ -7930,7 +7930,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_WallyVR5),
.party = EVERYTHING_CUSTOMIZED(sParty_WallyVR5),
},
[TRAINER_BRENDAN_LILYCOVE_MUDKIP] =
@ -8146,7 +8146,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_KimAndIris),
.party = EVERYTHING_CUSTOMIZED(sParty_KimAndIris),
},
[TRAINER_TYRA_AND_IVY] =
@ -8158,7 +8158,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_TyraAndIvy),
.party = EVERYTHING_CUSTOMIZED(sParty_TyraAndIvy),
},
[TRAINER_MEL_AND_PAUL] =
@ -8170,7 +8170,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = NO_ITEM_CUSTOM_MOVES(sParty_MelAndPaul),
.party = EVERYTHING_CUSTOMIZED(sParty_MelAndPaul),
},
[TRAINER_JOHN_AND_JAY_1] =
@ -8182,7 +8182,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_JohnAndJay1),
.party = EVERYTHING_CUSTOMIZED(sParty_JohnAndJay1),
},
[TRAINER_JOHN_AND_JAY_2] =
@ -8194,7 +8194,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_JohnAndJay2),
.party = EVERYTHING_CUSTOMIZED(sParty_JohnAndJay2),
},
[TRAINER_JOHN_AND_JAY_3] =
@ -8206,7 +8206,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_JohnAndJay3),
.party = EVERYTHING_CUSTOMIZED(sParty_JohnAndJay3),
},
[TRAINER_JOHN_AND_JAY_4] =
@ -8218,7 +8218,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
.party = NO_ITEM_CUSTOM_MOVES(sParty_JohnAndJay4),
.party = EVERYTHING_CUSTOMIZED(sParty_JohnAndJay4),
},
[TRAINER_JOHN_AND_JAY_5] =
@ -8230,7 +8230,7 @@ const struct Trainer gTrainers[] = {
.items = {},
.doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_JohnAndJay5),
.party = EVERYTHING_CUSTOMIZED(sParty_JohnAndJay5),
},
[TRAINER_RELI_AND_IAN] =
@ -9154,7 +9154,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = NO_ITEM_CUSTOM_MOVES(sParty_Leonel),
.party = EVERYTHING_CUSTOMIZED(sParty_Leonel),
},
[TRAINER_CALLIE] =

3
src/match_call.c
View File

@ -1803,9 +1803,6 @@ static void PopulateSpeciesFromTrainerParty(int matchCallId, u8 *destStr)
default:
speciesName = gSpeciesNames[party.NoItemDefaultMoves[monId].species];
break;
case F_TRAINER_PARTY_CUSTOM_MOVESET:
speciesName = gSpeciesNames[party.NoItemCustomMoves[monId].species];
break;
case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
speciesName = gSpeciesNames[party.EverythingCustomized[monId].species];
break;