Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed TrainerMonItemCustomMoves

Browse Source
This commit is contained in:
Eduardo Quezada 2023-07-04 21:06:55 -04:00
parent 862602233d
commit c201cae2ee
8 changed files with 128 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/data.h
View File

@ -75,19 +75,9 @@ struct TrainerMonNoItemCustomMoves
u16 moves[MAX_MON_MOVES]; u16 moves[MAX_MON_MOVES];
}; };
struct TrainerMonItemCustomMoves
{
u16 iv;
u8 lvl;
u16 species;
u16 heldItem;
u16 moves[MAX_MON_MOVES];
};
#define NO_ITEM_DEFAULT_MOVES(party) { .NoItemDefaultMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = 0 #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 NO_ITEM_CUSTOM_MOVES(party) { .NoItemCustomMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET
#define ITEM_DEFAULT_MOVES(party) { .ItemDefaultMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_HELD_ITEM #define ITEM_DEFAULT_MOVES(party) { .ItemDefaultMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_HELD_ITEM
#define ITEM_CUSTOM_MOVES(party) { .ItemCustomMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM
#define EVERYTHING_CUSTOMIZED(party) { .EverythingCustomized = party}, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED #define EVERYTHING_CUSTOMIZED(party) { .EverythingCustomized = party}, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED
union TrainerMonPtr union TrainerMonPtr
@ -95,7 +85,6 @@ union TrainerMonPtr
const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves; const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves; const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves;
const struct TrainerMonItemDefaultMoves *ItemDefaultMoves; const struct TrainerMonItemDefaultMoves *ItemDefaultMoves;
const struct TrainerMonItemCustomMoves *ItemCustomMoves;
const struct TrainerMonCustomized *EverythingCustomized; const struct TrainerMonCustomized *EverythingCustomized;
}; };

20
src/battle_main.c
View File

@ -1900,11 +1900,6 @@ static u32 GeneratePartyHash(const struct Trainer *trainer, u32 i)
buffer = (const u8 *) &trainer->party.ItemDefaultMoves[i]; buffer = (const u8 *) &trainer->party.ItemDefaultMoves[i];
n = sizeof(*trainer->party.ItemDefaultMoves); n = sizeof(*trainer->party.ItemDefaultMoves);
} }
else if (trainer->partyFlags == (F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET))
{
buffer = (const u8 *) &trainer->party.ItemCustomMoves[i];
n = sizeof(*trainer->party.ItemCustomMoves);
}
else if (trainer->partyFlags == F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED) else if (trainer->partyFlags == F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED)
{ {
buffer = (const u8 *) &trainer->party.EverythingCustomized[i]; buffer = (const u8 *) &trainer->party.EverythingCustomized[i];
@ -2026,21 +2021,6 @@ u8 CreateNPCTrainerPartyFromTrainer(struct Pokemon *party, const struct Trainer
SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem); SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem);
break; break;
} }
case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM:
{
const struct TrainerMonItemCustomMoves *partyData = trainer->party.ItemCustomMoves;
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);
SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem);
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: case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
{ {
const struct TrainerMonCustomized *partyData = trainer->party.EverythingCustomized; const struct TrainerMonCustomized *partyData = trainer->party.EverythingCustomized;

6
src/battle_script_commands.c
View File

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

8
src/battle_setup.c
View File

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

15
src/battle_tower.c
View File

@ -3085,21 +3085,6 @@ static void FillPartnerParty(u16 trainerId)
SetMonData(&gPlayerParty[i + 3], MON_DATA_HELD_ITEM, &partyData[i].heldItem); SetMonData(&gPlayerParty[i + 3], MON_DATA_HELD_ITEM, &partyData[i].heldItem);
break; break;
} }
case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM:
{
const struct TrainerMonItemCustomMoves *partyData = gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].party.ItemCustomMoves;
CreateMon(&gPlayerParty[i + 3], partyData[i].species, partyData[i].lvl, partyData[i].iv * 31 / 255, TRUE, j, TRUE, otID);
SetMonData(&gPlayerParty[i + 3], MON_DATA_HELD_ITEM, &partyData[i].heldItem);
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: case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
{ {
const struct TrainerMonCustomized *partyData = gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].party.EverythingCustomized; const struct TrainerMonCustomized *partyData = gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].party.EverythingCustomized;

128
src/data/trainer_parties.h
View File

@ -817,7 +817,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Ricky5[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Randall[] = { static const struct TrainerMonCustomized sParty_Randall[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 26, .lvl = 26,
@ -827,7 +827,7 @@ static const struct TrainerMonItemCustomMoves sParty_Randall[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Parker[] = { static const struct TrainerMonCustomized sParty_Parker[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 26, .lvl = 26,
@ -837,7 +837,7 @@ static const struct TrainerMonItemCustomMoves sParty_Parker[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_George[] = { static const struct TrainerMonCustomized sParty_George[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 26, .lvl = 26,
@ -847,7 +847,7 @@ static const struct TrainerMonItemCustomMoves sParty_George[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Berke[] = { static const struct TrainerMonCustomized sParty_Berke[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 26, .lvl = 26,
@ -1109,7 +1109,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Warren[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Mary[] = { static const struct TrainerMonCustomized sParty_Mary[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 26, .lvl = 26,
@ -1119,7 +1119,7 @@ static const struct TrainerMonItemCustomMoves sParty_Mary[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Alexia[] = { static const struct TrainerMonCustomized sParty_Alexia[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 26, .lvl = 26,
@ -1129,7 +1129,7 @@ static const struct TrainerMonItemCustomMoves sParty_Alexia[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Jody[] = { static const struct TrainerMonCustomized sParty_Jody[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 26, .lvl = 26,
@ -1457,7 +1457,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Cindy1[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Daphne[] = { static const struct TrainerMonCustomized sParty_Daphne[] = {
{ {
.iv = 100, .iv = 100,
.lvl = 39, .lvl = 39,
@ -1492,7 +1492,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter2[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Cindy2[] = { static const struct TrainerMonCustomized sParty_Cindy2[] = {
{ {
.iv = 0, .iv = 0,
.lvl = 11, .lvl = 11,
@ -1547,7 +1547,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Cindy5[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Cindy6[] = { static const struct TrainerMonCustomized sParty_Cindy6[] = {
{ {
.iv = 40, .iv = 40,
.lvl = 36, .lvl = 36,
@ -1764,7 +1764,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Winston4[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Winston5[] = { static const struct TrainerMonCustomized sParty_Winston5[] = {
{ {
.iv = 0, .iv = 0,
.lvl = 36, .lvl = 36,
@ -3212,7 +3212,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Walter5[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Sidney[] = { static const struct TrainerMonCustomized sParty_Sidney[] = {
{ {
.iv = 250, .iv = 250,
.lvl = 46, .lvl = 46,
@ -3250,7 +3250,7 @@ static const struct TrainerMonItemCustomMoves sParty_Sidney[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Phoebe[] = { static const struct TrainerMonCustomized sParty_Phoebe[] = {
{ {
.iv = 250, .iv = 250,
.lvl = 48, .lvl = 48,
@ -3288,7 +3288,7 @@ static const struct TrainerMonItemCustomMoves sParty_Phoebe[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Glacia[] = { static const struct TrainerMonCustomized sParty_Glacia[] = {
{ {
.iv = 250, .iv = 250,
.lvl = 50, .lvl = 50,
@ -3326,7 +3326,7 @@ static const struct TrainerMonItemCustomMoves sParty_Glacia[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Drake[] = { static const struct TrainerMonCustomized sParty_Drake[] = {
{ {
.iv = 250, .iv = 250,
.lvl = 52, .lvl = 52,
@ -3364,7 +3364,7 @@ static const struct TrainerMonItemCustomMoves sParty_Drake[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Roxanne1[] = { static const struct TrainerMonCustomized sParty_Roxanne1[] = {
{ {
.iv = 100, .iv = 100,
.lvl = 12, .lvl = 12,
@ -3388,7 +3388,7 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne1[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Brawly1[] = { static const struct TrainerMonCustomized sParty_Brawly1[] = {
{ {
.iv = 100, .iv = 100,
.lvl = 16, .lvl = 16,
@ -3412,7 +3412,7 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly1[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Wattson1[] = { static const struct TrainerMonCustomized sParty_Wattson1[] = {
{ {
.iv = 200, .iv = 200,
.lvl = 20, .lvl = 20,
@ -3443,7 +3443,7 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson1[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Flannery1[] = { static const struct TrainerMonCustomized sParty_Flannery1[] = {
{ {
.iv = 200, .iv = 200,
.lvl = 24, .lvl = 24,
@ -3474,7 +3474,7 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery1[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Norman1[] = { static const struct TrainerMonCustomized sParty_Norman1[] = {
{ {
.iv = 200, .iv = 200,
.lvl = 27, .lvl = 27,
@ -3505,7 +3505,7 @@ static const struct TrainerMonItemCustomMoves sParty_Norman1[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Winona1[] = { static const struct TrainerMonCustomized sParty_Winona1[] = {
{ {
.iv = 210, .iv = 210,
.lvl = 29, .lvl = 29,
@ -3543,7 +3543,7 @@ static const struct TrainerMonItemCustomMoves sParty_Winona1[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_TateAndLiza1[] = { static const struct TrainerMonCustomized sParty_TateAndLiza1[] = {
{ {
.iv = 250, .iv = 250,
.lvl = 41, .lvl = 41,
@ -3574,7 +3574,7 @@ static const struct TrainerMonItemCustomMoves sParty_TateAndLiza1[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Juan1[] = { static const struct TrainerMonCustomized sParty_Juan1[] = {
{ {
.iv = 200, .iv = 200,
.lvl = 41, .lvl = 41,
@ -3890,7 +3890,7 @@ static const struct TrainerMonItemDefaultMoves sParty_Miguel1[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Colton[] = { static const struct TrainerMonCustomized sParty_Colton[] = {
{ {
.iv = 0, .iv = 0,
.lvl = 22, .lvl = 22,
@ -4411,7 +4411,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Timmy[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Wallace[] = { static const struct TrainerMonCustomized sParty_Wallace[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 57, .lvl = 57,
@ -5418,7 +5418,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Takashi[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Dianne[] = { static const struct TrainerMonCustomized sParty_Dianne[] = {
{ {
.iv = 0, .iv = 0,
.lvl = 43, .lvl = 43,
@ -5558,7 +5558,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Lao4[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Lao5[] = { static const struct TrainerMonCustomized sParty_Lao5[] = {
{ {
.iv = 40, .iv = 40,
.lvl = 33, .lvl = 33,
@ -6539,7 +6539,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Eli[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Annika[] = { static const struct TrainerMonCustomized sParty_Annika[] = {
{ {
.iv = 100, .iv = 100,
.lvl = 39, .lvl = 39,
@ -6608,7 +6608,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Kelvin[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Marley[] = { static const struct TrainerMonCustomized sParty_Marley[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 34, .lvl = 34,
@ -7699,7 +7699,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Leonardo[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Athena[] = { static const struct TrainerMonCustomized sParty_Athena[] = {
{ {
.iv = 100, .iv = 100,
.lvl = 32, .lvl = 32,
@ -10298,7 +10298,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroTorchic[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Roxanne2[] = { static const struct TrainerMonCustomized sParty_Roxanne2[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 32, .lvl = 32,
@ -10329,7 +10329,7 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne2[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Roxanne3[] = { static const struct TrainerMonCustomized sParty_Roxanne3[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 37, .lvl = 37,
@ -10367,7 +10367,7 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne3[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Roxanne4[] = { static const struct TrainerMonCustomized sParty_Roxanne4[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 42, .lvl = 42,
@ -10405,7 +10405,7 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne4[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Roxanne5[] = { static const struct TrainerMonCustomized sParty_Roxanne5[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 47, .lvl = 47,
@ -10450,7 +10450,7 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne5[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Brawly2[] = { static const struct TrainerMonCustomized sParty_Brawly2[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 33, .lvl = 33,
@ -10481,7 +10481,7 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly2[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Brawly3[] = { static const struct TrainerMonCustomized sParty_Brawly3[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 38, .lvl = 38,
@ -10512,7 +10512,7 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly3[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Brawly4[] = { static const struct TrainerMonCustomized sParty_Brawly4[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 40, .lvl = 40,
@ -10550,7 +10550,7 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly4[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Brawly5[] = { static const struct TrainerMonCustomized sParty_Brawly5[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 46, .lvl = 46,
@ -10595,7 +10595,7 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly5[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Wattson2[] = { static const struct TrainerMonCustomized sParty_Wattson2[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 36, .lvl = 36,
@ -10626,7 +10626,7 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson2[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Wattson3[] = { static const struct TrainerMonCustomized sParty_Wattson3[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 39, .lvl = 39,
@ -10664,7 +10664,7 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson3[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Wattson4[] = { static const struct TrainerMonCustomized sParty_Wattson4[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 44, .lvl = 44,
@ -10702,7 +10702,7 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson4[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Wattson5[] = { static const struct TrainerMonCustomized sParty_Wattson5[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 50, .lvl = 50,
@ -10747,7 +10747,7 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson5[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Flannery2[] = { static const struct TrainerMonCustomized sParty_Flannery2[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 38, .lvl = 38,
@ -10778,7 +10778,7 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery2[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Flannery3[] = { static const struct TrainerMonCustomized sParty_Flannery3[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 41, .lvl = 41,
@ -10816,7 +10816,7 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery3[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Flannery4[] = { static const struct TrainerMonCustomized sParty_Flannery4[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 46, .lvl = 46,
@ -10861,7 +10861,7 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery4[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Flannery5[] = { static const struct TrainerMonCustomized sParty_Flannery5[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 51, .lvl = 51,
@ -10906,7 +10906,7 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery5[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Norman2[] = { static const struct TrainerMonCustomized sParty_Norman2[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 42, .lvl = 42,
@ -10937,7 +10937,7 @@ static const struct TrainerMonItemCustomMoves sParty_Norman2[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Norman3[] = { static const struct TrainerMonCustomized sParty_Norman3[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 47, .lvl = 47,
@ -10975,7 +10975,7 @@ static const struct TrainerMonItemCustomMoves sParty_Norman3[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Norman4[] = { static const struct TrainerMonCustomized sParty_Norman4[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 52, .lvl = 52,
@ -11013,7 +11013,7 @@ static const struct TrainerMonItemCustomMoves sParty_Norman4[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Norman5[] = { static const struct TrainerMonCustomized sParty_Norman5[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 57, .lvl = 57,
@ -11058,7 +11058,7 @@ static const struct TrainerMonItemCustomMoves sParty_Norman5[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Winona2[] = { static const struct TrainerMonCustomized sParty_Winona2[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 40, .lvl = 40,
@ -11096,7 +11096,7 @@ static const struct TrainerMonItemCustomMoves sParty_Winona2[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Winona3[] = { static const struct TrainerMonCustomized sParty_Winona3[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 43, .lvl = 43,
@ -11141,7 +11141,7 @@ static const struct TrainerMonItemCustomMoves sParty_Winona3[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Winona4[] = { static const struct TrainerMonCustomized sParty_Winona4[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 48, .lvl = 48,
@ -11186,7 +11186,7 @@ static const struct TrainerMonItemCustomMoves sParty_Winona4[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Winona5[] = { static const struct TrainerMonCustomized sParty_Winona5[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 53, .lvl = 53,
@ -11231,7 +11231,7 @@ static const struct TrainerMonItemCustomMoves sParty_Winona5[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_TateAndLiza2[] = { static const struct TrainerMonCustomized sParty_TateAndLiza2[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 48, .lvl = 48,
@ -11269,7 +11269,7 @@ static const struct TrainerMonItemCustomMoves sParty_TateAndLiza2[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_TateAndLiza3[] = { static const struct TrainerMonCustomized sParty_TateAndLiza3[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 53, .lvl = 53,
@ -11314,7 +11314,7 @@ static const struct TrainerMonItemCustomMoves sParty_TateAndLiza3[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_TateAndLiza4[] = { static const struct TrainerMonCustomized sParty_TateAndLiza4[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 58, .lvl = 58,
@ -11359,7 +11359,7 @@ static const struct TrainerMonItemCustomMoves sParty_TateAndLiza4[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_TateAndLiza5[] = { static const struct TrainerMonCustomized sParty_TateAndLiza5[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 63, .lvl = 63,
@ -11404,7 +11404,7 @@ static const struct TrainerMonItemCustomMoves sParty_TateAndLiza5[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Juan2[] = { static const struct TrainerMonCustomized sParty_Juan2[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 46, .lvl = 46,
@ -11442,7 +11442,7 @@ static const struct TrainerMonItemCustomMoves sParty_Juan2[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Juan3[] = { static const struct TrainerMonCustomized sParty_Juan3[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 50, .lvl = 50,
@ -11480,7 +11480,7 @@ static const struct TrainerMonItemCustomMoves sParty_Juan3[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Juan4[] = { static const struct TrainerMonCustomized sParty_Juan4[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 56, .lvl = 56,
@ -11525,7 +11525,7 @@ static const struct TrainerMonItemCustomMoves sParty_Juan4[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Juan5[] = { static const struct TrainerMonCustomized sParty_Juan5[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 61, .lvl = 61,
@ -11570,7 +11570,7 @@ static const struct TrainerMonItemCustomMoves sParty_Juan5[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Angelo[] = { static const struct TrainerMonCustomized sParty_Angelo[] = {
{ {
.iv = 100, .iv = 100,
.lvl = 17, .lvl = 17,
@ -11595,7 +11595,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Darius[] = {
} }
}; };
static const struct TrainerMonItemCustomMoves sParty_Steven[] = { static const struct TrainerMonCustomized sParty_Steven[] = {
{ {
.iv = 255, .iv = 255,
.lvl = 77, .lvl = 77,

128
src/data/trainers.h
View File

@ -862,7 +862,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Randall), .party = EVERYTHING_CUSTOMIZED(sParty_Randall),
}, },
[TRAINER_PARKER] = [TRAINER_PARKER] =
@ -874,7 +874,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Parker), .party = EVERYTHING_CUSTOMIZED(sParty_Parker),
}, },
[TRAINER_GEORGE] = [TRAINER_GEORGE] =
@ -886,7 +886,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_George), .party = EVERYTHING_CUSTOMIZED(sParty_George),
}, },
[TRAINER_BERKE] = [TRAINER_BERKE] =
@ -898,7 +898,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Berke), .party = EVERYTHING_CUSTOMIZED(sParty_Berke),
}, },
[TRAINER_BRAXTON] = [TRAINER_BRAXTON] =
@ -1078,7 +1078,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Mary), .party = EVERYTHING_CUSTOMIZED(sParty_Mary),
}, },
[TRAINER_ALEXIA] = [TRAINER_ALEXIA] =
@ -1090,7 +1090,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Alexia), .party = EVERYTHING_CUSTOMIZED(sParty_Alexia),
}, },
[TRAINER_JODY] = [TRAINER_JODY] =
@ -1102,7 +1102,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
.party = ITEM_CUSTOM_MOVES(sParty_Jody), .party = EVERYTHING_CUSTOMIZED(sParty_Jody),
}, },
[TRAINER_WENDY] = [TRAINER_WENDY] =
@ -1390,7 +1390,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_CUSTOM_MOVES(sParty_Daphne), .party = EVERYTHING_CUSTOMIZED(sParty_Daphne),
}, },
[TRAINER_GRUNT_SPACE_CENTER_2] = [TRAINER_GRUNT_SPACE_CENTER_2] =
@ -1414,7 +1414,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_CUSTOM_MOVES(sParty_Cindy2), .party = EVERYTHING_CUSTOMIZED(sParty_Cindy2),
}, },
[TRAINER_BRIANNA] = [TRAINER_BRIANNA] =
@ -1486,7 +1486,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_CUSTOM_MOVES(sParty_Cindy6), .party = EVERYTHING_CUSTOMIZED(sParty_Cindy6),
}, },
[TRAINER_MELISSA] = [TRAINER_MELISSA] =
@ -1714,7 +1714,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_CUSTOM_MOVES(sParty_Winston5), .party = EVERYTHING_CUSTOMIZED(sParty_Winston5),
}, },
[TRAINER_STEVE_1] = [TRAINER_STEVE_1] =
@ -3142,7 +3142,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_SETUP_FIRST_TURN, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_SETUP_FIRST_TURN,
.party = ITEM_CUSTOM_MOVES(sParty_Sidney), .party = EVERYTHING_CUSTOMIZED(sParty_Sidney),
}, },
[TRAINER_PHOEBE] = [TRAINER_PHOEBE] =
@ -3154,7 +3154,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Phoebe), .party = EVERYTHING_CUSTOMIZED(sParty_Phoebe),
}, },
[TRAINER_GLACIA] = [TRAINER_GLACIA] =
@ -3166,7 +3166,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Glacia), .party = EVERYTHING_CUSTOMIZED(sParty_Glacia),
}, },
[TRAINER_DRAKE] = [TRAINER_DRAKE] =
@ -3178,7 +3178,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Drake), .party = EVERYTHING_CUSTOMIZED(sParty_Drake),
}, },
[TRAINER_ROXANNE_1] = [TRAINER_ROXANNE_1] =
@ -3190,7 +3190,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_POTION, ITEM_POTION, ITEM_NONE, ITEM_NONE}, .items = {ITEM_POTION, ITEM_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Roxanne1), .party = EVERYTHING_CUSTOMIZED(sParty_Roxanne1),
}, },
[TRAINER_BRAWLY_1] = [TRAINER_BRAWLY_1] =
@ -3202,7 +3202,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Brawly1), .party = EVERYTHING_CUSTOMIZED(sParty_Brawly1),
}, },
[TRAINER_WATTSON_1] = [TRAINER_WATTSON_1] =
@ -3214,7 +3214,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Wattson1), .party = EVERYTHING_CUSTOMIZED(sParty_Wattson1),
}, },
[TRAINER_FLANNERY_1] = [TRAINER_FLANNERY_1] =
@ -3226,7 +3226,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Flannery1), .party = EVERYTHING_CUSTOMIZED(sParty_Flannery1),
}, },
[TRAINER_NORMAN_1] = [TRAINER_NORMAN_1] =
@ -3238,7 +3238,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Norman1), .party = EVERYTHING_CUSTOMIZED(sParty_Norman1),
}, },
[TRAINER_WINONA_1] = [TRAINER_WINONA_1] =
@ -3250,7 +3250,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY,
.party = ITEM_CUSTOM_MOVES(sParty_Winona1), .party = EVERYTHING_CUSTOMIZED(sParty_Winona1),
}, },
[TRAINER_TATE_AND_LIZA_1] = [TRAINER_TATE_AND_LIZA_1] =
@ -3262,7 +3262,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION}, .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_TateAndLiza1), .party = EVERYTHING_CUSTOMIZED(sParty_TateAndLiza1),
}, },
[TRAINER_JUAN_1] = [TRAINER_JUAN_1] =
@ -3274,7 +3274,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Juan1), .party = EVERYTHING_CUSTOMIZED(sParty_Juan1),
}, },
[TRAINER_JERRY_1] = [TRAINER_JERRY_1] =
@ -3538,7 +3538,7 @@ const struct Trainer gTrainers[] = {
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_CUSTOM_MOVES(sParty_Colton), .party = EVERYTHING_CUSTOMIZED(sParty_Colton),
}, },
[TRAINER_MIGUEL_2] = [TRAINER_MIGUEL_2] =
@ -4030,7 +4030,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Wallace), .party = EVERYTHING_CUSTOMIZED(sParty_Wallace),
}, },
[TRAINER_ANDREW] = [TRAINER_ANDREW] =
@ -5014,7 +5014,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = 0, .aiFlags = 0,
.party = ITEM_CUSTOM_MOVES(sParty_Dianne), .party = EVERYTHING_CUSTOMIZED(sParty_Dianne),
}, },
[TRAINER_JANI] = [TRAINER_JANI] =
@ -5098,7 +5098,7 @@ const struct Trainer gTrainers[] = {
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = 0, .aiFlags = 0,
.party = ITEM_CUSTOM_MOVES(sParty_Lao5), .party = EVERYTHING_CUSTOMIZED(sParty_Lao5),
}, },
[TRAINER_JOCELYN] = [TRAINER_JOCELYN] =
@ -6034,7 +6034,7 @@ const struct Trainer gTrainers[] = {
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
.party = ITEM_CUSTOM_MOVES(sParty_Annika), .party = EVERYTHING_CUSTOMIZED(sParty_Annika),
}, },
[TRAINER_JAZMYN] = [TRAINER_JAZMYN] =
@ -6106,7 +6106,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Marley), .party = EVERYTHING_CUSTOMIZED(sParty_Marley),
}, },
[TRAINER_REYNA] = [TRAINER_REYNA] =
@ -6934,7 +6934,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Athena), .party = EVERYTHING_CUSTOMIZED(sParty_Athena),
}, },
[TRAINER_HARRISON] = [TRAINER_HARRISON] =
@ -9250,7 +9250,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Roxanne2), .party = EVERYTHING_CUSTOMIZED(sParty_Roxanne2),
}, },
[TRAINER_ROXANNE_3] = [TRAINER_ROXANNE_3] =
@ -9262,7 +9262,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Roxanne3), .party = EVERYTHING_CUSTOMIZED(sParty_Roxanne3),
}, },
[TRAINER_ROXANNE_4] = [TRAINER_ROXANNE_4] =
@ -9274,7 +9274,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Roxanne4), .party = EVERYTHING_CUSTOMIZED(sParty_Roxanne4),
}, },
[TRAINER_ROXANNE_5] = [TRAINER_ROXANNE_5] =
@ -9286,7 +9286,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Roxanne5), .party = EVERYTHING_CUSTOMIZED(sParty_Roxanne5),
}, },
[TRAINER_BRAWLY_2] = [TRAINER_BRAWLY_2] =
@ -9298,7 +9298,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Brawly2), .party = EVERYTHING_CUSTOMIZED(sParty_Brawly2),
}, },
[TRAINER_BRAWLY_3] = [TRAINER_BRAWLY_3] =
@ -9310,7 +9310,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Brawly3), .party = EVERYTHING_CUSTOMIZED(sParty_Brawly3),
}, },
[TRAINER_BRAWLY_4] = [TRAINER_BRAWLY_4] =
@ -9322,7 +9322,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Brawly4), .party = EVERYTHING_CUSTOMIZED(sParty_Brawly4),
}, },
[TRAINER_BRAWLY_5] = [TRAINER_BRAWLY_5] =
@ -9334,7 +9334,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Brawly5), .party = EVERYTHING_CUSTOMIZED(sParty_Brawly5),
}, },
[TRAINER_WATTSON_2] = [TRAINER_WATTSON_2] =
@ -9346,7 +9346,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Wattson2), .party = EVERYTHING_CUSTOMIZED(sParty_Wattson2),
}, },
[TRAINER_WATTSON_3] = [TRAINER_WATTSON_3] =
@ -9358,7 +9358,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Wattson3), .party = EVERYTHING_CUSTOMIZED(sParty_Wattson3),
}, },
[TRAINER_WATTSON_4] = [TRAINER_WATTSON_4] =
@ -9370,7 +9370,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Wattson4), .party = EVERYTHING_CUSTOMIZED(sParty_Wattson4),
}, },
[TRAINER_WATTSON_5] = [TRAINER_WATTSON_5] =
@ -9382,7 +9382,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Wattson5), .party = EVERYTHING_CUSTOMIZED(sParty_Wattson5),
}, },
[TRAINER_FLANNERY_2] = [TRAINER_FLANNERY_2] =
@ -9394,7 +9394,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Flannery2), .party = EVERYTHING_CUSTOMIZED(sParty_Flannery2),
}, },
[TRAINER_FLANNERY_3] = [TRAINER_FLANNERY_3] =
@ -9406,7 +9406,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Flannery3), .party = EVERYTHING_CUSTOMIZED(sParty_Flannery3),
}, },
[TRAINER_FLANNERY_4] = [TRAINER_FLANNERY_4] =
@ -9418,7 +9418,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Flannery4), .party = EVERYTHING_CUSTOMIZED(sParty_Flannery4),
}, },
[TRAINER_FLANNERY_5] = [TRAINER_FLANNERY_5] =
@ -9430,7 +9430,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Flannery5), .party = EVERYTHING_CUSTOMIZED(sParty_Flannery5),
}, },
[TRAINER_NORMAN_2] = [TRAINER_NORMAN_2] =
@ -9442,7 +9442,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Norman2), .party = EVERYTHING_CUSTOMIZED(sParty_Norman2),
}, },
[TRAINER_NORMAN_3] = [TRAINER_NORMAN_3] =
@ -9454,7 +9454,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Norman3), .party = EVERYTHING_CUSTOMIZED(sParty_Norman3),
}, },
[TRAINER_NORMAN_4] = [TRAINER_NORMAN_4] =
@ -9466,7 +9466,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Norman4), .party = EVERYTHING_CUSTOMIZED(sParty_Norman4),
}, },
[TRAINER_NORMAN_5] = [TRAINER_NORMAN_5] =
@ -9478,7 +9478,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Norman5), .party = EVERYTHING_CUSTOMIZED(sParty_Norman5),
}, },
[TRAINER_WINONA_2] = [TRAINER_WINONA_2] =
@ -9490,7 +9490,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY,
.party = ITEM_CUSTOM_MOVES(sParty_Winona2), .party = EVERYTHING_CUSTOMIZED(sParty_Winona2),
}, },
[TRAINER_WINONA_3] = [TRAINER_WINONA_3] =
@ -9502,7 +9502,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY,
.party = ITEM_CUSTOM_MOVES(sParty_Winona3), .party = EVERYTHING_CUSTOMIZED(sParty_Winona3),
}, },
[TRAINER_WINONA_4] = [TRAINER_WINONA_4] =
@ -9514,7 +9514,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY,
.party = ITEM_CUSTOM_MOVES(sParty_Winona4), .party = EVERYTHING_CUSTOMIZED(sParty_Winona4),
}, },
[TRAINER_WINONA_5] = [TRAINER_WINONA_5] =
@ -9526,7 +9526,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY,
.party = ITEM_CUSTOM_MOVES(sParty_Winona5), .party = EVERYTHING_CUSTOMIZED(sParty_Winona5),
}, },
[TRAINER_TATE_AND_LIZA_2] = [TRAINER_TATE_AND_LIZA_2] =
@ -9538,7 +9538,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_TateAndLiza2), .party = EVERYTHING_CUSTOMIZED(sParty_TateAndLiza2),
}, },
[TRAINER_TATE_AND_LIZA_3] = [TRAINER_TATE_AND_LIZA_3] =
@ -9550,7 +9550,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_TateAndLiza3), .party = EVERYTHING_CUSTOMIZED(sParty_TateAndLiza3),
}, },
[TRAINER_TATE_AND_LIZA_4] = [TRAINER_TATE_AND_LIZA_4] =
@ -9562,7 +9562,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_TateAndLiza4), .party = EVERYTHING_CUSTOMIZED(sParty_TateAndLiza4),
}, },
[TRAINER_TATE_AND_LIZA_5] = [TRAINER_TATE_AND_LIZA_5] =
@ -9574,7 +9574,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_TateAndLiza5), .party = EVERYTHING_CUSTOMIZED(sParty_TateAndLiza5),
}, },
[TRAINER_JUAN_2] = [TRAINER_JUAN_2] =
@ -9586,7 +9586,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Juan2), .party = EVERYTHING_CUSTOMIZED(sParty_Juan2),
}, },
[TRAINER_JUAN_3] = [TRAINER_JUAN_3] =
@ -9598,7 +9598,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Juan3), .party = EVERYTHING_CUSTOMIZED(sParty_Juan3),
}, },
[TRAINER_JUAN_4] = [TRAINER_JUAN_4] =
@ -9610,7 +9610,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Juan4), .party = EVERYTHING_CUSTOMIZED(sParty_Juan4),
}, },
[TRAINER_JUAN_5] = [TRAINER_JUAN_5] =
@ -9622,7 +9622,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
.doubleBattle = TRUE, .doubleBattle = TRUE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Juan5), .party = EVERYTHING_CUSTOMIZED(sParty_Juan5),
}, },
[TRAINER_ANGELO] = [TRAINER_ANGELO] =
@ -9634,7 +9634,7 @@ const struct Trainer gTrainers[] = {
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Angelo), .party = EVERYTHING_CUSTOMIZED(sParty_Angelo),
}, },
[TRAINER_DARIUS] = [TRAINER_DARIUS] =
@ -9658,7 +9658,7 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_Steven), .party = EVERYTHING_CUSTOMIZED(sParty_Steven),
}, },
[TRAINER_ANABEL] = [TRAINER_ANABEL] =

3
src/match_call.c
View File

@ -1809,9 +1809,6 @@ static void PopulateSpeciesFromTrainerParty(int matchCallId, u8 *destStr)
case F_TRAINER_PARTY_HELD_ITEM: case F_TRAINER_PARTY_HELD_ITEM:
speciesName = gSpeciesNames[party.ItemDefaultMoves[monId].species]; speciesName = gSpeciesNames[party.ItemDefaultMoves[monId].species];
break; break;
case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM:
speciesName = gSpeciesNames[party.ItemCustomMoves[monId].species];
break;
case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED: case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
speciesName = gSpeciesNames[party.EverythingCustomized[monId].species]; speciesName = gSpeciesNames[party.EverythingCustomized[monId].species];
break; break;