diff --git a/include/battle_main.h b/include/battle_main.h index 5f603654bc..8a13213b83 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -72,7 +72,7 @@ bool32 IsWildMonSmart(void); u8 CreateNPCTrainerPartyFromTrainer(struct Pokemon *party, const struct Trainer *trainer, bool32 firstTrainer, u32 battleTypeFlags); void ModifyPersonalityForNature(u32 *personality, u32 newNature); u32 GeneratePersonalityForGender(u32 gender, u32 species); -void CustomTrainerPartyAssignMoves(struct Pokemon *mon, const struct TrainerMonCustomized *partyEntry); +void CustomTrainerPartyAssignMoves(struct Pokemon *mon, const struct TrainerMon *partyEntry); extern struct MultiPartnerMenuPokemon gMultiPartnerParty[MULTI_PARTY_SIZE]; diff --git a/include/constants/trainers.h b/include/constants/trainers.h index 25660ac073..16904bcd12 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -371,13 +371,6 @@ #define F_TRAINER_FEMALE (1 << 7) -// 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_HELD_ITEM (1 << 1) -#define F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED (1 << 3) - // Trainer party defines #define TRAINER_MON_MALE 1 #define TRAINER_MON_FEMALE 2 diff --git a/include/data.h b/include/data.h index d8e25df82d..d2248820ea 100644 --- a/include/data.h +++ b/include/data.h @@ -35,7 +35,7 @@ struct MonCoords #define TRAINER_PARTY_EVS(hp, atk, def, speed, spatk, spdef) ((const u8[6]){hp,atk,def,spatk,spdef,speed}) #define TRAINER_PARTY_NATURE(nature) (nature+1) -struct TrainerMonCustomized +struct TrainerMon { const u8 *nickname; const u8 *ev; @@ -52,64 +52,19 @@ struct TrainerMonCustomized bool8 isShiny : 1; }; -struct TrainerMonNoItemDefaultMoves -{ - u16 iv; - u8 lvl; - u16 species; -}; - -struct TrainerMonItemDefaultMoves -{ - u16 iv; - u8 lvl; - u16 species; - u16 heldItem; -}; - -struct TrainerMonNoItemCustomMoves -{ - u16 iv; - u8 lvl; - u16 species; - 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_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_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 - -union TrainerMonPtr -{ - const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves; - const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves; - const struct TrainerMonItemDefaultMoves *ItemDefaultMoves; - const struct TrainerMonItemCustomMoves *ItemCustomMoves; - const struct TrainerMonCustomized *EverythingCustomized; -}; +#define TRAINER_PARTY(partyArray) partyArray, .partySize = ARRAY_COUNT(partyArray) struct Trainer { /*0x00*/ u32 aiFlags; - /*0x04*/ union TrainerMonPtr party; + /*0x04*/ const struct TrainerMon *party; /*0x08*/ u16 items[MAX_TRAINER_ITEMS]; /*0x10*/ u8 trainerClass; /*0x11*/ u8 encounterMusic_gender; // last bit is gender /*0x12*/ u8 trainerPic; /*0x13*/ u8 trainerName[TRAINER_NAME_LENGTH + 1]; /*0x1E*/ bool8 doubleBattle:1; - u8 partyFlags:7; + u8 padding:7; /*0x1F*/ u8 partySize; }; diff --git a/src/battle_main.c b/src/battle_main.c index 85ed235b10..e6ed4269d1 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1902,33 +1902,8 @@ static u32 Crc32B (const u8 *data, u32 size) static u32 GeneratePartyHash(const struct Trainer *trainer, u32 i) { - const u8 *buffer; - u32 n; - if (trainer->partyFlags == 0) - { - 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_HELD_ITEM) - { - buffer = (const u8 *) &trainer->party.ItemDefaultMoves[i]; - 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) - { - buffer = (const u8 *) &trainer->party.EverythingCustomized[i]; - n = sizeof(*trainer->party.EverythingCustomized); - } + const u8 *buffer = (const u8 *) &trainer->party[i]; + u32 n = sizeof(*trainer->party); return Crc32B(buffer, n); } @@ -1954,7 +1929,7 @@ u32 GeneratePersonalityForGender(u32 gender, u32 species) return speciesInfo->genderRatio / 2; } -void CustomTrainerPartyAssignMoves(struct Pokemon *mon, const struct TrainerMonCustomized *partyEntry) +void CustomTrainerPartyAssignMoves(struct Pokemon *mon, const struct TrainerMon *partyEntry) { bool32 noMoveSet = TRUE; u32 j; @@ -2006,6 +1981,10 @@ u8 CreateNPCTrainerPartyFromTrainer(struct Pokemon *party, const struct Trainer { s32 ball = -1; u32 personalityHash = GeneratePartyHash(trainer, i); + const struct TrainerMon *partyData = trainer->party; + u32 otIdType = OT_ID_RANDOM_NO_SHINY; + u32 fixedOtId = 0; + if (trainer->doubleBattle == TRUE) personalityValue = 0x80; else if (trainer->encounterMusic_gender & F_TRAINER_FEMALE) @@ -2014,107 +1993,54 @@ u8 CreateNPCTrainerPartyFromTrainer(struct Pokemon *party, const struct Trainer personalityValue = 0x88; // Use personality more likely to result in a male Pokémon personalityValue += personalityHash << 8; - switch (trainer->partyFlags) + if (partyData[i].gender == TRAINER_MON_MALE) + personalityValue = (personalityValue & 0xFFFFFF00) | GeneratePersonalityForGender(MON_MALE, partyData[i].species); + else if (partyData[i].gender == TRAINER_MON_FEMALE) + personalityValue = (personalityValue & 0xFFFFFF00) | GeneratePersonalityForGender(MON_FEMALE, partyData[i].species); + if (partyData[i].nature != 0) + ModifyPersonalityForNature(&personalityValue, partyData[i].nature - 1); + if (partyData[i].isShiny) { - case 0: - { - const struct TrainerMonNoItemDefaultMoves *partyData = trainer->party.NoItemDefaultMoves; - 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); - break; + otIdType = OT_ID_PRESET; + fixedOtId = HIHALF(personalityValue) ^ LOHALF(personalityValue); } - 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); + CreateMon(&party[i], partyData[i].species, partyData[i].lvl, 0, TRUE, personalityValue, otIdType, fixedOtId); + 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_HELD_ITEM: + CustomTrainerPartyAssignMoves(&party[i], &partyData[i]); + SetMonData(&party[i], MON_DATA_IVS, &(partyData[i].iv)); + if (partyData[i].ev != NULL) { - const struct TrainerMonItemDefaultMoves *partyData = trainer->party.ItemDefaultMoves; - 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); - break; + SetMonData(&party[i], MON_DATA_HP_EV, &(partyData[i].ev[0])); + SetMonData(&party[i], MON_DATA_ATK_EV, &(partyData[i].ev[1])); + SetMonData(&party[i], MON_DATA_DEF_EV, &(partyData[i].ev[2])); + SetMonData(&party[i], MON_DATA_SPATK_EV, &(partyData[i].ev[3])); + SetMonData(&party[i], MON_DATA_SPDEF_EV, &(partyData[i].ev[4])); + SetMonData(&party[i], MON_DATA_SPEED_EV, &(partyData[i].ev[5])); } - case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM: + if (partyData[i].ability != ABILITY_NONE) { - 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++) + const struct SpeciesInfo *speciesInfo = &gSpeciesInfo[partyData[i].species]; + u32 maxAbilities = ARRAY_COUNT(speciesInfo->abilities); + for (j = 0; j < maxAbilities; ++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); + if (speciesInfo->abilities[j] == partyData[i].ability) + break; } - break; + if (j < maxAbilities) + SetMonData(&party[i], MON_DATA_ABILITY_NUM, &j); } - case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED: + SetMonData(&party[i], MON_DATA_FRIENDSHIP, &(partyData[i].friendship)); + if (partyData[i].ball != ITEM_NONE) { - const struct TrainerMonCustomized *partyData = trainer->party.EverythingCustomized; - u32 otIdType = OT_ID_RANDOM_NO_SHINY; - u32 fixedOtId = 0; - if (partyData[i].gender == TRAINER_MON_MALE) - personalityValue = (personalityValue & 0xFFFFFF00) | GeneratePersonalityForGender(MON_MALE, partyData[i].species); - else if (partyData[i].gender == TRAINER_MON_FEMALE) - personalityValue = (personalityValue & 0xFFFFFF00) | GeneratePersonalityForGender(MON_FEMALE, partyData[i].species); - if (partyData[i].nature != 0) - ModifyPersonalityForNature(&personalityValue, partyData[i].nature - 1); - if (partyData[i].isShiny) - { - otIdType = OT_ID_PRESET; - fixedOtId = HIHALF(personalityValue) ^ LOHALF(personalityValue); - } - CreateMon(&party[i], partyData[i].species, partyData[i].lvl, 0, TRUE, personalityValue, otIdType, fixedOtId); - SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem); - - CustomTrainerPartyAssignMoves(&party[i], &partyData[i]); - SetMonData(&party[i], MON_DATA_IVS, &(partyData[i].iv)); - if (partyData[i].ev != NULL) - { - SetMonData(&party[i], MON_DATA_HP_EV, &(partyData[i].ev[0])); - SetMonData(&party[i], MON_DATA_ATK_EV, &(partyData[i].ev[1])); - SetMonData(&party[i], MON_DATA_DEF_EV, &(partyData[i].ev[2])); - SetMonData(&party[i], MON_DATA_SPATK_EV, &(partyData[i].ev[3])); - SetMonData(&party[i], MON_DATA_SPDEF_EV, &(partyData[i].ev[4])); - SetMonData(&party[i], MON_DATA_SPEED_EV, &(partyData[i].ev[5])); - } - if (partyData[i].ability != ABILITY_NONE) - { - const struct SpeciesInfo *speciesInfo = &gSpeciesInfo[partyData[i].species]; - u32 maxAbilities = ARRAY_COUNT(speciesInfo->abilities); - for (j = 0; j < maxAbilities; ++j) - { - if (speciesInfo->abilities[j] == partyData[i].ability) - break; - } - if (j < maxAbilities) - SetMonData(&party[i], MON_DATA_ABILITY_NUM, &j); - } - SetMonData(&party[i], MON_DATA_FRIENDSHIP, &(partyData[i].friendship)); - if (partyData[i].ball != ITEM_NONE) - { - ball = partyData[i].ball; - SetMonData(&party[i], MON_DATA_POKEBALL, &ball); - } - if (partyData[i].nickname != NULL) - { - SetMonData(&party[i], MON_DATA_NICKNAME, partyData[i].nickname); - } - CalculateMonStats(&party[i]); + ball = partyData[i].ball; + SetMonData(&party[i], MON_DATA_POKEBALL, &ball); } + if (partyData[i].nickname != NULL) + { + SetMonData(&party[i], MON_DATA_NICKNAME, partyData[i].nickname); } + CalculateMonStats(&party[i]); #if B_TRAINER_CLASS_POKE_BALLS >= GEN_7 if (ball == -1) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 373a7004b3..64b68f7187 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7376,39 +7376,8 @@ static u32 GetTrainerMoneyToGive(u16 trainerId) } else { - switch (gTrainers[trainerId].partyFlags) - { - case 0: - { - const struct TrainerMonNoItemDefaultMoves *party = gTrainers[trainerId].party.NoItemDefaultMoves; - 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_HELD_ITEM: - { - const struct TrainerMonItemDefaultMoves *party = gTrainers[trainerId].party.ItemDefaultMoves; - lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl; - } - 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: - { - const struct TrainerMonCustomized *party = gTrainers[trainerId].party.EverythingCustomized; - lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl; - } - break; - } + const struct TrainerMon *party = gTrainers[trainerId].party; + lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl; for (; gTrainerMoneyTable[i].classId != 0xFF; i++) { diff --git a/src/battle_setup.c b/src/battle_setup.c index f26c690819..630aee14fa 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -812,55 +812,16 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons) u8 i; u8 sum; u32 count = numMons; + const struct TrainerMon *party; if (gTrainers[opponentId].partySize < count) count = gTrainers[opponentId].partySize; sum = 0; - switch (gTrainers[opponentId].partyFlags) - { - case 0: - { - const struct TrainerMonNoItemDefaultMoves *party; - party = gTrainers[opponentId].party.NoItemDefaultMoves; - for (i = 0; i < count; i++) - 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_HELD_ITEM: - { - const struct TrainerMonItemDefaultMoves *party; - party = gTrainers[opponentId].party.ItemDefaultMoves; - for (i = 0; i < count; i++) - sum += party[i].lvl; - } - 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: - { - const struct TrainerMonCustomized *party; - party = gTrainers[opponentId].party.EverythingCustomized; - for (i = 0; i < count; i++) - sum += party[i].lvl; - } - break; - } + party = gTrainers[opponentId].party; + for (i = 0; i < count; i++) + sum += party[i].lvl; return sum; } diff --git a/src/battle_tower.c b/src/battle_tower.c index a8794358a7..8ad26dfda7 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -3049,113 +3049,62 @@ static void FillPartnerParty(u16 trainerId) for (i = 0; i < 3 && i < gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].partySize; i++) { + const struct TrainerMon *partyData = gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].party; + u32 otIdType = OT_ID_RANDOM_NO_SHINY; do { j = Random32(); } while (IsShinyOtIdPersonality(otID, j)); - switch (gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].partyFlags) + if (partyData[i].gender == TRAINER_MON_MALE) + j = (j & 0xFFFFFF00) | GeneratePersonalityForGender(MON_MALE, partyData[i].species); + else if (partyData[i].gender == TRAINER_MON_FEMALE) + j = (j & 0xFFFFFF00) | GeneratePersonalityForGender(MON_FEMALE, partyData[i].species); + if (partyData[i].nature != 0) + ModifyPersonalityForNature(&j, partyData[i].nature - 1); + if (partyData[i].isShiny) { - case 0: + otIdType = OT_ID_PRESET; + otID = HIHALF(j) ^ LOHALF(j); + } + + CreateMon(&gPlayerParty[i + 3], partyData[i].species, partyData[i].lvl, 0, TRUE, j, otIdType, otID); + SetMonData(&gPlayerParty[i + 3], MON_DATA_HELD_ITEM, &partyData[i].heldItem); + CustomTrainerPartyAssignMoves(&gPlayerParty[i+3], &partyData[i]); + + SetMonData(&gPlayerParty[i+3], MON_DATA_IVS, &(partyData[i].iv)); + if (partyData[i].ev != NULL) { - const struct TrainerMonNoItemDefaultMoves *partyData = gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].party.NoItemDefaultMoves; - - CreateMon(&gPlayerParty[i + 3], partyData[i].species, partyData[i].lvl, partyData[i].iv * 31 / 255, TRUE, j, TRUE, otID); - break; + SetMonData(&gPlayerParty[i+3], MON_DATA_HP_EV, &(partyData[i].ev[0])); + SetMonData(&gPlayerParty[i+3], MON_DATA_ATK_EV, &(partyData[i].ev[1])); + SetMonData(&gPlayerParty[i+3], MON_DATA_DEF_EV, &(partyData[i].ev[2])); + SetMonData(&gPlayerParty[i+3], MON_DATA_SPATK_EV, &(partyData[i].ev[3])); + SetMonData(&gPlayerParty[i+3], MON_DATA_SPDEF_EV, &(partyData[i].ev[4])); + SetMonData(&gPlayerParty[i+3], MON_DATA_SPEED_EV, &(partyData[i].ev[5])); } - case F_TRAINER_PARTY_CUSTOM_MOVESET: + if (partyData[i].ability != ABILITY_NONE) { - 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++) + const struct SpeciesInfo *speciesInfo = &gSpeciesInfo[partyData[i].species]; + u32 maxAbilities = ARRAY_COUNT(speciesInfo->abilities); + for (j = 0; j < maxAbilities; ++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); + if (speciesInfo->abilities[j] == partyData[i].ability) + break; } - break; + if (j < maxAbilities) + SetMonData(&gPlayerParty[i+3], MON_DATA_ABILITY_NUM, &j); } - case F_TRAINER_PARTY_HELD_ITEM: + SetMonData(&gPlayerParty[i+3], MON_DATA_FRIENDSHIP, &(partyData[i].friendship)); + if (partyData[i].ball != ITEM_NONE) { - const struct TrainerMonItemDefaultMoves *partyData = gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].party.ItemDefaultMoves; - - 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); - break; + ball = partyData[i].ball; + SetMonData(&gPlayerParty[i+3], MON_DATA_POKEBALL, &ball); } - case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM: + if (partyData[i].nickname != NULL) { - 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: - { - const struct TrainerMonCustomized *partyData = gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].party.EverythingCustomized; - u32 otIdType = OT_ID_RANDOM_NO_SHINY; - - if (partyData[i].gender == TRAINER_MON_MALE) - j = (j & 0xFFFFFF00) | GeneratePersonalityForGender(MON_MALE, partyData[i].species); - else if (partyData[i].gender == TRAINER_MON_FEMALE) - j = (j & 0xFFFFFF00) | GeneratePersonalityForGender(MON_FEMALE, partyData[i].species); - if (partyData[i].nature != 0) - ModifyPersonalityForNature(&j, partyData[i].nature - 1); - if (partyData[i].isShiny) - { - otIdType = OT_ID_PRESET; - otID = HIHALF(j) ^ LOHALF(j); - } - - CreateMon(&gPlayerParty[i + 3], partyData[i].species, partyData[i].lvl, 0, TRUE, j, otIdType, otID); - SetMonData(&gPlayerParty[i + 3], MON_DATA_HELD_ITEM, &partyData[i].heldItem); - CustomTrainerPartyAssignMoves(&gPlayerParty[i+3], &partyData[i]); - - SetMonData(&gPlayerParty[i+3], MON_DATA_IVS, &(partyData[i].iv)); - if (partyData[i].ev != NULL) - { - SetMonData(&gPlayerParty[i+3], MON_DATA_HP_EV, &(partyData[i].ev[0])); - SetMonData(&gPlayerParty[i+3], MON_DATA_ATK_EV, &(partyData[i].ev[1])); - SetMonData(&gPlayerParty[i+3], MON_DATA_DEF_EV, &(partyData[i].ev[2])); - SetMonData(&gPlayerParty[i+3], MON_DATA_SPATK_EV, &(partyData[i].ev[3])); - SetMonData(&gPlayerParty[i+3], MON_DATA_SPDEF_EV, &(partyData[i].ev[4])); - SetMonData(&gPlayerParty[i+3], MON_DATA_SPEED_EV, &(partyData[i].ev[5])); - } - if (partyData[i].ability != ABILITY_NONE) - { - const struct SpeciesInfo *speciesInfo = &gSpeciesInfo[partyData[i].species]; - u32 maxAbilities = ARRAY_COUNT(speciesInfo->abilities); - for (j = 0; j < maxAbilities; ++j) - { - if (speciesInfo->abilities[j] == partyData[i].ability) - break; - } - if (j < maxAbilities) - SetMonData(&gPlayerParty[i+3], MON_DATA_ABILITY_NUM, &j); - } - SetMonData(&gPlayerParty[i+3], MON_DATA_FRIENDSHIP, &(partyData[i].friendship)); - if (partyData[i].ball != ITEM_NONE) - { - ball = partyData[i].ball; - SetMonData(&gPlayerParty[i+3], MON_DATA_POKEBALL, &ball); - } - if (partyData[i].nickname != NULL) - { - SetMonData(&gPlayerParty[i+3], MON_DATA_NICKNAME, partyData[i].nickname); - } - CalculateMonStats(&gPlayerParty[i+3]); - } + SetMonData(&gPlayerParty[i+3], MON_DATA_NICKNAME, partyData[i].nickname); } + CalculateMonStats(&gPlayerParty[i+3]); StringCopy(trainerName, gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].trainerName); SetMonData(&gPlayerParty[i + 3], MON_DATA_OT_NAME, trainerName); diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index 1759120b7f..ed53a181dd 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -1,825 +1,768 @@ -static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer1[] = { +static const struct TrainerMon sParty_Sawyer1[] = { { - .iv = 0, .lvl = 21, .species = SPECIES_GEODUDE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout1[] = { +static const struct TrainerMon sParty_GruntAquaHideout1[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_POOCHYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout2[] = { +static const struct TrainerMon sParty_GruntAquaHideout2[] = { { - .iv = 0, .lvl = 31, .species = SPECIES_ZUBAT, }, { - .iv = 0, .lvl = 31, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout3[] = { +static const struct TrainerMon sParty_GruntAquaHideout3[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_ZUBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout4[] = { +static const struct TrainerMon sParty_GruntAquaHideout4[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern1[] = { +static const struct TrainerMon sParty_GruntSeafloorCavern1[] = { { - .iv = 0, .lvl = 36, .species = SPECIES_POOCHYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern2[] = { +static const struct TrainerMon sParty_GruntSeafloorCavern2[] = { { - .iv = 0, .lvl = 36, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern3[] = { +static const struct TrainerMon sParty_GruntSeafloorCavern3[] = { { - .iv = 0, .lvl = 36, .species = SPECIES_ZUBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle1[] = { +static const struct TrainerMon sParty_Gabrielle1[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_SKITTY, }, { - .iv = 0, .lvl = 26, .species = SPECIES_POOCHYENA, }, { - .iv = 0, .lvl = 26, .species = SPECIES_ZIGZAGOON, }, { - .iv = 0, .lvl = 26, .species = SPECIES_LOTAD, }, { - .iv = 0, .lvl = 26, .species = SPECIES_SEEDOT, }, { - .iv = 0, .lvl = 26, .species = SPECIES_TAILLOW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntPetalburgWoods[] = { +static const struct TrainerMon sParty_GruntPetalburgWoods[] = { { - .iv = 0, .lvl = 9, .species = SPECIES_POOCHYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Marcel[] = { +static const struct TrainerMon sParty_Marcel[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_MANECTRIC, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_SHIFTRY, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Alberto[] = { +static const struct TrainerMon sParty_Alberto[] = { { - .iv = 0, .lvl = 30, .species = SPECIES_PELIPPER, }, { - .iv = 0, .lvl = 30, .species = SPECIES_XATU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ed[] = { +static const struct TrainerMon sParty_Ed[] = { { - .iv = 0, .lvl = 30, .species = SPECIES_ZANGOOSE, }, { - .iv = 0, .lvl = 30, .species = SPECIES_SEVIPER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern4[] = { +static const struct TrainerMon sParty_GruntSeafloorCavern4[] = { { - .iv = 0, .lvl = 36, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Declan[] = { +static const struct TrainerMon sParty_Declan[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_GYARADOS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntRusturfTunnel[] = { +static const struct TrainerMon sParty_GruntRusturfTunnel[] = { { - .iv = 0, .lvl = 11, .species = SPECIES_POOCHYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst1[] = { +static const struct TrainerMon sParty_GruntWeatherInst1[] = { { - .iv = 0, .lvl = 27, .species = SPECIES_ZUBAT, }, { - .iv = 0, .lvl = 27, .species = SPECIES_POOCHYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst2[] = { +static const struct TrainerMon sParty_GruntWeatherInst2[] = { { - .iv = 0, .lvl = 27, .species = SPECIES_POOCHYENA, }, { - .iv = 0, .lvl = 27, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst3[] = { +static const struct TrainerMon sParty_GruntWeatherInst3[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_POOCHYENA, }, { - .iv = 0, .lvl = 26, .species = SPECIES_ZUBAT, }, { - .iv = 0, .lvl = 26, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum1[] = { +static const struct TrainerMon sParty_GruntMuseum1[] = { { - .iv = 0, .lvl = 15, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum2[] = { +static const struct TrainerMon sParty_GruntMuseum2[] = { { - .iv = 0, .lvl = 14, .species = SPECIES_ZUBAT, }, { - .iv = 0, .lvl = 14, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter1[] = { +static const struct TrainerMon sParty_GruntSpaceCenter1[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre1[] = { +static const struct TrainerMon sParty_GruntMtPyre1[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_ZUBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre2[] = { +static const struct TrainerMon sParty_GruntMtPyre2[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre3[] = { +static const struct TrainerMon sParty_GruntMtPyre3[] = { { - .iv = 0, .lvl = 30, .species = SPECIES_POOCHYENA, }, { - .iv = 0, .lvl = 30, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst4[] = { +static const struct TrainerMon sParty_GruntWeatherInst4[] = { { - .iv = 0, .lvl = 28, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout5[] = { +static const struct TrainerMon sParty_GruntAquaHideout5[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout6[] = { +static const struct TrainerMon sParty_GruntAquaHideout6[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_ZUBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Fredrick[] = { +static const struct TrainerMon sParty_Fredrick[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 30, .species = SPECIES_MAKUHITA, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 30, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Matt[] = { +static const struct TrainerMon sParty_Matt[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 34, .species = SPECIES_MIGHTYENA, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 34, .species = SPECIES_GOLBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Zander[] = { +static const struct TrainerMon sParty_Zander[] = { { - .iv = 0, .lvl = 31, .species = SPECIES_HARIYAMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_ShellyWeatherInstitute[] = { +static const struct TrainerMon sParty_ShellyWeatherInstitute[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 28, .species = SPECIES_CARVANHA, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 28, .species = SPECIES_MIGHTYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_ShellySeafloorCavern[] = { +static const struct TrainerMon sParty_ShellySeafloorCavern[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 37, .species = SPECIES_SHARPEDO, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 37, .species = SPECIES_MIGHTYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Archie[] = { +static const struct TrainerMon sParty_Archie[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 41, .species = SPECIES_MIGHTYENA, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 41, .species = SPECIES_CROBAT, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 43, .species = SPECIES_SHARPEDO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Leah[] = { +static const struct TrainerMon sParty_Leah[] = { { - .iv = 0, .lvl = 31, .species = SPECIES_SPOINK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Daisy[] = { +static const struct TrainerMon sParty_Daisy[] = { { - .iv = 0, .lvl = 14, .species = SPECIES_SHROOMISH, }, { - .iv = 0, .lvl = 14, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Rose1[] = { +static const struct TrainerMon sParty_Rose1[] = { { - .iv = 0, .lvl = 14, .species = SPECIES_ROSELIA, }, { - .iv = 0, .lvl = 14, .species = SPECIES_SHROOMISH, }, { - .iv = 0, .lvl = 14, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Felix[] = { +static const struct TrainerMon sParty_Felix[] = { { - .iv = 0, .lvl = 43, .species = SPECIES_MEDICHAM, .moves = {MOVE_PSYCHIC, MOVE_NONE, MOVE_NONE, MOVE_NONE} }, { - .iv = 0, .lvl = 43, .species = SPECIES_CLAYDOL, .moves = {MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Violet[] = { +static const struct TrainerMon sParty_Violet[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_ROSELIA, }, { - .iv = 0, .lvl = 26, .species = SPECIES_GLOOM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Rose2[] = { +static const struct TrainerMon sParty_Rose2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 26, .species = SPECIES_SHROOMISH, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 26, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Rose3[] = { +static const struct TrainerMon sParty_Rose3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 28, .species = SPECIES_SHROOMISH, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 28, .species = SPECIES_GLOOM, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 28, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Rose4[] = { +static const struct TrainerMon sParty_Rose4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_SHROOMISH, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_GLOOM, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Rose5[] = { +static const struct TrainerMon sParty_Rose5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 34, .species = SPECIES_BRELOOM, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 34, .species = SPECIES_GLOOM, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 34, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Dusty1[] = { +static const struct TrainerMon sParty_Dusty1[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 23, .species = SPECIES_SANDSLASH, .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Chip[] = { +static const struct TrainerMon sParty_Chip[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 27, .species = SPECIES_BALTOY, .moves = {MOVE_PSYBEAM, MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_ANCIENT_POWER} }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 27, .species = SPECIES_SANDSHREW, .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING} }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 27, .species = SPECIES_SANDSLASH, .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Foster[] = { +static const struct TrainerMon sParty_Foster[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 25, .species = SPECIES_SANDSHREW, .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 25, .species = SPECIES_SANDSLASH, .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Dusty2[] = { +static const struct TrainerMon sParty_Dusty2[] = { { - .iv = 60, + .iv = TRAINER_PARTY_IVS(7, 7, 7, 7, 7, 7), .lvl = 27, .species = SPECIES_SANDSLASH, .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Dusty3[] = { +static const struct TrainerMon sParty_Dusty3[] = { { - .iv = 70, + .iv = TRAINER_PARTY_IVS(8, 8, 8, 8, 8, 8), .lvl = 30, .species = SPECIES_SANDSLASH, .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Dusty4[] = { +static const struct TrainerMon sParty_Dusty4[] = { { - .iv = 80, + .iv = TRAINER_PARTY_IVS(9, 9, 9, 9, 9, 9), .lvl = 33, .species = SPECIES_SANDSLASH, .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Dusty5[] = { +static const struct TrainerMon sParty_Dusty5[] = { { - .iv = 90, + .iv = TRAINER_PARTY_IVS(10, 10, 10, 10, 10, 10), .lvl = 36, .species = SPECIES_SANDSLASH, .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy1[] = { +static const struct TrainerMon sParty_GabbyAndTy1[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 17, .species = SPECIES_MAGNEMITE, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 17, .species = SPECIES_WHISMUR, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy2[] = { +static const struct TrainerMon sParty_GabbyAndTy2[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 27, .species = SPECIES_MAGNEMITE, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 27, .species = SPECIES_LOUDRED, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy3[] = { +static const struct TrainerMon sParty_GabbyAndTy3[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 30, .species = SPECIES_MAGNETON, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 30, .species = SPECIES_LOUDRED, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy4[] = { +static const struct TrainerMon sParty_GabbyAndTy4[] = { { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 33, .species = SPECIES_MAGNETON, }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 33, .species = SPECIES_LOUDRED, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy5[] = { +static const struct TrainerMon sParty_GabbyAndTy5[] = { { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 36, .species = SPECIES_MAGNETON, }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 36, .species = SPECIES_LOUDRED, } }; -static const struct TrainerMonNoItemCustomMoves sParty_GabbyAndTy6[] = { +static const struct TrainerMon sParty_GabbyAndTy6[] = { { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 39, .species = SPECIES_MAGNETON, .moves = {MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND, MOVE_THUNDERBOLT} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 39, .species = SPECIES_EXPLOUD, .moves = {MOVE_ASTONISH, MOVE_STOMP, MOVE_SUPERSONIC, MOVE_HYPER_VOICE} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lola1[] = { +static const struct TrainerMon sParty_Lola1[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 12, .species = SPECIES_AZURILL, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 12, .species = SPECIES_AZURILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Austina[] = { +static const struct TrainerMon sParty_Austina[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Gwen[] = { +static const struct TrainerMon sParty_Gwen[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lola2[] = { +static const struct TrainerMon sParty_Lola2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 26, .species = SPECIES_MARILL, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 26, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lola3[] = { +static const struct TrainerMon sParty_Lola3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_MARILL, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lola4[] = { +static const struct TrainerMon sParty_Lola4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 32, .species = SPECIES_MARILL, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 32, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lola5[] = { +static const struct TrainerMon sParty_Lola5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 35, .species = SPECIES_AZUMARILL, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 35, .species = SPECIES_AZUMARILL, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Ricky1[] = { +static const struct TrainerMon sParty_Ricky1[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 13, .species = SPECIES_ZIGZAGOON, .moves = {MOVE_SAND_ATTACK, MOVE_HEADBUTT, MOVE_TAIL_WHIP, MOVE_SURF} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Simon[] = { +static const struct TrainerMon sParty_Simon[] = { { - .iv = 0, .lvl = 12, .species = SPECIES_AZURILL, }, { - .iv = 0, .lvl = 12, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Charlie[] = { +static const struct TrainerMon sParty_Charlie[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Ricky2[] = { +static const struct TrainerMon sParty_Ricky2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 27, .species = SPECIES_LINOONE, .moves = {MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Ricky3[] = { +static const struct TrainerMon sParty_Ricky3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 30, .species = SPECIES_LINOONE, .moves = {MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Ricky4[] = { +static const struct TrainerMon sParty_Ricky4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 33, .species = SPECIES_LINOONE, .moves = {MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Ricky5[] = { +static const struct TrainerMon sParty_Ricky5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 36, .species = SPECIES_LINOONE, .moves = {MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF} } }; -static const struct TrainerMonItemCustomMoves sParty_Randall[] = { +static const struct TrainerMon sParty_Randall[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 26, .species = SPECIES_SWELLOW, .heldItem = ITEM_NONE, @@ -827,9 +770,9 @@ static const struct TrainerMonItemCustomMoves sParty_Randall[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Parker[] = { +static const struct TrainerMon sParty_Parker[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 26, .species = SPECIES_SPINDA, .heldItem = ITEM_NONE, @@ -837,9 +780,9 @@ static const struct TrainerMonItemCustomMoves sParty_Parker[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_George[] = { +static const struct TrainerMon sParty_George[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 26, .species = SPECIES_SLAKOTH, .heldItem = ITEM_SITRUS_BERRY, @@ -847,9 +790,9 @@ static const struct TrainerMonItemCustomMoves sParty_George[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Berke[] = { +static const struct TrainerMon sParty_Berke[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 26, .species = SPECIES_VIGOROTH, .heldItem = ITEM_NONE, @@ -857,261 +800,261 @@ static const struct TrainerMonItemCustomMoves sParty_Berke[] = { } }; -static const struct TrainerMonNoItemCustomMoves sParty_Braxton[] = { +static const struct TrainerMon sParty_Braxton[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 28, .species = SPECIES_SWELLOW, .moves = {MOVE_FOCUS_ENERGY, MOVE_QUICK_ATTACK, MOVE_WING_ATTACK, MOVE_ENDEAVOR} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 28, .species = SPECIES_TRAPINCH, .moves = {MOVE_BITE, MOVE_DIG, MOVE_FEINT_ATTACK, MOVE_SAND_TOMB} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 28, .species = SPECIES_WAILMER, .moves = {MOVE_ROLLOUT, MOVE_WHIRLPOOL, MOVE_ASTONISH, MOVE_WATER_PULSE} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 28, .species = SPECIES_MAGNETON, .moves = {MOVE_THUNDERBOLT, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 28, .species = SPECIES_SHIFTRY, .moves = {MOVE_GIGA_DRAIN, MOVE_FEINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SWAGGER} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Vincent[] = { +static const struct TrainerMon sParty_Vincent[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 44, .species = SPECIES_SABLEYE, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 44, .species = SPECIES_MEDICHAM, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 44, .species = SPECIES_SHARPEDO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Leroy[] = { +static const struct TrainerMon sParty_Leroy[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 46, .species = SPECIES_MAWILE, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 46, .species = SPECIES_STARMIE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Wilton1[] = { +static const struct TrainerMon sParty_Wilton1[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 17, .species = SPECIES_ELECTRIKE, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 17, .species = SPECIES_WAILMER, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 17, .species = SPECIES_MAKUHITA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Edgar[] = { +static const struct TrainerMon sParty_Edgar[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 43, .species = SPECIES_CACTURNE, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 43, .species = SPECIES_PELIPPER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Albert[] = { +static const struct TrainerMon sParty_Albert[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 43, .species = SPECIES_MAGNETON, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 43, .species = SPECIES_MUK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Samuel[] = { +static const struct TrainerMon sParty_Samuel[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_SWELLOW, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_MAWILE, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_KADABRA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Vito[] = { +static const struct TrainerMon sParty_Vito[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_DODRIO, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_KADABRA, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_ELECTRODE, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_SHIFTRY, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Owen[] = { +static const struct TrainerMon sParty_Owen[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_KECLEON, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_GRAVELER, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_WAILORD, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Wilton2[] = { +static const struct TrainerMon sParty_Wilton2[] = { { - .iv = 110, + .iv = TRAINER_PARTY_IVS(13, 13, 13, 13, 13, 13), .lvl = 26, .species = SPECIES_ELECTRIKE, }, { - .iv = 110, + .iv = TRAINER_PARTY_IVS(13, 13, 13, 13, 13, 13), .lvl = 26, .species = SPECIES_WAILMER, }, { - .iv = 110, + .iv = TRAINER_PARTY_IVS(13, 13, 13, 13, 13, 13), .lvl = 26, .species = SPECIES_MAKUHITA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Wilton3[] = { +static const struct TrainerMon sParty_Wilton3[] = { { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 29, .species = SPECIES_MANECTRIC, }, { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 29, .species = SPECIES_WAILMER, }, { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 29, .species = SPECIES_MAKUHITA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Wilton4[] = { +static const struct TrainerMon sParty_Wilton4[] = { { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 32, .species = SPECIES_MANECTRIC, }, { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 32, .species = SPECIES_WAILMER, }, { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 32, .species = SPECIES_MAKUHITA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Wilton5[] = { +static const struct TrainerMon sParty_Wilton5[] = { { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 35, .species = SPECIES_MANECTRIC, }, { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 35, .species = SPECIES_WAILMER, }, { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 35, .species = SPECIES_HARIYAMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Warren[] = { +static const struct TrainerMon sParty_Warren[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 33, .species = SPECIES_GRAVELER, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 33, .species = SPECIES_LUDICOLO, } }; -static const struct TrainerMonItemCustomMoves sParty_Mary[] = { +static const struct TrainerMon sParty_Mary[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 26, .species = SPECIES_DELCATTY, .heldItem = ITEM_NONE, @@ -1119,9 +1062,9 @@ static const struct TrainerMonItemCustomMoves sParty_Mary[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Alexia[] = { +static const struct TrainerMon sParty_Alexia[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 26, .species = SPECIES_WIGGLYTUFF, .heldItem = ITEM_NONE, @@ -1129,9 +1072,9 @@ static const struct TrainerMonItemCustomMoves sParty_Alexia[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Jody[] = { +static const struct TrainerMon sParty_Jody[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 26, .species = SPECIES_ZANGOOSE, .heldItem = ITEM_NONE, @@ -1139,334 +1082,326 @@ static const struct TrainerMonItemCustomMoves sParty_Jody[] = { } }; -static const struct TrainerMonNoItemCustomMoves sParty_Wendy[] = { +static const struct TrainerMon sParty_Wendy[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_MAWILE, .moves = {MOVE_BATON_PASS, MOVE_FEINT_ATTACK, MOVE_FAKE_TEARS, MOVE_BITE} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_ROSELIA, .moves = {MOVE_MEGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_LEECH_SEED} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_PELIPPER, .moves = {MOVE_FLY, MOVE_WATER_GUN, MOVE_MIST, MOVE_PROTECT} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Keira[] = { +static const struct TrainerMon sParty_Keira[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 45, .species = SPECIES_LAIRON, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 45, .species = SPECIES_MANECTRIC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Brooke1[] = { +static const struct TrainerMon sParty_Brooke1[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 17, .species = SPECIES_WINGULL, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 17, .species = SPECIES_NUMEL, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 17, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jennifer[] = { +static const struct TrainerMon sParty_Jennifer[] = { { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 30, .species = SPECIES_SABLEYE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Hope[] = { +static const struct TrainerMon sParty_Hope[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 45, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Shannon[] = { +static const struct TrainerMon sParty_Shannon[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 45, .species = SPECIES_CLAYDOL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Michelle[] = { +static const struct TrainerMon sParty_Michelle[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_TORKOAL, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_MEDICHAM, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_LUDICOLO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Caroline[] = { +static const struct TrainerMon sParty_Caroline[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 43, .species = SPECIES_SKARMORY, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 43, .species = SPECIES_SABLEYE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Julie[] = { +static const struct TrainerMon sParty_Julie[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_SANDSLASH, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_NINETALES, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 42, .species = SPECIES_TROPIUS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Brooke2[] = { +static const struct TrainerMon sParty_Brooke2[] = { { - .iv = 110, + .iv = TRAINER_PARTY_IVS(13, 13, 13, 13, 13, 13), .lvl = 26, .species = SPECIES_WINGULL, }, { - .iv = 110, + .iv = TRAINER_PARTY_IVS(13, 13, 13, 13, 13, 13), .lvl = 26, .species = SPECIES_NUMEL, }, { - .iv = 110, + .iv = TRAINER_PARTY_IVS(13, 13, 13, 13, 13, 13), .lvl = 26, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Brooke3[] = { +static const struct TrainerMon sParty_Brooke3[] = { { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 29, .species = SPECIES_PELIPPER, }, { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 29, .species = SPECIES_NUMEL, }, { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 29, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Brooke4[] = { +static const struct TrainerMon sParty_Brooke4[] = { { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 32, .species = SPECIES_PELIPPER, }, { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 32, .species = SPECIES_NUMEL, }, { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 32, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Brooke5[] = { +static const struct TrainerMon sParty_Brooke5[] = { { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 34, .species = SPECIES_PELIPPER, }, { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 34, .species = SPECIES_CAMERUPT, }, { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 34, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Patricia[] = { +static const struct TrainerMon sParty_Patricia[] = { { - .iv = 0, .lvl = 41, .species = SPECIES_BANETTE, }, { - .iv = 0, .lvl = 41, .species = SPECIES_LUNATONE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Kindra[] = { +static const struct TrainerMon sParty_Kindra[] = { { - .iv = 0, .lvl = 30, .species = SPECIES_DUSKULL, }, { - .iv = 0, .lvl = 30, .species = SPECIES_SHUPPET, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Tammy[] = { +static const struct TrainerMon sParty_Tammy[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_DUSKULL, }, { - .iv = 0, .lvl = 29, .species = SPECIES_SHUPPET, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Valerie1[] = { +static const struct TrainerMon sParty_Valerie1[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_SABLEYE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Tasha[] = { +static const struct TrainerMon sParty_Tasha[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 32, .species = SPECIES_SHUPPET, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Valerie2[] = { +static const struct TrainerMon sParty_Valerie2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 31, .species = SPECIES_SABLEYE, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 31, .species = SPECIES_SPOINK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Valerie3[] = { +static const struct TrainerMon sParty_Valerie3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 35, .species = SPECIES_SPOINK, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 35, .species = SPECIES_SABLEYE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Valerie4[] = { +static const struct TrainerMon sParty_Valerie4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 40, .species = SPECIES_SPOINK, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 40, .species = SPECIES_SABLEYE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Valerie5[] = { +static const struct TrainerMon sParty_Valerie5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 42, .species = SPECIES_DUSKULL, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 42, .species = SPECIES_SABLEYE, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 42, .species = SPECIES_GRUMPIG, } }; -static const struct TrainerMonItemDefaultMoves sParty_Cindy1[] = { +static const struct TrainerMon sParty_Cindy1[] = { { - .iv = 0, .lvl = 7, .species = SPECIES_ZIGZAGOON, .heldItem = ITEM_NUGGET } }; -static const struct TrainerMonItemCustomMoves sParty_Daphne[] = { +static const struct TrainerMon sParty_Daphne[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 39, .species = SPECIES_LUVDISC, .heldItem = ITEM_NUGGET, .moves = {MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL, MOVE_WATER_PULSE} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 39, .species = SPECIES_LUVDISC, .heldItem = ITEM_NUGGET, @@ -1474,27 +1409,23 @@ static const struct TrainerMonItemCustomMoves sParty_Daphne[] = { } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter2[] = { +static const struct TrainerMon sParty_GruntSpaceCenter2[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_MIGHTYENA, }, { - .iv = 0, .lvl = 28, .species = SPECIES_MIGHTYENA, }, { - .iv = 0, .lvl = 30, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonItemCustomMoves sParty_Cindy2[] = { +static const struct TrainerMon sParty_Cindy2[] = { { - .iv = 0, .lvl = 11, .species = SPECIES_ZIGZAGOON, .heldItem = ITEM_NUGGET, @@ -1502,54 +1433,54 @@ static const struct TrainerMonItemCustomMoves sParty_Cindy2[] = { } }; -static const struct TrainerMonItemDefaultMoves sParty_Brianna[] = { +static const struct TrainerMon sParty_Brianna[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 40, .species = SPECIES_SEAKING, .heldItem = ITEM_NUGGET } }; -static const struct TrainerMonItemDefaultMoves sParty_Naomi[] = { +static const struct TrainerMon sParty_Naomi[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 45, .species = SPECIES_ROSELIA, .heldItem = ITEM_NUGGET } }; -static const struct TrainerMonItemDefaultMoves sParty_Cindy3[] = { +static const struct TrainerMon sParty_Cindy3[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 27, .species = SPECIES_LINOONE, .heldItem = ITEM_NUGGET } }; -static const struct TrainerMonItemDefaultMoves sParty_Cindy4[] = { +static const struct TrainerMon sParty_Cindy4[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 30, .species = SPECIES_LINOONE, .heldItem = ITEM_NUGGET } }; -static const struct TrainerMonItemDefaultMoves sParty_Cindy5[] = { +static const struct TrainerMon sParty_Cindy5[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 33, .species = SPECIES_LINOONE, .heldItem = ITEM_NUGGET } }; -static const struct TrainerMonItemCustomMoves sParty_Cindy6[] = { +static const struct TrainerMon sParty_Cindy6[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 36, .species = SPECIES_LINOONE, .heldItem = ITEM_NUGGET, @@ -1557,216 +1488,204 @@ static const struct TrainerMonItemCustomMoves sParty_Cindy6[] = { } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Melissa[] = { +static const struct TrainerMon sParty_Melissa[] = { { - .iv = 0, .lvl = 21, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Sheila[] = { +static const struct TrainerMon sParty_Sheila[] = { { - .iv = 0, .lvl = 21, .species = SPECIES_SHROOMISH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Shirley[] = { +static const struct TrainerMon sParty_Shirley[] = { { - .iv = 0, .lvl = 21, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Jessica1[] = { +static const struct TrainerMon sParty_Jessica1[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_KECLEON, .moves = {MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FEINT_ATTACK} }, { - .iv = 0, .lvl = 29, .species = SPECIES_SEVIPER, .moves = {MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Connie[] = { +static const struct TrainerMon sParty_Connie[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 40, .species = SPECIES_GOLDEEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Bridget[] = { +static const struct TrainerMon sParty_Bridget[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 40, .species = SPECIES_AZUMARILL, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Olivia[] = { +static const struct TrainerMon sParty_Olivia[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 35, .species = SPECIES_CLAMPERL, .moves = {MOVE_IRON_DEFENSE, MOVE_WHIRLPOOL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 37, .species = SPECIES_CORPHISH, .moves = {MOVE_TAUNT, MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_NONE} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 39, .species = SPECIES_LOMBRE, .moves = {MOVE_UPROAR, MOVE_FURY_SWIPES, MOVE_FAKE_OUT, MOVE_WATER_PULSE} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Tiffany[] = { +static const struct TrainerMon sParty_Tiffany[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 39, .species = SPECIES_CARVANHA, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 39, .species = SPECIES_SHARPEDO, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Jessica2[] = { +static const struct TrainerMon sParty_Jessica2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 35, .species = SPECIES_KECLEON, .moves = {MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FEINT_ATTACK} }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 35, .species = SPECIES_SEVIPER, .moves = {MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Jessica3[] = { +static const struct TrainerMon sParty_Jessica3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 38, .species = SPECIES_KECLEON, .moves = {MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FEINT_ATTACK} }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 38, .species = SPECIES_SEVIPER, .moves = {MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Jessica4[] = { +static const struct TrainerMon sParty_Jessica4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 41, .species = SPECIES_KECLEON, .moves = {MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FEINT_ATTACK} }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 41, .species = SPECIES_SEVIPER, .moves = {MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Jessica5[] = { +static const struct TrainerMon sParty_Jessica5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 44, .species = SPECIES_KECLEON, .moves = {MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FEINT_ATTACK} }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 44, .species = SPECIES_SEVIPER, .moves = {MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH} } }; -static const struct TrainerMonItemDefaultMoves sParty_Winston1[] = { +static const struct TrainerMon sParty_Winston1[] = { { - .iv = 0, .lvl = 7, .species = SPECIES_ZIGZAGOON, .heldItem = ITEM_NUGGET } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Mollie[] = { +static const struct TrainerMon sParty_Mollie[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_WHISCASH, }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 33, .species = SPECIES_MEDITITE, } }; -static const struct TrainerMonItemDefaultMoves sParty_Garret[] = { +static const struct TrainerMon sParty_Garret[] = { { - .iv = 0, .lvl = 45, .species = SPECIES_AZUMARILL, .heldItem = ITEM_NUGGET } }; -static const struct TrainerMonItemDefaultMoves sParty_Winston2[] = { +static const struct TrainerMon sParty_Winston2[] = { { - .iv = 0, .lvl = 27, .species = SPECIES_LINOONE, .heldItem = ITEM_NUGGET } }; -static const struct TrainerMonItemDefaultMoves sParty_Winston3[] = { +static const struct TrainerMon sParty_Winston3[] = { { - .iv = 0, .lvl = 30, .species = SPECIES_LINOONE, .heldItem = ITEM_NUGGET } }; -static const struct TrainerMonItemDefaultMoves sParty_Winston4[] = { +static const struct TrainerMon sParty_Winston4[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_LINOONE, .heldItem = ITEM_NUGGET } }; -static const struct TrainerMonItemCustomMoves sParty_Winston5[] = { +static const struct TrainerMon sParty_Winston5[] = { { - .iv = 0, .lvl = 36, .species = SPECIES_LINOONE, .heldItem = ITEM_NUGGET, @@ -1774,1475 +1693,1396 @@ static const struct TrainerMonItemCustomMoves sParty_Winston5[] = { } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Steve1[] = { +static const struct TrainerMon sParty_Steve1[] = { { - .iv = 0, .lvl = 19, .species = SPECIES_ARON, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Thalia1[] = { +static const struct TrainerMon sParty_Thalia1[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_WAILMER, }, { - .iv = 0, .lvl = 25, .species = SPECIES_HORSEA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Mark[] = { +static const struct TrainerMon sParty_Mark[] = { { - .iv = 0, .lvl = 31, .species = SPECIES_RHYHORN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtChimney1[] = { +static const struct TrainerMon sParty_GruntMtChimney1[] = { { - .iv = 0, .lvl = 20, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Steve2[] = { +static const struct TrainerMon sParty_Steve2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 27, .species = SPECIES_LAIRON, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Steve3[] = { +static const struct TrainerMon sParty_Steve3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_LAIRON, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_RHYHORN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Steve4[] = { +static const struct TrainerMon sParty_Steve4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 32, .species = SPECIES_LAIRON, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 32, .species = SPECIES_RHYHORN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Steve5[] = { +static const struct TrainerMon sParty_Steve5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 35, .species = SPECIES_AGGRON, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 35, .species = SPECIES_RHYDON, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Luis[] = { +static const struct TrainerMon sParty_Luis[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dominik[] = { +static const struct TrainerMon sParty_Dominik[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_TENTACOOL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Douglas[] = { +static const struct TrainerMon sParty_Douglas[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 24, .species = SPECIES_TENTACOOL, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 24, .species = SPECIES_TENTACOOL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Darrin[] = { +static const struct TrainerMon sParty_Darrin[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 24, .species = SPECIES_TENTACOOL, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 24, .species = SPECIES_WINGULL, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 24, .species = SPECIES_TENTACOOL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Tony1[] = { +static const struct TrainerMon sParty_Tony1[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jerome[] = { +static const struct TrainerMon sParty_Jerome[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_TENTACRUEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Matthew[] = { +static const struct TrainerMon sParty_Matthew[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_David[] = { +static const struct TrainerMon sParty_David[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_TENTACOOL, }, { - .iv = 0, .lvl = 25, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Spencer[] = { +static const struct TrainerMon sParty_Spencer[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_TENTACOOL, }, { - .iv = 0, .lvl = 33, .species = SPECIES_WINGULL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Roland[] = { +static const struct TrainerMon sParty_Roland[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Nolen[] = { +static const struct TrainerMon sParty_Nolen[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_TENTACRUEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Stan[] = { +static const struct TrainerMon sParty_Stan[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_HORSEA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Barry[] = { +static const struct TrainerMon sParty_Barry[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_GYARADOS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dean[] = { +static const struct TrainerMon sParty_Dean[] = { { - .iv = 0, .lvl = 31, .species = SPECIES_CARVANHA, }, { - .iv = 0, .lvl = 31, .species = SPECIES_WINGULL, }, { - .iv = 0, .lvl = 31, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Rodney[] = { +static const struct TrainerMon sParty_Rodney[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_GYARADOS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Richard[] = { +static const struct TrainerMon sParty_Richard[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_PELIPPER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Herman[] = { +static const struct TrainerMon sParty_Herman[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_WINGULL, }, { - .iv = 0, .lvl = 33, .species = SPECIES_TENTACRUEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Santiago[] = { +static const struct TrainerMon sParty_Santiago[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_TENTACRUEL, }, { - .iv = 0, .lvl = 33, .species = SPECIES_WAILMER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Gilbert[] = { +static const struct TrainerMon sParty_Gilbert[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_SHARPEDO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Franklin[] = { +static const struct TrainerMon sParty_Franklin[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_SEALEO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Kevin[] = { +static const struct TrainerMon sParty_Kevin[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_SPHEAL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jack[] = { +static const struct TrainerMon sParty_Jack[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_GYARADOS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dudley[] = { +static const struct TrainerMon sParty_Dudley[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_TENTACOOL, }, { - .iv = 0, .lvl = 33, .species = SPECIES_WINGULL, }, { - .iv = 0, .lvl = 33, .species = SPECIES_TENTACRUEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Chad[] = { +static const struct TrainerMon sParty_Chad[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_TENTACOOL, }, { - .iv = 0, .lvl = 33, .species = SPECIES_WAILMER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Tony2[] = { +static const struct TrainerMon sParty_Tony2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 30, .species = SPECIES_SHARPEDO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Tony3[] = { +static const struct TrainerMon sParty_Tony3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 33, .species = SPECIES_SHARPEDO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Tony4[] = { +static const struct TrainerMon sParty_Tony4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 34, .species = SPECIES_STARYU, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 36, .species = SPECIES_SHARPEDO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Tony5[] = { +static const struct TrainerMon sParty_Tony5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 37, .species = SPECIES_STARMIE, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 39, .species = SPECIES_SHARPEDO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Takao[] = { +static const struct TrainerMon sParty_Takao[] = { { - .iv = 127, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 13, .species = SPECIES_MACHOP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Hitoshi[] = { +static const struct TrainerMon sParty_Hitoshi[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 32, .species = SPECIES_MACHOP, }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 32, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Kiyo[] = { +static const struct TrainerMon sParty_Kiyo[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 34, .species = SPECIES_HARIYAMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Koichi[] = { +static const struct TrainerMon sParty_Koichi[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 24, .species = SPECIES_MACHOP, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 28, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Nob1[] = { +static const struct TrainerMon sParty_Nob1[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 19, .species = SPECIES_MACHOP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Nob2[] = { +static const struct TrainerMon sParty_Nob2[] = { { - .iv = 110, + .iv = TRAINER_PARTY_IVS(13, 13, 13, 13, 13, 13), .lvl = 27, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Nob3[] = { +static const struct TrainerMon sParty_Nob3[] = { { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 29, .species = SPECIES_MACHOP, }, { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 29, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Nob4[] = { +static const struct TrainerMon sParty_Nob4[] = { { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 31, .species = SPECIES_MACHOP, }, { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 31, .species = SPECIES_MACHOKE, }, { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 31, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonItemDefaultMoves sParty_Nob5[] = { +static const struct TrainerMon sParty_Nob5[] = { { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 33, .species = SPECIES_MACHOP, .heldItem = ITEM_NONE }, { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 33, .species = SPECIES_MACHOKE, .heldItem = ITEM_NONE }, { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 33, .species = SPECIES_MACHOKE, .heldItem = ITEM_NONE }, { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 33, .species = SPECIES_MACHAMP, .heldItem = ITEM_BLACK_BELT } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Yuji[] = { +static const struct TrainerMon sParty_Yuji[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 26, .species = SPECIES_MAKUHITA, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 26, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Daisuke[] = { +static const struct TrainerMon sParty_Daisuke[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 19, .species = SPECIES_MACHOP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Atsushi[] = { +static const struct TrainerMon sParty_Atsushi[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 32, .species = SPECIES_HARIYAMA, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Kirk[] = { +static const struct TrainerMon sParty_Kirk[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 17, .species = SPECIES_ELECTRIKE, .moves = {MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_LEER} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 17, .species = SPECIES_VOLTORB, .moves = {MOVE_CHARGE, MOVE_SHOCK_WAVE, MOVE_SCREECH, MOVE_NONE} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout7[] = { +static const struct TrainerMon sParty_GruntAquaHideout7[] = { { - .iv = 0, .lvl = 31, .species = SPECIES_POOCHYENA, }, { - .iv = 0, .lvl = 31, .species = SPECIES_ZUBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout8[] = { +static const struct TrainerMon sParty_GruntAquaHideout8[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Shawn[] = { +static const struct TrainerMon sParty_Shawn[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 17, .species = SPECIES_VOLTORB, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 17, .species = SPECIES_MAGNEMITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Fernando1[] = { +static const struct TrainerMon sParty_Fernando1[] = { { - .iv = 0, .lvl = 30, .species = SPECIES_ELECTRIKE, }, { - .iv = 0, .lvl = 30, .species = SPECIES_LOUDRED, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dalton1[] = { +static const struct TrainerMon sParty_Dalton1[] = { { - .iv = 0, .lvl = 15, .species = SPECIES_MAGNEMITE, }, { - .iv = 0, .lvl = 15, .species = SPECIES_WHISMUR, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dalton2[] = { +static const struct TrainerMon sParty_Dalton2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_MAGNEMITE, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_WHISMUR, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_MAGNEMITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dalton3[] = { +static const struct TrainerMon sParty_Dalton3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 28, .species = SPECIES_MAGNEMITE, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 28, .species = SPECIES_LOUDRED, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 28, .species = SPECIES_MAGNEMITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dalton4[] = { +static const struct TrainerMon sParty_Dalton4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_MAGNETON, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_LOUDRED, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_MAGNETON, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dalton5[] = { +static const struct TrainerMon sParty_Dalton5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 34, .species = SPECIES_MAGNETON, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 34, .species = SPECIES_EXPLOUD, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 34, .species = SPECIES_MAGNETON, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cole[] = { +static const struct TrainerMon sParty_Cole[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 23, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jeff[] = { +static const struct TrainerMon sParty_Jeff[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 22, .species = SPECIES_SLUGMA, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 22, .species = SPECIES_SLUGMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Axle[] = { +static const struct TrainerMon sParty_Axle[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 23, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jace[] = { +static const struct TrainerMon sParty_Jace[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 23, .species = SPECIES_SLUGMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Keegan[] = { +static const struct TrainerMon sParty_Keegan[] = { { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 23, .species = SPECIES_SLUGMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Bernie1[] = { +static const struct TrainerMon sParty_Bernie1[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_SLUGMA, }, { - .iv = 0, .lvl = 18, .species = SPECIES_WINGULL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Bernie2[] = { +static const struct TrainerMon sParty_Bernie2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 26, .species = SPECIES_SLUGMA, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 26, .species = SPECIES_WINGULL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Bernie3[] = { +static const struct TrainerMon sParty_Bernie3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_SLUGMA, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_PELIPPER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Bernie4[] = { +static const struct TrainerMon sParty_Bernie4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 32, .species = SPECIES_SLUGMA, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 32, .species = SPECIES_PELIPPER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Bernie5[] = { +static const struct TrainerMon sParty_Bernie5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 35, .species = SPECIES_MAGCARGO, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 35, .species = SPECIES_PELIPPER, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Drew[] = { +static const struct TrainerMon sParty_Drew[] = { { - .iv = 0, .lvl = 23, .species = SPECIES_SANDSHREW, .moves = {MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Beau[] = { +static const struct TrainerMon sParty_Beau[] = { { - .iv = 0, .lvl = 21, .species = SPECIES_BALTOY, .moves = {MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB} }, { - .iv = 0, .lvl = 21, .species = SPECIES_SANDSHREW, .moves = {MOVE_POISON_STING, MOVE_SAND_ATTACK, MOVE_SCRATCH, MOVE_DIG} }, { - .iv = 0, .lvl = 21, .species = SPECIES_BALTOY, .moves = {MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Larry[] = { +static const struct TrainerMon sParty_Larry[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_NUZLEAF, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Shane[] = { +static const struct TrainerMon sParty_Shane[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_SANDSHREW, }, { - .iv = 0, .lvl = 18, .species = SPECIES_NUZLEAF, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Justin[] = { +static const struct TrainerMon sParty_Justin[] = { { - .iv = 0, .lvl = 24, .species = SPECIES_KECLEON, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ethan1[] = { +static const struct TrainerMon sParty_Ethan1[] = { { - .iv = 0, .lvl = 20, .species = SPECIES_ZIGZAGOON, }, { - .iv = 0, .lvl = 20, .species = SPECIES_TAILLOW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Autumn[] = { +static const struct TrainerMon sParty_Autumn[] = { { - .iv = 0, .lvl = 21, .species = SPECIES_SHROOMISH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Travis[] = { +static const struct TrainerMon sParty_Travis[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_SANDSHREW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ethan2[] = { +static const struct TrainerMon sParty_Ethan2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 26, .species = SPECIES_ZIGZAGOON, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 26, .species = SPECIES_TAILLOW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ethan3[] = { +static const struct TrainerMon sParty_Ethan3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_LINOONE, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_SWELLOW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ethan4[] = { +static const struct TrainerMon sParty_Ethan4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_SANDSHREW, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_SWELLOW, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_LINOONE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ethan5[] = { +static const struct TrainerMon sParty_Ethan5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 34, .species = SPECIES_SWELLOW, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 34, .species = SPECIES_SANDSLASH, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 34, .species = SPECIES_LINOONE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Brent[] = { +static const struct TrainerMon sParty_Brent[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 26, .species = SPECIES_SURSKIT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Donald[] = { +static const struct TrainerMon sParty_Donald[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 24, .species = SPECIES_WURMPLE, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 24, .species = SPECIES_SILCOON, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 24, .species = SPECIES_BEAUTIFLY, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Taylor[] = { +static const struct TrainerMon sParty_Taylor[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 27, .species = SPECIES_WURMPLE, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 27, .species = SPECIES_CASCOON, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 27, .species = SPECIES_DUSTOX, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey1[] = { +static const struct TrainerMon sParty_Jeffrey1[] = { { - .iv = 0, .lvl = 27, .species = SPECIES_SURSKIT, }, { - .iv = 0, .lvl = 27, .species = SPECIES_SURSKIT, }, { - .iv = 0, .lvl = 27, .species = SPECIES_SURSKIT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Derek[] = { +static const struct TrainerMon sParty_Derek[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 16, .species = SPECIES_DUSTOX, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 16, .species = SPECIES_BEAUTIFLY, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey2[] = { +static const struct TrainerMon sParty_Jeffrey2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 31, .species = SPECIES_SURSKIT, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 31, .species = SPECIES_SURSKIT, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 31, .species = SPECIES_SURSKIT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey3[] = { +static const struct TrainerMon sParty_Jeffrey3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 34, .species = SPECIES_SURSKIT, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 34, .species = SPECIES_SURSKIT, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 34, .species = SPECIES_MASQUERAIN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey4[] = { +static const struct TrainerMon sParty_Jeffrey4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 36, .species = SPECIES_SURSKIT, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 36, .species = SPECIES_WURMPLE, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 36, .species = SPECIES_SURSKIT, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 36, .species = SPECIES_MASQUERAIN, } }; -static const struct TrainerMonItemDefaultMoves sParty_Jeffrey5[] = { +static const struct TrainerMon sParty_Jeffrey5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 38, .species = SPECIES_SURSKIT, .heldItem = ITEM_NONE }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 38, .species = SPECIES_DUSTOX, .heldItem = ITEM_NONE }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 38, .species = SPECIES_SURSKIT, .heldItem = ITEM_NONE }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 38, .species = SPECIES_MASQUERAIN, .heldItem = ITEM_SILVER_POWDER }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 38, .species = SPECIES_BEAUTIFLY, .heldItem = ITEM_NONE } }; -static const struct TrainerMonNoItemCustomMoves sParty_Edward[] = { +static const struct TrainerMon sParty_Edward[] = { { - .iv = 0, .lvl = 15, .species = SPECIES_ABRA, .moves = {MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Preston[] = { +static const struct TrainerMon sParty_Preston[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 36, .species = SPECIES_KIRLIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Virgil[] = { +static const struct TrainerMon sParty_Virgil[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 36, .species = SPECIES_RALTS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Blake[] = { +static const struct TrainerMon sParty_Blake[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 36, .species = SPECIES_GIRAFARIG, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_William[] = { +static const struct TrainerMon sParty_William[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_RALTS, }, { - .iv = 0, .lvl = 26, .species = SPECIES_RALTS, }, { - .iv = 0, .lvl = 26, .species = SPECIES_KIRLIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Joshua[] = { +static const struct TrainerMon sParty_Joshua[] = { { - .iv = 0, .lvl = 41, .species = SPECIES_KADABRA, }, { - .iv = 0, .lvl = 41, .species = SPECIES_SOLROCK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cameron1[] = { +static const struct TrainerMon sParty_Cameron1[] = { { - .iv = 0, .lvl = 31, .species = SPECIES_SOLROCK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cameron2[] = { +static const struct TrainerMon sParty_Cameron2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 33, .species = SPECIES_KADABRA, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 33, .species = SPECIES_SOLROCK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cameron3[] = { +static const struct TrainerMon sParty_Cameron3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 38, .species = SPECIES_KADABRA, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 38, .species = SPECIES_SOLROCK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cameron4[] = { +static const struct TrainerMon sParty_Cameron4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 41, .species = SPECIES_KADABRA, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 41, .species = SPECIES_SOLROCK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cameron5[] = { +static const struct TrainerMon sParty_Cameron5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 45, .species = SPECIES_SOLROCK, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 45, .species = SPECIES_ALAKAZAM, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Jaclyn[] = { +static const struct TrainerMon sParty_Jaclyn[] = { { - .iv = 0, .lvl = 16, .species = SPECIES_ABRA, .moves = {MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Hannah[] = { +static const struct TrainerMon sParty_Hannah[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 36, .species = SPECIES_KIRLIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Samantha[] = { +static const struct TrainerMon sParty_Samantha[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 36, .species = SPECIES_XATU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Maura[] = { +static const struct TrainerMon sParty_Maura[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 36, .species = SPECIES_KADABRA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Kayla[] = { +static const struct TrainerMon sParty_Kayla[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_WOBBUFFET, }, { - .iv = 0, .lvl = 26, .species = SPECIES_NATU, }, { - .iv = 0, .lvl = 26, .species = SPECIES_KADABRA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Alexis[] = { +static const struct TrainerMon sParty_Alexis[] = { { - .iv = 0, .lvl = 41, .species = SPECIES_KIRLIA, }, { - .iv = 0, .lvl = 41, .species = SPECIES_XATU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jacki1[] = { +static const struct TrainerMon sParty_Jacki1[] = { { - .iv = 0, .lvl = 30, .species = SPECIES_KADABRA, }, { - .iv = 0, .lvl = 30, .species = SPECIES_LUNATONE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jacki2[] = { +static const struct TrainerMon sParty_Jacki2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 34, .species = SPECIES_KADABRA, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 34, .species = SPECIES_LUNATONE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jacki3[] = { +static const struct TrainerMon sParty_Jacki3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 37, .species = SPECIES_KADABRA, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 37, .species = SPECIES_LUNATONE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jacki4[] = { +static const struct TrainerMon sParty_Jacki4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 40, .species = SPECIES_KADABRA, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 40, .species = SPECIES_LUNATONE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jacki5[] = { +static const struct TrainerMon sParty_Jacki5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 43, .species = SPECIES_LUNATONE, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 43, .species = SPECIES_ALAKAZAM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Walter1[] = { +static const struct TrainerMon sParty_Walter1[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_MANECTRIC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Micah[] = { +static const struct TrainerMon sParty_Micah[] = { { - .iv = 0, .lvl = 44, .species = SPECIES_MANECTRIC, }, { - .iv = 0, .lvl = 44, .species = SPECIES_MANECTRIC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Thomas[] = { +static const struct TrainerMon sParty_Thomas[] = { { - .iv = 0, .lvl = 45, .species = SPECIES_ZANGOOSE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Walter2[] = { +static const struct TrainerMon sParty_Walter2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 34, .species = SPECIES_MANECTRIC, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Walter3[] = { +static const struct TrainerMon sParty_Walter3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 36, .species = SPECIES_LINOONE, .moves = {MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES} }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 36, .species = SPECIES_MANECTRIC, .moves = {MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Walter4[] = { +static const struct TrainerMon sParty_Walter4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 39, .species = SPECIES_LINOONE, .moves = {MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES} }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 39, .species = SPECIES_MANECTRIC, .moves = {MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_NONE} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Walter5[] = { +static const struct TrainerMon sParty_Walter5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 41, .species = SPECIES_LINOONE, .moves = {MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES} }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 41, .species = SPECIES_GOLDUCK, .moves = {MOVE_FURY_SWIPES, MOVE_DISABLE, MOVE_CONFUSION, MOVE_PSYCH_UP} }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 41, .species = SPECIES_MANECTRIC, .moves = {MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR} } }; -static const struct TrainerMonItemCustomMoves sParty_Sidney[] = { +static const struct TrainerMon sParty_Sidney[] = { { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 46, .species = SPECIES_MIGHTYENA, .heldItem = ITEM_NONE, .moves = {MOVE_ROAR, MOVE_DOUBLE_EDGE, MOVE_SAND_ATTACK, MOVE_CRUNCH} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 48, .species = SPECIES_SHIFTRY, .heldItem = ITEM_NONE, .moves = {MOVE_TORMENT, MOVE_DOUBLE_TEAM, MOVE_SWAGGER, MOVE_EXTRASENSORY} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 46, .species = SPECIES_CACTURNE, .heldItem = ITEM_NONE, .moves = {MOVE_LEECH_SEED, MOVE_FEINT_ATTACK, MOVE_NEEDLE_ARM, MOVE_COTTON_SPORE} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 48, .species = SPECIES_CRAWDAUNT, .heldItem = ITEM_NONE, .moves = {MOVE_SURF, MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_FACADE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 49, .species = SPECIES_ABSOL, .heldItem = ITEM_SITRUS_BERRY, @@ -3250,37 +3090,37 @@ static const struct TrainerMonItemCustomMoves sParty_Sidney[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Phoebe[] = { +static const struct TrainerMon sParty_Phoebe[] = { { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 48, .species = SPECIES_DUSCLOPS, .heldItem = ITEM_NONE, .moves = {MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_CURSE, MOVE_PROTECT} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 49, .species = SPECIES_BANETTE, .heldItem = ITEM_NONE, .moves = {MOVE_SHADOW_BALL, MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_FEINT_ATTACK} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 50, .species = SPECIES_SABLEYE, .heldItem = ITEM_NONE, .moves = {MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_NIGHT_SHADE, MOVE_FEINT_ATTACK} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 49, .species = SPECIES_BANETTE, .heldItem = ITEM_NONE, .moves = {MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FACADE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 51, .species = SPECIES_DUSCLOPS, .heldItem = ITEM_SITRUS_BERRY, @@ -3288,37 +3128,37 @@ static const struct TrainerMonItemCustomMoves sParty_Phoebe[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Glacia[] = { +static const struct TrainerMon sParty_Glacia[] = { { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 50, .species = SPECIES_SEALEO, .heldItem = ITEM_NONE, .moves = {MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_HAIL, MOVE_ICE_BALL} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 50, .species = SPECIES_GLALIE, .heldItem = ITEM_NONE, .moves = {MOVE_LIGHT_SCREEN, MOVE_CRUNCH, MOVE_ICY_WIND, MOVE_ICE_BEAM} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 52, .species = SPECIES_SEALEO, .heldItem = ITEM_NONE, .moves = {MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_HAIL, MOVE_BLIZZARD} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 52, .species = SPECIES_GLALIE, .heldItem = ITEM_NONE, .moves = {MOVE_SHADOW_BALL, MOVE_EXPLOSION, MOVE_HAIL, MOVE_ICE_BEAM} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 53, .species = SPECIES_WALREIN, .heldItem = ITEM_SITRUS_BERRY, @@ -3326,37 +3166,37 @@ static const struct TrainerMonItemCustomMoves sParty_Glacia[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Drake[] = { +static const struct TrainerMon sParty_Drake[] = { { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 52, .species = SPECIES_SHELGON, .heldItem = ITEM_NONE, .moves = {MOVE_ROCK_TOMB, MOVE_DRAGON_CLAW, MOVE_PROTECT, MOVE_DOUBLE_EDGE} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 54, .species = SPECIES_ALTARIA, .heldItem = ITEM_NONE, .moves = {MOVE_DOUBLE_EDGE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 53, .species = SPECIES_KINGDRA, .heldItem = ITEM_NONE, .moves = {MOVE_SMOKESCREEN, MOVE_DRAGON_DANCE, MOVE_SURF, MOVE_BODY_SLAM} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 53, .species = SPECIES_FLYGON, .heldItem = ITEM_NONE, .moves = {MOVE_FLAMETHROWER, MOVE_CRUNCH, MOVE_DRAGON_BREATH, MOVE_EARTHQUAKE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 55, .species = SPECIES_SALAMENCE, .heldItem = ITEM_SITRUS_BERRY, @@ -3364,23 +3204,23 @@ static const struct TrainerMonItemCustomMoves sParty_Drake[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Roxanne1[] = { +static const struct TrainerMon sParty_Roxanne1[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 12, .species = SPECIES_GEODUDE, .heldItem = ITEM_NONE, .moves = {MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 12, .species = SPECIES_GEODUDE, .heldItem = ITEM_NONE, .moves = {MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB} }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 15, .species = SPECIES_NOSEPASS, .heldItem = ITEM_ORAN_BERRY, @@ -3388,23 +3228,23 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne1[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Brawly1[] = { +static const struct TrainerMon sParty_Brawly1[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 16, .species = SPECIES_MACHOP, .heldItem = ITEM_NONE, .moves = {MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SEISMIC_TOSS, MOVE_BULK_UP} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 16, .species = SPECIES_MEDITITE, .heldItem = ITEM_NONE, .moves = {MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_BULK_UP} }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 19, .species = SPECIES_MAKUHITA, .heldItem = ITEM_SITRUS_BERRY, @@ -3412,30 +3252,30 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly1[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Wattson1[] = { +static const struct TrainerMon sParty_Wattson1[] = { { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 20, .species = SPECIES_VOLTORB, .heldItem = ITEM_NONE, .moves = {MOVE_ROLLOUT, MOVE_SPARK, MOVE_SELF_DESTRUCT, MOVE_SHOCK_WAVE} }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 20, .species = SPECIES_ELECTRIKE, .heldItem = ITEM_NONE, .moves = {MOVE_SHOCK_WAVE, MOVE_LEER, MOVE_QUICK_ATTACK, MOVE_HOWL} }, { - .iv = 220, + .iv = TRAINER_PARTY_IVS(26, 26, 26, 26, 26, 26), .lvl = 22, .species = SPECIES_MAGNETON, .heldItem = ITEM_NONE, .moves = {MOVE_SUPERSONIC, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 24, .species = SPECIES_MANECTRIC, .heldItem = ITEM_SITRUS_BERRY, @@ -3443,30 +3283,30 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson1[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Flannery1[] = { +static const struct TrainerMon sParty_Flannery1[] = { { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 24, .species = SPECIES_NUMEL, .heldItem = ITEM_NONE, .moves = {MOVE_OVERHEAT, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY} }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 24, .species = SPECIES_SLUGMA, .heldItem = ITEM_NONE, .moves = {MOVE_OVERHEAT, MOVE_SMOG, MOVE_LIGHT_SCREEN, MOVE_SUNNY_DAY} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 26, .species = SPECIES_CAMERUPT, .heldItem = ITEM_NONE, .moves = {MOVE_OVERHEAT, MOVE_TACKLE, MOVE_SUNNY_DAY, MOVE_ATTRACT} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 29, .species = SPECIES_TORKOAL, .heldItem = ITEM_WHITE_HERB, @@ -3474,30 +3314,30 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery1[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Norman1[] = { +static const struct TrainerMon sParty_Norman1[] = { { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 27, .species = SPECIES_SPINDA, .heldItem = ITEM_NONE, .moves = {MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FACADE, MOVE_ENCORE} }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 27, .species = SPECIES_VIGOROTH, .heldItem = ITEM_NONE, .moves = {MOVE_SLASH, MOVE_FACADE, MOVE_ENCORE, MOVE_FEINT_ATTACK} }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 29, .species = SPECIES_LINOONE, .heldItem = ITEM_NONE, .moves = {MOVE_SLASH, MOVE_BELLY_DRUM, MOVE_FACADE, MOVE_HEADBUTT} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 31, .species = SPECIES_SLAKING, .heldItem = ITEM_SITRUS_BERRY, @@ -3505,37 +3345,37 @@ static const struct TrainerMonItemCustomMoves sParty_Norman1[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Winona1[] = { +static const struct TrainerMon sParty_Winona1[] = { { - .iv = 210, + .iv = TRAINER_PARTY_IVS(25, 25, 25, 25, 25, 25), .lvl = 29, .species = SPECIES_SWABLU, .heldItem = ITEM_NONE, .moves = {MOVE_PERISH_SONG, MOVE_MIRROR_MOVE, MOVE_SAFEGUARD, MOVE_AERIAL_ACE} }, { - .iv = 210, + .iv = TRAINER_PARTY_IVS(25, 25, 25, 25, 25, 25), .lvl = 29, .species = SPECIES_TROPIUS, .heldItem = ITEM_NONE, .moves = {MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_SYNTHESIS} }, { - .iv = 210, + .iv = TRAINER_PARTY_IVS(25, 25, 25, 25, 25, 25), .lvl = 30, .species = SPECIES_PELIPPER, .heldItem = ITEM_NONE, .moves = {MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE} }, { - .iv = 220, + .iv = TRAINER_PARTY_IVS(26, 26, 26, 26, 26, 26), .lvl = 31, .species = SPECIES_SKARMORY, .heldItem = ITEM_NONE, .moves = {MOVE_SAND_ATTACK, MOVE_FURY_ATTACK, MOVE_STEEL_WING, MOVE_AERIAL_ACE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 33, .species = SPECIES_ALTARIA, .heldItem = ITEM_ORAN_BERRY, @@ -3543,30 +3383,30 @@ static const struct TrainerMonItemCustomMoves sParty_Winona1[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_TateAndLiza1[] = { +static const struct TrainerMon sParty_TateAndLiza1[] = { { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 41, .species = SPECIES_CLAYDOL, .heldItem = ITEM_NONE, .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 41, .species = SPECIES_XATU, .heldItem = ITEM_NONE, .moves = {MOVE_PSYCHIC, MOVE_SUNNY_DAY, MOVE_CONFUSE_RAY, MOVE_CALM_MIND} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 42, .species = SPECIES_LUNATONE, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_CALM_MIND} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 42, .species = SPECIES_SOLROCK, .heldItem = ITEM_SITRUS_BERRY, @@ -3574,37 +3414,37 @@ static const struct TrainerMonItemCustomMoves sParty_TateAndLiza1[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Juan1[] = { +static const struct TrainerMon sParty_Juan1[] = { { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 41, .species = SPECIES_LUVDISC, .heldItem = ITEM_NONE, .moves = {MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL} }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 41, .species = SPECIES_WHISCASH, .heldItem = ITEM_NONE, .moves = {MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_AMNESIA, MOVE_EARTHQUAKE} }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 43, .species = SPECIES_SEALEO, .heldItem = ITEM_NONE, .moves = {MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_AURORA_BEAM, MOVE_WATER_PULSE} }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 43, .species = SPECIES_CRAWDAUNT, .heldItem = ITEM_NONE, .moves = {MOVE_WATER_PULSE, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_LEER} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 46, .species = SPECIES_KINGDRA, .heldItem = ITEM_CHESTO_BERRY, @@ -3612,322 +3452,311 @@ static const struct TrainerMonItemCustomMoves sParty_Juan1[] = { } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jerry1[] = { +static const struct TrainerMon sParty_Jerry1[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 9, .species = SPECIES_RALTS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ted[] = { +static const struct TrainerMon sParty_Ted[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 17, .species = SPECIES_RALTS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Paul[] = { +static const struct TrainerMon sParty_Paul[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 15, .species = SPECIES_NUMEL, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 15, .species = SPECIES_ODDISH, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 15, .species = SPECIES_WINGULL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jerry2[] = { +static const struct TrainerMon sParty_Jerry2[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 26, .species = SPECIES_RALTS, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 26, .species = SPECIES_MEDITITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jerry3[] = { +static const struct TrainerMon sParty_Jerry3[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 29, .species = SPECIES_KIRLIA, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 29, .species = SPECIES_MEDITITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jerry4[] = { +static const struct TrainerMon sParty_Jerry4[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 32, .species = SPECIES_KIRLIA, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 32, .species = SPECIES_MEDICHAM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jerry5[] = { +static const struct TrainerMon sParty_Jerry5[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 34, .species = SPECIES_KIRLIA, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 34, .species = SPECIES_BANETTE, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 34, .species = SPECIES_MEDICHAM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Karen1[] = { +static const struct TrainerMon sParty_Karen1[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 9, .species = SPECIES_SHROOMISH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Georgia[] = { +static const struct TrainerMon sParty_Georgia[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 16, .species = SPECIES_SHROOMISH, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 16, .species = SPECIES_BEAUTIFLY, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Karen2[] = { +static const struct TrainerMon sParty_Karen2[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 26, .species = SPECIES_SHROOMISH, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 26, .species = SPECIES_WHISMUR, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Karen3[] = { +static const struct TrainerMon sParty_Karen3[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 29, .species = SPECIES_SHROOMISH, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 29, .species = SPECIES_LOUDRED, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Karen4[] = { +static const struct TrainerMon sParty_Karen4[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 32, .species = SPECIES_BRELOOM, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 32, .species = SPECIES_LOUDRED, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Karen5[] = { +static const struct TrainerMon sParty_Karen5[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 35, .species = SPECIES_BRELOOM, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 35, .species = SPECIES_EXPLOUD, } }; -static const struct TrainerMonNoItemCustomMoves sParty_KateAndJoy[] = { +static const struct TrainerMon sParty_KateAndJoy[] = { { - .iv = 0, .lvl = 30, .species = SPECIES_SPINDA, .moves = {MOVE_HYPNOSIS, MOVE_PSYBEAM, MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE} }, { - .iv = 0, .lvl = 32, .species = SPECIES_SLAKING, .moves = {MOVE_FOCUS_PUNCH, MOVE_YAWN, MOVE_SLACK_OFF, MOVE_FEINT_ATTACK} } }; -static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg1[] = { +static const struct TrainerMon sParty_AnnaAndMeg1[] = { { - .iv = 0, .lvl = 15, .species = SPECIES_ZIGZAGOON, .moves = {MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH} }, { - .iv = 0, .lvl = 17, .species = SPECIES_MAKUHITA, .moves = {MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE} } }; -static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg2[] = { +static const struct TrainerMon sParty_AnnaAndMeg2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 28, .species = SPECIES_ZIGZAGOON, .moves = {MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH} }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 30, .species = SPECIES_MAKUHITA, .moves = {MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE} } }; -static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg3[] = { +static const struct TrainerMon sParty_AnnaAndMeg3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 31, .species = SPECIES_ZIGZAGOON, .moves = {MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH} }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 33, .species = SPECIES_MAKUHITA, .moves = {MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE} } }; -static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg4[] = { +static const struct TrainerMon sParty_AnnaAndMeg4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 34, .species = SPECIES_LINOONE, .moves = {MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH} }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 36, .species = SPECIES_MAKUHITA, .moves = {MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE} } }; -static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg5[] = { +static const struct TrainerMon sParty_AnnaAndMeg5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 36, .species = SPECIES_LINOONE, .moves = {MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH} }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 38, .species = SPECIES_HARIYAMA, .moves = {MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE} } }; -static const struct TrainerMonItemDefaultMoves sParty_Victor[] = { +static const struct TrainerMon sParty_Victor[] = { { - .iv = 25, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 16, .species = SPECIES_TAILLOW, .heldItem = ITEM_ORAN_BERRY }, { - .iv = 25, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 16, .species = SPECIES_ZIGZAGOON, .heldItem = ITEM_ORAN_BERRY } }; -static const struct TrainerMonItemDefaultMoves sParty_Miguel1[] = { +static const struct TrainerMon sParty_Miguel1[] = { { - .iv = 0, .lvl = 15, .species = SPECIES_SKITTY, .heldItem = ITEM_ORAN_BERRY } }; -static const struct TrainerMonItemCustomMoves sParty_Colton[] = { +static const struct TrainerMon sParty_Colton[] = { { - .iv = 0, .lvl = 22, .species = SPECIES_SKITTY, .heldItem = ITEM_ORAN_BERRY, .moves = {MOVE_ASSIST, MOVE_CHARM, MOVE_FEINT_ATTACK, MOVE_HEAL_BELL} }, { - .iv = 0, .lvl = 36, .species = SPECIES_SKITTY, .heldItem = ITEM_ORAN_BERRY, .moves = {MOVE_ASSIST, MOVE_CHARM, MOVE_FEINT_ATTACK, MOVE_HEAL_BELL} }, { - .iv = 0, .lvl = 40, .species = SPECIES_SKITTY, .heldItem = ITEM_ORAN_BERRY, .moves = {MOVE_ASSIST, MOVE_CHARM, MOVE_FEINT_ATTACK, MOVE_HEAL_BELL} }, { - .iv = 0, .lvl = 12, .species = SPECIES_SKITTY, .heldItem = ITEM_ORAN_BERRY, .moves = {MOVE_ASSIST, MOVE_CHARM, MOVE_FEINT_ATTACK, MOVE_HEAL_BELL} }, { - .iv = 0, .lvl = 30, .species = SPECIES_SKITTY, .heldItem = ITEM_ORAN_BERRY, .moves = {MOVE_ASSIST, MOVE_CHARM, MOVE_FEINT_ATTACK, MOVE_HEAL_BELL} }, { - .iv = 0, .lvl = 42, .species = SPECIES_DELCATTY, .heldItem = ITEM_ORAN_BERRY, @@ -3935,520 +3764,501 @@ static const struct TrainerMonItemCustomMoves sParty_Colton[] = { } }; -static const struct TrainerMonItemDefaultMoves sParty_Miguel2[] = { +static const struct TrainerMon sParty_Miguel2[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_SKITTY, .heldItem = ITEM_ORAN_BERRY } }; -static const struct TrainerMonItemDefaultMoves sParty_Miguel3[] = { +static const struct TrainerMon sParty_Miguel3[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_SKITTY, .heldItem = ITEM_ORAN_BERRY } }; -static const struct TrainerMonItemDefaultMoves sParty_Miguel4[] = { +static const struct TrainerMon sParty_Miguel4[] = { { - .iv = 0, .lvl = 35, .species = SPECIES_DELCATTY, .heldItem = ITEM_ORAN_BERRY } }; -static const struct TrainerMonItemDefaultMoves sParty_Miguel5[] = { +static const struct TrainerMon sParty_Miguel5[] = { { - .iv = 0, .lvl = 38, .species = SPECIES_DELCATTY, .heldItem = ITEM_SITRUS_BERRY } }; -static const struct TrainerMonItemDefaultMoves sParty_Victoria[] = { +static const struct TrainerMon sParty_Victoria[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 17, .species = SPECIES_ROSELIA, .heldItem = ITEM_ORAN_BERRY } }; -static const struct TrainerMonItemDefaultMoves sParty_Vanessa[] = { +static const struct TrainerMon sParty_Vanessa[] = { { - .iv = 0, .lvl = 30, .species = SPECIES_PIKACHU, .heldItem = ITEM_ORAN_BERRY } }; -static const struct TrainerMonItemDefaultMoves sParty_Bethany[] = { +static const struct TrainerMon sParty_Bethany[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 35, .species = SPECIES_AZURILL, .heldItem = ITEM_ORAN_BERRY }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 37, .species = SPECIES_MARILL, .heldItem = ITEM_ORAN_BERRY }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 39, .species = SPECIES_AZUMARILL, .heldItem = ITEM_ORAN_BERRY } }; -static const struct TrainerMonItemDefaultMoves sParty_Isabel1[] = { +static const struct TrainerMon sParty_Isabel1[] = { { - .iv = 0, .lvl = 14, .species = SPECIES_PLUSLE, .heldItem = ITEM_ORAN_BERRY }, { - .iv = 0, .lvl = 14, .species = SPECIES_MINUN, .heldItem = ITEM_ORAN_BERRY } }; -static const struct TrainerMonItemDefaultMoves sParty_Isabel2[] = { +static const struct TrainerMon sParty_Isabel2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 26, .species = SPECIES_PLUSLE, .heldItem = ITEM_ORAN_BERRY }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 26, .species = SPECIES_MINUN, .heldItem = ITEM_ORAN_BERRY } }; -static const struct TrainerMonItemDefaultMoves sParty_Isabel3[] = { +static const struct TrainerMon sParty_Isabel3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_PLUSLE, .heldItem = ITEM_ORAN_BERRY }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_MINUN, .heldItem = ITEM_ORAN_BERRY } }; -static const struct TrainerMonItemDefaultMoves sParty_Isabel4[] = { +static const struct TrainerMon sParty_Isabel4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 32, .species = SPECIES_PLUSLE, .heldItem = ITEM_ORAN_BERRY }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 32, .species = SPECIES_MINUN, .heldItem = ITEM_ORAN_BERRY } }; -static const struct TrainerMonItemDefaultMoves sParty_Isabel5[] = { +static const struct TrainerMon sParty_Isabel5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 35, .species = SPECIES_PLUSLE, .heldItem = ITEM_SITRUS_BERRY }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 35, .species = SPECIES_MINUN, .heldItem = ITEM_SITRUS_BERRY } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Timothy1[] = { +static const struct TrainerMon sParty_Timothy1[] = { { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 27, .species = SPECIES_HARIYAMA, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Timothy2[] = { +static const struct TrainerMon sParty_Timothy2[] = { { - .iv = 210, + .iv = TRAINER_PARTY_IVS(25, 25, 25, 25, 25, 25), .lvl = 33, .species = SPECIES_HARIYAMA, .moves = {MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Timothy3[] = { +static const struct TrainerMon sParty_Timothy3[] = { { - .iv = 220, + .iv = TRAINER_PARTY_IVS(26, 26, 26, 26, 26, 26), .lvl = 36, .species = SPECIES_HARIYAMA, .moves = {MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Timothy4[] = { +static const struct TrainerMon sParty_Timothy4[] = { { - .iv = 230, + .iv = TRAINER_PARTY_IVS(27, 27, 27, 27, 27, 27), .lvl = 39, .species = SPECIES_HARIYAMA, .moves = {MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Timothy5[] = { +static const struct TrainerMon sParty_Timothy5[] = { { - .iv = 240, + .iv = TRAINER_PARTY_IVS(29, 29, 29, 29, 29, 29), .lvl = 42, .species = SPECIES_HARIYAMA, .moves = {MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Vicky[] = { +static const struct TrainerMon sParty_Vicky[] = { { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 18, .species = SPECIES_MEDITITE, .moves = {MOVE_HIGH_JUMP_KICK, MOVE_MEDITATE, MOVE_CONFUSION, MOVE_DETECT} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Shelby1[] = { +static const struct TrainerMon sParty_Shelby1[] = { { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 21, .species = SPECIES_MEDITITE, }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 21, .species = SPECIES_MAKUHITA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Shelby2[] = { +static const struct TrainerMon sParty_Shelby2[] = { { - .iv = 210, + .iv = TRAINER_PARTY_IVS(25, 25, 25, 25, 25, 25), .lvl = 30, .species = SPECIES_MEDITITE, }, { - .iv = 210, + .iv = TRAINER_PARTY_IVS(25, 25, 25, 25, 25, 25), .lvl = 30, .species = SPECIES_MAKUHITA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Shelby3[] = { +static const struct TrainerMon sParty_Shelby3[] = { { - .iv = 220, + .iv = TRAINER_PARTY_IVS(26, 26, 26, 26, 26, 26), .lvl = 33, .species = SPECIES_MEDICHAM, }, { - .iv = 220, + .iv = TRAINER_PARTY_IVS(26, 26, 26, 26, 26, 26), .lvl = 33, .species = SPECIES_HARIYAMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Shelby4[] = { +static const struct TrainerMon sParty_Shelby4[] = { { - .iv = 230, + .iv = TRAINER_PARTY_IVS(27, 27, 27, 27, 27, 27), .lvl = 36, .species = SPECIES_MEDICHAM, }, { - .iv = 230, + .iv = TRAINER_PARTY_IVS(27, 27, 27, 27, 27, 27), .lvl = 36, .species = SPECIES_HARIYAMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Shelby5[] = { +static const struct TrainerMon sParty_Shelby5[] = { { - .iv = 240, + .iv = TRAINER_PARTY_IVS(29, 29, 29, 29, 29, 29), .lvl = 39, .species = SPECIES_MEDICHAM, }, { - .iv = 240, + .iv = TRAINER_PARTY_IVS(29, 29, 29, 29, 29, 29), .lvl = 39, .species = SPECIES_HARIYAMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Calvin1[] = { +static const struct TrainerMon sParty_Calvin1[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_POOCHYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Billy[] = { +static const struct TrainerMon sParty_Billy[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_ZIGZAGOON, }, { - .iv = 0, .lvl = 7, .species = SPECIES_SEEDOT, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Josh[] = { +static const struct TrainerMon sParty_Josh[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 10, .species = SPECIES_GEODUDE, .moves = {MOVE_TACKLE, MOVE_NONE, MOVE_NONE, MOVE_NONE} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Tommy[] = { +static const struct TrainerMon sParty_Tommy[] = { { - .iv = 110, + .iv = TRAINER_PARTY_IVS(13, 13, 13, 13, 13, 13), .lvl = 8, .species = SPECIES_GEODUDE, }, { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 8, .species = SPECIES_GEODUDE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Joey[] = { +static const struct TrainerMon sParty_Joey[] = { { - .iv = 0, .lvl = 9, .species = SPECIES_MACHOP, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Ben[] = { +static const struct TrainerMon sParty_Ben[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 17, .species = SPECIES_ZIGZAGOON, .moves = {MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_GROWL, MOVE_THUNDERBOLT} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 17, .species = SPECIES_GULPIN, .moves = {MOVE_AMNESIA, MOVE_SLUDGE, MOVE_YAWN, MOVE_POUND} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Quincy[] = { +static const struct TrainerMon sParty_Quincy[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 43, .species = SPECIES_SLAKING, .moves = {MOVE_ATTRACT, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 43, .species = SPECIES_DUSCLOPS, .moves = {MOVE_SKILL_SWAP, MOVE_PROTECT, MOVE_WILL_O_WISP, MOVE_TOXIC} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Katelynn[] = { +static const struct TrainerMon sParty_Katelynn[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 43, .species = SPECIES_GARDEVOIR, .moves = {MOVE_SKILL_SWAP, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_CALM_MIND} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 43, .species = SPECIES_SLAKING, .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jaylen[] = { +static const struct TrainerMon sParty_Jaylen[] = { { - .iv = 0, .lvl = 19, .species = SPECIES_TRAPINCH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dillon[] = { +static const struct TrainerMon sParty_Dillon[] = { { - .iv = 0, .lvl = 19, .species = SPECIES_ARON, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Calvin2[] = { +static const struct TrainerMon sParty_Calvin2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 27, .species = SPECIES_MIGHTYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Calvin3[] = { +static const struct TrainerMon sParty_Calvin3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 28, .species = SPECIES_SWELLOW, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 30, .species = SPECIES_MIGHTYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Calvin4[] = { +static const struct TrainerMon sParty_Calvin4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_SWELLOW, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 29, .species = SPECIES_LINOONE, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 33, .species = SPECIES_MIGHTYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Calvin5[] = { +static const struct TrainerMon sParty_Calvin5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 34, .species = SPECIES_SWELLOW, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 32, .species = SPECIES_LINOONE, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 36, .species = SPECIES_MIGHTYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Eddie[] = { +static const struct TrainerMon sParty_Eddie[] = { { - .iv = 0, .lvl = 14, .species = SPECIES_ZIGZAGOON, }, { - .iv = 0, .lvl = 16, .species = SPECIES_ZIGZAGOON, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Allen[] = { +static const struct TrainerMon sParty_Allen[] = { { - .iv = 0, .lvl = 4, .species = SPECIES_ZIGZAGOON, }, { - .iv = 0, .lvl = 3, .species = SPECIES_TAILLOW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Timmy[] = { +static const struct TrainerMon sParty_Timmy[] = { { - .iv = 0, .lvl = 15, .species = SPECIES_ARON, }, { - .iv = 0, .lvl = 13, .species = SPECIES_ELECTRIKE, } }; -static const struct TrainerMonItemCustomMoves sParty_Wallace[] = { +static const struct TrainerMon sParty_Wallace[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 57, .species = SPECIES_WAILORD, .heldItem = ITEM_NONE, .moves = {MOVE_RAIN_DANCE, MOVE_WATER_SPOUT, MOVE_DOUBLE_EDGE, MOVE_BLIZZARD} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 55, .species = SPECIES_TENTACRUEL, .heldItem = ITEM_NONE, .moves = {MOVE_TOXIC, MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 56, .species = SPECIES_LUDICOLO, .heldItem = ITEM_NONE, .moves = {MOVE_GIGA_DRAIN, MOVE_SURF, MOVE_LEECH_SEED, MOVE_DOUBLE_TEAM} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 56, .species = SPECIES_WHISCASH, .heldItem = ITEM_NONE, .moves = {MOVE_EARTHQUAKE, MOVE_SURF, MOVE_AMNESIA, MOVE_HYPER_BEAM} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 56, .species = SPECIES_GYARADOS, .heldItem = ITEM_NONE, .moves = {MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 58, .species = SPECIES_MILOTIC, .heldItem = ITEM_SITRUS_BERRY, @@ -4456,978 +4266,912 @@ static const struct TrainerMonItemCustomMoves sParty_Wallace[] = { } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Andrew[] = { +static const struct TrainerMon sParty_Andrew[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_MAGIKARP, }, { - .iv = 0, .lvl = 10, .species = SPECIES_TENTACOOL, }, { - .iv = 0, .lvl = 15, .species = SPECIES_MAGIKARP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ivan[] = { +static const struct TrainerMon sParty_Ivan[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_MAGIKARP, }, { - .iv = 0, .lvl = 6, .species = SPECIES_MAGIKARP, }, { - .iv = 0, .lvl = 7, .species = SPECIES_MAGIKARP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Claude[] = { +static const struct TrainerMon sParty_Claude[] = { { - .iv = 0, .lvl = 16, .species = SPECIES_MAGIKARP, }, { - .iv = 0, .lvl = 17, .species = SPECIES_GOLDEEN, }, { - .iv = 0, .lvl = 18, .species = SPECIES_BARBOACH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Elliot1[] = { +static const struct TrainerMon sParty_Elliot1[] = { { - .iv = 0, .lvl = 10, .species = SPECIES_MAGIKARP, }, { - .iv = 0, .lvl = 7, .species = SPECIES_TENTACOOL, }, { - .iv = 0, .lvl = 10, .species = SPECIES_MAGIKARP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ned[] = { +static const struct TrainerMon sParty_Ned[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 11, .species = SPECIES_TENTACOOL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dale[] = { +static const struct TrainerMon sParty_Dale[] = { { - .iv = 0, .lvl = 11, .species = SPECIES_TENTACOOL, }, { - .iv = 0, .lvl = 14, .species = SPECIES_WAILMER, }, { - .iv = 0, .lvl = 11, .species = SPECIES_TENTACOOL, }, { - .iv = 0, .lvl = 14, .species = SPECIES_WAILMER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Nolan[] = { +static const struct TrainerMon sParty_Nolan[] = { { - .iv = 0, .lvl = 19, .species = SPECIES_BARBOACH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Barny[] = { +static const struct TrainerMon sParty_Barny[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_TENTACOOL, }, { - .iv = 0, .lvl = 25, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Wade[] = { +static const struct TrainerMon sParty_Wade[] = { { - .iv = 0, .lvl = 16, .species = SPECIES_TENTACOOL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Carter[] = { +static const struct TrainerMon sParty_Carter[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_WAILMER, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_TENTACRUEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Elliot2[] = { +static const struct TrainerMon sParty_Elliot2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 24, .species = SPECIES_TENTACOOL, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 27, .species = SPECIES_GYARADOS, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 27, .species = SPECIES_GYARADOS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Elliot3[] = { +static const struct TrainerMon sParty_Elliot3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_GYARADOS, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 26, .species = SPECIES_CARVANHA, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 26, .species = SPECIES_TENTACOOL, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_GYARADOS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Elliot4[] = { +static const struct TrainerMon sParty_Elliot4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_GYARADOS, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 30, .species = SPECIES_CARVANHA, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 30, .species = SPECIES_TENTACRUEL, }, { - .iv = 31, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_GYARADOS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Elliot5[] = { +static const struct TrainerMon sParty_Elliot5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_GYARADOS, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_SHARPEDO, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_GYARADOS, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 35, .species = SPECIES_TENTACRUEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ronald[] = { +static const struct TrainerMon sParty_Ronald[] = { { - .iv = 0, .lvl = 19, .species = SPECIES_MAGIKARP, }, { - .iv = 0, .lvl = 21, .species = SPECIES_GYARADOS, }, { - .iv = 0, .lvl = 23, .species = SPECIES_GYARADOS, }, { - .iv = 0, .lvl = 26, .species = SPECIES_GYARADOS, }, { - .iv = 0, .lvl = 30, .species = SPECIES_GYARADOS, }, { - .iv = 0, .lvl = 35, .species = SPECIES_GYARADOS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jacob[] = { +static const struct TrainerMon sParty_Jacob[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 6, .species = SPECIES_VOLTORB, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 6, .species = SPECIES_VOLTORB, }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 14, .species = SPECIES_MAGNEMITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Anthony[] = { +static const struct TrainerMon sParty_Anthony[] = { { - .iv = 0, .lvl = 14, .species = SPECIES_MAGNEMITE, }, { - .iv = 0, .lvl = 14, .species = SPECIES_MAGNEMITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin1[] = { +static const struct TrainerMon sParty_Benjamin1[] = { { - .iv = 0, .lvl = 16, .species = SPECIES_MAGNEMITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin2[] = { +static const struct TrainerMon sParty_Benjamin2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 30, .species = SPECIES_MAGNEMITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin3[] = { +static const struct TrainerMon sParty_Benjamin3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 33, .species = SPECIES_MAGNEMITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin4[] = { +static const struct TrainerMon sParty_Benjamin4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 36, .species = SPECIES_MAGNETON, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin5[] = { +static const struct TrainerMon sParty_Benjamin5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 39, .species = SPECIES_MAGNETON, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Abigail1[] = { +static const struct TrainerMon sParty_Abigail1[] = { { - .iv = 0, .lvl = 16, .species = SPECIES_MAGNEMITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jasmine[] = { +static const struct TrainerMon sParty_Jasmine[] = { { - .iv = 80, + .iv = TRAINER_PARTY_IVS(9, 9, 9, 9, 9, 9), .lvl = 14, .species = SPECIES_MAGNEMITE, }, { - .iv = 80, + .iv = TRAINER_PARTY_IVS(9, 9, 9, 9, 9, 9), .lvl = 14, .species = SPECIES_MAGNEMITE, }, { - .iv = 0, .lvl = 6, .species = SPECIES_VOLTORB, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Abigail2[] = { +static const struct TrainerMon sParty_Abigail2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 28, .species = SPECIES_MAGNEMITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Abigail3[] = { +static const struct TrainerMon sParty_Abigail3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 31, .species = SPECIES_MAGNEMITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Abigail4[] = { +static const struct TrainerMon sParty_Abigail4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 34, .species = SPECIES_MAGNETON, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Abigail5[] = { +static const struct TrainerMon sParty_Abigail5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 37, .species = SPECIES_MAGNETON, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dylan1[] = { +static const struct TrainerMon sParty_Dylan1[] = { { - .iv = 0, .lvl = 17, .species = SPECIES_DODUO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dylan2[] = { +static const struct TrainerMon sParty_Dylan2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 28, .species = SPECIES_DODUO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dylan3[] = { +static const struct TrainerMon sParty_Dylan3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 31, .species = SPECIES_DODUO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dylan4[] = { +static const struct TrainerMon sParty_Dylan4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 34, .species = SPECIES_DODRIO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dylan5[] = { +static const struct TrainerMon sParty_Dylan5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 37, .species = SPECIES_DODRIO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Maria1[] = { +static const struct TrainerMon sParty_Maria1[] = { { - .iv = 0, .lvl = 17, .species = SPECIES_DODUO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Maria2[] = { +static const struct TrainerMon sParty_Maria2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 28, .species = SPECIES_DODUO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Maria3[] = { +static const struct TrainerMon sParty_Maria3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 31, .species = SPECIES_DODUO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Maria4[] = { +static const struct TrainerMon sParty_Maria4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 34, .species = SPECIES_DODRIO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Maria5[] = { +static const struct TrainerMon sParty_Maria5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 37, .species = SPECIES_DODRIO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Camden[] = { +static const struct TrainerMon sParty_Camden[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_STARYU, }, { - .iv = 0, .lvl = 33, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Demetrius[] = { +static const struct TrainerMon sParty_Demetrius[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_ZIGZAGOON, }, { - .iv = 0, .lvl = 25, .species = SPECIES_ELECTRIKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah1[] = { +static const struct TrainerMon sParty_Isaiah1[] = { { - .iv = 0, .lvl = 35, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Pablo1[] = { +static const struct TrainerMon sParty_Pablo1[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_STARYU, }, { - .iv = 0, .lvl = 33, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Chase[] = { +static const struct TrainerMon sParty_Chase[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_WINGULL, }, { - .iv = 80, + .iv = TRAINER_PARTY_IVS(9, 9, 9, 9, 9, 9), .lvl = 34, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah2[] = { +static const struct TrainerMon sParty_Isaiah2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 39, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah3[] = { +static const struct TrainerMon sParty_Isaiah3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 42, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah4[] = { +static const struct TrainerMon sParty_Isaiah4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 45, .species = SPECIES_STARMIE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah5[] = { +static const struct TrainerMon sParty_Isaiah5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 48, .species = SPECIES_STARMIE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Isobel[] = { +static const struct TrainerMon sParty_Isobel[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Donny[] = { +static const struct TrainerMon sParty_Donny[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_WINGULL, }, { - .iv = 160, + .iv = TRAINER_PARTY_IVS(19, 19, 19, 19, 19, 19), .lvl = 34, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Talia[] = { +static const struct TrainerMon sParty_Talia[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn1[] = { +static const struct TrainerMon sParty_Katelyn1[] = { { - .iv = 0, .lvl = 35, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Allison[] = { +static const struct TrainerMon sParty_Allison[] = { { - .iv = 0, .lvl = 27, .species = SPECIES_WINGULL, }, { - .iv = 240, + .iv = TRAINER_PARTY_IVS(29, 29, 29, 29, 29, 29), .lvl = 33, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn2[] = { +static const struct TrainerMon sParty_Katelyn2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 39, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn3[] = { +static const struct TrainerMon sParty_Katelyn3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 42, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn4[] = { +static const struct TrainerMon sParty_Katelyn4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 45, .species = SPECIES_STARMIE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn5[] = { +static const struct TrainerMon sParty_Katelyn5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 48, .species = SPECIES_STARMIE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas1[] = { +static const struct TrainerMon sParty_Nicolas1[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 37, .species = SPECIES_ALTARIA, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 37, .species = SPECIES_ALTARIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas2[] = { +static const struct TrainerMon sParty_Nicolas2[] = { { - .iv = 110, + .iv = TRAINER_PARTY_IVS(13, 13, 13, 13, 13, 13), .lvl = 41, .species = SPECIES_ALTARIA, }, { - .iv = 110, + .iv = TRAINER_PARTY_IVS(13, 13, 13, 13, 13, 13), .lvl = 41, .species = SPECIES_ALTARIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas3[] = { +static const struct TrainerMon sParty_Nicolas3[] = { { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 44, .species = SPECIES_ALTARIA, }, { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 44, .species = SPECIES_ALTARIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas4[] = { +static const struct TrainerMon sParty_Nicolas4[] = { { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 46, .species = SPECIES_BAGON, }, { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 46, .species = SPECIES_ALTARIA, }, { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 46, .species = SPECIES_ALTARIA, } }; -static const struct TrainerMonItemDefaultMoves sParty_Nicolas5[] = { +static const struct TrainerMon sParty_Nicolas5[] = { { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 49, .species = SPECIES_ALTARIA, .heldItem = ITEM_NONE }, { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 49, .species = SPECIES_ALTARIA, .heldItem = ITEM_NONE }, { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 49, .species = SPECIES_SHELGON, .heldItem = ITEM_DRAGON_FANG } }; -static const struct TrainerMonNoItemCustomMoves sParty_Aaron[] = { +static const struct TrainerMon sParty_Aaron[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 34, .species = SPECIES_BAGON, .moves = {MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_FOCUS_ENERGY, MOVE_EMBER} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Perry[] = { +static const struct TrainerMon sParty_Perry[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_WINGULL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Hugh[] = { +static const struct TrainerMon sParty_Hugh[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_WINGULL, }, { - .iv = 0, .lvl = 25, .species = SPECIES_TROPIUS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Phil[] = { +static const struct TrainerMon sParty_Phil[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_SWELLOW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jared[] = { +static const struct TrainerMon sParty_Jared[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 27, .species = SPECIES_DODUO, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 27, .species = SPECIES_SKARMORY, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 27, .species = SPECIES_TROPIUS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Humberto[] = { +static const struct TrainerMon sParty_Humberto[] = { { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 30, .species = SPECIES_SKARMORY, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Presley[] = { +static const struct TrainerMon sParty_Presley[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_TROPIUS, }, { - .iv = 0, .lvl = 33, .species = SPECIES_XATU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Edwardo[] = { +static const struct TrainerMon sParty_Edwardo[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 29, .species = SPECIES_DODUO, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 29, .species = SPECIES_PELIPPER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Colin[] = { +static const struct TrainerMon sParty_Colin[] = { { - .iv = 0, .lvl = 28, .species = SPECIES_WINGULL, }, { - .iv = 0, .lvl = 28, .species = SPECIES_NATU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Robert1[] = { +static const struct TrainerMon sParty_Robert1[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_SWABLU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Benny[] = { +static const struct TrainerMon sParty_Benny[] = { { - .iv = 0, .lvl = 36, .species = SPECIES_SWELLOW, }, { - .iv = 0, .lvl = 36, .species = SPECIES_PELIPPER, }, { - .iv = 0, .lvl = 36, .species = SPECIES_XATU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Chester[] = { +static const struct TrainerMon sParty_Chester[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_TAILLOW, }, { - .iv = 0, .lvl = 25, .species = SPECIES_SWELLOW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Robert2[] = { +static const struct TrainerMon sParty_Robert2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 32, .species = SPECIES_NATU, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 32, .species = SPECIES_SWABLU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Robert3[] = { +static const struct TrainerMon sParty_Robert3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 35, .species = SPECIES_NATU, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 35, .species = SPECIES_ALTARIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Robert4[] = { +static const struct TrainerMon sParty_Robert4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 38, .species = SPECIES_NATU, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 38, .species = SPECIES_ALTARIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Robert5[] = { +static const struct TrainerMon sParty_Robert5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 41, .species = SPECIES_ALTARIA, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 41, .species = SPECIES_XATU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Alex[] = { +static const struct TrainerMon sParty_Alex[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 33, .species = SPECIES_NATU, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 33, .species = SPECIES_SWELLOW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Beck[] = { +static const struct TrainerMon sParty_Beck[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_TROPIUS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Yasu[] = { +static const struct TrainerMon sParty_Yasu[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_NINJASK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Takashi[] = { +static const struct TrainerMon sParty_Takashi[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_NINJASK, }, { - .iv = 0, .lvl = 25, .species = SPECIES_KOFFING, } }; -static const struct TrainerMonItemCustomMoves sParty_Dianne[] = { +static const struct TrainerMon sParty_Dianne[] = { { - .iv = 0, .lvl = 43, .species = SPECIES_CLAYDOL, .heldItem = ITEM_NONE, .moves = {MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE} }, { - .iv = 0, .lvl = 43, .species = SPECIES_LANTURN, .heldItem = ITEM_NONE, @@ -5435,153 +5179,143 @@ static const struct TrainerMonItemCustomMoves sParty_Dianne[] = { } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jani[] = { +static const struct TrainerMon sParty_Jani[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Lao1[] = { +static const struct TrainerMon sParty_Lao1[] = { { - .iv = 0, .lvl = 17, .species = SPECIES_KOFFING, .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT} }, { - .iv = 0, .lvl = 17, .species = SPECIES_KOFFING, .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT} }, { - .iv = 0, .lvl = 17, .species = SPECIES_KOFFING, .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lung[] = { +static const struct TrainerMon sParty_Lung[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_KOFFING, }, { - .iv = 0, .lvl = 18, .species = SPECIES_NINJASK, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Lao2[] = { +static const struct TrainerMon sParty_Lao2[] = { { - .iv = 0, .lvl = 24, .species = SPECIES_KOFFING, .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT} }, { - .iv = 0, .lvl = 24, .species = SPECIES_KOFFING, .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE} }, { - .iv = 0, .lvl = 24, .species = SPECIES_KOFFING, .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT} }, { - .iv = 0, .lvl = 26, .species = SPECIES_KOFFING, .moves = {MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Lao3[] = { +static const struct TrainerMon sParty_Lao3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 27, .species = SPECIES_KOFFING, .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT} }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 27, .species = SPECIES_KOFFING, .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT} }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 27, .species = SPECIES_KOFFING, .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE} }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_KOFFING, .moves = {MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Lao4[] = { +static const struct TrainerMon sParty_Lao4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 30, .species = SPECIES_KOFFING, .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE} }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 30, .species = SPECIES_KOFFING, .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE} }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 30, .species = SPECIES_KOFFING, .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE} }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 32, .species = SPECIES_KOFFING, .moves = {MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE} } }; -static const struct TrainerMonItemCustomMoves sParty_Lao5[] = { +static const struct TrainerMon sParty_Lao5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_KOFFING, .heldItem = ITEM_NONE, .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE} }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_KOFFING, .heldItem = ITEM_NONE, .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT} }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_KOFFING, .heldItem = ITEM_NONE, .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT} }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 35, .species = SPECIES_WEEZING, .heldItem = ITEM_SMOKE_BALL, @@ -5589,966 +5323,882 @@ static const struct TrainerMonItemCustomMoves sParty_Lao5[] = { } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jocelyn[] = { +static const struct TrainerMon sParty_Jocelyn[] = { { - .iv = 127, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 13, .species = SPECIES_MEDITITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Laura[] = { +static const struct TrainerMon sParty_Laura[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 13, .species = SPECIES_MEDITITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy1[] = { +static const struct TrainerMon sParty_Cyndy1[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 18, .species = SPECIES_MEDITITE, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 18, .species = SPECIES_MAKUHITA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cora[] = { +static const struct TrainerMon sParty_Cora[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 27, .species = SPECIES_MEDITITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Paula[] = { +static const struct TrainerMon sParty_Paula[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 27, .species = SPECIES_BRELOOM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy2[] = { +static const struct TrainerMon sParty_Cyndy2[] = { { - .iv = 110, + .iv = TRAINER_PARTY_IVS(13, 13, 13, 13, 13, 13), .lvl = 26, .species = SPECIES_MEDITITE, }, { - .iv = 110, + .iv = TRAINER_PARTY_IVS(13, 13, 13, 13, 13, 13), .lvl = 26, .species = SPECIES_MAKUHITA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy3[] = { +static const struct TrainerMon sParty_Cyndy3[] = { { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 29, .species = SPECIES_MEDITITE, }, { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 29, .species = SPECIES_MAKUHITA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy4[] = { +static const struct TrainerMon sParty_Cyndy4[] = { { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 32, .species = SPECIES_MEDICHAM, }, { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 32, .species = SPECIES_HARIYAMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy5[] = { +static const struct TrainerMon sParty_Cyndy5[] = { { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 35, .species = SPECIES_MEDICHAM, }, { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 35, .species = SPECIES_HARIYAMA, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Madeline1[] = { +static const struct TrainerMon sParty_Madeline1[] = { { - .iv = 0, .lvl = 19, .species = SPECIES_NUMEL, .moves = {MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Clarissa[] = { +static const struct TrainerMon sParty_Clarissa[] = { { - .iv = 0, .lvl = 28, .species = SPECIES_ROSELIA, }, { - .iv = 0, .lvl = 28, .species = SPECIES_WAILMER, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Angelica[] = { +static const struct TrainerMon sParty_Angelica[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 30, .species = SPECIES_CASTFORM, .moves = {MOVE_RAIN_DANCE, MOVE_WEATHER_BALL, MOVE_THUNDER, MOVE_WATER_PULSE} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Madeline2[] = { +static const struct TrainerMon sParty_Madeline2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 29, .species = SPECIES_NUMEL, .moves = {MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Madeline3[] = { +static const struct TrainerMon sParty_Madeline3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 32, .species = SPECIES_NUMEL, .moves = {MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Madeline4[] = { +static const struct TrainerMon sParty_Madeline4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 34, .species = SPECIES_ROSELIA, .moves = {MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_SUNNY_DAY} }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 34, .species = SPECIES_NUMEL, .moves = {MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Madeline5[] = { +static const struct TrainerMon sParty_Madeline5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 37, .species = SPECIES_ROSELIA, .moves = {MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY} }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 37, .species = SPECIES_CAMERUPT, .moves = {MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Beverly[] = { +static const struct TrainerMon sParty_Beverly[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_WINGULL, }, { - .iv = 0, .lvl = 25, .species = SPECIES_WAILMER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Imani[] = { +static const struct TrainerMon sParty_Imani[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Kyla[] = { +static const struct TrainerMon sParty_Kyla[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_WAILMER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Denise[] = { +static const struct TrainerMon sParty_Denise[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_WINGULL, }, { - .iv = 0, .lvl = 25, .species = SPECIES_GOLDEEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Beth[] = { +static const struct TrainerMon sParty_Beth[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_GOLDEEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Tara[] = { +static const struct TrainerMon sParty_Tara[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_HORSEA, }, { - .iv = 0, .lvl = 25, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Missy[] = { +static const struct TrainerMon sParty_Missy[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_GOLDEEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Alice[] = { +static const struct TrainerMon sParty_Alice[] = { { - .iv = 0, .lvl = 24, .species = SPECIES_GOLDEEN, }, { - .iv = 0, .lvl = 24, .species = SPECIES_WINGULL, }, { - .iv = 0, .lvl = 24, .species = SPECIES_GOLDEEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jenny1[] = { +static const struct TrainerMon sParty_Jenny1[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_WAILMER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Grace[] = { +static const struct TrainerMon sParty_Grace[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Tanya[] = { +static const struct TrainerMon sParty_Tanya[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_LUVDISC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Sharon[] = { +static const struct TrainerMon sParty_Sharon[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_SEAKING, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Nikki[] = { +static const struct TrainerMon sParty_Nikki[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_MARILL, }, { - .iv = 0, .lvl = 33, .species = SPECIES_SPHEAL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Brenda[] = { +static const struct TrainerMon sParty_Brenda[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_GOLDEEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Katie[] = { +static const struct TrainerMon sParty_Katie[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_GOLDEEN, }, { - .iv = 0, .lvl = 33, .species = SPECIES_SPHEAL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Susie[] = { +static const struct TrainerMon sParty_Susie[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_LUVDISC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Kara[] = { +static const struct TrainerMon sParty_Kara[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_SEAKING, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dana[] = { +static const struct TrainerMon sParty_Dana[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_AZUMARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Sienna[] = { +static const struct TrainerMon sParty_Sienna[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_LUVDISC, }, { - .iv = 0, .lvl = 33, .species = SPECIES_LUVDISC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Debra[] = { +static const struct TrainerMon sParty_Debra[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_SEAKING, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Linda[] = { +static const struct TrainerMon sParty_Linda[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_HORSEA, }, { - .iv = 0, .lvl = 33, .species = SPECIES_SEADRA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Kaylee[] = { +static const struct TrainerMon sParty_Kaylee[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_LANTURN, }, { - .iv = 0, .lvl = 34, .species = SPECIES_PELIPPER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Laurel[] = { +static const struct TrainerMon sParty_Laurel[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_LUVDISC, }, { - .iv = 0, .lvl = 33, .species = SPECIES_LUVDISC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Carlee[] = { +static const struct TrainerMon sParty_Carlee[] = { { - .iv = 0, .lvl = 35, .species = SPECIES_SEAKING, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jenny2[] = { +static const struct TrainerMon sParty_Jenny2[] = { { - .iv = 0, .lvl = 38, .species = SPECIES_WAILMER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jenny3[] = { +static const struct TrainerMon sParty_Jenny3[] = { { - .iv = 0, .lvl = 41, .species = SPECIES_WAILMER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jenny4[] = { +static const struct TrainerMon sParty_Jenny4[] = { { - .iv = 0, .lvl = 43, .species = SPECIES_STARYU, }, { - .iv = 0, .lvl = 43, .species = SPECIES_WAILMER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jenny5[] = { +static const struct TrainerMon sParty_Jenny5[] = { { - .iv = 0, .lvl = 45, .species = SPECIES_LUVDISC, }, { - .iv = 0, .lvl = 45, .species = SPECIES_WAILMER, }, { - .iv = 0, .lvl = 45, .species = SPECIES_STARMIE, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Heidi[] = { +static const struct TrainerMon sParty_Heidi[] = { { - .iv = 0, .lvl = 22, .species = SPECIES_SANDSHREW, .moves = {MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH} }, { - .iv = 0, .lvl = 22, .species = SPECIES_BALTOY, .moves = {MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Becky[] = { +static const struct TrainerMon sParty_Becky[] = { { - .iv = 0, .lvl = 22, .species = SPECIES_SANDSHREW, .moves = {MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH, MOVE_DIG} }, { - .iv = 0, .lvl = 22, .species = SPECIES_MARILL, .moves = {MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_TAIL_WHIP, MOVE_DEFENSE_CURL} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Carol[] = { +static const struct TrainerMon sParty_Carol[] = { { - .iv = 0, .lvl = 17, .species = SPECIES_TAILLOW, }, { - .iv = 0, .lvl = 17, .species = SPECIES_LOMBRE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Nancy[] = { +static const struct TrainerMon sParty_Nancy[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_MARILL, }, { - .iv = 0, .lvl = 18, .species = SPECIES_LOMBRE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Martha[] = { +static const struct TrainerMon sParty_Martha[] = { { - .iv = 0, .lvl = 23, .species = SPECIES_SKITTY, }, { - .iv = 0, .lvl = 23, .species = SPECIES_SWABLU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Diana1[] = { +static const struct TrainerMon sParty_Diana1[] = { { - .iv = 0, .lvl = 19, .species = SPECIES_SHROOMISH, }, { - .iv = 0, .lvl = 19, .species = SPECIES_ODDISH, }, { - .iv = 0, .lvl = 19, .species = SPECIES_SWABLU, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Cedric[] = { +static const struct TrainerMon sParty_Cedric[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_WOBBUFFET, .moves = {MOVE_DESTINY_BOND, MOVE_SAFEGUARD, MOVE_COUNTER, MOVE_MIRROR_COAT} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Irene[] = { +static const struct TrainerMon sParty_Irene[] = { { - .iv = 0, .lvl = 17, .species = SPECIES_SHROOMISH, }, { - .iv = 0, .lvl = 17, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Diana2[] = { +static const struct TrainerMon sParty_Diana2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_SHROOMISH, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_GLOOM, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_SWABLU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Diana3[] = { +static const struct TrainerMon sParty_Diana3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 28, .species = SPECIES_BRELOOM, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 28, .species = SPECIES_GLOOM, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 28, .species = SPECIES_SWABLU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Diana4[] = { +static const struct TrainerMon sParty_Diana4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_BRELOOM, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_GLOOM, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_SWABLU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Diana5[] = { +static const struct TrainerMon sParty_Diana5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 40, .species = SPECIES_BRELOOM, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 40, .species = SPECIES_VILEPLUME, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 40, .species = SPECIES_ALTARIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv1[] = { +static const struct TrainerMon sParty_AmyAndLiv1[] = { { - .iv = 0, .lvl = 15, .species = SPECIES_PLUSLE, }, { - .iv = 0, .lvl = 15, .species = SPECIES_MINUN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv2[] = { +static const struct TrainerMon sParty_AmyAndLiv2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 27, .species = SPECIES_PLUSLE, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 27, .species = SPECIES_MINUN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GinaAndMia1[] = { +static const struct TrainerMon sParty_GinaAndMia1[] = { { - .iv = 0, .lvl = 6, .species = SPECIES_SEEDOT, }, { - .iv = 0, .lvl = 6, .species = SPECIES_LOTAD, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MiuAndYuki[] = { +static const struct TrainerMon sParty_MiuAndYuki[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_BEAUTIFLY, }, { - .iv = 0, .lvl = 26, .species = SPECIES_DUSTOX, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv3[] = { +static const struct TrainerMon sParty_AmyAndLiv3[] = { { - .iv = 0, .lvl = 9, .species = SPECIES_PLUSLE, }, { - .iv = 0, .lvl = 9, .species = SPECIES_MINUN, } }; -static const struct TrainerMonNoItemCustomMoves sParty_GinaAndMia2[] = { +static const struct TrainerMon sParty_GinaAndMia2[] = { { - .iv = 0, .lvl = 10, .species = SPECIES_DUSKULL, .moves = {MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_NONE, MOVE_NONE} }, { - .iv = 0, .lvl = 10, .species = SPECIES_SHROOMISH, .moves = {MOVE_ABSORB, MOVE_LEECH_SEED, MOVE_NONE, MOVE_NONE} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv4[] = { +static const struct TrainerMon sParty_AmyAndLiv4[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 30, .species = SPECIES_PLUSLE, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 30, .species = SPECIES_MINUN, } }; -static const struct TrainerMonNoItemCustomMoves sParty_AmyAndLiv5[] = { +static const struct TrainerMon sParty_AmyAndLiv5[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 33, .species = SPECIES_PLUSLE, .moves = {MOVE_SPARK, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND} }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 33, .species = SPECIES_MINUN, .moves = {MOVE_SPARK, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND} } }; -static const struct TrainerMonNoItemCustomMoves sParty_AmyAndLiv6[] = { +static const struct TrainerMon sParty_AmyAndLiv6[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 36, .species = SPECIES_PLUSLE, .moves = {MOVE_THUNDER, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND} }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 36, .species = SPECIES_MINUN, .moves = {MOVE_THUNDER, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Huey[] = { +static const struct TrainerMon sParty_Huey[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 12, .species = SPECIES_WINGULL, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 12, .species = SPECIES_MACHOP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Edmond[] = { +static const struct TrainerMon sParty_Edmond[] = { { - .iv = 0, .lvl = 13, .species = SPECIES_WINGULL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ernest1[] = { +static const struct TrainerMon sParty_Ernest1[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_WINGULL, }, { - .iv = 0, .lvl = 33, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dwayne[] = { +static const struct TrainerMon sParty_Dwayne[] = { { - .iv = 0, .lvl = 11, .species = SPECIES_WINGULL, }, { - .iv = 0, .lvl = 11, .species = SPECIES_MACHOP, }, { - .iv = 0, .lvl = 11, .species = SPECIES_TENTACOOL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Phillip[] = { +static const struct TrainerMon sParty_Phillip[] = { { - .iv = 0, .lvl = 44, .species = SPECIES_TENTACRUEL, }, { - .iv = 0, .lvl = 44, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Leonard[] = { +static const struct TrainerMon sParty_Leonard[] = { { - .iv = 0, .lvl = 43, .species = SPECIES_MACHOP, }, { - .iv = 0, .lvl = 43, .species = SPECIES_PELIPPER, }, { - .iv = 0, .lvl = 43, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Duncan[] = { +static const struct TrainerMon sParty_Duncan[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_SPHEAL, }, { - .iv = 0, .lvl = 25, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ernest2[] = { +static const struct TrainerMon sParty_Ernest2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 36, .species = SPECIES_WINGULL, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 36, .species = SPECIES_TENTACOOL, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 36, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ernest3[] = { +static const struct TrainerMon sParty_Ernest3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 39, .species = SPECIES_PELIPPER, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 39, .species = SPECIES_TENTACOOL, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 39, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ernest4[] = { +static const struct TrainerMon sParty_Ernest4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 42, .species = SPECIES_PELIPPER, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 42, .species = SPECIES_TENTACOOL, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 42, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ernest5[] = { +static const struct TrainerMon sParty_Ernest5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 45, .species = SPECIES_PELIPPER, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 45, .species = SPECIES_MACHOKE, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 45, .species = SPECIES_TENTACRUEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Eli[] = { +static const struct TrainerMon sParty_Eli[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 23, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonItemCustomMoves sParty_Annika[] = { +static const struct TrainerMon sParty_Annika[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 39, .species = SPECIES_FEEBAS, .heldItem = ITEM_ORAN_BERRY, .moves = {MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 39, .species = SPECIES_FEEBAS, .heldItem = ITEM_ORAN_BERRY, @@ -6556,61 +6206,56 @@ static const struct TrainerMonItemCustomMoves sParty_Annika[] = { } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jazmyn[] = { +static const struct TrainerMon sParty_Jazmyn[] = { { - .iv = 0, .lvl = 27, .species = SPECIES_ABSOL, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Jonas[] = { +static const struct TrainerMon sParty_Jonas[] = { { - .iv = 0, .lvl = 31, .species = SPECIES_KOFFING, .moves = {MOVE_TOXIC, MOVE_THUNDER, MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Kayley[] = { +static const struct TrainerMon sParty_Kayley[] = { { - .iv = 0, .lvl = 31, .species = SPECIES_CASTFORM, .moves = {MOVE_SUNNY_DAY, MOVE_WEATHER_BALL, MOVE_FLAMETHROWER, MOVE_SOLAR_BEAM} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Auron[] = { +static const struct TrainerMon sParty_Auron[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_MANECTRIC, }, { - .iv = 0, .lvl = 33, .species = SPECIES_MACHAMP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Kelvin[] = { +static const struct TrainerMon sParty_Kelvin[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 33, .species = SPECIES_MACHOKE, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 33, .species = SPECIES_SPHEAL, } }; -static const struct TrainerMonItemCustomMoves sParty_Marley[] = { +static const struct TrainerMon sParty_Marley[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 34, .species = SPECIES_MANECTRIC, .heldItem = ITEM_NONE, @@ -6618,1097 +6263,1053 @@ static const struct TrainerMonItemCustomMoves sParty_Marley[] = { } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Reyna[] = { +static const struct TrainerMon sParty_Reyna[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 33, .species = SPECIES_MEDITITE, }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 33, .species = SPECIES_HARIYAMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Hudson[] = { +static const struct TrainerMon sParty_Hudson[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_WAILMER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Conor[] = { +static const struct TrainerMon sParty_Conor[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_CHINCHOU, }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 33, .species = SPECIES_HARIYAMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Edwin1[] = { +static const struct TrainerMon sParty_Edwin1[] = { { - .iv = 0, .lvl = 14, .species = SPECIES_LOMBRE, }, { - .iv = 0, .lvl = 14, .species = SPECIES_NUZLEAF, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Hector[] = { +static const struct TrainerMon sParty_Hector[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_ZANGOOSE, }, { - .iv = 0, .lvl = 18, .species = SPECIES_SEVIPER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMossdeep[] = { +static const struct TrainerMon sParty_TabithaMossdeep[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 36, .species = SPECIES_CAMERUPT, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 38, .species = SPECIES_MIGHTYENA, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 40, .species = SPECIES_GOLBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Edwin2[] = { +static const struct TrainerMon sParty_Edwin2[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_LOMBRE, }, { - .iv = 0, .lvl = 26, .species = SPECIES_NUZLEAF, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Edwin3[] = { +static const struct TrainerMon sParty_Edwin3[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_LOMBRE, }, { - .iv = 0, .lvl = 29, .species = SPECIES_NUZLEAF, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Edwin4[] = { +static const struct TrainerMon sParty_Edwin4[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_LOMBRE, }, { - .iv = 0, .lvl = 32, .species = SPECIES_NUZLEAF, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Edwin5[] = { +static const struct TrainerMon sParty_Edwin5[] = { { - .iv = 0, .lvl = 35, .species = SPECIES_LUDICOLO, }, { - .iv = 0, .lvl = 35, .species = SPECIES_SHIFTRY, } }; -static const struct TrainerMonNoItemCustomMoves sParty_WallyVR1[] = { +static const struct TrainerMon sParty_WallyVR1[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 44, .species = SPECIES_ALTARIA, .moves = {MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 43, .species = SPECIES_DELCATTY, .moves = {MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FEINT_ATTACK} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 44, .species = SPECIES_ROSELIA, .moves = {MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 41, .species = SPECIES_MAGNETON, .moves = {MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 45, .species = SPECIES_GARDEVOIR, .moves = {MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Mudkip[] = { +static const struct TrainerMon sParty_BrendanRoute103Mudkip[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_TREECKO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Mudkip[] = { +static const struct TrainerMon sParty_BrendanRoute110Mudkip[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 18, .species = SPECIES_SLUGMA, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 18, .species = SPECIES_WINGULL, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 20, .species = SPECIES_GROVYLE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Mudkip[] = { +static const struct TrainerMon sParty_BrendanRoute119Mudkip[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_SLUGMA, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_PELIPPER, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 31, .species = SPECIES_GROVYLE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Treecko[] = { +static const struct TrainerMon sParty_BrendanRoute103Treecko[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_TORCHIC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Treecko[] = { +static const struct TrainerMon sParty_BrendanRoute110Treecko[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 18, .species = SPECIES_WINGULL, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 18, .species = SPECIES_LOMBRE, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 20, .species = SPECIES_COMBUSKEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Treecko[] = { +static const struct TrainerMon sParty_BrendanRoute119Treecko[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_PELIPPER, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_LOMBRE, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 31, .species = SPECIES_COMBUSKEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Torchic[] = { +static const struct TrainerMon sParty_BrendanRoute103Torchic[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_MUDKIP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Torchic[] = { +static const struct TrainerMon sParty_BrendanRoute110Torchic[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 18, .species = SPECIES_LOMBRE, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 18, .species = SPECIES_SLUGMA, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 20, .species = SPECIES_MARSHTOMP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Torchic[] = { +static const struct TrainerMon sParty_BrendanRoute119Torchic[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_LOMBRE, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_SLUGMA, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 31, .species = SPECIES_MARSHTOMP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Mudkip[] = { +static const struct TrainerMon sParty_MayRoute103Mudkip[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_TREECKO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Mudkip[] = { +static const struct TrainerMon sParty_MayRoute110Mudkip[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 18, .species = SPECIES_WINGULL, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 18, .species = SPECIES_SLUGMA, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 20, .species = SPECIES_GROVYLE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Mudkip[] = { +static const struct TrainerMon sParty_MayRoute119Mudkip[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_SLUGMA, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_LOMBRE, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 31, .species = SPECIES_GROVYLE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Treecko[] = { +static const struct TrainerMon sParty_MayRoute103Treecko[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_TORCHIC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Treecko[] = { +static const struct TrainerMon sParty_MayRoute110Treecko[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 18, .species = SPECIES_WINGULL, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 18, .species = SPECIES_LOMBRE, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 20, .species = SPECIES_COMBUSKEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Treecko[] = { +static const struct TrainerMon sParty_MayRoute119Treecko[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_PELIPPER, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_LOMBRE, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 31, .species = SPECIES_COMBUSKEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Torchic[] = { +static const struct TrainerMon sParty_MayRoute103Torchic[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_MUDKIP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Torchic[] = { +static const struct TrainerMon sParty_MayRoute110Torchic[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 18, .species = SPECIES_LOMBRE, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 18, .species = SPECIES_SLUGMA, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 20, .species = SPECIES_MARSHTOMP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Torchic[] = { +static const struct TrainerMon sParty_MayRoute119Torchic[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_LOMBRE, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_SLUGMA, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 31, .species = SPECIES_MARSHTOMP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Isaac1[] = { +static const struct TrainerMon sParty_Isaac1[] = { { - .iv = 0, .lvl = 11, .species = SPECIES_WHISMUR, }, { - .iv = 0, .lvl = 11, .species = SPECIES_ZIGZAGOON, }, { - .iv = 0, .lvl = 11, .species = SPECIES_ARON, }, { - .iv = 0, .lvl = 11, .species = SPECIES_POOCHYENA, }, { - .iv = 0, .lvl = 11, .species = SPECIES_TAILLOW, }, { - .iv = 0, .lvl = 11, .species = SPECIES_MAKUHITA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Davis[] = { +static const struct TrainerMon sParty_Davis[] = { { - .iv = 0, .lvl = 27, .species = SPECIES_PINSIR, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Mitchell[] = { +static const struct TrainerMon sParty_Mitchell[] = { { - .iv = 0, .lvl = 43, .species = SPECIES_LUNATONE, .moves = {MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_PSYCHIC} }, { - .iv = 0, .lvl = 43, .species = SPECIES_SOLROCK, .moves = {MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_SHADOW_BALL} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Isaac2[] = { +static const struct TrainerMon sParty_Isaac2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 22, .species = SPECIES_LOUDRED, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 22, .species = SPECIES_LINOONE, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 22, .species = SPECIES_ARON, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 22, .species = SPECIES_MIGHTYENA, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 22, .species = SPECIES_SWELLOW, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 22, .species = SPECIES_MAKUHITA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Isaac3[] = { +static const struct TrainerMon sParty_Isaac3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 25, .species = SPECIES_LOUDRED, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 25, .species = SPECIES_LINOONE, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 25, .species = SPECIES_ARON, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 25, .species = SPECIES_MIGHTYENA, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 25, .species = SPECIES_SWELLOW, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 25, .species = SPECIES_HARIYAMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Isaac4[] = { +static const struct TrainerMon sParty_Isaac4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 28, .species = SPECIES_LOUDRED, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 28, .species = SPECIES_LINOONE, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 28, .species = SPECIES_ARON, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 28, .species = SPECIES_MIGHTYENA, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 28, .species = SPECIES_SWELLOW, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 28, .species = SPECIES_HARIYAMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Isaac5[] = { +static const struct TrainerMon sParty_Isaac5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 31, .species = SPECIES_LOUDRED, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 31, .species = SPECIES_LINOONE, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 31, .species = SPECIES_LAIRON, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 31, .species = SPECIES_MIGHTYENA, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 31, .species = SPECIES_SWELLOW, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 31, .species = SPECIES_HARIYAMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lydia1[] = { +static const struct TrainerMon sParty_Lydia1[] = { { - .iv = 0, .lvl = 11, .species = SPECIES_WINGULL, }, { - .iv = 0, .lvl = 11, .species = SPECIES_SHROOMISH, }, { - .iv = 0, .lvl = 11, .species = SPECIES_MARILL, }, { - .iv = 0, .lvl = 11, .species = SPECIES_ROSELIA, }, { - .iv = 0, .lvl = 11, .species = SPECIES_SKITTY, }, { - .iv = 0, .lvl = 11, .species = SPECIES_GOLDEEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Halle[] = { +static const struct TrainerMon sParty_Halle[] = { { - .iv = 0, .lvl = 43, .species = SPECIES_SABLEYE, }, { - .iv = 0, .lvl = 43, .species = SPECIES_ABSOL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Garrison[] = { +static const struct TrainerMon sParty_Garrison[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_SANDSLASH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lydia2[] = { +static const struct TrainerMon sParty_Lydia2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 22, .species = SPECIES_WINGULL, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 22, .species = SPECIES_SHROOMISH, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 22, .species = SPECIES_MARILL, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 22, .species = SPECIES_ROSELIA, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 22, .species = SPECIES_SKITTY, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 22, .species = SPECIES_GOLDEEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lydia3[] = { +static const struct TrainerMon sParty_Lydia3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 25, .species = SPECIES_PELIPPER, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 25, .species = SPECIES_BRELOOM, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 25, .species = SPECIES_MARILL, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 25, .species = SPECIES_ROSELIA, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 25, .species = SPECIES_DELCATTY, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 25, .species = SPECIES_GOLDEEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lydia4[] = { +static const struct TrainerMon sParty_Lydia4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 28, .species = SPECIES_PELIPPER, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 28, .species = SPECIES_BRELOOM, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 28, .species = SPECIES_MARILL, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 28, .species = SPECIES_ROSELIA, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 28, .species = SPECIES_DELCATTY, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 28, .species = SPECIES_GOLDEEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lydia5[] = { +static const struct TrainerMon sParty_Lydia5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 31, .species = SPECIES_PELIPPER, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 31, .species = SPECIES_BRELOOM, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 31, .species = SPECIES_AZUMARILL, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 31, .species = SPECIES_ROSELIA, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 31, .species = SPECIES_DELCATTY, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 31, .species = SPECIES_SEAKING, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jackson1[] = { +static const struct TrainerMon sParty_Jackson1[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 27, .species = SPECIES_BRELOOM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lorenzo[] = { +static const struct TrainerMon sParty_Lorenzo[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 28, .species = SPECIES_SEEDOT, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 28, .species = SPECIES_NUZLEAF, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 28, .species = SPECIES_LOMBRE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Sebastian[] = { +static const struct TrainerMon sParty_Sebastian[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 39, .species = SPECIES_CACTURNE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jackson2[] = { +static const struct TrainerMon sParty_Jackson2[] = { { - .iv = 60, + .iv = TRAINER_PARTY_IVS(7, 7, 7, 7, 7, 7), .lvl = 31, .species = SPECIES_BRELOOM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jackson3[] = { +static const struct TrainerMon sParty_Jackson3[] = { { - .iv = 70, + .iv = TRAINER_PARTY_IVS(8, 8, 8, 8, 8, 8), .lvl = 34, .species = SPECIES_BRELOOM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jackson4[] = { +static const struct TrainerMon sParty_Jackson4[] = { { - .iv = 80, + .iv = TRAINER_PARTY_IVS(9, 9, 9, 9, 9, 9), .lvl = 37, .species = SPECIES_BRELOOM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jackson5[] = { +static const struct TrainerMon sParty_Jackson5[] = { { - .iv = 90, + .iv = TRAINER_PARTY_IVS(10, 10, 10, 10, 10, 10), .lvl = 39, .species = SPECIES_KECLEON, }, { - .iv = 90, + .iv = TRAINER_PARTY_IVS(10, 10, 10, 10, 10, 10), .lvl = 39, .species = SPECIES_BRELOOM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Catherine1[] = { +static const struct TrainerMon sParty_Catherine1[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 26, .species = SPECIES_GLOOM, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 26, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jenna[] = { +static const struct TrainerMon sParty_Jenna[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 28, .species = SPECIES_LOTAD, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 28, .species = SPECIES_LOMBRE, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 28, .species = SPECIES_NUZLEAF, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Sophia[] = { +static const struct TrainerMon sParty_Sophia[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 38, .species = SPECIES_SWABLU, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 38, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Catherine2[] = { +static const struct TrainerMon sParty_Catherine2[] = { { - .iv = 60, + .iv = TRAINER_PARTY_IVS(7, 7, 7, 7, 7, 7), .lvl = 30, .species = SPECIES_GLOOM, }, { - .iv = 60, + .iv = TRAINER_PARTY_IVS(7, 7, 7, 7, 7, 7), .lvl = 30, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Catherine3[] = { +static const struct TrainerMon sParty_Catherine3[] = { { - .iv = 70, + .iv = TRAINER_PARTY_IVS(8, 8, 8, 8, 8, 8), .lvl = 33, .species = SPECIES_GLOOM, }, { - .iv = 70, + .iv = TRAINER_PARTY_IVS(8, 8, 8, 8, 8, 8), .lvl = 33, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Catherine4[] = { +static const struct TrainerMon sParty_Catherine4[] = { { - .iv = 80, + .iv = TRAINER_PARTY_IVS(9, 9, 9, 9, 9, 9), .lvl = 36, .species = SPECIES_GLOOM, }, { - .iv = 80, + .iv = TRAINER_PARTY_IVS(9, 9, 9, 9, 9, 9), .lvl = 36, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Catherine5[] = { +static const struct TrainerMon sParty_Catherine5[] = { { - .iv = 90, + .iv = TRAINER_PARTY_IVS(10, 10, 10, 10, 10, 10), .lvl = 39, .species = SPECIES_BELLOSSOM, }, { - .iv = 90, + .iv = TRAINER_PARTY_IVS(10, 10, 10, 10, 10, 10), .lvl = 39, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Julio[] = { +static const struct TrainerMon sParty_Julio[] = { { - .iv = 0, .lvl = 21, .species = SPECIES_MAGNEMITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern5[] = { +static const struct TrainerMon sParty_GruntSeafloorCavern5[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 35, .species = SPECIES_MIGHTYENA, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 35, .species = SPECIES_GOLBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntUnused[] = { +static const struct TrainerMon sParty_GruntUnused[] = { { - .iv = 0, .lvl = 31, .species = SPECIES_WAILMER, }, { - .iv = 0, .lvl = 31, .species = SPECIES_ZUBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre4[] = { +static const struct TrainerMon sParty_GruntMtPyre4[] = { { - .iv = 0, .lvl = 30, .species = SPECIES_WAILMER, }, { - .iv = 0, .lvl = 30, .species = SPECIES_ZUBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntJaggedPass[] = { +static const struct TrainerMon sParty_GruntJaggedPass[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 22, .species = SPECIES_POOCHYENA, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 22, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Marc[] = { +static const struct TrainerMon sParty_Marc[] = { { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 8, .species = SPECIES_GEODUDE, }, { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 8, .species = SPECIES_GEODUDE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Brenden[] = { +static const struct TrainerMon sParty_Brenden[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 13, .species = SPECIES_MACHOP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lilith[] = { +static const struct TrainerMon sParty_Lilith[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 13, .species = SPECIES_MEDITITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cristian[] = { +static const struct TrainerMon sParty_Cristian[] = { { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 13, .species = SPECIES_MAKUHITA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Sylvia[] = { +static const struct TrainerMon sParty_Sylvia[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 36, .species = SPECIES_MEDITITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Leonardo[] = { +static const struct TrainerMon sParty_Leonardo[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonItemCustomMoves sParty_Athena[] = { +static const struct TrainerMon sParty_Athena[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 32, .species = SPECIES_MANECTRIC, .heldItem = ITEM_NONE, .moves = {MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_NONE} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 32, .species = SPECIES_LINOONE, .heldItem = ITEM_NONE, @@ -7716,2612 +7317,2396 @@ static const struct TrainerMonItemCustomMoves sParty_Athena[] = { } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Harrison[] = { +static const struct TrainerMon sParty_Harrison[] = { { - .iv = 0, .lvl = 35, .species = SPECIES_TENTACRUEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtChimney2[] = { +static const struct TrainerMon sParty_GruntMtChimney2[] = { { - .iv = 0, .lvl = 20, .species = SPECIES_ZUBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Clarence[] = { +static const struct TrainerMon sParty_Clarence[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_SHARPEDO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Terry[] = { +static const struct TrainerMon sParty_Terry[] = { { - .iv = 0, .lvl = 37, .species = SPECIES_GIRAFARIG, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Nate[] = { +static const struct TrainerMon sParty_Nate[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 36, .species = SPECIES_SPOINK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Kathleen[] = { +static const struct TrainerMon sParty_Kathleen[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 36, .species = SPECIES_KADABRA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Clifford[] = { +static const struct TrainerMon sParty_Clifford[] = { { - .iv = 0, .lvl = 36, .species = SPECIES_GIRAFARIG, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Nicholas[] = { +static const struct TrainerMon sParty_Nicholas[] = { { - .iv = 0, .lvl = 36, .species = SPECIES_WOBBUFFET, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter3[] = { +static const struct TrainerMon sParty_GruntSpaceCenter3[] = { { - .iv = 0, .lvl = 31, .species = SPECIES_ZUBAT, }, { - .iv = 0, .lvl = 31, .species = SPECIES_POOCHYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter4[] = { +static const struct TrainerMon sParty_GruntSpaceCenter4[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_BALTOY, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter5[] = { +static const struct TrainerMon sParty_GruntSpaceCenter5[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_ZUBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter6[] = { +static const struct TrainerMon sParty_GruntSpaceCenter6[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_MIGHTYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter7[] = { +static const struct TrainerMon sParty_GruntSpaceCenter7[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_BALTOY, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Macey[] = { +static const struct TrainerMon sParty_Macey[] = { { - .iv = 0, .lvl = 36, .species = SPECIES_NATU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRustboroTreecko[] = { +static const struct TrainerMon sParty_BrendanRustboroTreecko[] = { { - .iv = 25, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 13, .species = SPECIES_LOTAD, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 15, .species = SPECIES_TORCHIC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRustboroMudkip[] = { +static const struct TrainerMon sParty_BrendanRustboroMudkip[] = { { - .iv = 25, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 13, .species = SPECIES_WINGULL, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 15, .species = SPECIES_TREECKO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Paxton[] = { +static const struct TrainerMon sParty_Paxton[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_SWELLOW, }, { - .iv = 0, .lvl = 33, .species = SPECIES_BRELOOM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Isabella[] = { +static const struct TrainerMon sParty_Isabella[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst5[] = { +static const struct TrainerMon sParty_GruntWeatherInst5[] = { { - .iv = 0, .lvl = 27, .species = SPECIES_ZUBAT, }, { - .iv = 0, .lvl = 27, .species = SPECIES_POOCHYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMtChimney[] = { +static const struct TrainerMon sParty_TabithaMtChimney[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 18, .species = SPECIES_NUMEL, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 20, .species = SPECIES_POOCHYENA, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 22, .species = SPECIES_NUMEL, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 22, .species = SPECIES_ZUBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jonathan[] = { +static const struct TrainerMon sParty_Jonathan[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_KECLEON, }, { - .iv = 0, .lvl = 33, .species = SPECIES_LOUDRED, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRustboroTorchic[] = { +static const struct TrainerMon sParty_BrendanRustboroTorchic[] = { { - .iv = 25, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 13, .species = SPECIES_SLUGMA, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 15, .species = SPECIES_MUDKIP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroMudkip[] = { +static const struct TrainerMon sParty_MayRustboroMudkip[] = { { - .iv = 25, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 13, .species = SPECIES_WINGULL, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 15, .species = SPECIES_TREECKO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MaxieMagmaHideout[] = { +static const struct TrainerMon sParty_MaxieMagmaHideout[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 37, .species = SPECIES_MIGHTYENA, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 38, .species = SPECIES_CROBAT, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 39, .species = SPECIES_CAMERUPT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MaxieMtChimney[] = { +static const struct TrainerMon sParty_MaxieMtChimney[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 24, .species = SPECIES_MIGHTYENA, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 24, .species = SPECIES_ZUBAT, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 25, .species = SPECIES_CAMERUPT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Tiana[] = { +static const struct TrainerMon sParty_Tiana[] = { { - .iv = 0, .lvl = 4, .species = SPECIES_ZIGZAGOON, }, { - .iv = 0, .lvl = 4, .species = SPECIES_SHROOMISH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Haley1[] = { +static const struct TrainerMon sParty_Haley1[] = { { - .iv = 0, .lvl = 6, .species = SPECIES_LOTAD, }, { - .iv = 0, .lvl = 6, .species = SPECIES_SHROOMISH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Janice[] = { +static const struct TrainerMon sParty_Janice[] = { { - .iv = 0, .lvl = 9, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Vivi[] = { +static const struct TrainerMon sParty_Vivi[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 15, .species = SPECIES_MARILL, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 15, .species = SPECIES_SHROOMISH, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 15, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Haley2[] = { +static const struct TrainerMon sParty_Haley2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 26, .species = SPECIES_LOMBRE, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 26, .species = SPECIES_SHROOMISH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Haley3[] = { +static const struct TrainerMon sParty_Haley3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_LOMBRE, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_BRELOOM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Haley4[] = { +static const struct TrainerMon sParty_Haley4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 32, .species = SPECIES_LOMBRE, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 32, .species = SPECIES_BRELOOM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Haley5[] = { +static const struct TrainerMon sParty_Haley5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 34, .species = SPECIES_SWELLOW, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 34, .species = SPECIES_LOMBRE, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 34, .species = SPECIES_BRELOOM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Sally[] = { +static const struct TrainerMon sParty_Sally[] = { { - .iv = 0, .lvl = 16, .species = SPECIES_ODDISH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Robin[] = { +static const struct TrainerMon sParty_Robin[] = { { - .iv = 0, .lvl = 14, .species = SPECIES_SKITTY, }, { - .iv = 0, .lvl = 14, .species = SPECIES_SHROOMISH, }, { - .iv = 0, .lvl = 14, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Andrea[] = { +static const struct TrainerMon sParty_Andrea[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 40, .species = SPECIES_LUVDISC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Crissy[] = { +static const struct TrainerMon sParty_Crissy[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 39, .species = SPECIES_GOLDEEN, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 39, .species = SPECIES_WAILMER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Rick[] = { +static const struct TrainerMon sParty_Rick[] = { { - .iv = 0, .lvl = 4, .species = SPECIES_WURMPLE, }, { - .iv = 0, .lvl = 4, .species = SPECIES_WURMPLE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lyle[] = { +static const struct TrainerMon sParty_Lyle[] = { { - .iv = 0, .lvl = 3, .species = SPECIES_WURMPLE, }, { - .iv = 0, .lvl = 3, .species = SPECIES_WURMPLE, }, { - .iv = 0, .lvl = 3, .species = SPECIES_WURMPLE, }, { - .iv = 0, .lvl = 3, .species = SPECIES_WURMPLE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jose[] = { +static const struct TrainerMon sParty_Jose[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 8, .species = SPECIES_WURMPLE, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 8, .species = SPECIES_NINCADA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Doug[] = { +static const struct TrainerMon sParty_Doug[] = { { - .iv = 0, .lvl = 28, .species = SPECIES_NINCADA, }, { - .iv = 0, .lvl = 28, .species = SPECIES_NINJASK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Greg[] = { +static const struct TrainerMon sParty_Greg[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_VOLBEAT, }, { - .iv = 0, .lvl = 25, .species = SPECIES_ILLUMISE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Kent[] = { +static const struct TrainerMon sParty_Kent[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_NINJASK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_James1[] = { +static const struct TrainerMon sParty_James1[] = { { - .iv = 0, .lvl = 6, .species = SPECIES_NINCADA, }, { - .iv = 0, .lvl = 6, .species = SPECIES_NINCADA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_James2[] = { +static const struct TrainerMon sParty_James2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 27, .species = SPECIES_NINJASK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_James3[] = { +static const struct TrainerMon sParty_James3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_DUSTOX, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 29, .species = SPECIES_NINJASK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_James4[] = { +static const struct TrainerMon sParty_James4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_SURSKIT, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_DUSTOX, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 31, .species = SPECIES_NINJASK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_James5[] = { +static const struct TrainerMon sParty_James5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_SURSKIT, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_NINJASK, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_DUSTOX, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_NINJASK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Brice[] = { +static const struct TrainerMon sParty_Brice[] = { { - .iv = 0, .lvl = 17, .species = SPECIES_NUMEL, }, { - .iv = 0, .lvl = 17, .species = SPECIES_MACHOP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Trent1[] = { +static const struct TrainerMon sParty_Trent1[] = { { - .iv = 0, .lvl = 16, .species = SPECIES_GEODUDE, }, { - .iv = 0, .lvl = 17, .species = SPECIES_GEODUDE, }, { - .iv = 0, .lvl = 16, .species = SPECIES_GEODUDE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lenny[] = { +static const struct TrainerMon sParty_Lenny[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_GEODUDE, }, { - .iv = 0, .lvl = 18, .species = SPECIES_MACHOP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lucas1[] = { +static const struct TrainerMon sParty_Lucas1[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_GEODUDE, }, { - .iv = 0, .lvl = 18, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Alan[] = { +static const struct TrainerMon sParty_Alan[] = { { - .iv = 0, .lvl = 22, .species = SPECIES_GEODUDE, }, { - .iv = 0, .lvl = 22, .species = SPECIES_NOSEPASS, }, { - .iv = 0, .lvl = 22, .species = SPECIES_GRAVELER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Clark[] = { +static const struct TrainerMon sParty_Clark[] = { { - .iv = 0, .lvl = 8, .species = SPECIES_GEODUDE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Eric[] = { +static const struct TrainerMon sParty_Eric[] = { { - .iv = 0, .lvl = 20, .species = SPECIES_GEODUDE, }, { - .iv = 0, .lvl = 20, .species = SPECIES_BALTOY, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Lucas2[] = { +static const struct TrainerMon sParty_Lucas2[] = { { - .iv = 0, .lvl = 9, .species = SPECIES_WAILMER, .moves = {MOVE_SPLASH, MOVE_WATER_GUN, MOVE_NONE, MOVE_NONE} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Mike1[] = { +static const struct TrainerMon sParty_Mike1[] = { { - .iv = 0, .lvl = 10, .species = SPECIES_PELIPPER, .moves = {MOVE_GUST, MOVE_GROWL, MOVE_NONE, MOVE_NONE} }, { - .iv = 0, .lvl = 10, .species = SPECIES_POOCHYENA, .moves = {MOVE_BITE, MOVE_SCARY_FACE, MOVE_NONE, MOVE_NONE} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Mike2[] = { +static const struct TrainerMon sParty_Mike2[] = { { - .iv = 0, .lvl = 16, .species = SPECIES_GEODUDE, }, { - .iv = 0, .lvl = 16, .species = SPECIES_GEODUDE, }, { - .iv = 0, .lvl = 16, .species = SPECIES_MACHOP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Trent2[] = { +static const struct TrainerMon sParty_Trent2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 24, .species = SPECIES_GEODUDE, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 24, .species = SPECIES_GEODUDE, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 24, .species = SPECIES_GEODUDE, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 24, .species = SPECIES_GRAVELER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Trent3[] = { +static const struct TrainerMon sParty_Trent3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 27, .species = SPECIES_GEODUDE, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 27, .species = SPECIES_GEODUDE, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 27, .species = SPECIES_GRAVELER, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 27, .species = SPECIES_GRAVELER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Trent4[] = { +static const struct TrainerMon sParty_Trent4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 30, .species = SPECIES_GEODUDE, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 30, .species = SPECIES_GRAVELER, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 30, .species = SPECIES_GRAVELER, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 30, .species = SPECIES_GRAVELER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Trent5[] = { +static const struct TrainerMon sParty_Trent5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_GRAVELER, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_GRAVELER, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_GRAVELER, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_GOLEM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_DezAndLuke[] = { +static const struct TrainerMon sParty_DezAndLuke[] = { { - .iv = 0, .lvl = 31, .species = SPECIES_DELCATTY, }, { - .iv = 0, .lvl = 31, .species = SPECIES_MANECTRIC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_LeaAndJed[] = { +static const struct TrainerMon sParty_LeaAndJed[] = { { - .iv = 0, .lvl = 45, .species = SPECIES_LUVDISC, }, { - .iv = 0, .lvl = 45, .species = SPECIES_LUVDISC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan1[] = { +static const struct TrainerMon sParty_KiraAndDan1[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_VOLBEAT, }, { - .iv = 0, .lvl = 25, .species = SPECIES_ILLUMISE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan2[] = { +static const struct TrainerMon sParty_KiraAndDan2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 30, .species = SPECIES_VOLBEAT, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 30, .species = SPECIES_ILLUMISE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan3[] = { +static const struct TrainerMon sParty_KiraAndDan3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 33, .species = SPECIES_VOLBEAT, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 33, .species = SPECIES_ILLUMISE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan4[] = { +static const struct TrainerMon sParty_KiraAndDan4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 36, .species = SPECIES_VOLBEAT, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 36, .species = SPECIES_ILLUMISE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan5[] = { +static const struct TrainerMon sParty_KiraAndDan5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 39, .species = SPECIES_VOLBEAT, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 39, .species = SPECIES_ILLUMISE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Johanna[] = { +static const struct TrainerMon sParty_Johanna[] = { { - .iv = 0, .lvl = 13, .species = SPECIES_GOLDEEN, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Gerald[] = { +static const struct TrainerMon sParty_Gerald[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 23, .species = SPECIES_KECLEON, .moves = {MOVE_FLAMETHROWER, MOVE_FURY_SWIPES, MOVE_FEINT_ATTACK, MOVE_BIND} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Vivian[] = { +static const struct TrainerMon sParty_Vivian[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 17, .species = SPECIES_MEDITITE, .moves = {MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_THUNDER_PUNCH} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 17, .species = SPECIES_MEDITITE, .moves = {MOVE_THUNDER_PUNCH, MOVE_DETECT, MOVE_CONFUSION, MOVE_MEDITATE} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Danielle[] = { +static const struct TrainerMon sParty_Danielle[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 23, .species = SPECIES_MEDITITE, .moves = {MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_FIRE_PUNCH} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Hideo[] = { +static const struct TrainerMon sParty_Hideo[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_KOFFING, .moves = {MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN} }, { - .iv = 0, .lvl = 25, .species = SPECIES_KOFFING, .moves = {MOVE_TACKLE, MOVE_POISON_GAS, MOVE_SLUDGE, MOVE_SMOKESCREEN} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Keigo[] = { +static const struct TrainerMon sParty_Keigo[] = { { - .iv = 0, .lvl = 28, .species = SPECIES_KOFFING, .moves = {MOVE_POISON_GAS, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN} }, { - .iv = 0, .lvl = 28, .species = SPECIES_NINJASK, .moves = {MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM, MOVE_FURY_CUTTER, MOVE_SWORDS_DANCE} } }; -static const struct TrainerMonNoItemCustomMoves sParty_Riley[] = { +static const struct TrainerMon sParty_Riley[] = { { - .iv = 0, .lvl = 28, .species = SPECIES_NINCADA, .moves = {MOVE_LEECH_LIFE, MOVE_FURY_SWIPES, MOVE_MIND_READER, MOVE_DIG} }, { - .iv = 0, .lvl = 28, .species = SPECIES_KOFFING, .moves = {MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Flint[] = { +static const struct TrainerMon sParty_Flint[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 29, .species = SPECIES_SWELLOW, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 29, .species = SPECIES_XATU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ashley[] = { +static const struct TrainerMon sParty_Ashley[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 27, .species = SPECIES_SWABLU, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 27, .species = SPECIES_SWABLU, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 27, .species = SPECIES_SWABLU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_WallyMauville[] = { +static const struct TrainerMon sParty_WallyMauville[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 16, .species = SPECIES_RALTS, } }; -static const struct TrainerMonNoItemCustomMoves sParty_WallyVR2[] = { +static const struct TrainerMon sParty_WallyVR2[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 47, .species = SPECIES_ALTARIA, .moves = {MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 46, .species = SPECIES_DELCATTY, .moves = {MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FEINT_ATTACK} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 47, .species = SPECIES_ROSELIA, .moves = {MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 44, .species = SPECIES_MAGNETON, .moves = {MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 48, .species = SPECIES_GARDEVOIR, .moves = {MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT} } }; -static const struct TrainerMonNoItemCustomMoves sParty_WallyVR3[] = { +static const struct TrainerMon sParty_WallyVR3[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 50, .species = SPECIES_ALTARIA, .moves = {MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 49, .species = SPECIES_DELCATTY, .moves = {MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FEINT_ATTACK} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 50, .species = SPECIES_ROSELIA, .moves = {MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 47, .species = SPECIES_MAGNETON, .moves = {MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 51, .species = SPECIES_GARDEVOIR, .moves = {MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT} } }; -static const struct TrainerMonNoItemCustomMoves sParty_WallyVR4[] = { +static const struct TrainerMon sParty_WallyVR4[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 53, .species = SPECIES_ALTARIA, .moves = {MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 52, .species = SPECIES_DELCATTY, .moves = {MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FEINT_ATTACK} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 53, .species = SPECIES_ROSELIA, .moves = {MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 50, .species = SPECIES_MAGNETON, .moves = {MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 54, .species = SPECIES_GARDEVOIR, .moves = {MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT} } }; -static const struct TrainerMonNoItemCustomMoves sParty_WallyVR5[] = { +static const struct TrainerMon sParty_WallyVR5[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 56, .species = SPECIES_ALTARIA, .moves = {MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 55, .species = SPECIES_DELCATTY, .moves = {MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FEINT_ATTACK} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 56, .species = SPECIES_ROSELIA, .moves = {MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC} }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 53, .species = SPECIES_MAGNETON, .moves = {MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH} }, { - .iv = 250, + .iv = TRAINER_PARTY_IVS(30, 30, 30, 30, 30, 30), .lvl = 57, .species = SPECIES_GARDEVOIR, .moves = {MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLilycoveMudkip[] = { +static const struct TrainerMon sParty_BrendanLilycoveMudkip[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 31, .species = SPECIES_TROPIUS, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 32, .species = SPECIES_SLUGMA, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 32, .species = SPECIES_PELIPPER, }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 34, .species = SPECIES_GROVYLE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLilycoveTreecko[] = { +static const struct TrainerMon sParty_BrendanLilycoveTreecko[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 31, .species = SPECIES_TROPIUS, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 32, .species = SPECIES_PELIPPER, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 32, .species = SPECIES_LUDICOLO, }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 34, .species = SPECIES_COMBUSKEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLilycoveTorchic[] = { +static const struct TrainerMon sParty_BrendanLilycoveTorchic[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 31, .species = SPECIES_TROPIUS, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 32, .species = SPECIES_LUDICOLO, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 32, .species = SPECIES_SLUGMA, }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 34, .species = SPECIES_MARSHTOMP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayLilycoveMudkip[] = { +static const struct TrainerMon sParty_MayLilycoveMudkip[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 31, .species = SPECIES_TROPIUS, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 32, .species = SPECIES_SLUGMA, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 32, .species = SPECIES_PELIPPER, }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 34, .species = SPECIES_GROVYLE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayLilycoveTreecko[] = { +static const struct TrainerMon sParty_MayLilycoveTreecko[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 31, .species = SPECIES_TROPIUS, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 32, .species = SPECIES_PELIPPER, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 32, .species = SPECIES_LUDICOLO, }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 34, .species = SPECIES_COMBUSKEN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayLilycoveTorchic[] = { +static const struct TrainerMon sParty_MayLilycoveTorchic[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 31, .species = SPECIES_TROPIUS, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 32, .species = SPECIES_LUDICOLO, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 32, .species = SPECIES_SLUGMA, }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 34, .species = SPECIES_MARSHTOMP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jonah[] = { +static const struct TrainerMon sParty_Jonah[] = { { - .iv = 0, .lvl = 30, .species = SPECIES_WAILMER, }, { - .iv = 0, .lvl = 31, .species = SPECIES_TENTACOOL, }, { - .iv = 0, .lvl = 32, .species = SPECIES_SHARPEDO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Henry[] = { +static const struct TrainerMon sParty_Henry[] = { { - .iv = 0, .lvl = 31, .species = SPECIES_CARVANHA, }, { - .iv = 0, .lvl = 34, .species = SPECIES_TENTACRUEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Roger[] = { +static const struct TrainerMon sParty_Roger[] = { { - .iv = 0, .lvl = 15, .species = SPECIES_MAGIKARP, }, { - .iv = 0, .lvl = 25, .species = SPECIES_MAGIKARP, }, { - .iv = 0, .lvl = 35, .species = SPECIES_GYARADOS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Alexa[] = { +static const struct TrainerMon sParty_Alexa[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 34, .species = SPECIES_GLOOM, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 34, .species = SPECIES_AZUMARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Ruben[] = { +static const struct TrainerMon sParty_Ruben[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 34, .species = SPECIES_SHIFTRY, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 34, .species = SPECIES_NOSEPASS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Koji1[] = { +static const struct TrainerMon sParty_Koji1[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Wayne[] = { +static const struct TrainerMon sParty_Wayne[] = { { - .iv = 0, .lvl = 31, .species = SPECIES_TENTACOOL, }, { - .iv = 0, .lvl = 31, .species = SPECIES_TENTACOOL, }, { - .iv = 0, .lvl = 36, .species = SPECIES_WAILMER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Aidan[] = { +static const struct TrainerMon sParty_Aidan[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_SWELLOW, }, { - .iv = 0, .lvl = 32, .species = SPECIES_SKARMORY, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Reed[] = { +static const struct TrainerMon sParty_Reed[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_SPHEAL, }, { - .iv = 0, .lvl = 33, .species = SPECIES_SHARPEDO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Tisha[] = { +static const struct TrainerMon sParty_Tisha[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_CHINCHOU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_ToriAndTia[] = { +static const struct TrainerMon sParty_ToriAndTia[] = { { - .iv = 0, .lvl = 19, .species = SPECIES_SPINDA, }, { - .iv = 0, .lvl = 19, .species = SPECIES_SPINDA, } }; -static const struct TrainerMonNoItemCustomMoves sParty_KimAndIris[] = { +static const struct TrainerMon sParty_KimAndIris[] = { { - .iv = 0, .lvl = 32, .species = SPECIES_SWABLU, .moves = {MOVE_SING, MOVE_FURY_ATTACK, MOVE_SAFEGUARD, MOVE_AERIAL_ACE} }, { - .iv = 0, .lvl = 35, .species = SPECIES_NUMEL, .moves = {MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_REST, MOVE_EARTHQUAKE} } }; -static const struct TrainerMonNoItemCustomMoves sParty_TyraAndIvy[] = { +static const struct TrainerMon sParty_TyraAndIvy[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_ROSELIA, .moves = {MOVE_GROWTH, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_LEECH_SEED} }, { - .iv = 0, .lvl = 20, .species = SPECIES_GRAVELER, .moves = {MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_MUD_SPORT, MOVE_ROCK_THROW} } }; -static const struct TrainerMonNoItemCustomMoves sParty_MelAndPaul[] = { +static const struct TrainerMon sParty_MelAndPaul[] = { { - .iv = 0, .lvl = 27, .species = SPECIES_DUSTOX, .moves = {MOVE_GUST, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_PROTECT} }, { - .iv = 0, .lvl = 27, .species = SPECIES_BEAUTIFLY, .moves = {MOVE_GUST, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_STUN_SPORE} } }; -static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay1[] = { +static const struct TrainerMon sParty_JohnAndJay1[] = { { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 39, .species = SPECIES_MEDICHAM, .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT} }, { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 39, .species = SPECIES_HARIYAMA, .moves = {MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM} } }; -static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay2[] = { +static const struct TrainerMon sParty_JohnAndJay2[] = { { - .iv = 210, + .iv = TRAINER_PARTY_IVS(25, 25, 25, 25, 25, 25), .lvl = 43, .species = SPECIES_MEDICHAM, .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT} }, { - .iv = 210, + .iv = TRAINER_PARTY_IVS(25, 25, 25, 25, 25, 25), .lvl = 43, .species = SPECIES_HARIYAMA, .moves = {MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM} } }; -static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay3[] = { +static const struct TrainerMon sParty_JohnAndJay3[] = { { - .iv = 220, + .iv = TRAINER_PARTY_IVS(26, 26, 26, 26, 26, 26), .lvl = 46, .species = SPECIES_MEDICHAM, .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT} }, { - .iv = 220, + .iv = TRAINER_PARTY_IVS(26, 26, 26, 26, 26, 26), .lvl = 46, .species = SPECIES_HARIYAMA, .moves = {MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM} } }; -static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay4[] = { +static const struct TrainerMon sParty_JohnAndJay4[] = { { - .iv = 230, + .iv = TRAINER_PARTY_IVS(27, 27, 27, 27, 27, 27), .lvl = 49, .species = SPECIES_MEDICHAM, .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT} }, { - .iv = 230, + .iv = TRAINER_PARTY_IVS(27, 27, 27, 27, 27, 27), .lvl = 49, .species = SPECIES_HARIYAMA, .moves = {MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM} } }; -static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay5[] = { +static const struct TrainerMon sParty_JohnAndJay5[] = { { - .iv = 240, + .iv = TRAINER_PARTY_IVS(29, 29, 29, 29, 29, 29), .lvl = 52, .species = SPECIES_MEDICHAM, .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT} }, { - .iv = 240, + .iv = TRAINER_PARTY_IVS(29, 29, 29, 29, 29, 29), .lvl = 52, .species = SPECIES_HARIYAMA, .moves = {MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_ReliAndIan[] = { +static const struct TrainerMon sParty_ReliAndIan[] = { { - .iv = 0, .lvl = 35, .species = SPECIES_AZUMARILL, }, { - .iv = 0, .lvl = 33, .species = SPECIES_WINGULL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy1[] = { +static const struct TrainerMon sParty_LilaAndRoy1[] = { { - .iv = 0, .lvl = 34, .species = SPECIES_CHINCHOU, }, { - .iv = 0, .lvl = 33, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy2[] = { +static const struct TrainerMon sParty_LilaAndRoy2[] = { { - .iv = 0, .lvl = 42, .species = SPECIES_CHINCHOU, }, { - .iv = 0, .lvl = 40, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy3[] = { +static const struct TrainerMon sParty_LilaAndRoy3[] = { { - .iv = 0, .lvl = 45, .species = SPECIES_LANTURN, }, { - .iv = 0, .lvl = 43, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy4[] = { +static const struct TrainerMon sParty_LilaAndRoy4[] = { { - .iv = 0, .lvl = 48, .species = SPECIES_LANTURN, }, { - .iv = 0, .lvl = 46, .species = SPECIES_SHARPEDO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy5[] = { +static const struct TrainerMon sParty_LilaAndRoy5[] = { { - .iv = 0, .lvl = 51, .species = SPECIES_LANTURN, }, { - .iv = 0, .lvl = 49, .species = SPECIES_SHARPEDO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_LisaAndRay[] = { +static const struct TrainerMon sParty_LisaAndRay[] = { { - .iv = 0, .lvl = 27, .species = SPECIES_GOLDEEN, }, { - .iv = 0, .lvl = 25, .species = SPECIES_TENTACOOL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Chris[] = { +static const struct TrainerMon sParty_Chris[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_MAGIKARP, }, { - .iv = 0, .lvl = 20, .species = SPECIES_TENTACOOL, }, { - .iv = 0, .lvl = 26, .species = SPECIES_FEEBAS, }, { - .iv = 0, .lvl = 23, .species = SPECIES_CARVANHA, } }; -static const struct TrainerMonItemDefaultMoves sParty_Dawson[] = { +static const struct TrainerMon sParty_Dawson[] = { { - .iv = 0, .lvl = 8, .species = SPECIES_ZIGZAGOON, .heldItem = ITEM_NUGGET }, { - .iv = 0, .lvl = 8, .species = SPECIES_POOCHYENA, .heldItem = ITEM_NONE } }; -static const struct TrainerMonItemDefaultMoves sParty_Sarah[] = { +static const struct TrainerMon sParty_Sarah[] = { { - .iv = 0, .lvl = 8, .species = SPECIES_LOTAD, .heldItem = ITEM_NONE }, { - .iv = 0, .lvl = 8, .species = SPECIES_ZIGZAGOON, .heldItem = ITEM_NUGGET } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Darian[] = { +static const struct TrainerMon sParty_Darian[] = { { - .iv = 0, .lvl = 9, .species = SPECIES_MAGIKARP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Hailey[] = { +static const struct TrainerMon sParty_Hailey[] = { { - .iv = 0, .lvl = 13, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Chandler[] = { +static const struct TrainerMon sParty_Chandler[] = { { - .iv = 0, .lvl = 12, .species = SPECIES_TENTACOOL, }, { - .iv = 0, .lvl = 12, .species = SPECIES_TENTACOOL, } }; -static const struct TrainerMonItemDefaultMoves sParty_Kaleb[] = { +static const struct TrainerMon sParty_Kaleb[] = { { - .iv = 0, .lvl = 14, .species = SPECIES_MINUN, .heldItem = ITEM_ORAN_BERRY }, { - .iv = 0, .lvl = 14, .species = SPECIES_PLUSLE, .heldItem = ITEM_ORAN_BERRY } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Joseph[] = { +static const struct TrainerMon sParty_Joseph[] = { { - .iv = 0, .lvl = 14, .species = SPECIES_ELECTRIKE, }, { - .iv = 0, .lvl = 14, .species = SPECIES_VOLTORB, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Alyssa[] = { +static const struct TrainerMon sParty_Alyssa[] = { { - .iv = 0, .lvl = 15, .species = SPECIES_MAGNEMITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Marcos[] = { +static const struct TrainerMon sParty_Marcos[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 15, .species = SPECIES_VOLTORB, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Rhett[] = { +static const struct TrainerMon sParty_Rhett[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 15, .species = SPECIES_MAKUHITA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Tyron[] = { +static const struct TrainerMon sParty_Tyron[] = { { - .iv = 0, .lvl = 19, .species = SPECIES_SANDSHREW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Celina[] = { +static const struct TrainerMon sParty_Celina[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Bianca[] = { +static const struct TrainerMon sParty_Bianca[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_SHROOMISH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Hayden[] = { +static const struct TrainerMon sParty_Hayden[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Sophie[] = { +static const struct TrainerMon sParty_Sophie[] = { { - .iv = 0, .lvl = 17, .species = SPECIES_MARILL, }, { - .iv = 0, .lvl = 19, .species = SPECIES_LOMBRE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Coby[] = { +static const struct TrainerMon sParty_Coby[] = { { - .iv = 0, .lvl = 17, .species = SPECIES_SKARMORY, }, { - .iv = 0, .lvl = 19, .species = SPECIES_SWELLOW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lawrence[] = { +static const struct TrainerMon sParty_Lawrence[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_BALTOY, }, { - .iv = 0, .lvl = 18, .species = SPECIES_SANDSHREW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Wyatt[] = { +static const struct TrainerMon sParty_Wyatt[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_ARON, }, { - .iv = 0, .lvl = 18, .species = SPECIES_ARON, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Angelina[] = { +static const struct TrainerMon sParty_Angelina[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_LOMBRE, }, { - .iv = 0, .lvl = 18, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Kai[] = { +static const struct TrainerMon sParty_Kai[] = { { - .iv = 0, .lvl = 19, .species = SPECIES_BARBOACH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Charlotte[] = { +static const struct TrainerMon sParty_Charlotte[] = { { - .iv = 0, .lvl = 19, .species = SPECIES_NUZLEAF, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Deandre[] = { +static const struct TrainerMon sParty_Deandre[] = { { - .iv = 0, .lvl = 14, .species = SPECIES_ZIGZAGOON, }, { - .iv = 0, .lvl = 14, .species = SPECIES_ARON, }, { - .iv = 0, .lvl = 14, .species = SPECIES_ELECTRIKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout1[] = { +static const struct TrainerMon sParty_GruntMagmaHideout1[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_ZUBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout2[] = { +static const struct TrainerMon sParty_GruntMagmaHideout2[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_POOCHYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout3[] = { +static const struct TrainerMon sParty_GruntMagmaHideout3[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout4[] = { +static const struct TrainerMon sParty_GruntMagmaHideout4[] = { { - .iv = 0, .lvl = 28, .species = SPECIES_BALTOY, }, { - .iv = 0, .lvl = 28, .species = SPECIES_ZUBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout5[] = { +static const struct TrainerMon sParty_GruntMagmaHideout5[] = { { - .iv = 0, .lvl = 28, .species = SPECIES_BALTOY, }, { - .iv = 0, .lvl = 28, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout6[] = { +static const struct TrainerMon sParty_GruntMagmaHideout6[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_MIGHTYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout7[] = { +static const struct TrainerMon sParty_GruntMagmaHideout7[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_ZUBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout8[] = { +static const struct TrainerMon sParty_GruntMagmaHideout8[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_POOCHYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout9[] = { +static const struct TrainerMon sParty_GruntMagmaHideout9[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_ZUBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout10[] = { +static const struct TrainerMon sParty_GruntMagmaHideout10[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_MIGHTYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout11[] = { +static const struct TrainerMon sParty_GruntMagmaHideout11[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_BALTOY, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout12[] = { +static const struct TrainerMon sParty_GruntMagmaHideout12[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout13[] = { +static const struct TrainerMon sParty_GruntMagmaHideout13[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_ZUBAT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout14[] = { +static const struct TrainerMon sParty_GruntMagmaHideout14[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_MIGHTYENA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout15[] = { +static const struct TrainerMon sParty_GruntMagmaHideout15[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout16[] = { +static const struct TrainerMon sParty_GruntMagmaHideout16[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_BALTOY, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMagmaHideout[] = { +static const struct TrainerMon sParty_TabithaMagmaHideout[] = { { - .iv = 75, + .iv = TRAINER_PARTY_IVS(9, 9, 9, 9, 9, 9), .lvl = 26, .species = SPECIES_NUMEL, }, { - .iv = 75, + .iv = TRAINER_PARTY_IVS(9, 9, 9, 9, 9, 9), .lvl = 28, .species = SPECIES_MIGHTYENA, }, { - .iv = 75, + .iv = TRAINER_PARTY_IVS(9, 9, 9, 9, 9, 9), .lvl = 30, .species = SPECIES_ZUBAT, }, { - .iv = 75, + .iv = TRAINER_PARTY_IVS(9, 9, 9, 9, 9, 9), .lvl = 33, .species = SPECIES_CAMERUPT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Darcy[] = { +static const struct TrainerMon sParty_Darcy[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_PELIPPER, }, { - .iv = 0, .lvl = 33, .species = SPECIES_CAMERUPT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MaxieMossdeep[] = { +static const struct TrainerMon sParty_MaxieMossdeep[] = { { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 42, .species = SPECIES_MIGHTYENA, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 43, .species = SPECIES_CROBAT, }, { - .iv = 150, + .iv = TRAINER_PARTY_IVS(18, 18, 18, 18, 18, 18), .lvl = 44, .species = SPECIES_CAMERUPT, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Pete[] = { +static const struct TrainerMon sParty_Pete[] = { { - .iv = 0, .lvl = 15, .species = SPECIES_TENTACOOL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Isabelle[] = { +static const struct TrainerMon sParty_Isabelle[] = { { - .iv = 0, .lvl = 15, .species = SPECIES_MARILL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Andres1[] = { +static const struct TrainerMon sParty_Andres1[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 25, .species = SPECIES_SANDSHREW, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 25, .species = SPECIES_SANDSHREW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Josue[] = { +static const struct TrainerMon sParty_Josue[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 25, .species = SPECIES_TAILLOW, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 25, .species = SPECIES_WINGULL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Camron[] = { +static const struct TrainerMon sParty_Camron[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cory1[] = { +static const struct TrainerMon sParty_Cory1[] = { { - .iv = 0, .lvl = 24, .species = SPECIES_WINGULL, }, { - .iv = 0, .lvl = 24, .species = SPECIES_MACHOP, }, { - .iv = 0, .lvl = 24, .species = SPECIES_TENTACOOL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Carolina[] = { +static const struct TrainerMon sParty_Carolina[] = { { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 24, .species = SPECIES_MANECTRIC, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 24, .species = SPECIES_SWELLOW, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 24, .species = SPECIES_MANECTRIC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Elijah[] = { +static const struct TrainerMon sParty_Elijah[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_SKARMORY, }, { - .iv = 0, .lvl = 25, .species = SPECIES_SKARMORY, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Celia[] = { +static const struct TrainerMon sParty_Celia[] = { { - .iv = 0, .lvl = 22, .species = SPECIES_MARILL, }, { - .iv = 0, .lvl = 22, .species = SPECIES_LOMBRE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Bryan[] = { +static const struct TrainerMon sParty_Bryan[] = { { - .iv = 0, .lvl = 22, .species = SPECIES_SANDSHREW, }, { - .iv = 0, .lvl = 22, .species = SPECIES_SANDSLASH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Branden[] = { +static const struct TrainerMon sParty_Branden[] = { { - .iv = 0, .lvl = 22, .species = SPECIES_TAILLOW, }, { - .iv = 0, .lvl = 22, .species = SPECIES_NUZLEAF, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Bryant[] = { +static const struct TrainerMon sParty_Bryant[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_NUMEL, }, { - .iv = 0, .lvl = 18, .species = SPECIES_SLUGMA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Shayla[] = { +static const struct TrainerMon sParty_Shayla[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_SHROOMISH, }, { - .iv = 0, .lvl = 18, .species = SPECIES_ROSELIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Kyra[] = { +static const struct TrainerMon sParty_Kyra[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_DODUO, }, { - .iv = 0, .lvl = 26, .species = SPECIES_DODRIO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Jaiden[] = { +static const struct TrainerMon sParty_Jaiden[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_NINJASK, }, { - .iv = 0, .lvl = 26, .species = SPECIES_GULPIN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Alix[] = { +static const struct TrainerMon sParty_Alix[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_KADABRA, }, { - .iv = 0, .lvl = 26, .species = SPECIES_KIRLIA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Helene[] = { +static const struct TrainerMon sParty_Helene[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_MEDITITE, }, { - .iv = 0, .lvl = 26, .species = SPECIES_MAKUHITA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Marlene[] = { +static const struct TrainerMon sParty_Marlene[] = { { - .iv = 0, .lvl = 18, .species = SPECIES_MEDITITE, }, { - .iv = 0, .lvl = 18, .species = SPECIES_SPOINK, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Devan[] = { +static const struct TrainerMon sParty_Devan[] = { { - .iv = 0, .lvl = 8, .species = SPECIES_GEODUDE, }, { - .iv = 0, .lvl = 8, .species = SPECIES_GEODUDE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Johnson[] = { +static const struct TrainerMon sParty_Johnson[] = { { - .iv = 0, .lvl = 8, .species = SPECIES_SHROOMISH, }, { - .iv = 0, .lvl = 8, .species = SPECIES_LOTAD, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Melina[] = { +static const struct TrainerMon sParty_Melina[] = { { - .iv = 0, .lvl = 17, .species = SPECIES_DODUO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Brandi[] = { +static const struct TrainerMon sParty_Brandi[] = { { - .iv = 0, .lvl = 17, .species = SPECIES_RALTS, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Aisha[] = { +static const struct TrainerMon sParty_Aisha[] = { { - .iv = 0, .lvl = 17, .species = SPECIES_MEDITITE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Makayla[] = { +static const struct TrainerMon sParty_Makayla[] = { { - .iv = 0, .lvl = 33, .species = SPECIES_ROSELIA, }, { - .iv = 0, .lvl = 33, .species = SPECIES_MEDICHAM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Fabian[] = { +static const struct TrainerMon sParty_Fabian[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_MANECTRIC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Dayton[] = { +static const struct TrainerMon sParty_Dayton[] = { { - .iv = 0, .lvl = 25, .species = SPECIES_SLUGMA, }, { - .iv = 0, .lvl = 25, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Rachel[] = { +static const struct TrainerMon sParty_Rachel[] = { { - .iv = 0, .lvl = 26, .species = SPECIES_GOLDEEN, } }; -static const struct TrainerMonNoItemCustomMoves sParty_Leonel[] = { +static const struct TrainerMon sParty_Leonel[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 30, .species = SPECIES_MANECTRIC, .moves = {MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_NONE} } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Callie[] = { +static const struct TrainerMon sParty_Callie[] = { { - .iv = 0, .lvl = 28, .species = SPECIES_MEDITITE, }, { - .iv = 0, .lvl = 28, .species = SPECIES_MAKUHITA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cale[] = { +static const struct TrainerMon sParty_Cale[] = { { - .iv = 0, .lvl = 29, .species = SPECIES_DUSTOX, }, { - .iv = 0, .lvl = 29, .species = SPECIES_BEAUTIFLY, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Myles[] = { +static const struct TrainerMon sParty_Myles[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_MAKUHITA, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_WINGULL, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_TROPIUS, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_ZIGZAGOON, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_ELECTRIKE, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Pat[] = { +static const struct TrainerMon sParty_Pat[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_POOCHYENA, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_SHROOMISH, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_ELECTRIKE, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_MARILL, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_SANDSHREW, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 25, .species = SPECIES_GULPIN, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cristin1[] = { +static const struct TrainerMon sParty_Cristin1[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_LOUDRED, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 29, .species = SPECIES_VIGOROTH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroTreecko[] = { +static const struct TrainerMon sParty_MayRustboroTreecko[] = { { - .iv = 25, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 13, .species = SPECIES_LOTAD, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 15, .species = SPECIES_TORCHIC, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroTorchic[] = { +static const struct TrainerMon sParty_MayRustboroTorchic[] = { { - .iv = 25, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 13, .species = SPECIES_TORKOAL, }, { - .iv = 50, + .iv = TRAINER_PARTY_IVS(6, 6, 6, 6, 6, 6), .lvl = 15, .species = SPECIES_MUDKIP, } }; -static const struct TrainerMonItemCustomMoves sParty_Roxanne2[] = { +static const struct TrainerMon sParty_Roxanne2[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 32, .species = SPECIES_GOLEM, .heldItem = ITEM_NONE, .moves = {MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 35, .species = SPECIES_KABUTO, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 35, .species = SPECIES_ONIX, .heldItem = ITEM_NONE, .moves = {MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 37, .species = SPECIES_NOSEPASS, .heldItem = ITEM_SITRUS_BERRY, @@ -10329,37 +9714,37 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne2[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Roxanne3[] = { +static const struct TrainerMon sParty_Roxanne3[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 37, .species = SPECIES_OMANYTE, .heldItem = ITEM_NONE, .moves = {MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 37, .species = SPECIES_GOLEM, .heldItem = ITEM_NONE, .moves = {MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 40, .species = SPECIES_KABUTOPS, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 40, .species = SPECIES_ONIX, .heldItem = ITEM_NONE, .moves = {MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 42, .species = SPECIES_NOSEPASS, .heldItem = ITEM_SITRUS_BERRY, @@ -10367,37 +9752,37 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne3[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Roxanne4[] = { +static const struct TrainerMon sParty_Roxanne4[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 42, .species = SPECIES_OMASTAR, .heldItem = ITEM_NONE, .moves = {MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 42, .species = SPECIES_GOLEM, .heldItem = ITEM_NONE, .moves = {MOVE_PROTECT, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 45, .species = SPECIES_KABUTOPS, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 45, .species = SPECIES_ONIX, .heldItem = ITEM_NONE, .moves = {MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 47, .species = SPECIES_NOSEPASS, .heldItem = ITEM_SITRUS_BERRY, @@ -10405,44 +9790,44 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne4[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Roxanne5[] = { +static const struct TrainerMon sParty_Roxanne5[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 47, .species = SPECIES_AERODACTYL, .heldItem = ITEM_NONE, .moves = {MOVE_ROCK_SLIDE, MOVE_HYPER_BEAM, MOVE_SUPERSONIC, MOVE_PROTECT} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 47, .species = SPECIES_GOLEM, .heldItem = ITEM_NONE, .moves = {MOVE_FOCUS_PUNCH, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 47, .species = SPECIES_OMASTAR, .heldItem = ITEM_NONE, .moves = {MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 50, .species = SPECIES_KABUTOPS, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 50, .species = SPECIES_STEELIX, .heldItem = ITEM_NONE, .moves = {MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 52, .species = SPECIES_NOSEPASS, .heldItem = ITEM_SITRUS_BERRY, @@ -10450,30 +9835,30 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne5[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Brawly2[] = { +static const struct TrainerMon sParty_Brawly2[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 33, .species = SPECIES_MACHAMP, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 33, .species = SPECIES_MEDITITE, .heldItem = ITEM_NONE, .moves = {MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 35, .species = SPECIES_HITMONTOP, .heldItem = ITEM_NONE, .moves = {MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 37, .species = SPECIES_HARIYAMA, .heldItem = ITEM_SITRUS_BERRY, @@ -10481,30 +9866,30 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly2[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Brawly3[] = { +static const struct TrainerMon sParty_Brawly3[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 38, .species = SPECIES_MACHAMP, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 38, .species = SPECIES_MEDICHAM, .heldItem = ITEM_NONE, .moves = {MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 40, .species = SPECIES_HITMONTOP, .heldItem = ITEM_NONE, .moves = {MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 42, .species = SPECIES_HARIYAMA, .heldItem = ITEM_SITRUS_BERRY, @@ -10512,37 +9897,37 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly3[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Brawly4[] = { +static const struct TrainerMon sParty_Brawly4[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 40, .species = SPECIES_HITMONCHAN, .heldItem = ITEM_NONE, .moves = {MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 43, .species = SPECIES_MACHAMP, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 43, .species = SPECIES_MEDICHAM, .heldItem = ITEM_NONE, .moves = {MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 45, .species = SPECIES_HITMONTOP, .heldItem = ITEM_NONE, .moves = {MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 47, .species = SPECIES_HARIYAMA, .heldItem = ITEM_SITRUS_BERRY, @@ -10550,44 +9935,44 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly4[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Brawly5[] = { +static const struct TrainerMon sParty_Brawly5[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 46, .species = SPECIES_HITMONLEE, .heldItem = ITEM_NONE, .moves = {MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_BULK_UP} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 46, .species = SPECIES_HITMONCHAN, .heldItem = ITEM_NONE, .moves = {MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 48, .species = SPECIES_MACHAMP, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 48, .species = SPECIES_MEDICHAM, .heldItem = ITEM_NONE, .moves = {MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 50, .species = SPECIES_HITMONTOP, .heldItem = ITEM_NONE, .moves = {MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 52, .species = SPECIES_HARIYAMA, .heldItem = ITEM_SITRUS_BERRY, @@ -10595,30 +9980,30 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly5[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Wattson2[] = { +static const struct TrainerMon sParty_Wattson2[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 36, .species = SPECIES_MAREEP, .heldItem = ITEM_NONE, .moves = {MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 36, .species = SPECIES_ELECTRODE, .heldItem = ITEM_NONE, .moves = {MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 38, .species = SPECIES_MAGNETON, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 40, .species = SPECIES_MANECTRIC, .heldItem = ITEM_SITRUS_BERRY, @@ -10626,37 +10011,37 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson2[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Wattson3[] = { +static const struct TrainerMon sParty_Wattson3[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 39, .species = SPECIES_PIKACHU, .heldItem = ITEM_NONE, .moves = {MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_SHOCK_WAVE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 41, .species = SPECIES_FLAAFFY, .heldItem = ITEM_NONE, .moves = {MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 41, .species = SPECIES_ELECTRODE, .heldItem = ITEM_NONE, .moves = {MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 43, .species = SPECIES_MAGNETON, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 45, .species = SPECIES_MANECTRIC, .heldItem = ITEM_SITRUS_BERRY, @@ -10664,37 +10049,37 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson3[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Wattson4[] = { +static const struct TrainerMon sParty_Wattson4[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 44, .species = SPECIES_RAICHU, .heldItem = ITEM_NONE, .moves = {MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 46, .species = SPECIES_AMPHAROS, .heldItem = ITEM_NONE, .moves = {MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 46, .species = SPECIES_ELECTRODE, .heldItem = ITEM_NONE, .moves = {MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 48, .species = SPECIES_MAGNETON, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 50, .species = SPECIES_MANECTRIC, .heldItem = ITEM_SITRUS_BERRY, @@ -10702,44 +10087,44 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson4[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Wattson5[] = { +static const struct TrainerMon sParty_Wattson5[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 50, .species = SPECIES_ELECTABUZZ, .heldItem = ITEM_NONE, .moves = {MOVE_SWIFT, MOVE_FOCUS_PUNCH, MOVE_THUNDER_PUNCH, MOVE_LIGHT_SCREEN} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 51, .species = SPECIES_RAICHU, .heldItem = ITEM_NONE, .moves = {MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 51, .species = SPECIES_AMPHAROS, .heldItem = ITEM_NONE, .moves = {MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 53, .species = SPECIES_ELECTRODE, .heldItem = ITEM_NONE, .moves = {MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 53, .species = SPECIES_MAGNETON, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 55, .species = SPECIES_MANECTRIC, .heldItem = ITEM_SITRUS_BERRY, @@ -10747,30 +10132,30 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson5[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Flannery2[] = { +static const struct TrainerMon sParty_Flannery2[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 38, .species = SPECIES_MAGCARGO, .heldItem = ITEM_WHITE_HERB, .moves = {MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 36, .species = SPECIES_PONYTA, .heldItem = ITEM_NONE, .moves = {MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 38, .species = SPECIES_CAMERUPT, .heldItem = ITEM_WHITE_HERB, .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 40, .species = SPECIES_TORKOAL, .heldItem = ITEM_WHITE_HERB, @@ -10778,37 +10163,37 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery2[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Flannery3[] = { +static const struct TrainerMon sParty_Flannery3[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 41, .species = SPECIES_GROWLITHE, .heldItem = ITEM_NONE, .moves = {MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_SUNNY_DAY} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 43, .species = SPECIES_MAGCARGO, .heldItem = ITEM_WHITE_HERB, .moves = {MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 41, .species = SPECIES_PONYTA, .heldItem = ITEM_NONE, .moves = {MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 43, .species = SPECIES_CAMERUPT, .heldItem = ITEM_WHITE_HERB, .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 45, .species = SPECIES_TORKOAL, .heldItem = ITEM_WHITE_HERB, @@ -10816,44 +10201,44 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery3[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Flannery4[] = { +static const struct TrainerMon sParty_Flannery4[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 46, .species = SPECIES_HOUNDOUR, .heldItem = ITEM_NONE, .moves = {MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 46, .species = SPECIES_GROWLITHE, .heldItem = ITEM_NONE, .moves = {MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 48, .species = SPECIES_MAGCARGO, .heldItem = ITEM_WHITE_HERB, .moves = {MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 46, .species = SPECIES_RAPIDASH, .heldItem = ITEM_NONE, .moves = {MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 48, .species = SPECIES_CAMERUPT, .heldItem = ITEM_WHITE_HERB, .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 50, .species = SPECIES_TORKOAL, .heldItem = ITEM_WHITE_HERB, @@ -10861,44 +10246,44 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery4[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Flannery5[] = { +static const struct TrainerMon sParty_Flannery5[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 51, .species = SPECIES_ARCANINE, .heldItem = ITEM_NONE, .moves = {MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 53, .species = SPECIES_MAGCARGO, .heldItem = ITEM_WHITE_HERB, .moves = {MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 51, .species = SPECIES_HOUNDOOM, .heldItem = ITEM_NONE, .moves = {MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 51, .species = SPECIES_RAPIDASH, .heldItem = ITEM_NONE, .moves = {MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 53, .species = SPECIES_CAMERUPT, .heldItem = ITEM_WHITE_HERB, .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 55, .species = SPECIES_TORKOAL, .heldItem = ITEM_WHITE_HERB, @@ -10906,30 +10291,30 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery5[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Norman2[] = { +static const struct TrainerMon sParty_Norman2[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 42, .species = SPECIES_CHANSEY, .heldItem = ITEM_NONE, .moves = {MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 42, .species = SPECIES_SLAKING, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 43, .species = SPECIES_SPINDA, .heldItem = ITEM_NONE, .moves = {MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 45, .species = SPECIES_SLAKING, .heldItem = ITEM_SITRUS_BERRY, @@ -10937,37 +10322,37 @@ static const struct TrainerMonItemCustomMoves sParty_Norman2[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Norman3[] = { +static const struct TrainerMon sParty_Norman3[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 47, .species = SPECIES_SLAKING, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 47, .species = SPECIES_CHANSEY, .heldItem = ITEM_NONE, .moves = {MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 45, .species = SPECIES_KANGASKHAN, .heldItem = ITEM_NONE, .moves = {MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 48, .species = SPECIES_SPINDA, .heldItem = ITEM_NONE, .moves = {MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 50, .species = SPECIES_SLAKING, .heldItem = ITEM_SITRUS_BERRY, @@ -10975,37 +10360,37 @@ static const struct TrainerMonItemCustomMoves sParty_Norman3[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Norman4[] = { +static const struct TrainerMon sParty_Norman4[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 52, .species = SPECIES_SLAKING, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 52, .species = SPECIES_BLISSEY, .heldItem = ITEM_NONE, .moves = {MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 50, .species = SPECIES_KANGASKHAN, .heldItem = ITEM_NONE, .moves = {MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 53, .species = SPECIES_SPINDA, .heldItem = ITEM_NONE, .moves = {MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 55, .species = SPECIES_SLAKING, .heldItem = ITEM_SITRUS_BERRY, @@ -11013,44 +10398,44 @@ static const struct TrainerMonItemCustomMoves sParty_Norman4[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Norman5[] = { +static const struct TrainerMon sParty_Norman5[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 57, .species = SPECIES_SLAKING, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 57, .species = SPECIES_BLISSEY, .heldItem = ITEM_NONE, .moves = {MOVE_PROTECT, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 55, .species = SPECIES_KANGASKHAN, .heldItem = ITEM_NONE, .moves = {MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 57, .species = SPECIES_TAUROS, .heldItem = ITEM_NONE, .moves = {MOVE_TAKE_DOWN, MOVE_PROTECT, MOVE_FIRE_BLAST, MOVE_EARTHQUAKE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 58, .species = SPECIES_SPINDA, .heldItem = ITEM_NONE, .moves = {MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 60, .species = SPECIES_SLAKING, .heldItem = ITEM_SITRUS_BERRY, @@ -11058,37 +10443,37 @@ static const struct TrainerMonItemCustomMoves sParty_Norman5[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Winona2[] = { +static const struct TrainerMon sParty_Winona2[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 40, .species = SPECIES_DRATINI, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 38, .species = SPECIES_TROPIUS, .heldItem = ITEM_NONE, .moves = {MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 41, .species = SPECIES_PELIPPER, .heldItem = ITEM_NONE, .moves = {MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 43, .species = SPECIES_SKARMORY, .heldItem = ITEM_NONE, .moves = {MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 45, .species = SPECIES_ALTARIA, .heldItem = ITEM_CHESTO_BERRY, @@ -11096,44 +10481,44 @@ static const struct TrainerMonItemCustomMoves sParty_Winona2[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Winona3[] = { +static const struct TrainerMon sParty_Winona3[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 43, .species = SPECIES_HOOTHOOT, .heldItem = ITEM_NONE, .moves = {MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 43, .species = SPECIES_TROPIUS, .heldItem = ITEM_NONE, .moves = {MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 45, .species = SPECIES_DRAGONAIR, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 46, .species = SPECIES_PELIPPER, .heldItem = ITEM_NONE, .moves = {MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 48, .species = SPECIES_SKARMORY, .heldItem = ITEM_NONE, .moves = {MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 50, .species = SPECIES_ALTARIA, .heldItem = ITEM_CHESTO_BERRY, @@ -11141,44 +10526,44 @@ static const struct TrainerMonItemCustomMoves sParty_Winona3[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Winona4[] = { +static const struct TrainerMon sParty_Winona4[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 48, .species = SPECIES_NOCTOWL, .heldItem = ITEM_NONE, .moves = {MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 49, .species = SPECIES_TROPIUS, .heldItem = ITEM_NONE, .moves = {MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 50, .species = SPECIES_DRAGONAIR, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 51, .species = SPECIES_PELIPPER, .heldItem = ITEM_NONE, .moves = {MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 53, .species = SPECIES_SKARMORY, .heldItem = ITEM_NONE, .moves = {MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 55, .species = SPECIES_ALTARIA, .heldItem = ITEM_CHESTO_BERRY, @@ -11186,44 +10571,44 @@ static const struct TrainerMonItemCustomMoves sParty_Winona4[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Winona5[] = { +static const struct TrainerMon sParty_Winona5[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 53, .species = SPECIES_NOCTOWL, .heldItem = ITEM_NONE, .moves = {MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 54, .species = SPECIES_TROPIUS, .heldItem = ITEM_NONE, .moves = {MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 55, .species = SPECIES_PELIPPER, .heldItem = ITEM_NONE, .moves = {MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 55, .species = SPECIES_DRAGONITE, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 58, .species = SPECIES_SKARMORY, .heldItem = ITEM_NONE, .moves = {MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 60, .species = SPECIES_ALTARIA, .heldItem = ITEM_CHESTO_BERRY, @@ -11231,37 +10616,37 @@ static const struct TrainerMonItemCustomMoves sParty_Winona5[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_TateAndLiza2[] = { +static const struct TrainerMon sParty_TateAndLiza2[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 48, .species = SPECIES_SLOWPOKE, .heldItem = ITEM_NONE, .moves = {MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 49, .species = SPECIES_CLAYDOL, .heldItem = ITEM_NONE, .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 49, .species = SPECIES_XATU, .heldItem = ITEM_CHESTO_BERRY, .moves = {MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 50, .species = SPECIES_LUNATONE, .heldItem = ITEM_CHESTO_BERRY, .moves = {MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 50, .species = SPECIES_SOLROCK, .heldItem = ITEM_SITRUS_BERRY, @@ -11269,44 +10654,44 @@ static const struct TrainerMonItemCustomMoves sParty_TateAndLiza2[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_TateAndLiza3[] = { +static const struct TrainerMon sParty_TateAndLiza3[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 53, .species = SPECIES_DROWZEE, .heldItem = ITEM_NONE, .moves = {MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 53, .species = SPECIES_SLOWPOKE, .heldItem = ITEM_NONE, .moves = {MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 54, .species = SPECIES_CLAYDOL, .heldItem = ITEM_NONE, .moves = {MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 54, .species = SPECIES_XATU, .heldItem = ITEM_CHESTO_BERRY, .moves = {MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 55, .species = SPECIES_LUNATONE, .heldItem = ITEM_CHESTO_BERRY, .moves = {MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 55, .species = SPECIES_SOLROCK, .heldItem = ITEM_SITRUS_BERRY, @@ -11314,44 +10699,44 @@ static const struct TrainerMonItemCustomMoves sParty_TateAndLiza3[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_TateAndLiza4[] = { +static const struct TrainerMon sParty_TateAndLiza4[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 58, .species = SPECIES_HYPNO, .heldItem = ITEM_NONE, .moves = {MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 59, .species = SPECIES_CLAYDOL, .heldItem = ITEM_NONE, .moves = {MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 58, .species = SPECIES_SLOWPOKE, .heldItem = ITEM_NONE, .moves = {MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 59, .species = SPECIES_XATU, .heldItem = ITEM_CHESTO_BERRY, .moves = {MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 60, .species = SPECIES_LUNATONE, .heldItem = ITEM_CHESTO_BERRY, .moves = {MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 60, .species = SPECIES_SOLROCK, .heldItem = ITEM_SITRUS_BERRY, @@ -11359,44 +10744,44 @@ static const struct TrainerMonItemCustomMoves sParty_TateAndLiza4[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_TateAndLiza5[] = { +static const struct TrainerMon sParty_TateAndLiza5[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 63, .species = SPECIES_HYPNO, .heldItem = ITEM_NONE, .moves = {MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 64, .species = SPECIES_CLAYDOL, .heldItem = ITEM_NONE, .moves = {MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 63, .species = SPECIES_SLOWKING, .heldItem = ITEM_NONE, .moves = {MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 64, .species = SPECIES_XATU, .heldItem = ITEM_CHESTO_BERRY, .moves = {MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 65, .species = SPECIES_LUNATONE, .heldItem = ITEM_CHESTO_BERRY, .moves = {MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 65, .species = SPECIES_SOLROCK, .heldItem = ITEM_SITRUS_BERRY, @@ -11404,37 +10789,37 @@ static const struct TrainerMonItemCustomMoves sParty_TateAndLiza5[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Juan2[] = { +static const struct TrainerMon sParty_Juan2[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 46, .species = SPECIES_POLIWAG, .heldItem = ITEM_NONE, .moves = {MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 46, .species = SPECIES_WHISCASH, .heldItem = ITEM_NONE, .moves = {MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 48, .species = SPECIES_WALREIN, .heldItem = ITEM_NONE, .moves = {MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 48, .species = SPECIES_CRAWDAUNT, .heldItem = ITEM_CHESTO_BERRY, .moves = {MOVE_REST, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_DOUBLE_TEAM} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 51, .species = SPECIES_KINGDRA, .heldItem = ITEM_CHESTO_BERRY, @@ -11442,37 +10827,37 @@ static const struct TrainerMonItemCustomMoves sParty_Juan2[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Juan3[] = { +static const struct TrainerMon sParty_Juan3[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 50, .species = SPECIES_POLIWHIRL, .heldItem = ITEM_NONE, .moves = {MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 51, .species = SPECIES_WHISCASH, .heldItem = ITEM_NONE, .moves = {MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 53, .species = SPECIES_WALREIN, .heldItem = ITEM_NONE, .moves = {MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 53, .species = SPECIES_CRAWDAUNT, .heldItem = ITEM_CHESTO_BERRY, .moves = {MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 56, .species = SPECIES_KINGDRA, .heldItem = ITEM_CHESTO_BERRY, @@ -11480,44 +10865,44 @@ static const struct TrainerMonItemCustomMoves sParty_Juan3[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Juan4[] = { +static const struct TrainerMon sParty_Juan4[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 56, .species = SPECIES_LAPRAS, .heldItem = ITEM_NONE, .moves = {MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 58, .species = SPECIES_WHISCASH, .heldItem = ITEM_NONE, .moves = {MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 56, .species = SPECIES_POLIWHIRL, .heldItem = ITEM_NONE, .moves = {MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 58, .species = SPECIES_WALREIN, .heldItem = ITEM_NONE, .moves = {MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 58, .species = SPECIES_CRAWDAUNT, .heldItem = ITEM_CHESTO_BERRY, .moves = {MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 61, .species = SPECIES_KINGDRA, .heldItem = ITEM_CHESTO_BERRY, @@ -11525,44 +10910,44 @@ static const struct TrainerMonItemCustomMoves sParty_Juan4[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Juan5[] = { +static const struct TrainerMon sParty_Juan5[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 61, .species = SPECIES_LAPRAS, .heldItem = ITEM_NONE, .moves = {MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 63, .species = SPECIES_WHISCASH, .heldItem = ITEM_NONE, .moves = {MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 61, .species = SPECIES_POLITOED, .heldItem = ITEM_NONE, .moves = {MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_HYDRO_PUMP, MOVE_PERISH_SONG} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 63, .species = SPECIES_WALREIN, .heldItem = ITEM_NONE, .moves = {MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_SHEER_COLD} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 63, .species = SPECIES_CRAWDAUNT, .heldItem = ITEM_CHESTO_BERRY, .moves = {MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 66, .species = SPECIES_KINGDRA, .heldItem = ITEM_CHESTO_BERRY, @@ -11570,16 +10955,16 @@ static const struct TrainerMonItemCustomMoves sParty_Juan5[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Angelo[] = { +static const struct TrainerMon sParty_Angelo[] = { { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 17, .species = SPECIES_ILLUMISE, .heldItem = ITEM_NONE, .moves = {MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CHARM, MOVE_NONE} }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 17, .species = SPECIES_VOLBEAT, .heldItem = ITEM_NONE, @@ -11587,52 +10972,52 @@ static const struct TrainerMonItemCustomMoves sParty_Angelo[] = { } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Darius[] = { +static const struct TrainerMon sParty_Darius[] = { { - .iv = 200, + .iv = TRAINER_PARTY_IVS(24, 24, 24, 24, 24, 24), .lvl = 30, .species = SPECIES_TROPIUS, } }; -static const struct TrainerMonItemCustomMoves sParty_Steven[] = { +static const struct TrainerMon sParty_Steven[] = { { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 77, .species = SPECIES_SKARMORY, .heldItem = ITEM_NONE, .moves = {MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_SPIKES, MOVE_STEEL_WING} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 75, .species = SPECIES_CLAYDOL, .heldItem = ITEM_NONE, .moves = {MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 76, .species = SPECIES_AGGRON, .heldItem = ITEM_NONE, .moves = {MOVE_THUNDER, MOVE_EARTHQUAKE, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 76, .species = SPECIES_CRADILY, .heldItem = ITEM_NONE, .moves = {MOVE_GIGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_INGRAIN, MOVE_CONFUSE_RAY} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 76, .species = SPECIES_ARMALDO, .heldItem = ITEM_NONE, .moves = {MOVE_WATER_PULSE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_SLASH} }, { - .iv = 255, + .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31), .lvl = 78, .species = SPECIES_METAGROSS, .heldItem = ITEM_SITRUS_BERRY, @@ -11640,796 +11025,781 @@ static const struct TrainerMonItemCustomMoves sParty_Steven[] = { } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Anabel[] = { +static const struct TrainerMon sParty_Anabel[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_BELDUM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Tucker[] = { +static const struct TrainerMon sParty_Tucker[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_BELDUM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Spenser[] = { +static const struct TrainerMon sParty_Spenser[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_BELDUM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Greta[] = { +static const struct TrainerMon sParty_Greta[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_BELDUM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Noland[] = { +static const struct TrainerMon sParty_Noland[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_BELDUM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Lucy[] = { +static const struct TrainerMon sParty_Lucy[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_BELDUM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Brandon[] = { +static const struct TrainerMon sParty_Brandon[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_BELDUM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Andres2[] = { +static const struct TrainerMon sParty_Andres2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 31, .species = SPECIES_SANDSHREW, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 31, .species = SPECIES_SANDSHREW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Andres3[] = { +static const struct TrainerMon sParty_Andres3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 33, .species = SPECIES_NOSEPASS, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 33, .species = SPECIES_SANDSHREW, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 33, .species = SPECIES_SANDSHREW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Andres4[] = { +static const struct TrainerMon sParty_Andres4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 35, .species = SPECIES_NOSEPASS, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 35, .species = SPECIES_SANDSHREW, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 35, .species = SPECIES_SANDSHREW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Andres5[] = { +static const struct TrainerMon sParty_Andres5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 37, .species = SPECIES_NOSEPASS, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 37, .species = SPECIES_SANDSLASH, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 37, .species = SPECIES_SANDSLASH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cory2[] = { +static const struct TrainerMon sParty_Cory2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 30, .species = SPECIES_WINGULL, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 30, .species = SPECIES_MACHOP, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 30, .species = SPECIES_TENTACOOL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cory3[] = { +static const struct TrainerMon sParty_Cory3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 32, .species = SPECIES_PELIPPER, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 32, .species = SPECIES_MACHOP, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 32, .species = SPECIES_TENTACOOL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cory4[] = { +static const struct TrainerMon sParty_Cory4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 34, .species = SPECIES_PELIPPER, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 34, .species = SPECIES_MACHOP, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 34, .species = SPECIES_TENTACRUEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cory5[] = { +static const struct TrainerMon sParty_Cory5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 36, .species = SPECIES_PELIPPER, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 36, .species = SPECIES_MACHOKE, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 36, .species = SPECIES_TENTACRUEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Pablo2[] = { +static const struct TrainerMon sParty_Pablo2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 37, .species = SPECIES_STARYU, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 37, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Pablo3[] = { +static const struct TrainerMon sParty_Pablo3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 39, .species = SPECIES_WINGULL, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 39, .species = SPECIES_STARYU, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 39, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Pablo4[] = { +static const struct TrainerMon sParty_Pablo4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 41, .species = SPECIES_PELIPPER, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 41, .species = SPECIES_STARYU, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 41, .species = SPECIES_STARYU, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Pablo5[] = { +static const struct TrainerMon sParty_Pablo5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 43, .species = SPECIES_PELIPPER, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 43, .species = SPECIES_STARMIE, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 43, .species = SPECIES_STARMIE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Koji2[] = { +static const struct TrainerMon sParty_Koji2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 37, .species = SPECIES_MACHOKE, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 37, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Koji3[] = { +static const struct TrainerMon sParty_Koji3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 39, .species = SPECIES_MAKUHITA, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 39, .species = SPECIES_MACHOKE, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 39, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Koji4[] = { +static const struct TrainerMon sParty_Koji4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 41, .species = SPECIES_HARIYAMA, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 41, .species = SPECIES_MACHOKE, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 41, .species = SPECIES_MACHOKE, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Koji5[] = { +static const struct TrainerMon sParty_Koji5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 43, .species = SPECIES_HARIYAMA, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 43, .species = SPECIES_MACHAMP, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 43, .species = SPECIES_MACHAMP, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cristin2[] = { +static const struct TrainerMon sParty_Cristin2[] = { { - .iv = 110, + .iv = TRAINER_PARTY_IVS(13, 13, 13, 13, 13, 13), .lvl = 35, .species = SPECIES_LOUDRED, }, { - .iv = 110, + .iv = TRAINER_PARTY_IVS(13, 13, 13, 13, 13, 13), .lvl = 35, .species = SPECIES_VIGOROTH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cristin3[] = { +static const struct TrainerMon sParty_Cristin3[] = { { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 37, .species = SPECIES_SPINDA, }, { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 37, .species = SPECIES_LOUDRED, }, { - .iv = 120, + .iv = TRAINER_PARTY_IVS(14, 14, 14, 14, 14, 14), .lvl = 37, .species = SPECIES_VIGOROTH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cristin4[] = { +static const struct TrainerMon sParty_Cristin4[] = { { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 39, .species = SPECIES_SPINDA, }, { - .iv = 130, + .iv = TRAINER_PARTY_IVS(15, 15, 15, 15, 15, 15), .lvl = 39, .species = SPECIES_LOUDRED, }, { - .iv = 100, + .iv = TRAINER_PARTY_IVS(12, 12, 12, 12, 12, 12), .lvl = 39, .species = SPECIES_VIGOROTH, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Cristin5[] = { +static const struct TrainerMon sParty_Cristin5[] = { { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 41, .species = SPECIES_SPINDA, }, { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 41, .species = SPECIES_EXPLOUD, }, { - .iv = 140, + .iv = TRAINER_PARTY_IVS(17, 17, 17, 17, 17, 17), .lvl = 41, .species = SPECIES_SLAKING, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Fernando2[] = { +static const struct TrainerMon sParty_Fernando2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 35, .species = SPECIES_ELECTRIKE, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 35, .species = SPECIES_ELECTRIKE, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 35, .species = SPECIES_LOUDRED, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Fernando3[] = { +static const struct TrainerMon sParty_Fernando3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 37, .species = SPECIES_ELECTRIKE, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 37, .species = SPECIES_MANECTRIC, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 37, .species = SPECIES_LOUDRED, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Fernando4[] = { +static const struct TrainerMon sParty_Fernando4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 39, .species = SPECIES_MANECTRIC, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 39, .species = SPECIES_MANECTRIC, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 39, .species = SPECIES_LOUDRED, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Fernando5[] = { +static const struct TrainerMon sParty_Fernando5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 41, .species = SPECIES_MANECTRIC, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 41, .species = SPECIES_MANECTRIC, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 41, .species = SPECIES_EXPLOUD, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer2[] = { +static const struct TrainerMon sParty_Sawyer2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 26, .species = SPECIES_GEODUDE, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 26, .species = SPECIES_NUMEL, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer3[] = { +static const struct TrainerMon sParty_Sawyer3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 28, .species = SPECIES_MACHOP, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 28, .species = SPECIES_NUMEL, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 28, .species = SPECIES_GRAVELER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer4[] = { +static const struct TrainerMon sParty_Sawyer4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 30, .species = SPECIES_MACHOP, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 30, .species = SPECIES_NUMEL, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 30, .species = SPECIES_GRAVELER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer5[] = { +static const struct TrainerMon sParty_Sawyer5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_MACHOKE, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_CAMERUPT, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 33, .species = SPECIES_GOLEM, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle2[] = { +static const struct TrainerMon sParty_Gabrielle2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 31, .species = SPECIES_SKITTY, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 31, .species = SPECIES_MIGHTYENA, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 31, .species = SPECIES_ZIGZAGOON, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 31, .species = SPECIES_LOTAD, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 31, .species = SPECIES_SEEDOT, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 31, .species = SPECIES_TAILLOW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle3[] = { +static const struct TrainerMon sParty_Gabrielle3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 33, .species = SPECIES_SKITTY, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 33, .species = SPECIES_MIGHTYENA, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 33, .species = SPECIES_LINOONE, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 33, .species = SPECIES_LOMBRE, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 33, .species = SPECIES_NUZLEAF, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 33, .species = SPECIES_TAILLOW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle4[] = { +static const struct TrainerMon sParty_Gabrielle4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 35, .species = SPECIES_DELCATTY, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 35, .species = SPECIES_MIGHTYENA, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 35, .species = SPECIES_LINOONE, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 35, .species = SPECIES_LOMBRE, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 35, .species = SPECIES_NUZLEAF, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 35, .species = SPECIES_SWELLOW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle5[] = { +static const struct TrainerMon sParty_Gabrielle5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 37, .species = SPECIES_DELCATTY, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 37, .species = SPECIES_MIGHTYENA, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 37, .species = SPECIES_LINOONE, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 37, .species = SPECIES_LUDICOLO, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 37, .species = SPECIES_SHIFTRY, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 37, .species = SPECIES_SWELLOW, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Thalia2[] = { +static const struct TrainerMon sParty_Thalia2[] = { { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 34, .species = SPECIES_WAILMER, }, { - .iv = 10, + .iv = TRAINER_PARTY_IVS(1, 1, 1, 1, 1, 1), .lvl = 34, .species = SPECIES_HORSEA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Thalia3[] = { +static const struct TrainerMon sParty_Thalia3[] = { { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 36, .species = SPECIES_LUVDISC, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 36, .species = SPECIES_WAILMER, }, { - .iv = 20, + .iv = TRAINER_PARTY_IVS(2, 2, 2, 2, 2, 2), .lvl = 36, .species = SPECIES_SEADRA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Thalia4[] = { +static const struct TrainerMon sParty_Thalia4[] = { { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 38, .species = SPECIES_LUVDISC, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 38, .species = SPECIES_WAILMER, }, { - .iv = 30, + .iv = TRAINER_PARTY_IVS(3, 3, 3, 3, 3, 3), .lvl = 38, .species = SPECIES_SEADRA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Thalia5[] = { +static const struct TrainerMon sParty_Thalia5[] = { { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 40, .species = SPECIES_LUVDISC, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 40, .species = SPECIES_WAILORD, }, { - .iv = 40, + .iv = TRAINER_PARTY_IVS(4, 4, 4, 4, 4, 4), .lvl = 40, .species = SPECIES_KINGDRA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Mariela[] = { +static const struct TrainerMon sParty_Mariela[] = { { - .iv = 0, .lvl = 41, .species = SPECIES_CHIMECHO, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Alvaro[] = { +static const struct TrainerMon sParty_Alvaro[] = { { - .iv = 0, .lvl = 41, .species = SPECIES_BANETTE, }, { - .iv = 0, .lvl = 41, .species = SPECIES_KADABRA, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Everett[] = { +static const struct TrainerMon sParty_Everett[] = { { - .iv = 0, .lvl = 41, .species = SPECIES_WOBBUFFET, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Red[] = { +static const struct TrainerMon sParty_Red[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_CHARMANDER, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_Leaf[] = { +static const struct TrainerMon sParty_Leaf[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_BULBASAUR, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLinkPlaceholder[] = { +static const struct TrainerMon sParty_BrendanLinkPlaceholder[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_GROUDON, } }; -static const struct TrainerMonNoItemDefaultMoves sParty_MayLinkPlaceholder[] = { +static const struct TrainerMon sParty_MayLinkPlaceholder[] = { { - .iv = 0, .lvl = 5, .species = SPECIES_KYOGRE, } diff --git a/src/data/trainers.h b/src/data/trainers.h index 75f7edc8b7..7a34223b85 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -1,7 +1,6 @@ const struct Trainer gTrainers[] = { [TRAINER_NONE] = { - .partyFlags = 0, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_1, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_HIKER, @@ -10,7 +9,7 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0, .partySize = 0, - .party = {.NoItemDefaultMoves = NULL}, + .party = NULL, }, [TRAINER_SAWYER_1] = @@ -22,7 +21,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_DEFAULT_MOVES(sParty_Sawyer1), + .party = TRAINER_PARTY(sParty_Sawyer1), }, [TRAINER_GRUNT_AQUA_HIDEOUT_1] = @@ -34,7 +33,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout1), + .party = TRAINER_PARTY(sParty_GruntAquaHideout1), }, [TRAINER_GRUNT_AQUA_HIDEOUT_2] = @@ -46,7 +45,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout2), + .party = TRAINER_PARTY(sParty_GruntAquaHideout2), }, [TRAINER_GRUNT_AQUA_HIDEOUT_3] = @@ -58,7 +57,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout3), + .party = TRAINER_PARTY(sParty_GruntAquaHideout3), }, [TRAINER_GRUNT_AQUA_HIDEOUT_4] = @@ -70,7 +69,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout4), + .party = TRAINER_PARTY(sParty_GruntAquaHideout4), }, [TRAINER_GRUNT_SEAFLOOR_CAVERN_1] = @@ -82,7 +81,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSeafloorCavern1), + .party = TRAINER_PARTY(sParty_GruntSeafloorCavern1), }, [TRAINER_GRUNT_SEAFLOOR_CAVERN_2] = @@ -94,7 +93,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSeafloorCavern2), + .party = TRAINER_PARTY(sParty_GruntSeafloorCavern2), }, [TRAINER_GRUNT_SEAFLOOR_CAVERN_3] = @@ -106,7 +105,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSeafloorCavern3), + .party = TRAINER_PARTY(sParty_GruntSeafloorCavern3), }, [TRAINER_GABRIELLE_1] = @@ -118,7 +117,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Gabrielle1), + .party = TRAINER_PARTY(sParty_Gabrielle1), }, [TRAINER_GRUNT_PETALBURG_WOODS] = @@ -130,7 +129,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntPetalburgWoods), + .party = TRAINER_PARTY(sParty_GruntPetalburgWoods), }, [TRAINER_MARCEL] = @@ -142,7 +141,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_DEFAULT_MOVES(sParty_Marcel), + .party = TRAINER_PARTY(sParty_Marcel), }, [TRAINER_ALBERTO] = @@ -154,7 +153,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Alberto), + .party = TRAINER_PARTY(sParty_Alberto), }, [TRAINER_ED] = @@ -166,7 +165,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ed), + .party = TRAINER_PARTY(sParty_Ed), }, [TRAINER_GRUNT_SEAFLOOR_CAVERN_4] = @@ -178,7 +177,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSeafloorCavern4), + .party = TRAINER_PARTY(sParty_GruntSeafloorCavern4), }, [TRAINER_DECLAN] = @@ -190,7 +189,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Declan), + .party = TRAINER_PARTY(sParty_Declan), }, [TRAINER_GRUNT_RUSTURF_TUNNEL] = @@ -202,7 +201,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntRusturfTunnel), + .party = TRAINER_PARTY(sParty_GruntRusturfTunnel), }, [TRAINER_GRUNT_WEATHER_INST_1] = @@ -214,7 +213,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntWeatherInst1), + .party = TRAINER_PARTY(sParty_GruntWeatherInst1), }, [TRAINER_GRUNT_WEATHER_INST_2] = @@ -226,7 +225,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntWeatherInst2), + .party = TRAINER_PARTY(sParty_GruntWeatherInst2), }, [TRAINER_GRUNT_WEATHER_INST_3] = @@ -238,7 +237,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntWeatherInst3), + .party = TRAINER_PARTY(sParty_GruntWeatherInst3), }, [TRAINER_GRUNT_MUSEUM_1] = @@ -250,7 +249,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMuseum1), + .party = TRAINER_PARTY(sParty_GruntMuseum1), }, [TRAINER_GRUNT_MUSEUM_2] = @@ -262,7 +261,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMuseum2), + .party = TRAINER_PARTY(sParty_GruntMuseum2), }, [TRAINER_GRUNT_SPACE_CENTER_1] = @@ -274,7 +273,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter1), + .party = TRAINER_PARTY(sParty_GruntSpaceCenter1), }, [TRAINER_GRUNT_MT_PYRE_1] = @@ -286,7 +285,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtPyre1), + .party = TRAINER_PARTY(sParty_GruntMtPyre1), }, [TRAINER_GRUNT_MT_PYRE_2] = @@ -298,7 +297,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtPyre2), + .party = TRAINER_PARTY(sParty_GruntMtPyre2), }, [TRAINER_GRUNT_MT_PYRE_3] = @@ -310,7 +309,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtPyre3), + .party = TRAINER_PARTY(sParty_GruntMtPyre3), }, [TRAINER_GRUNT_WEATHER_INST_4] = @@ -322,7 +321,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntWeatherInst4), + .party = TRAINER_PARTY(sParty_GruntWeatherInst4), }, [TRAINER_GRUNT_AQUA_HIDEOUT_5] = @@ -334,7 +333,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout5), + .party = TRAINER_PARTY(sParty_GruntAquaHideout5), }, [TRAINER_GRUNT_AQUA_HIDEOUT_6] = @@ -346,7 +345,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout6), + .party = TRAINER_PARTY(sParty_GruntAquaHideout6), }, [TRAINER_FREDRICK] = @@ -358,7 +357,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_DEFAULT_MOVES(sParty_Fredrick), + .party = TRAINER_PARTY(sParty_Fredrick), }, [TRAINER_MATT] = @@ -370,7 +369,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_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_DEFAULT_MOVES(sParty_Matt), + .party = TRAINER_PARTY(sParty_Matt), }, [TRAINER_ZANDER] = @@ -382,7 +381,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Zander), + .party = TRAINER_PARTY(sParty_Zander), }, [TRAINER_SHELLY_WEATHER_INSTITUTE] = @@ -394,7 +393,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_DEFAULT_MOVES(sParty_ShellyWeatherInstitute), + .party = TRAINER_PARTY(sParty_ShellyWeatherInstitute), }, [TRAINER_SHELLY_SEAFLOOR_CAVERN] = @@ -406,7 +405,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_DEFAULT_MOVES(sParty_ShellySeafloorCavern), + .party = TRAINER_PARTY(sParty_ShellySeafloorCavern), }, [TRAINER_ARCHIE] = @@ -418,7 +417,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Archie), + .party = TRAINER_PARTY(sParty_Archie), }, [TRAINER_LEAH] = @@ -430,7 +429,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Leah), + .party = TRAINER_PARTY(sParty_Leah), }, [TRAINER_DAISY] = @@ -442,7 +441,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Daisy), + .party = TRAINER_PARTY(sParty_Daisy), }, [TRAINER_ROSE_1] = @@ -454,7 +453,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Rose1), + .party = TRAINER_PARTY(sParty_Rose1), }, [TRAINER_FELIX] = @@ -466,7 +465,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 = TRAINER_PARTY(sParty_Felix), }, [TRAINER_VIOLET] = @@ -478,7 +477,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Violet), + .party = TRAINER_PARTY(sParty_Violet), }, [TRAINER_ROSE_2] = @@ -490,7 +489,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Rose2), + .party = TRAINER_PARTY(sParty_Rose2), }, [TRAINER_ROSE_3] = @@ -502,7 +501,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Rose3), + .party = TRAINER_PARTY(sParty_Rose3), }, [TRAINER_ROSE_4] = @@ -514,7 +513,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Rose4), + .party = TRAINER_PARTY(sParty_Rose4), }, [TRAINER_ROSE_5] = @@ -526,7 +525,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Rose5), + .party = TRAINER_PARTY(sParty_Rose5), }, [TRAINER_DUSTY_1] = @@ -538,7 +537,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Dusty1), + .party = TRAINER_PARTY(sParty_Dusty1), }, [TRAINER_CHIP] = @@ -550,7 +549,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Chip), + .party = TRAINER_PARTY(sParty_Chip), }, [TRAINER_FOSTER] = @@ -562,7 +561,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Foster), + .party = TRAINER_PARTY(sParty_Foster), }, [TRAINER_DUSTY_2] = @@ -574,7 +573,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Dusty2), + .party = TRAINER_PARTY(sParty_Dusty2), }, [TRAINER_DUSTY_3] = @@ -586,7 +585,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Dusty3), + .party = TRAINER_PARTY(sParty_Dusty3), }, [TRAINER_DUSTY_4] = @@ -598,7 +597,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Dusty4), + .party = TRAINER_PARTY(sParty_Dusty4), }, [TRAINER_DUSTY_5] = @@ -610,7 +609,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Dusty5), + .party = TRAINER_PARTY(sParty_Dusty5), }, [TRAINER_GABBY_AND_TY_1] = @@ -622,7 +621,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GabbyAndTy1), + .party = TRAINER_PARTY(sParty_GabbyAndTy1), }, [TRAINER_GABBY_AND_TY_2] = @@ -634,7 +633,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GabbyAndTy2), + .party = TRAINER_PARTY(sParty_GabbyAndTy2), }, [TRAINER_GABBY_AND_TY_3] = @@ -646,7 +645,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GabbyAndTy3), + .party = TRAINER_PARTY(sParty_GabbyAndTy3), }, [TRAINER_GABBY_AND_TY_4] = @@ -658,7 +657,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GabbyAndTy4), + .party = TRAINER_PARTY(sParty_GabbyAndTy4), }, [TRAINER_GABBY_AND_TY_5] = @@ -670,7 +669,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GabbyAndTy5), + .party = TRAINER_PARTY(sParty_GabbyAndTy5), }, [TRAINER_GABBY_AND_TY_6] = @@ -682,7 +681,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_GabbyAndTy6), + .party = TRAINER_PARTY(sParty_GabbyAndTy6), }, [TRAINER_LOLA_1] = @@ -694,7 +693,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lola1), + .party = TRAINER_PARTY(sParty_Lola1), }, [TRAINER_AUSTINA] = @@ -706,7 +705,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Austina), + .party = TRAINER_PARTY(sParty_Austina), }, [TRAINER_GWEN] = @@ -718,7 +717,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Gwen), + .party = TRAINER_PARTY(sParty_Gwen), }, [TRAINER_LOLA_2] = @@ -730,7 +729,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lola2), + .party = TRAINER_PARTY(sParty_Lola2), }, [TRAINER_LOLA_3] = @@ -742,7 +741,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lola3), + .party = TRAINER_PARTY(sParty_Lola3), }, [TRAINER_LOLA_4] = @@ -754,7 +753,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lola4), + .party = TRAINER_PARTY(sParty_Lola4), }, [TRAINER_LOLA_5] = @@ -766,7 +765,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lola5), + .party = TRAINER_PARTY(sParty_Lola5), }, [TRAINER_RICKY_1] = @@ -778,7 +777,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Ricky1), + .party = TRAINER_PARTY(sParty_Ricky1), }, [TRAINER_SIMON] = @@ -790,7 +789,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Simon), + .party = TRAINER_PARTY(sParty_Simon), }, [TRAINER_CHARLIE] = @@ -802,7 +801,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Charlie), + .party = TRAINER_PARTY(sParty_Charlie), }, [TRAINER_RICKY_2] = @@ -814,7 +813,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Ricky2), + .party = TRAINER_PARTY(sParty_Ricky2), }, [TRAINER_RICKY_3] = @@ -826,7 +825,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Ricky3), + .party = TRAINER_PARTY(sParty_Ricky3), }, [TRAINER_RICKY_4] = @@ -838,7 +837,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Ricky4), + .party = TRAINER_PARTY(sParty_Ricky4), }, [TRAINER_RICKY_5] = @@ -850,7 +849,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Ricky5), + .party = TRAINER_PARTY(sParty_Ricky5), }, [TRAINER_RANDALL] = @@ -862,7 +861,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 = ITEM_CUSTOM_MOVES(sParty_Randall), + .party = TRAINER_PARTY(sParty_Randall), }, [TRAINER_PARKER] = @@ -874,7 +873,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 = ITEM_CUSTOM_MOVES(sParty_Parker), + .party = TRAINER_PARTY(sParty_Parker), }, [TRAINER_GEORGE] = @@ -886,7 +885,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 = ITEM_CUSTOM_MOVES(sParty_George), + .party = TRAINER_PARTY(sParty_George), }, [TRAINER_BERKE] = @@ -898,7 +897,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 = ITEM_CUSTOM_MOVES(sParty_Berke), + .party = TRAINER_PARTY(sParty_Berke), }, [TRAINER_BRAXTON] = @@ -910,7 +909,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 = TRAINER_PARTY(sParty_Braxton), }, [TRAINER_VINCENT] = @@ -922,7 +921,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_DEFAULT_MOVES(sParty_Vincent), + .party = TRAINER_PARTY(sParty_Vincent), }, [TRAINER_LEROY] = @@ -934,7 +933,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_DEFAULT_MOVES(sParty_Leroy), + .party = TRAINER_PARTY(sParty_Leroy), }, [TRAINER_WILTON_1] = @@ -946,7 +945,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_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_DEFAULT_MOVES(sParty_Wilton1), + .party = TRAINER_PARTY(sParty_Wilton1), }, [TRAINER_EDGAR] = @@ -958,7 +957,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_DEFAULT_MOVES(sParty_Edgar), + .party = TRAINER_PARTY(sParty_Edgar), }, [TRAINER_ALBERT] = @@ -970,7 +969,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_DEFAULT_MOVES(sParty_Albert), + .party = TRAINER_PARTY(sParty_Albert), }, [TRAINER_SAMUEL] = @@ -982,7 +981,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_DEFAULT_MOVES(sParty_Samuel), + .party = TRAINER_PARTY(sParty_Samuel), }, [TRAINER_VITO] = @@ -994,7 +993,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_DEFAULT_MOVES(sParty_Vito), + .party = TRAINER_PARTY(sParty_Vito), }, [TRAINER_OWEN] = @@ -1006,7 +1005,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_DEFAULT_MOVES(sParty_Owen), + .party = TRAINER_PARTY(sParty_Owen), }, [TRAINER_WILTON_2] = @@ -1018,7 +1017,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_DEFAULT_MOVES(sParty_Wilton2), + .party = TRAINER_PARTY(sParty_Wilton2), }, [TRAINER_WILTON_3] = @@ -1030,7 +1029,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_DEFAULT_MOVES(sParty_Wilton3), + .party = TRAINER_PARTY(sParty_Wilton3), }, [TRAINER_WILTON_4] = @@ -1042,7 +1041,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_DEFAULT_MOVES(sParty_Wilton4), + .party = TRAINER_PARTY(sParty_Wilton4), }, [TRAINER_WILTON_5] = @@ -1054,7 +1053,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_DEFAULT_MOVES(sParty_Wilton5), + .party = TRAINER_PARTY(sParty_Wilton5), }, [TRAINER_WARREN] = @@ -1066,7 +1065,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_DEFAULT_MOVES(sParty_Warren), + .party = TRAINER_PARTY(sParty_Warren), }, [TRAINER_MARY] = @@ -1078,7 +1077,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 = ITEM_CUSTOM_MOVES(sParty_Mary), + .party = TRAINER_PARTY(sParty_Mary), }, [TRAINER_ALEXIA] = @@ -1090,7 +1089,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 = ITEM_CUSTOM_MOVES(sParty_Alexia), + .party = TRAINER_PARTY(sParty_Alexia), }, [TRAINER_JODY] = @@ -1102,7 +1101,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_SETUP_FIRST_TURN, - .party = ITEM_CUSTOM_MOVES(sParty_Jody), + .party = TRAINER_PARTY(sParty_Jody), }, [TRAINER_WENDY] = @@ -1114,7 +1113,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 = TRAINER_PARTY(sParty_Wendy), }, [TRAINER_KEIRA] = @@ -1126,7 +1125,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_DEFAULT_MOVES(sParty_Keira), + .party = TRAINER_PARTY(sParty_Keira), }, [TRAINER_BROOKE_1] = @@ -1138,7 +1137,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_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_DEFAULT_MOVES(sParty_Brooke1), + .party = TRAINER_PARTY(sParty_Brooke1), }, [TRAINER_JENNIFER] = @@ -1150,7 +1149,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_DEFAULT_MOVES(sParty_Jennifer), + .party = TRAINER_PARTY(sParty_Jennifer), }, [TRAINER_HOPE] = @@ -1162,7 +1161,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_DEFAULT_MOVES(sParty_Hope), + .party = TRAINER_PARTY(sParty_Hope), }, [TRAINER_SHANNON] = @@ -1174,7 +1173,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_DEFAULT_MOVES(sParty_Shannon), + .party = TRAINER_PARTY(sParty_Shannon), }, [TRAINER_MICHELLE] = @@ -1186,7 +1185,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_DEFAULT_MOVES(sParty_Michelle), + .party = TRAINER_PARTY(sParty_Michelle), }, [TRAINER_CAROLINE] = @@ -1198,7 +1197,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_DEFAULT_MOVES(sParty_Caroline), + .party = TRAINER_PARTY(sParty_Caroline), }, [TRAINER_JULIE] = @@ -1210,7 +1209,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_DEFAULT_MOVES(sParty_Julie), + .party = TRAINER_PARTY(sParty_Julie), }, [TRAINER_BROOKE_2] = @@ -1222,7 +1221,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_DEFAULT_MOVES(sParty_Brooke2), + .party = TRAINER_PARTY(sParty_Brooke2), }, [TRAINER_BROOKE_3] = @@ -1234,7 +1233,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_DEFAULT_MOVES(sParty_Brooke3), + .party = TRAINER_PARTY(sParty_Brooke3), }, [TRAINER_BROOKE_4] = @@ -1246,7 +1245,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_DEFAULT_MOVES(sParty_Brooke4), + .party = TRAINER_PARTY(sParty_Brooke4), }, [TRAINER_BROOKE_5] = @@ -1258,7 +1257,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_DEFAULT_MOVES(sParty_Brooke5), + .party = TRAINER_PARTY(sParty_Brooke5), }, [TRAINER_PATRICIA] = @@ -1270,7 +1269,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Patricia), + .party = TRAINER_PARTY(sParty_Patricia), }, [TRAINER_KINDRA] = @@ -1282,7 +1281,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Kindra), + .party = TRAINER_PARTY(sParty_Kindra), }, [TRAINER_TAMMY] = @@ -1294,7 +1293,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Tammy), + .party = TRAINER_PARTY(sParty_Tammy), }, [TRAINER_VALERIE_1] = @@ -1306,7 +1305,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Valerie1), + .party = TRAINER_PARTY(sParty_Valerie1), }, [TRAINER_TASHA] = @@ -1318,7 +1317,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Tasha), + .party = TRAINER_PARTY(sParty_Tasha), }, [TRAINER_VALERIE_2] = @@ -1330,7 +1329,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Valerie2), + .party = TRAINER_PARTY(sParty_Valerie2), }, [TRAINER_VALERIE_3] = @@ -1342,7 +1341,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Valerie3), + .party = TRAINER_PARTY(sParty_Valerie3), }, [TRAINER_VALERIE_4] = @@ -1354,7 +1353,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Valerie4), + .party = TRAINER_PARTY(sParty_Valerie4), }, [TRAINER_VALERIE_5] = @@ -1366,7 +1365,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Valerie5), + .party = TRAINER_PARTY(sParty_Valerie5), }, [TRAINER_CINDY_1] = @@ -1378,7 +1377,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Cindy1), + .party = TRAINER_PARTY(sParty_Cindy1), }, [TRAINER_DAPHNE] = @@ -1390,7 +1389,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_CUSTOM_MOVES(sParty_Daphne), + .party = TRAINER_PARTY(sParty_Daphne), }, [TRAINER_GRUNT_SPACE_CENTER_2] = @@ -1402,7 +1401,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter2), + .party = TRAINER_PARTY(sParty_GruntSpaceCenter2), }, [TRAINER_CINDY_2] = @@ -1414,7 +1413,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_CUSTOM_MOVES(sParty_Cindy2), + .party = TRAINER_PARTY(sParty_Cindy2), }, [TRAINER_BRIANNA] = @@ -1426,7 +1425,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Brianna), + .party = TRAINER_PARTY(sParty_Brianna), }, [TRAINER_NAOMI] = @@ -1438,7 +1437,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Naomi), + .party = TRAINER_PARTY(sParty_Naomi), }, [TRAINER_CINDY_3] = @@ -1450,7 +1449,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Cindy3), + .party = TRAINER_PARTY(sParty_Cindy3), }, [TRAINER_CINDY_4] = @@ -1462,7 +1461,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Cindy4), + .party = TRAINER_PARTY(sParty_Cindy4), }, [TRAINER_CINDY_5] = @@ -1474,7 +1473,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Cindy5), + .party = TRAINER_PARTY(sParty_Cindy5), }, [TRAINER_CINDY_6] = @@ -1486,7 +1485,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_CUSTOM_MOVES(sParty_Cindy6), + .party = TRAINER_PARTY(sParty_Cindy6), }, [TRAINER_MELISSA] = @@ -1498,7 +1497,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Melissa), + .party = TRAINER_PARTY(sParty_Melissa), }, [TRAINER_SHEILA] = @@ -1510,7 +1509,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Sheila), + .party = TRAINER_PARTY(sParty_Sheila), }, [TRAINER_SHIRLEY] = @@ -1522,7 +1521,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Shirley), + .party = TRAINER_PARTY(sParty_Shirley), }, [TRAINER_JESSICA_1] = @@ -1534,7 +1533,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Jessica1), + .party = TRAINER_PARTY(sParty_Jessica1), }, [TRAINER_CONNIE] = @@ -1546,7 +1545,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Connie), + .party = TRAINER_PARTY(sParty_Connie), }, [TRAINER_BRIDGET] = @@ -1558,7 +1557,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Bridget), + .party = TRAINER_PARTY(sParty_Bridget), }, [TRAINER_OLIVIA] = @@ -1570,7 +1569,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Olivia), + .party = TRAINER_PARTY(sParty_Olivia), }, [TRAINER_TIFFANY] = @@ -1582,7 +1581,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Tiffany), + .party = TRAINER_PARTY(sParty_Tiffany), }, [TRAINER_JESSICA_2] = @@ -1594,7 +1593,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Jessica2), + .party = TRAINER_PARTY(sParty_Jessica2), }, [TRAINER_JESSICA_3] = @@ -1606,7 +1605,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Jessica3), + .party = TRAINER_PARTY(sParty_Jessica3), }, [TRAINER_JESSICA_4] = @@ -1618,7 +1617,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Jessica4), + .party = TRAINER_PARTY(sParty_Jessica4), }, [TRAINER_JESSICA_5] = @@ -1630,7 +1629,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Jessica5), + .party = TRAINER_PARTY(sParty_Jessica5), }, [TRAINER_WINSTON_1] = @@ -1642,7 +1641,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Winston1), + .party = TRAINER_PARTY(sParty_Winston1), }, [TRAINER_MOLLIE] = @@ -1654,7 +1653,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Mollie), + .party = TRAINER_PARTY(sParty_Mollie), }, [TRAINER_GARRET] = @@ -1666,7 +1665,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Garret), + .party = TRAINER_PARTY(sParty_Garret), }, [TRAINER_WINSTON_2] = @@ -1678,7 +1677,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Winston2), + .party = TRAINER_PARTY(sParty_Winston2), }, [TRAINER_WINSTON_3] = @@ -1690,7 +1689,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Winston3), + .party = TRAINER_PARTY(sParty_Winston3), }, [TRAINER_WINSTON_4] = @@ -1702,7 +1701,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Winston4), + .party = TRAINER_PARTY(sParty_Winston4), }, [TRAINER_WINSTON_5] = @@ -1714,7 +1713,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_CUSTOM_MOVES(sParty_Winston5), + .party = TRAINER_PARTY(sParty_Winston5), }, [TRAINER_STEVE_1] = @@ -1726,7 +1725,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Steve1), + .party = TRAINER_PARTY(sParty_Steve1), }, [TRAINER_THALIA_1] = @@ -1738,7 +1737,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Thalia1), + .party = TRAINER_PARTY(sParty_Thalia1), }, [TRAINER_MARK] = @@ -1750,7 +1749,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Mark), + .party = TRAINER_PARTY(sParty_Mark), }, [TRAINER_GRUNT_MT_CHIMNEY_1] = @@ -1762,7 +1761,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtChimney1), + .party = TRAINER_PARTY(sParty_GruntMtChimney1), }, [TRAINER_STEVE_2] = @@ -1774,7 +1773,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Steve2), + .party = TRAINER_PARTY(sParty_Steve2), }, [TRAINER_STEVE_3] = @@ -1786,7 +1785,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Steve3), + .party = TRAINER_PARTY(sParty_Steve3), }, [TRAINER_STEVE_4] = @@ -1798,7 +1797,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Steve4), + .party = TRAINER_PARTY(sParty_Steve4), }, [TRAINER_STEVE_5] = @@ -1810,7 +1809,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Steve5), + .party = TRAINER_PARTY(sParty_Steve5), }, [TRAINER_LUIS] = @@ -1822,7 +1821,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Luis), + .party = TRAINER_PARTY(sParty_Luis), }, [TRAINER_DOMINIK] = @@ -1834,7 +1833,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dominik), + .party = TRAINER_PARTY(sParty_Dominik), }, [TRAINER_DOUGLAS] = @@ -1846,7 +1845,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Douglas), + .party = TRAINER_PARTY(sParty_Douglas), }, [TRAINER_DARRIN] = @@ -1858,7 +1857,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Darrin), + .party = TRAINER_PARTY(sParty_Darrin), }, [TRAINER_TONY_1] = @@ -1870,7 +1869,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Tony1), + .party = TRAINER_PARTY(sParty_Tony1), }, [TRAINER_JEROME] = @@ -1882,7 +1881,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerome), + .party = TRAINER_PARTY(sParty_Jerome), }, [TRAINER_MATTHEW] = @@ -1894,7 +1893,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Matthew), + .party = TRAINER_PARTY(sParty_Matthew), }, [TRAINER_DAVID] = @@ -1906,7 +1905,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_David), + .party = TRAINER_PARTY(sParty_David), }, [TRAINER_SPENCER] = @@ -1918,7 +1917,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Spencer), + .party = TRAINER_PARTY(sParty_Spencer), }, [TRAINER_ROLAND] = @@ -1930,7 +1929,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Roland), + .party = TRAINER_PARTY(sParty_Roland), }, [TRAINER_NOLEN] = @@ -1942,7 +1941,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Nolen), + .party = TRAINER_PARTY(sParty_Nolen), }, [TRAINER_STAN] = @@ -1954,7 +1953,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Stan), + .party = TRAINER_PARTY(sParty_Stan), }, [TRAINER_BARRY] = @@ -1966,7 +1965,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Barry), + .party = TRAINER_PARTY(sParty_Barry), }, [TRAINER_DEAN] = @@ -1978,7 +1977,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dean), + .party = TRAINER_PARTY(sParty_Dean), }, [TRAINER_RODNEY] = @@ -1990,7 +1989,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Rodney), + .party = TRAINER_PARTY(sParty_Rodney), }, [TRAINER_RICHARD] = @@ -2002,7 +2001,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Richard), + .party = TRAINER_PARTY(sParty_Richard), }, [TRAINER_HERMAN] = @@ -2014,7 +2013,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Herman), + .party = TRAINER_PARTY(sParty_Herman), }, [TRAINER_SANTIAGO] = @@ -2026,7 +2025,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Santiago), + .party = TRAINER_PARTY(sParty_Santiago), }, [TRAINER_GILBERT] = @@ -2038,7 +2037,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Gilbert), + .party = TRAINER_PARTY(sParty_Gilbert), }, [TRAINER_FRANKLIN] = @@ -2050,7 +2049,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Franklin), + .party = TRAINER_PARTY(sParty_Franklin), }, [TRAINER_KEVIN] = @@ -2062,7 +2061,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Kevin), + .party = TRAINER_PARTY(sParty_Kevin), }, [TRAINER_JACK] = @@ -2074,7 +2073,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jack), + .party = TRAINER_PARTY(sParty_Jack), }, [TRAINER_DUDLEY] = @@ -2086,7 +2085,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dudley), + .party = TRAINER_PARTY(sParty_Dudley), }, [TRAINER_CHAD] = @@ -2098,7 +2097,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Chad), + .party = TRAINER_PARTY(sParty_Chad), }, [TRAINER_TONY_2] = @@ -2110,7 +2109,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Tony2), + .party = TRAINER_PARTY(sParty_Tony2), }, [TRAINER_TONY_3] = @@ -2122,7 +2121,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Tony3), + .party = TRAINER_PARTY(sParty_Tony3), }, [TRAINER_TONY_4] = @@ -2134,7 +2133,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Tony4), + .party = TRAINER_PARTY(sParty_Tony4), }, [TRAINER_TONY_5] = @@ -2146,7 +2145,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Tony5), + .party = TRAINER_PARTY(sParty_Tony5), }, [TRAINER_TAKAO] = @@ -2158,7 +2157,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Takao), + .party = TRAINER_PARTY(sParty_Takao), }, [TRAINER_HITOSHI] = @@ -2170,7 +2169,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Hitoshi), + .party = TRAINER_PARTY(sParty_Hitoshi), }, [TRAINER_KIYO] = @@ -2182,7 +2181,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Kiyo), + .party = TRAINER_PARTY(sParty_Kiyo), }, [TRAINER_KOICHI] = @@ -2194,7 +2193,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Koichi), + .party = TRAINER_PARTY(sParty_Koichi), }, [TRAINER_NOB_1] = @@ -2206,7 +2205,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Nob1), + .party = TRAINER_PARTY(sParty_Nob1), }, [TRAINER_NOB_2] = @@ -2218,7 +2217,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Nob2), + .party = TRAINER_PARTY(sParty_Nob2), }, [TRAINER_NOB_3] = @@ -2230,7 +2229,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Nob3), + .party = TRAINER_PARTY(sParty_Nob3), }, [TRAINER_NOB_4] = @@ -2242,7 +2241,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Nob4), + .party = TRAINER_PARTY(sParty_Nob4), }, [TRAINER_NOB_5] = @@ -2254,7 +2253,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Nob5), + .party = TRAINER_PARTY(sParty_Nob5), }, [TRAINER_YUJI] = @@ -2266,7 +2265,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Yuji), + .party = TRAINER_PARTY(sParty_Yuji), }, [TRAINER_DAISUKE] = @@ -2278,7 +2277,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Daisuke), + .party = TRAINER_PARTY(sParty_Daisuke), }, [TRAINER_ATSUSHI] = @@ -2290,7 +2289,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Atsushi), + .party = TRAINER_PARTY(sParty_Atsushi), }, [TRAINER_KIRK] = @@ -2302,7 +2301,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Kirk), + .party = TRAINER_PARTY(sParty_Kirk), }, [TRAINER_GRUNT_AQUA_HIDEOUT_7] = @@ -2314,7 +2313,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout7), + .party = TRAINER_PARTY(sParty_GruntAquaHideout7), }, [TRAINER_GRUNT_AQUA_HIDEOUT_8] = @@ -2326,7 +2325,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout8), + .party = TRAINER_PARTY(sParty_GruntAquaHideout8), }, [TRAINER_SHAWN] = @@ -2338,7 +2337,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Shawn), + .party = TRAINER_PARTY(sParty_Shawn), }, [TRAINER_FERNANDO_1] = @@ -2350,7 +2349,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Fernando1), + .party = TRAINER_PARTY(sParty_Fernando1), }, [TRAINER_DALTON_1] = @@ -2362,7 +2361,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dalton1), + .party = TRAINER_PARTY(sParty_Dalton1), }, [TRAINER_DALTON_2] = @@ -2374,7 +2373,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dalton2), + .party = TRAINER_PARTY(sParty_Dalton2), }, [TRAINER_DALTON_3] = @@ -2386,7 +2385,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dalton3), + .party = TRAINER_PARTY(sParty_Dalton3), }, [TRAINER_DALTON_4] = @@ -2398,7 +2397,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dalton4), + .party = TRAINER_PARTY(sParty_Dalton4), }, [TRAINER_DALTON_5] = @@ -2410,7 +2409,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dalton5), + .party = TRAINER_PARTY(sParty_Dalton5), }, [TRAINER_COLE] = @@ -2422,7 +2421,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cole), + .party = TRAINER_PARTY(sParty_Cole), }, [TRAINER_JEFF] = @@ -2434,7 +2433,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jeff), + .party = TRAINER_PARTY(sParty_Jeff), }, [TRAINER_AXLE] = @@ -2446,7 +2445,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Axle), + .party = TRAINER_PARTY(sParty_Axle), }, [TRAINER_JACE] = @@ -2458,7 +2457,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jace), + .party = TRAINER_PARTY(sParty_Jace), }, [TRAINER_KEEGAN] = @@ -2470,7 +2469,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Keegan), + .party = TRAINER_PARTY(sParty_Keegan), }, [TRAINER_BERNIE_1] = @@ -2482,7 +2481,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Bernie1), + .party = TRAINER_PARTY(sParty_Bernie1), }, [TRAINER_BERNIE_2] = @@ -2494,7 +2493,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Bernie2), + .party = TRAINER_PARTY(sParty_Bernie2), }, [TRAINER_BERNIE_3] = @@ -2506,7 +2505,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Bernie3), + .party = TRAINER_PARTY(sParty_Bernie3), }, [TRAINER_BERNIE_4] = @@ -2518,7 +2517,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Bernie4), + .party = TRAINER_PARTY(sParty_Bernie4), }, [TRAINER_BERNIE_5] = @@ -2530,7 +2529,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Bernie5), + .party = TRAINER_PARTY(sParty_Bernie5), }, [TRAINER_DREW] = @@ -2542,7 +2541,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Drew), + .party = TRAINER_PARTY(sParty_Drew), }, [TRAINER_BEAU] = @@ -2554,7 +2553,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Beau), + .party = TRAINER_PARTY(sParty_Beau), }, [TRAINER_LARRY] = @@ -2566,7 +2565,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Larry), + .party = TRAINER_PARTY(sParty_Larry), }, [TRAINER_SHANE] = @@ -2578,7 +2577,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Shane), + .party = TRAINER_PARTY(sParty_Shane), }, [TRAINER_JUSTIN] = @@ -2590,7 +2589,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Justin), + .party = TRAINER_PARTY(sParty_Justin), }, [TRAINER_ETHAN_1] = @@ -2602,7 +2601,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ethan1), + .party = TRAINER_PARTY(sParty_Ethan1), }, [TRAINER_AUTUMN] = @@ -2614,7 +2613,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Autumn), + .party = TRAINER_PARTY(sParty_Autumn), }, [TRAINER_TRAVIS] = @@ -2626,7 +2625,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Travis), + .party = TRAINER_PARTY(sParty_Travis), }, [TRAINER_ETHAN_2] = @@ -2638,7 +2637,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ethan2), + .party = TRAINER_PARTY(sParty_Ethan2), }, [TRAINER_ETHAN_3] = @@ -2650,7 +2649,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ethan3), + .party = TRAINER_PARTY(sParty_Ethan3), }, [TRAINER_ETHAN_4] = @@ -2662,7 +2661,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ethan4), + .party = TRAINER_PARTY(sParty_Ethan4), }, [TRAINER_ETHAN_5] = @@ -2674,7 +2673,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ethan5), + .party = TRAINER_PARTY(sParty_Ethan5), }, [TRAINER_BRENT] = @@ -2686,7 +2685,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Brent), + .party = TRAINER_PARTY(sParty_Brent), }, [TRAINER_DONALD] = @@ -2698,7 +2697,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Donald), + .party = TRAINER_PARTY(sParty_Donald), }, [TRAINER_TAYLOR] = @@ -2710,7 +2709,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Taylor), + .party = TRAINER_PARTY(sParty_Taylor), }, [TRAINER_JEFFREY_1] = @@ -2722,7 +2721,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jeffrey1), + .party = TRAINER_PARTY(sParty_Jeffrey1), }, [TRAINER_DEREK] = @@ -2734,7 +2733,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Derek), + .party = TRAINER_PARTY(sParty_Derek), }, [TRAINER_JEFFREY_2] = @@ -2746,7 +2745,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jeffrey2), + .party = TRAINER_PARTY(sParty_Jeffrey2), }, [TRAINER_JEFFREY_3] = @@ -2758,7 +2757,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jeffrey3), + .party = TRAINER_PARTY(sParty_Jeffrey3), }, [TRAINER_JEFFREY_4] = @@ -2770,7 +2769,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jeffrey4), + .party = TRAINER_PARTY(sParty_Jeffrey4), }, [TRAINER_JEFFREY_5] = @@ -2782,7 +2781,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Jeffrey5), + .party = TRAINER_PARTY(sParty_Jeffrey5), }, [TRAINER_EDWARD] = @@ -2794,7 +2793,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Edward), + .party = TRAINER_PARTY(sParty_Edward), }, [TRAINER_PRESTON] = @@ -2806,7 +2805,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Preston), + .party = TRAINER_PARTY(sParty_Preston), }, [TRAINER_VIRGIL] = @@ -2818,7 +2817,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Virgil), + .party = TRAINER_PARTY(sParty_Virgil), }, [TRAINER_BLAKE] = @@ -2830,7 +2829,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Blake), + .party = TRAINER_PARTY(sParty_Blake), }, [TRAINER_WILLIAM] = @@ -2842,7 +2841,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_William), + .party = TRAINER_PARTY(sParty_William), }, [TRAINER_JOSHUA] = @@ -2854,7 +2853,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Joshua), + .party = TRAINER_PARTY(sParty_Joshua), }, [TRAINER_CAMERON_1] = @@ -2866,7 +2865,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cameron1), + .party = TRAINER_PARTY(sParty_Cameron1), }, [TRAINER_CAMERON_2] = @@ -2878,7 +2877,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cameron2), + .party = TRAINER_PARTY(sParty_Cameron2), }, [TRAINER_CAMERON_3] = @@ -2890,7 +2889,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cameron3), + .party = TRAINER_PARTY(sParty_Cameron3), }, [TRAINER_CAMERON_4] = @@ -2902,7 +2901,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cameron4), + .party = TRAINER_PARTY(sParty_Cameron4), }, [TRAINER_CAMERON_5] = @@ -2914,7 +2913,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cameron5), + .party = TRAINER_PARTY(sParty_Cameron5), }, [TRAINER_JACLYN] = @@ -2926,7 +2925,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Jaclyn), + .party = TRAINER_PARTY(sParty_Jaclyn), }, [TRAINER_HANNAH] = @@ -2938,7 +2937,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Hannah), + .party = TRAINER_PARTY(sParty_Hannah), }, [TRAINER_SAMANTHA] = @@ -2950,7 +2949,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Samantha), + .party = TRAINER_PARTY(sParty_Samantha), }, [TRAINER_MAURA] = @@ -2962,7 +2961,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Maura), + .party = TRAINER_PARTY(sParty_Maura), }, [TRAINER_KAYLA] = @@ -2974,7 +2973,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Kayla), + .party = TRAINER_PARTY(sParty_Kayla), }, [TRAINER_ALEXIS] = @@ -2986,7 +2985,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Alexis), + .party = TRAINER_PARTY(sParty_Alexis), }, [TRAINER_JACKI_1] = @@ -2998,7 +2997,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacki1), + .party = TRAINER_PARTY(sParty_Jacki1), }, [TRAINER_JACKI_2] = @@ -3010,7 +3009,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacki2), + .party = TRAINER_PARTY(sParty_Jacki2), }, [TRAINER_JACKI_3] = @@ -3022,7 +3021,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacki3), + .party = TRAINER_PARTY(sParty_Jacki3), }, [TRAINER_JACKI_4] = @@ -3034,7 +3033,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacki4), + .party = TRAINER_PARTY(sParty_Jacki4), }, [TRAINER_JACKI_5] = @@ -3046,7 +3045,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacki5), + .party = TRAINER_PARTY(sParty_Jacki5), }, [TRAINER_WALTER_1] = @@ -3058,7 +3057,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Walter1), + .party = TRAINER_PARTY(sParty_Walter1), }, [TRAINER_MICAH] = @@ -3070,7 +3069,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Micah), + .party = TRAINER_PARTY(sParty_Micah), }, [TRAINER_THOMAS] = @@ -3082,7 +3081,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Thomas), + .party = TRAINER_PARTY(sParty_Thomas), }, [TRAINER_WALTER_2] = @@ -3094,7 +3093,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Walter2), + .party = TRAINER_PARTY(sParty_Walter2), }, [TRAINER_WALTER_3] = @@ -3106,7 +3105,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Walter3), + .party = TRAINER_PARTY(sParty_Walter3), }, [TRAINER_WALTER_4] = @@ -3118,7 +3117,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Walter4), + .party = TRAINER_PARTY(sParty_Walter4), }, [TRAINER_WALTER_5] = @@ -3130,7 +3129,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Walter5), + .party = TRAINER_PARTY(sParty_Walter5), }, [TRAINER_SIDNEY] = @@ -3142,7 +3141,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 | AI_FLAG_SETUP_FIRST_TURN, - .party = ITEM_CUSTOM_MOVES(sParty_Sidney), + .party = TRAINER_PARTY(sParty_Sidney), }, [TRAINER_PHOEBE] = @@ -3154,7 +3153,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 = ITEM_CUSTOM_MOVES(sParty_Phoebe), + .party = TRAINER_PARTY(sParty_Phoebe), }, [TRAINER_GLACIA] = @@ -3166,7 +3165,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 = ITEM_CUSTOM_MOVES(sParty_Glacia), + .party = TRAINER_PARTY(sParty_Glacia), }, [TRAINER_DRAKE] = @@ -3178,7 +3177,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 = ITEM_CUSTOM_MOVES(sParty_Drake), + .party = TRAINER_PARTY(sParty_Drake), }, [TRAINER_ROXANNE_1] = @@ -3190,7 +3189,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_POTION, ITEM_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Roxanne1), + .party = TRAINER_PARTY(sParty_Roxanne1), }, [TRAINER_BRAWLY_1] = @@ -3202,7 +3201,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Brawly1), + .party = TRAINER_PARTY(sParty_Brawly1), }, [TRAINER_WATTSON_1] = @@ -3214,7 +3213,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Wattson1), + .party = TRAINER_PARTY(sParty_Wattson1), }, [TRAINER_FLANNERY_1] = @@ -3226,7 +3225,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Flannery1), + .party = TRAINER_PARTY(sParty_Flannery1), }, [TRAINER_NORMAN_1] = @@ -3238,7 +3237,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Norman1), + .party = TRAINER_PARTY(sParty_Norman1), }, [TRAINER_WINONA_1] = @@ -3250,7 +3249,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .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 = TRAINER_PARTY(sParty_Winona1), }, [TRAINER_TATE_AND_LIZA_1] = @@ -3262,7 +3261,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_TateAndLiza1), + .party = TRAINER_PARTY(sParty_TateAndLiza1), }, [TRAINER_JUAN_1] = @@ -3274,7 +3273,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Juan1), + .party = TRAINER_PARTY(sParty_Juan1), }, [TRAINER_JERRY_1] = @@ -3286,7 +3285,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerry1), + .party = TRAINER_PARTY(sParty_Jerry1), }, [TRAINER_TED] = @@ -3298,7 +3297,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ted), + .party = TRAINER_PARTY(sParty_Ted), }, [TRAINER_PAUL] = @@ -3310,7 +3309,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Paul), + .party = TRAINER_PARTY(sParty_Paul), }, [TRAINER_JERRY_2] = @@ -3322,7 +3321,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerry2), + .party = TRAINER_PARTY(sParty_Jerry2), }, [TRAINER_JERRY_3] = @@ -3334,7 +3333,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerry3), + .party = TRAINER_PARTY(sParty_Jerry3), }, [TRAINER_JERRY_4] = @@ -3346,7 +3345,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerry4), + .party = TRAINER_PARTY(sParty_Jerry4), }, [TRAINER_JERRY_5] = @@ -3358,7 +3357,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerry5), + .party = TRAINER_PARTY(sParty_Jerry5), }, [TRAINER_KAREN_1] = @@ -3370,7 +3369,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Karen1), + .party = TRAINER_PARTY(sParty_Karen1), }, [TRAINER_GEORGIA] = @@ -3382,7 +3381,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Georgia), + .party = TRAINER_PARTY(sParty_Georgia), }, [TRAINER_KAREN_2] = @@ -3394,7 +3393,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Karen2), + .party = TRAINER_PARTY(sParty_Karen2), }, [TRAINER_KAREN_3] = @@ -3406,7 +3405,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Karen3), + .party = TRAINER_PARTY(sParty_Karen3), }, [TRAINER_KAREN_4] = @@ -3418,7 +3417,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Karen4), + .party = TRAINER_PARTY(sParty_Karen4), }, [TRAINER_KAREN_5] = @@ -3430,7 +3429,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Karen5), + .party = TRAINER_PARTY(sParty_Karen5), }, [TRAINER_KATE_AND_JOY] = @@ -3442,7 +3441,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_KateAndJoy), + .party = TRAINER_PARTY(sParty_KateAndJoy), }, [TRAINER_ANNA_AND_MEG_1] = @@ -3454,7 +3453,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_AnnaAndMeg1), + .party = TRAINER_PARTY(sParty_AnnaAndMeg1), }, [TRAINER_ANNA_AND_MEG_2] = @@ -3466,7 +3465,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_AnnaAndMeg2), + .party = TRAINER_PARTY(sParty_AnnaAndMeg2), }, [TRAINER_ANNA_AND_MEG_3] = @@ -3478,7 +3477,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_AnnaAndMeg3), + .party = TRAINER_PARTY(sParty_AnnaAndMeg3), }, [TRAINER_ANNA_AND_MEG_4] = @@ -3490,7 +3489,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_AnnaAndMeg4), + .party = TRAINER_PARTY(sParty_AnnaAndMeg4), }, [TRAINER_ANNA_AND_MEG_5] = @@ -3502,7 +3501,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_AnnaAndMeg5), + .party = TRAINER_PARTY(sParty_AnnaAndMeg5), }, [TRAINER_VICTOR] = @@ -3514,7 +3513,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Victor), + .party = TRAINER_PARTY(sParty_Victor), }, [TRAINER_MIGUEL_1] = @@ -3526,7 +3525,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Miguel1), + .party = TRAINER_PARTY(sParty_Miguel1), }, [TRAINER_COLTON] = @@ -3538,7 +3537,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_CUSTOM_MOVES(sParty_Colton), + .party = TRAINER_PARTY(sParty_Colton), }, [TRAINER_MIGUEL_2] = @@ -3550,7 +3549,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Miguel2), + .party = TRAINER_PARTY(sParty_Miguel2), }, [TRAINER_MIGUEL_3] = @@ -3562,7 +3561,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Miguel3), + .party = TRAINER_PARTY(sParty_Miguel3), }, [TRAINER_MIGUEL_4] = @@ -3574,7 +3573,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Miguel4), + .party = TRAINER_PARTY(sParty_Miguel4), }, [TRAINER_MIGUEL_5] = @@ -3586,7 +3585,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Miguel5), + .party = TRAINER_PARTY(sParty_Miguel5), }, [TRAINER_VICTORIA] = @@ -3598,7 +3597,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT, - .party = ITEM_DEFAULT_MOVES(sParty_Victoria), + .party = TRAINER_PARTY(sParty_Victoria), }, [TRAINER_VANESSA] = @@ -3610,7 +3609,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Vanessa), + .party = TRAINER_PARTY(sParty_Vanessa), }, [TRAINER_BETHANY] = @@ -3622,7 +3621,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Bethany), + .party = TRAINER_PARTY(sParty_Bethany), }, [TRAINER_ISABEL_1] = @@ -3634,7 +3633,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Isabel1), + .party = TRAINER_PARTY(sParty_Isabel1), }, [TRAINER_ISABEL_2] = @@ -3646,7 +3645,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Isabel2), + .party = TRAINER_PARTY(sParty_Isabel2), }, [TRAINER_ISABEL_3] = @@ -3658,7 +3657,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Isabel3), + .party = TRAINER_PARTY(sParty_Isabel3), }, [TRAINER_ISABEL_4] = @@ -3670,7 +3669,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Isabel4), + .party = TRAINER_PARTY(sParty_Isabel4), }, [TRAINER_ISABEL_5] = @@ -3682,7 +3681,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Isabel5), + .party = TRAINER_PARTY(sParty_Isabel5), }, [TRAINER_TIMOTHY_1] = @@ -3694,7 +3693,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_DEFAULT_MOVES(sParty_Timothy1), + .party = TRAINER_PARTY(sParty_Timothy1), }, [TRAINER_TIMOTHY_2] = @@ -3706,7 +3705,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 = TRAINER_PARTY(sParty_Timothy2), }, [TRAINER_TIMOTHY_3] = @@ -3718,7 +3717,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 = TRAINER_PARTY(sParty_Timothy3), }, [TRAINER_TIMOTHY_4] = @@ -3730,7 +3729,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 = TRAINER_PARTY(sParty_Timothy4), }, [TRAINER_TIMOTHY_5] = @@ -3742,7 +3741,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 = TRAINER_PARTY(sParty_Timothy5), }, [TRAINER_VICKY] = @@ -3754,7 +3753,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 = TRAINER_PARTY(sParty_Vicky), }, [TRAINER_SHELBY_1] = @@ -3766,7 +3765,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_DEFAULT_MOVES(sParty_Shelby1), + .party = TRAINER_PARTY(sParty_Shelby1), }, [TRAINER_SHELBY_2] = @@ -3778,7 +3777,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_DEFAULT_MOVES(sParty_Shelby2), + .party = TRAINER_PARTY(sParty_Shelby2), }, [TRAINER_SHELBY_3] = @@ -3790,7 +3789,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_DEFAULT_MOVES(sParty_Shelby3), + .party = TRAINER_PARTY(sParty_Shelby3), }, [TRAINER_SHELBY_4] = @@ -3802,7 +3801,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_DEFAULT_MOVES(sParty_Shelby4), + .party = TRAINER_PARTY(sParty_Shelby4), }, [TRAINER_SHELBY_5] = @@ -3814,7 +3813,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_DEFAULT_MOVES(sParty_Shelby5), + .party = TRAINER_PARTY(sParty_Shelby5), }, [TRAINER_CALVIN_1] = @@ -3826,7 +3825,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Calvin1), + .party = TRAINER_PARTY(sParty_Calvin1), }, [TRAINER_BILLY] = @@ -3838,7 +3837,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Billy), + .party = TRAINER_PARTY(sParty_Billy), }, [TRAINER_JOSH] = @@ -3850,7 +3849,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Josh), + .party = TRAINER_PARTY(sParty_Josh), }, [TRAINER_TOMMY] = @@ -3862,7 +3861,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Tommy), + .party = TRAINER_PARTY(sParty_Tommy), }, [TRAINER_JOEY] = @@ -3874,7 +3873,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Joey), + .party = TRAINER_PARTY(sParty_Joey), }, [TRAINER_BEN] = @@ -3886,7 +3885,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Ben), + .party = TRAINER_PARTY(sParty_Ben), }, [TRAINER_QUINCY] = @@ -3898,7 +3897,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 = TRAINER_PARTY(sParty_Quincy), }, [TRAINER_KATELYNN] = @@ -3910,7 +3909,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 = TRAINER_PARTY(sParty_Katelynn), }, [TRAINER_JAYLEN] = @@ -3922,7 +3921,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jaylen), + .party = TRAINER_PARTY(sParty_Jaylen), }, [TRAINER_DILLON] = @@ -3934,7 +3933,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dillon), + .party = TRAINER_PARTY(sParty_Dillon), }, [TRAINER_CALVIN_2] = @@ -3946,7 +3945,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Calvin2), + .party = TRAINER_PARTY(sParty_Calvin2), }, [TRAINER_CALVIN_3] = @@ -3958,7 +3957,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Calvin3), + .party = TRAINER_PARTY(sParty_Calvin3), }, [TRAINER_CALVIN_4] = @@ -3970,7 +3969,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Calvin4), + .party = TRAINER_PARTY(sParty_Calvin4), }, [TRAINER_CALVIN_5] = @@ -3982,7 +3981,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Calvin5), + .party = TRAINER_PARTY(sParty_Calvin5), }, [TRAINER_EDDIE] = @@ -3994,7 +3993,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Eddie), + .party = TRAINER_PARTY(sParty_Eddie), }, [TRAINER_ALLEN] = @@ -4006,7 +4005,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Allen), + .party = TRAINER_PARTY(sParty_Allen), }, [TRAINER_TIMMY] = @@ -4018,7 +4017,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Timmy), + .party = TRAINER_PARTY(sParty_Timmy), }, [TRAINER_WALLACE] = @@ -4030,7 +4029,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Wallace), + .party = TRAINER_PARTY(sParty_Wallace), }, [TRAINER_ANDREW] = @@ -4042,7 +4041,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Andrew), + .party = TRAINER_PARTY(sParty_Andrew), }, [TRAINER_IVAN] = @@ -4054,7 +4053,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ivan), + .party = TRAINER_PARTY(sParty_Ivan), }, [TRAINER_CLAUDE] = @@ -4066,7 +4065,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Claude), + .party = TRAINER_PARTY(sParty_Claude), }, [TRAINER_ELLIOT_1] = @@ -4078,7 +4077,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Elliot1), + .party = TRAINER_PARTY(sParty_Elliot1), }, [TRAINER_NED] = @@ -4090,7 +4089,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ned), + .party = TRAINER_PARTY(sParty_Ned), }, [TRAINER_DALE] = @@ -4102,7 +4101,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dale), + .party = TRAINER_PARTY(sParty_Dale), }, [TRAINER_NOLAN] = @@ -4114,7 +4113,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Nolan), + .party = TRAINER_PARTY(sParty_Nolan), }, [TRAINER_BARNY] = @@ -4126,7 +4125,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Barny), + .party = TRAINER_PARTY(sParty_Barny), }, [TRAINER_WADE] = @@ -4138,7 +4137,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Wade), + .party = TRAINER_PARTY(sParty_Wade), }, [TRAINER_CARTER] = @@ -4150,7 +4149,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Carter), + .party = TRAINER_PARTY(sParty_Carter), }, [TRAINER_ELLIOT_2] = @@ -4162,7 +4161,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Elliot2), + .party = TRAINER_PARTY(sParty_Elliot2), }, [TRAINER_ELLIOT_3] = @@ -4174,7 +4173,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Elliot3), + .party = TRAINER_PARTY(sParty_Elliot3), }, [TRAINER_ELLIOT_4] = @@ -4186,7 +4185,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Elliot4), + .party = TRAINER_PARTY(sParty_Elliot4), }, [TRAINER_ELLIOT_5] = @@ -4198,7 +4197,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Elliot5), + .party = TRAINER_PARTY(sParty_Elliot5), }, [TRAINER_RONALD] = @@ -4210,7 +4209,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ronald), + .party = TRAINER_PARTY(sParty_Ronald), }, [TRAINER_JACOB] = @@ -4222,7 +4221,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacob), + .party = TRAINER_PARTY(sParty_Jacob), }, [TRAINER_ANTHONY] = @@ -4234,7 +4233,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Anthony), + .party = TRAINER_PARTY(sParty_Anthony), }, [TRAINER_BENJAMIN_1] = @@ -4246,7 +4245,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Benjamin1), + .party = TRAINER_PARTY(sParty_Benjamin1), }, [TRAINER_BENJAMIN_2] = @@ -4258,7 +4257,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Benjamin2), + .party = TRAINER_PARTY(sParty_Benjamin2), }, [TRAINER_BENJAMIN_3] = @@ -4270,7 +4269,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Benjamin3), + .party = TRAINER_PARTY(sParty_Benjamin3), }, [TRAINER_BENJAMIN_4] = @@ -4282,7 +4281,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Benjamin4), + .party = TRAINER_PARTY(sParty_Benjamin4), }, [TRAINER_BENJAMIN_5] = @@ -4294,7 +4293,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Benjamin5), + .party = TRAINER_PARTY(sParty_Benjamin5), }, [TRAINER_ABIGAIL_1] = @@ -4306,7 +4305,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Abigail1), + .party = TRAINER_PARTY(sParty_Abigail1), }, [TRAINER_JASMINE] = @@ -4318,7 +4317,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jasmine), + .party = TRAINER_PARTY(sParty_Jasmine), }, [TRAINER_ABIGAIL_2] = @@ -4330,7 +4329,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Abigail2), + .party = TRAINER_PARTY(sParty_Abigail2), }, [TRAINER_ABIGAIL_3] = @@ -4342,7 +4341,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Abigail3), + .party = TRAINER_PARTY(sParty_Abigail3), }, [TRAINER_ABIGAIL_4] = @@ -4354,7 +4353,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Abigail4), + .party = TRAINER_PARTY(sParty_Abigail4), }, [TRAINER_ABIGAIL_5] = @@ -4366,7 +4365,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Abigail5), + .party = TRAINER_PARTY(sParty_Abigail5), }, [TRAINER_DYLAN_1] = @@ -4378,7 +4377,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dylan1), + .party = TRAINER_PARTY(sParty_Dylan1), }, [TRAINER_DYLAN_2] = @@ -4390,7 +4389,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dylan2), + .party = TRAINER_PARTY(sParty_Dylan2), }, [TRAINER_DYLAN_3] = @@ -4402,7 +4401,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dylan3), + .party = TRAINER_PARTY(sParty_Dylan3), }, [TRAINER_DYLAN_4] = @@ -4414,7 +4413,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dylan4), + .party = TRAINER_PARTY(sParty_Dylan4), }, [TRAINER_DYLAN_5] = @@ -4426,7 +4425,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dylan5), + .party = TRAINER_PARTY(sParty_Dylan5), }, [TRAINER_MARIA_1] = @@ -4438,7 +4437,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Maria1), + .party = TRAINER_PARTY(sParty_Maria1), }, [TRAINER_MARIA_2] = @@ -4450,7 +4449,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Maria2), + .party = TRAINER_PARTY(sParty_Maria2), }, [TRAINER_MARIA_3] = @@ -4462,7 +4461,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Maria3), + .party = TRAINER_PARTY(sParty_Maria3), }, [TRAINER_MARIA_4] = @@ -4474,7 +4473,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Maria4), + .party = TRAINER_PARTY(sParty_Maria4), }, [TRAINER_MARIA_5] = @@ -4486,7 +4485,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Maria5), + .party = TRAINER_PARTY(sParty_Maria5), }, [TRAINER_CAMDEN] = @@ -4498,7 +4497,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Camden), + .party = TRAINER_PARTY(sParty_Camden), }, [TRAINER_DEMETRIUS] = @@ -4510,7 +4509,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Demetrius), + .party = TRAINER_PARTY(sParty_Demetrius), }, [TRAINER_ISAIAH_1] = @@ -4522,7 +4521,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaiah1), + .party = TRAINER_PARTY(sParty_Isaiah1), }, [TRAINER_PABLO_1] = @@ -4534,7 +4533,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Pablo1), + .party = TRAINER_PARTY(sParty_Pablo1), }, [TRAINER_CHASE] = @@ -4546,7 +4545,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Chase), + .party = TRAINER_PARTY(sParty_Chase), }, [TRAINER_ISAIAH_2] = @@ -4558,7 +4557,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaiah2), + .party = TRAINER_PARTY(sParty_Isaiah2), }, [TRAINER_ISAIAH_3] = @@ -4570,7 +4569,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaiah3), + .party = TRAINER_PARTY(sParty_Isaiah3), }, [TRAINER_ISAIAH_4] = @@ -4582,7 +4581,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaiah4), + .party = TRAINER_PARTY(sParty_Isaiah4), }, [TRAINER_ISAIAH_5] = @@ -4594,7 +4593,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaiah5), + .party = TRAINER_PARTY(sParty_Isaiah5), }, [TRAINER_ISOBEL] = @@ -4606,7 +4605,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Isobel), + .party = TRAINER_PARTY(sParty_Isobel), }, [TRAINER_DONNY] = @@ -4618,7 +4617,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Donny), + .party = TRAINER_PARTY(sParty_Donny), }, [TRAINER_TALIA] = @@ -4630,7 +4629,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Talia), + .party = TRAINER_PARTY(sParty_Talia), }, [TRAINER_KATELYN_1] = @@ -4642,7 +4641,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Katelyn1), + .party = TRAINER_PARTY(sParty_Katelyn1), }, [TRAINER_ALLISON] = @@ -4654,7 +4653,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Allison), + .party = TRAINER_PARTY(sParty_Allison), }, [TRAINER_KATELYN_2] = @@ -4666,7 +4665,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Katelyn2), + .party = TRAINER_PARTY(sParty_Katelyn2), }, [TRAINER_KATELYN_3] = @@ -4678,7 +4677,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Katelyn3), + .party = TRAINER_PARTY(sParty_Katelyn3), }, [TRAINER_KATELYN_4] = @@ -4690,7 +4689,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Katelyn4), + .party = TRAINER_PARTY(sParty_Katelyn4), }, [TRAINER_KATELYN_5] = @@ -4702,7 +4701,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Katelyn5), + .party = TRAINER_PARTY(sParty_Katelyn5), }, [TRAINER_NICOLAS_1] = @@ -4714,7 +4713,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Nicolas1), + .party = TRAINER_PARTY(sParty_Nicolas1), }, [TRAINER_NICOLAS_2] = @@ -4726,7 +4725,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Nicolas2), + .party = TRAINER_PARTY(sParty_Nicolas2), }, [TRAINER_NICOLAS_3] = @@ -4738,7 +4737,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Nicolas3), + .party = TRAINER_PARTY(sParty_Nicolas3), }, [TRAINER_NICOLAS_4] = @@ -4750,7 +4749,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Nicolas4), + .party = TRAINER_PARTY(sParty_Nicolas4), }, [TRAINER_NICOLAS_5] = @@ -4762,7 +4761,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Nicolas5), + .party = TRAINER_PARTY(sParty_Nicolas5), }, [TRAINER_AARON] = @@ -4774,7 +4773,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Aaron), + .party = TRAINER_PARTY(sParty_Aaron), }, [TRAINER_PERRY] = @@ -4786,7 +4785,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Perry), + .party = TRAINER_PARTY(sParty_Perry), }, [TRAINER_HUGH] = @@ -4798,7 +4797,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Hugh), + .party = TRAINER_PARTY(sParty_Hugh), }, [TRAINER_PHIL] = @@ -4810,7 +4809,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Phil), + .party = TRAINER_PARTY(sParty_Phil), }, [TRAINER_JARED] = @@ -4822,7 +4821,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jared), + .party = TRAINER_PARTY(sParty_Jared), }, [TRAINER_HUMBERTO] = @@ -4834,7 +4833,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Humberto), + .party = TRAINER_PARTY(sParty_Humberto), }, [TRAINER_PRESLEY] = @@ -4846,7 +4845,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Presley), + .party = TRAINER_PARTY(sParty_Presley), }, [TRAINER_EDWARDO] = @@ -4858,7 +4857,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwardo), + .party = TRAINER_PARTY(sParty_Edwardo), }, [TRAINER_COLIN] = @@ -4870,7 +4869,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Colin), + .party = TRAINER_PARTY(sParty_Colin), }, [TRAINER_ROBERT_1] = @@ -4882,7 +4881,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Robert1), + .party = TRAINER_PARTY(sParty_Robert1), }, [TRAINER_BENNY] = @@ -4894,7 +4893,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Benny), + .party = TRAINER_PARTY(sParty_Benny), }, [TRAINER_CHESTER] = @@ -4906,7 +4905,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Chester), + .party = TRAINER_PARTY(sParty_Chester), }, [TRAINER_ROBERT_2] = @@ -4918,7 +4917,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Robert2), + .party = TRAINER_PARTY(sParty_Robert2), }, [TRAINER_ROBERT_3] = @@ -4930,7 +4929,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Robert3), + .party = TRAINER_PARTY(sParty_Robert3), }, [TRAINER_ROBERT_4] = @@ -4942,7 +4941,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Robert4), + .party = TRAINER_PARTY(sParty_Robert4), }, [TRAINER_ROBERT_5] = @@ -4954,7 +4953,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Robert5), + .party = TRAINER_PARTY(sParty_Robert5), }, [TRAINER_ALEX] = @@ -4966,7 +4965,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Alex), + .party = TRAINER_PARTY(sParty_Alex), }, [TRAINER_BECK] = @@ -4978,7 +4977,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Beck), + .party = TRAINER_PARTY(sParty_Beck), }, [TRAINER_YASU] = @@ -4990,7 +4989,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Yasu), + .party = TRAINER_PARTY(sParty_Yasu), }, [TRAINER_TAKASHI] = @@ -5002,7 +5001,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Takashi), + .party = TRAINER_PARTY(sParty_Takashi), }, [TRAINER_DIANNE] = @@ -5014,7 +5013,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = 0, - .party = ITEM_CUSTOM_MOVES(sParty_Dianne), + .party = TRAINER_PARTY(sParty_Dianne), }, [TRAINER_JANI] = @@ -5026,7 +5025,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jani), + .party = TRAINER_PARTY(sParty_Jani), }, [TRAINER_LAO_1] = @@ -5038,7 +5037,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Lao1), + .party = TRAINER_PARTY(sParty_Lao1), }, [TRAINER_LUNG] = @@ -5050,7 +5049,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lung), + .party = TRAINER_PARTY(sParty_Lung), }, [TRAINER_LAO_2] = @@ -5062,7 +5061,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Lao2), + .party = TRAINER_PARTY(sParty_Lao2), }, [TRAINER_LAO_3] = @@ -5074,7 +5073,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Lao3), + .party = TRAINER_PARTY(sParty_Lao3), }, [TRAINER_LAO_4] = @@ -5086,7 +5085,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Lao4), + .party = TRAINER_PARTY(sParty_Lao4), }, [TRAINER_LAO_5] = @@ -5098,7 +5097,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .party = ITEM_CUSTOM_MOVES(sParty_Lao5), + .party = TRAINER_PARTY(sParty_Lao5), }, [TRAINER_JOCELYN] = @@ -5110,7 +5109,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jocelyn), + .party = TRAINER_PARTY(sParty_Jocelyn), }, [TRAINER_LAURA] = @@ -5122,7 +5121,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Laura), + .party = TRAINER_PARTY(sParty_Laura), }, [TRAINER_CYNDY_1] = @@ -5134,7 +5133,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cyndy1), + .party = TRAINER_PARTY(sParty_Cyndy1), }, [TRAINER_CORA] = @@ -5146,7 +5145,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cora), + .party = TRAINER_PARTY(sParty_Cora), }, [TRAINER_PAULA] = @@ -5158,7 +5157,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Paula), + .party = TRAINER_PARTY(sParty_Paula), }, [TRAINER_CYNDY_2] = @@ -5170,7 +5169,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cyndy2), + .party = TRAINER_PARTY(sParty_Cyndy2), }, [TRAINER_CYNDY_3] = @@ -5182,7 +5181,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cyndy3), + .party = TRAINER_PARTY(sParty_Cyndy3), }, [TRAINER_CYNDY_4] = @@ -5194,7 +5193,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cyndy4), + .party = TRAINER_PARTY(sParty_Cyndy4), }, [TRAINER_CYNDY_5] = @@ -5206,7 +5205,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cyndy5), + .party = TRAINER_PARTY(sParty_Cyndy5), }, [TRAINER_MADELINE_1] = @@ -5218,7 +5217,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Madeline1), + .party = TRAINER_PARTY(sParty_Madeline1), }, [TRAINER_CLARISSA] = @@ -5230,7 +5229,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Clarissa), + .party = TRAINER_PARTY(sParty_Clarissa), }, [TRAINER_ANGELICA] = @@ -5242,7 +5241,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Angelica), + .party = TRAINER_PARTY(sParty_Angelica), }, [TRAINER_MADELINE_2] = @@ -5254,7 +5253,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Madeline2), + .party = TRAINER_PARTY(sParty_Madeline2), }, [TRAINER_MADELINE_3] = @@ -5266,7 +5265,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Madeline3), + .party = TRAINER_PARTY(sParty_Madeline3), }, [TRAINER_MADELINE_4] = @@ -5278,7 +5277,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Madeline4), + .party = TRAINER_PARTY(sParty_Madeline4), }, [TRAINER_MADELINE_5] = @@ -5290,7 +5289,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Madeline5), + .party = TRAINER_PARTY(sParty_Madeline5), }, [TRAINER_BEVERLY] = @@ -5302,7 +5301,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Beverly), + .party = TRAINER_PARTY(sParty_Beverly), }, [TRAINER_IMANI] = @@ -5314,7 +5313,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Imani), + .party = TRAINER_PARTY(sParty_Imani), }, [TRAINER_KYLA] = @@ -5326,7 +5325,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Kyla), + .party = TRAINER_PARTY(sParty_Kyla), }, [TRAINER_DENISE] = @@ -5338,7 +5337,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Denise), + .party = TRAINER_PARTY(sParty_Denise), }, [TRAINER_BETH] = @@ -5350,7 +5349,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Beth), + .party = TRAINER_PARTY(sParty_Beth), }, [TRAINER_TARA] = @@ -5362,7 +5361,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Tara), + .party = TRAINER_PARTY(sParty_Tara), }, [TRAINER_MISSY] = @@ -5374,7 +5373,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Missy), + .party = TRAINER_PARTY(sParty_Missy), }, [TRAINER_ALICE] = @@ -5386,7 +5385,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Alice), + .party = TRAINER_PARTY(sParty_Alice), }, [TRAINER_JENNY_1] = @@ -5398,7 +5397,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenny1), + .party = TRAINER_PARTY(sParty_Jenny1), }, [TRAINER_GRACE] = @@ -5410,7 +5409,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Grace), + .party = TRAINER_PARTY(sParty_Grace), }, [TRAINER_TANYA] = @@ -5422,7 +5421,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Tanya), + .party = TRAINER_PARTY(sParty_Tanya), }, [TRAINER_SHARON] = @@ -5434,7 +5433,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Sharon), + .party = TRAINER_PARTY(sParty_Sharon), }, [TRAINER_NIKKI] = @@ -5446,7 +5445,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Nikki), + .party = TRAINER_PARTY(sParty_Nikki), }, [TRAINER_BRENDA] = @@ -5458,7 +5457,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Brenda), + .party = TRAINER_PARTY(sParty_Brenda), }, [TRAINER_KATIE] = @@ -5470,7 +5469,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Katie), + .party = TRAINER_PARTY(sParty_Katie), }, [TRAINER_SUSIE] = @@ -5482,7 +5481,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Susie), + .party = TRAINER_PARTY(sParty_Susie), }, [TRAINER_KARA] = @@ -5494,7 +5493,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Kara), + .party = TRAINER_PARTY(sParty_Kara), }, [TRAINER_DANA] = @@ -5506,7 +5505,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dana), + .party = TRAINER_PARTY(sParty_Dana), }, [TRAINER_SIENNA] = @@ -5518,7 +5517,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Sienna), + .party = TRAINER_PARTY(sParty_Sienna), }, [TRAINER_DEBRA] = @@ -5530,7 +5529,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Debra), + .party = TRAINER_PARTY(sParty_Debra), }, [TRAINER_LINDA] = @@ -5542,7 +5541,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Linda), + .party = TRAINER_PARTY(sParty_Linda), }, [TRAINER_KAYLEE] = @@ -5554,7 +5553,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Kaylee), + .party = TRAINER_PARTY(sParty_Kaylee), }, [TRAINER_LAUREL] = @@ -5566,7 +5565,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Laurel), + .party = TRAINER_PARTY(sParty_Laurel), }, [TRAINER_CARLEE] = @@ -5578,7 +5577,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Carlee), + .party = TRAINER_PARTY(sParty_Carlee), }, [TRAINER_JENNY_2] = @@ -5590,7 +5589,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenny2), + .party = TRAINER_PARTY(sParty_Jenny2), }, [TRAINER_JENNY_3] = @@ -5602,7 +5601,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenny3), + .party = TRAINER_PARTY(sParty_Jenny3), }, [TRAINER_JENNY_4] = @@ -5614,7 +5613,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenny4), + .party = TRAINER_PARTY(sParty_Jenny4), }, [TRAINER_JENNY_5] = @@ -5626,7 +5625,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenny5), + .party = TRAINER_PARTY(sParty_Jenny5), }, [TRAINER_HEIDI] = @@ -5638,7 +5637,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Heidi), + .party = TRAINER_PARTY(sParty_Heidi), }, [TRAINER_BECKY] = @@ -5650,7 +5649,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Becky), + .party = TRAINER_PARTY(sParty_Becky), }, [TRAINER_CAROL] = @@ -5662,7 +5661,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Carol), + .party = TRAINER_PARTY(sParty_Carol), }, [TRAINER_NANCY] = @@ -5674,7 +5673,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Nancy), + .party = TRAINER_PARTY(sParty_Nancy), }, [TRAINER_MARTHA] = @@ -5686,7 +5685,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Martha), + .party = TRAINER_PARTY(sParty_Martha), }, [TRAINER_DIANA_1] = @@ -5698,7 +5697,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Diana1), + .party = TRAINER_PARTY(sParty_Diana1), }, [TRAINER_CEDRIC] = @@ -5710,7 +5709,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Cedric), + .party = TRAINER_PARTY(sParty_Cedric), }, [TRAINER_IRENE] = @@ -5722,7 +5721,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Irene), + .party = TRAINER_PARTY(sParty_Irene), }, [TRAINER_DIANA_2] = @@ -5734,7 +5733,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Diana2), + .party = TRAINER_PARTY(sParty_Diana2), }, [TRAINER_DIANA_3] = @@ -5746,7 +5745,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Diana3), + .party = TRAINER_PARTY(sParty_Diana3), }, [TRAINER_DIANA_4] = @@ -5758,7 +5757,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Diana4), + .party = TRAINER_PARTY(sParty_Diana4), }, [TRAINER_DIANA_5] = @@ -5770,7 +5769,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Diana5), + .party = TRAINER_PARTY(sParty_Diana5), }, [TRAINER_AMY_AND_LIV_1] = @@ -5782,7 +5781,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_AmyAndLiv1), + .party = TRAINER_PARTY(sParty_AmyAndLiv1), }, [TRAINER_AMY_AND_LIV_2] = @@ -5794,7 +5793,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_AmyAndLiv2), + .party = TRAINER_PARTY(sParty_AmyAndLiv2), }, [TRAINER_GINA_AND_MIA_1] = @@ -5806,7 +5805,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GinaAndMia1), + .party = TRAINER_PARTY(sParty_GinaAndMia1), }, [TRAINER_MIU_AND_YUKI] = @@ -5818,7 +5817,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_MiuAndYuki), + .party = TRAINER_PARTY(sParty_MiuAndYuki), }, [TRAINER_AMY_AND_LIV_3] = @@ -5830,7 +5829,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_AmyAndLiv3), + .party = TRAINER_PARTY(sParty_AmyAndLiv3), }, [TRAINER_GINA_AND_MIA_2] = @@ -5842,7 +5841,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_GinaAndMia2), + .party = TRAINER_PARTY(sParty_GinaAndMia2), }, [TRAINER_AMY_AND_LIV_4] = @@ -5854,7 +5853,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_AmyAndLiv4), + .party = TRAINER_PARTY(sParty_AmyAndLiv4), }, [TRAINER_AMY_AND_LIV_5] = @@ -5866,7 +5865,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_AmyAndLiv5), + .party = TRAINER_PARTY(sParty_AmyAndLiv5), }, [TRAINER_AMY_AND_LIV_6] = @@ -5878,7 +5877,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_AmyAndLiv6), + .party = TRAINER_PARTY(sParty_AmyAndLiv6), }, [TRAINER_HUEY] = @@ -5890,7 +5889,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Huey), + .party = TRAINER_PARTY(sParty_Huey), }, [TRAINER_EDMOND] = @@ -5902,7 +5901,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Edmond), + .party = TRAINER_PARTY(sParty_Edmond), }, [TRAINER_ERNEST_1] = @@ -5914,7 +5913,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ernest1), + .party = TRAINER_PARTY(sParty_Ernest1), }, [TRAINER_DWAYNE] = @@ -5926,7 +5925,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dwayne), + .party = TRAINER_PARTY(sParty_Dwayne), }, [TRAINER_PHILLIP] = @@ -5938,7 +5937,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Phillip), + .party = TRAINER_PARTY(sParty_Phillip), }, [TRAINER_LEONARD] = @@ -5950,7 +5949,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Leonard), + .party = TRAINER_PARTY(sParty_Leonard), }, [TRAINER_DUNCAN] = @@ -5962,7 +5961,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Duncan), + .party = TRAINER_PARTY(sParty_Duncan), }, [TRAINER_ERNEST_2] = @@ -5974,7 +5973,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ernest2), + .party = TRAINER_PARTY(sParty_Ernest2), }, [TRAINER_ERNEST_3] = @@ -5986,7 +5985,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ernest3), + .party = TRAINER_PARTY(sParty_Ernest3), }, [TRAINER_ERNEST_4] = @@ -5998,7 +5997,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ernest4), + .party = TRAINER_PARTY(sParty_Ernest4), }, [TRAINER_ERNEST_5] = @@ -6010,7 +6009,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ernest5), + .party = TRAINER_PARTY(sParty_Ernest5), }, [TRAINER_ELI] = @@ -6022,7 +6021,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Eli), + .party = TRAINER_PARTY(sParty_Eli), }, [TRAINER_ANNIKA] = @@ -6034,7 +6033,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_CUSTOM_MOVES(sParty_Annika), + .party = TRAINER_PARTY(sParty_Annika), }, [TRAINER_JAZMYN] = @@ -6046,7 +6045,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_DEFAULT_MOVES(sParty_Jazmyn), + .party = TRAINER_PARTY(sParty_Jazmyn), }, [TRAINER_JONAS] = @@ -6058,7 +6057,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 = TRAINER_PARTY(sParty_Jonas), }, [TRAINER_KAYLEY] = @@ -6070,7 +6069,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Kayley), + .party = TRAINER_PARTY(sParty_Kayley), }, [TRAINER_AURON] = @@ -6082,7 +6081,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Auron), + .party = TRAINER_PARTY(sParty_Auron), }, [TRAINER_KELVIN] = @@ -6094,7 +6093,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Kelvin), + .party = TRAINER_PARTY(sParty_Kelvin), }, [TRAINER_MARLEY] = @@ -6106,7 +6105,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 = ITEM_CUSTOM_MOVES(sParty_Marley), + .party = TRAINER_PARTY(sParty_Marley), }, [TRAINER_REYNA] = @@ -6118,7 +6117,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Reyna), + .party = TRAINER_PARTY(sParty_Reyna), }, [TRAINER_HUDSON] = @@ -6130,7 +6129,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Hudson), + .party = TRAINER_PARTY(sParty_Hudson), }, [TRAINER_CONOR] = @@ -6142,7 +6141,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Conor), + .party = TRAINER_PARTY(sParty_Conor), }, [TRAINER_EDWIN_1] = @@ -6154,7 +6153,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwin1), + .party = TRAINER_PARTY(sParty_Edwin1), }, [TRAINER_HECTOR] = @@ -6166,7 +6165,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Hector), + .party = TRAINER_PARTY(sParty_Hector), }, [TRAINER_TABITHA_MOSSDEEP] = @@ -6178,7 +6177,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_TabithaMossdeep), + .party = TRAINER_PARTY(sParty_TabithaMossdeep), }, [TRAINER_EDWIN_2] = @@ -6190,7 +6189,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwin2), + .party = TRAINER_PARTY(sParty_Edwin2), }, [TRAINER_EDWIN_3] = @@ -6202,7 +6201,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwin3), + .party = TRAINER_PARTY(sParty_Edwin3), }, [TRAINER_EDWIN_4] = @@ -6214,7 +6213,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwin4), + .party = TRAINER_PARTY(sParty_Edwin4), }, [TRAINER_EDWIN_5] = @@ -6226,7 +6225,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwin5), + .party = TRAINER_PARTY(sParty_Edwin5), }, [TRAINER_WALLY_VR_1] = @@ -6238,7 +6237,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 = TRAINER_PARTY(sParty_WallyVR1), }, [TRAINER_BRENDAN_ROUTE_103_MUDKIP] = @@ -6250,7 +6249,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_DEFAULT_MOVES(sParty_BrendanRoute103Mudkip), + .party = TRAINER_PARTY(sParty_BrendanRoute103Mudkip), }, [TRAINER_BRENDAN_ROUTE_110_MUDKIP] = @@ -6262,7 +6261,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_DEFAULT_MOVES(sParty_BrendanRoute110Mudkip), + .party = TRAINER_PARTY(sParty_BrendanRoute110Mudkip), }, [TRAINER_BRENDAN_ROUTE_119_MUDKIP] = @@ -6274,7 +6273,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_DEFAULT_MOVES(sParty_BrendanRoute119Mudkip), + .party = TRAINER_PARTY(sParty_BrendanRoute119Mudkip), }, [TRAINER_BRENDAN_ROUTE_103_TREECKO] = @@ -6286,7 +6285,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN, - .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute103Treecko), + .party = TRAINER_PARTY(sParty_BrendanRoute103Treecko), }, [TRAINER_BRENDAN_ROUTE_110_TREECKO] = @@ -6298,7 +6297,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_DEFAULT_MOVES(sParty_BrendanRoute110Treecko), + .party = TRAINER_PARTY(sParty_BrendanRoute110Treecko), }, [TRAINER_BRENDAN_ROUTE_119_TREECKO] = @@ -6310,7 +6309,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_DEFAULT_MOVES(sParty_BrendanRoute119Treecko), + .party = TRAINER_PARTY(sParty_BrendanRoute119Treecko), }, [TRAINER_BRENDAN_ROUTE_103_TORCHIC] = @@ -6322,7 +6321,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_DEFAULT_MOVES(sParty_BrendanRoute103Torchic), + .party = TRAINER_PARTY(sParty_BrendanRoute103Torchic), }, [TRAINER_BRENDAN_ROUTE_110_TORCHIC] = @@ -6334,7 +6333,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_DEFAULT_MOVES(sParty_BrendanRoute110Torchic), + .party = TRAINER_PARTY(sParty_BrendanRoute110Torchic), }, [TRAINER_BRENDAN_ROUTE_119_TORCHIC] = @@ -6346,7 +6345,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_DEFAULT_MOVES(sParty_BrendanRoute119Torchic), + .party = TRAINER_PARTY(sParty_BrendanRoute119Torchic), }, [TRAINER_MAY_ROUTE_103_MUDKIP] = @@ -6358,7 +6357,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_DEFAULT_MOVES(sParty_MayRoute103Mudkip), + .party = TRAINER_PARTY(sParty_MayRoute103Mudkip), }, [TRAINER_MAY_ROUTE_110_MUDKIP] = @@ -6370,7 +6369,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_DEFAULT_MOVES(sParty_MayRoute110Mudkip), + .party = TRAINER_PARTY(sParty_MayRoute110Mudkip), }, [TRAINER_MAY_ROUTE_119_MUDKIP] = @@ -6382,7 +6381,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_DEFAULT_MOVES(sParty_MayRoute119Mudkip), + .party = TRAINER_PARTY(sParty_MayRoute119Mudkip), }, [TRAINER_MAY_ROUTE_103_TREECKO] = @@ -6394,7 +6393,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_DEFAULT_MOVES(sParty_MayRoute103Treecko), + .party = TRAINER_PARTY(sParty_MayRoute103Treecko), }, [TRAINER_MAY_ROUTE_110_TREECKO] = @@ -6406,7 +6405,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_DEFAULT_MOVES(sParty_MayRoute110Treecko), + .party = TRAINER_PARTY(sParty_MayRoute110Treecko), }, [TRAINER_MAY_ROUTE_119_TREECKO] = @@ -6418,7 +6417,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_DEFAULT_MOVES(sParty_MayRoute119Treecko), + .party = TRAINER_PARTY(sParty_MayRoute119Treecko), }, [TRAINER_MAY_ROUTE_103_TORCHIC] = @@ -6430,7 +6429,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_DEFAULT_MOVES(sParty_MayRoute103Torchic), + .party = TRAINER_PARTY(sParty_MayRoute103Torchic), }, [TRAINER_MAY_ROUTE_110_TORCHIC] = @@ -6442,7 +6441,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_DEFAULT_MOVES(sParty_MayRoute110Torchic), + .party = TRAINER_PARTY(sParty_MayRoute110Torchic), }, [TRAINER_MAY_ROUTE_119_TORCHIC] = @@ -6454,7 +6453,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_DEFAULT_MOVES(sParty_MayRoute119Torchic), + .party = TRAINER_PARTY(sParty_MayRoute119Torchic), }, [TRAINER_ISAAC_1] = @@ -6466,7 +6465,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaac1), + .party = TRAINER_PARTY(sParty_Isaac1), }, [TRAINER_DAVIS] = @@ -6478,7 +6477,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Davis), + .party = TRAINER_PARTY(sParty_Davis), }, [TRAINER_MITCHELL] = @@ -6490,7 +6489,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 = TRAINER_PARTY(sParty_Mitchell), }, [TRAINER_ISAAC_2] = @@ -6502,7 +6501,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaac2), + .party = TRAINER_PARTY(sParty_Isaac2), }, [TRAINER_ISAAC_3] = @@ -6514,7 +6513,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaac3), + .party = TRAINER_PARTY(sParty_Isaac3), }, [TRAINER_ISAAC_4] = @@ -6526,7 +6525,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaac4), + .party = TRAINER_PARTY(sParty_Isaac4), }, [TRAINER_ISAAC_5] = @@ -6538,7 +6537,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaac5), + .party = TRAINER_PARTY(sParty_Isaac5), }, [TRAINER_LYDIA_1] = @@ -6550,7 +6549,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lydia1), + .party = TRAINER_PARTY(sParty_Lydia1), }, [TRAINER_HALLE] = @@ -6562,7 +6561,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_DEFAULT_MOVES(sParty_Halle), + .party = TRAINER_PARTY(sParty_Halle), }, [TRAINER_GARRISON] = @@ -6574,7 +6573,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Garrison), + .party = TRAINER_PARTY(sParty_Garrison), }, [TRAINER_LYDIA_2] = @@ -6586,7 +6585,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lydia2), + .party = TRAINER_PARTY(sParty_Lydia2), }, [TRAINER_LYDIA_3] = @@ -6598,7 +6597,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lydia3), + .party = TRAINER_PARTY(sParty_Lydia3), }, [TRAINER_LYDIA_4] = @@ -6610,7 +6609,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lydia4), + .party = TRAINER_PARTY(sParty_Lydia4), }, [TRAINER_LYDIA_5] = @@ -6622,7 +6621,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lydia5), + .party = TRAINER_PARTY(sParty_Lydia5), }, [TRAINER_JACKSON_1] = @@ -6634,7 +6633,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_DEFAULT_MOVES(sParty_Jackson1), + .party = TRAINER_PARTY(sParty_Jackson1), }, [TRAINER_LORENZO] = @@ -6646,7 +6645,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_DEFAULT_MOVES(sParty_Lorenzo), + .party = TRAINER_PARTY(sParty_Lorenzo), }, [TRAINER_SEBASTIAN] = @@ -6658,7 +6657,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_DEFAULT_MOVES(sParty_Sebastian), + .party = TRAINER_PARTY(sParty_Sebastian), }, [TRAINER_JACKSON_2] = @@ -6670,7 +6669,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_DEFAULT_MOVES(sParty_Jackson2), + .party = TRAINER_PARTY(sParty_Jackson2), }, [TRAINER_JACKSON_3] = @@ -6682,7 +6681,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_DEFAULT_MOVES(sParty_Jackson3), + .party = TRAINER_PARTY(sParty_Jackson3), }, [TRAINER_JACKSON_4] = @@ -6694,7 +6693,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_DEFAULT_MOVES(sParty_Jackson4), + .party = TRAINER_PARTY(sParty_Jackson4), }, [TRAINER_JACKSON_5] = @@ -6706,7 +6705,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_DEFAULT_MOVES(sParty_Jackson5), + .party = TRAINER_PARTY(sParty_Jackson5), }, [TRAINER_CATHERINE_1] = @@ -6718,7 +6717,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_DEFAULT_MOVES(sParty_Catherine1), + .party = TRAINER_PARTY(sParty_Catherine1), }, [TRAINER_JENNA] = @@ -6730,7 +6729,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_DEFAULT_MOVES(sParty_Jenna), + .party = TRAINER_PARTY(sParty_Jenna), }, [TRAINER_SOPHIA] = @@ -6742,7 +6741,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_DEFAULT_MOVES(sParty_Sophia), + .party = TRAINER_PARTY(sParty_Sophia), }, [TRAINER_CATHERINE_2] = @@ -6754,7 +6753,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_DEFAULT_MOVES(sParty_Catherine2), + .party = TRAINER_PARTY(sParty_Catherine2), }, [TRAINER_CATHERINE_3] = @@ -6766,7 +6765,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_DEFAULT_MOVES(sParty_Catherine3), + .party = TRAINER_PARTY(sParty_Catherine3), }, [TRAINER_CATHERINE_4] = @@ -6778,7 +6777,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_DEFAULT_MOVES(sParty_Catherine4), + .party = TRAINER_PARTY(sParty_Catherine4), }, [TRAINER_CATHERINE_5] = @@ -6790,7 +6789,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_DEFAULT_MOVES(sParty_Catherine5), + .party = TRAINER_PARTY(sParty_Catherine5), }, [TRAINER_JULIO] = @@ -6802,7 +6801,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Julio), + .party = TRAINER_PARTY(sParty_Julio), }, [TRAINER_GRUNT_SEAFLOOR_CAVERN_5] = @@ -6814,7 +6813,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSeafloorCavern5), + .party = TRAINER_PARTY(sParty_GruntSeafloorCavern5), }, [TRAINER_GRUNT_UNUSED] = @@ -6826,7 +6825,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntUnused), + .party = TRAINER_PARTY(sParty_GruntUnused), }, [TRAINER_GRUNT_MT_PYRE_4] = @@ -6838,7 +6837,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtPyre4), + .party = TRAINER_PARTY(sParty_GruntMtPyre4), }, [TRAINER_GRUNT_JAGGED_PASS] = @@ -6850,7 +6849,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntJaggedPass), + .party = TRAINER_PARTY(sParty_GruntJaggedPass), }, [TRAINER_MARC] = @@ -6862,7 +6861,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Marc), + .party = TRAINER_PARTY(sParty_Marc), }, [TRAINER_BRENDEN] = @@ -6874,7 +6873,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Brenden), + .party = TRAINER_PARTY(sParty_Brenden), }, [TRAINER_LILITH] = @@ -6886,7 +6885,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lilith), + .party = TRAINER_PARTY(sParty_Lilith), }, [TRAINER_CRISTIAN] = @@ -6898,7 +6897,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cristian), + .party = TRAINER_PARTY(sParty_Cristian), }, [TRAINER_SYLVIA] = @@ -6910,7 +6909,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Sylvia), + .party = TRAINER_PARTY(sParty_Sylvia), }, [TRAINER_LEONARDO] = @@ -6922,7 +6921,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Leonardo), + .party = TRAINER_PARTY(sParty_Leonardo), }, [TRAINER_ATHENA] = @@ -6934,7 +6933,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 = ITEM_CUSTOM_MOVES(sParty_Athena), + .party = TRAINER_PARTY(sParty_Athena), }, [TRAINER_HARRISON] = @@ -6946,7 +6945,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Harrison), + .party = TRAINER_PARTY(sParty_Harrison), }, [TRAINER_GRUNT_MT_CHIMNEY_2] = @@ -6958,7 +6957,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtChimney2), + .party = TRAINER_PARTY(sParty_GruntMtChimney2), }, [TRAINER_CLARENCE] = @@ -6970,7 +6969,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Clarence), + .party = TRAINER_PARTY(sParty_Clarence), }, [TRAINER_TERRY] = @@ -6982,7 +6981,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Terry), + .party = TRAINER_PARTY(sParty_Terry), }, [TRAINER_NATE] = @@ -6994,7 +6993,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Nate), + .party = TRAINER_PARTY(sParty_Nate), }, [TRAINER_KATHLEEN] = @@ -7006,7 +7005,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Kathleen), + .party = TRAINER_PARTY(sParty_Kathleen), }, [TRAINER_CLIFFORD] = @@ -7018,7 +7017,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Clifford), + .party = TRAINER_PARTY(sParty_Clifford), }, [TRAINER_NICHOLAS] = @@ -7030,7 +7029,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Nicholas), + .party = TRAINER_PARTY(sParty_Nicholas), }, [TRAINER_GRUNT_SPACE_CENTER_3] = @@ -7042,7 +7041,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter3), + .party = TRAINER_PARTY(sParty_GruntSpaceCenter3), }, [TRAINER_GRUNT_SPACE_CENTER_4] = @@ -7054,7 +7053,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter4), + .party = TRAINER_PARTY(sParty_GruntSpaceCenter4), }, [TRAINER_GRUNT_SPACE_CENTER_5] = @@ -7066,7 +7065,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter5), + .party = TRAINER_PARTY(sParty_GruntSpaceCenter5), }, [TRAINER_GRUNT_SPACE_CENTER_6] = @@ -7078,7 +7077,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter6), + .party = TRAINER_PARTY(sParty_GruntSpaceCenter6), }, [TRAINER_GRUNT_SPACE_CENTER_7] = @@ -7090,7 +7089,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter7), + .party = TRAINER_PARTY(sParty_GruntSpaceCenter7), }, [TRAINER_MACEY] = @@ -7102,7 +7101,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Macey), + .party = TRAINER_PARTY(sParty_Macey), }, [TRAINER_BRENDAN_RUSTBORO_TREECKO] = @@ -7114,7 +7113,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRustboroTreecko), + .party = TRAINER_PARTY(sParty_BrendanRustboroTreecko), }, [TRAINER_BRENDAN_RUSTBORO_MUDKIP] = @@ -7126,7 +7125,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRustboroMudkip), + .party = TRAINER_PARTY(sParty_BrendanRustboroMudkip), }, [TRAINER_PAXTON] = @@ -7138,7 +7137,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_DEFAULT_MOVES(sParty_Paxton), + .party = TRAINER_PARTY(sParty_Paxton), }, [TRAINER_ISABELLA] = @@ -7150,7 +7149,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Isabella), + .party = TRAINER_PARTY(sParty_Isabella), }, [TRAINER_GRUNT_WEATHER_INST_5] = @@ -7162,7 +7161,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntWeatherInst5), + .party = TRAINER_PARTY(sParty_GruntWeatherInst5), }, [TRAINER_TABITHA_MT_CHIMNEY] = @@ -7174,7 +7173,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_DEFAULT_MOVES(sParty_TabithaMtChimney), + .party = TRAINER_PARTY(sParty_TabithaMtChimney), }, [TRAINER_JONATHAN] = @@ -7186,7 +7185,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_SETUP_FIRST_TURN, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jonathan), + .party = TRAINER_PARTY(sParty_Jonathan), }, [TRAINER_BRENDAN_RUSTBORO_TORCHIC] = @@ -7198,7 +7197,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_DEFAULT_MOVES(sParty_BrendanRustboroTorchic), + .party = TRAINER_PARTY(sParty_BrendanRustboroTorchic), }, [TRAINER_MAY_RUSTBORO_MUDKIP] = @@ -7210,7 +7209,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN, - .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRustboroMudkip), + .party = TRAINER_PARTY(sParty_MayRustboroMudkip), }, [TRAINER_MAXIE_MAGMA_HIDEOUT] = @@ -7222,7 +7221,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = NO_ITEM_DEFAULT_MOVES(sParty_MaxieMagmaHideout), + .party = TRAINER_PARTY(sParty_MaxieMagmaHideout), }, [TRAINER_MAXIE_MT_CHIMNEY] = @@ -7234,7 +7233,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = NO_ITEM_DEFAULT_MOVES(sParty_MaxieMtChimney), + .party = TRAINER_PARTY(sParty_MaxieMtChimney), }, [TRAINER_TIANA] = @@ -7246,7 +7245,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Tiana), + .party = TRAINER_PARTY(sParty_Tiana), }, [TRAINER_HALEY_1] = @@ -7258,7 +7257,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Haley1), + .party = TRAINER_PARTY(sParty_Haley1), }, [TRAINER_JANICE] = @@ -7270,7 +7269,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Janice), + .party = TRAINER_PARTY(sParty_Janice), }, [TRAINER_VIVI] = @@ -7282,7 +7281,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_DEFAULT_MOVES(sParty_Vivi), + .party = TRAINER_PARTY(sParty_Vivi), }, [TRAINER_HALEY_2] = @@ -7294,7 +7293,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Haley2), + .party = TRAINER_PARTY(sParty_Haley2), }, [TRAINER_HALEY_3] = @@ -7306,7 +7305,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Haley3), + .party = TRAINER_PARTY(sParty_Haley3), }, [TRAINER_HALEY_4] = @@ -7318,7 +7317,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Haley4), + .party = TRAINER_PARTY(sParty_Haley4), }, [TRAINER_HALEY_5] = @@ -7330,7 +7329,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Haley5), + .party = TRAINER_PARTY(sParty_Haley5), }, [TRAINER_SALLY] = @@ -7342,7 +7341,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Sally), + .party = TRAINER_PARTY(sParty_Sally), }, [TRAINER_ROBIN] = @@ -7354,7 +7353,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Robin), + .party = TRAINER_PARTY(sParty_Robin), }, [TRAINER_ANDREA] = @@ -7366,7 +7365,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Andrea), + .party = TRAINER_PARTY(sParty_Andrea), }, [TRAINER_CRISSY] = @@ -7378,7 +7377,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Crissy), + .party = TRAINER_PARTY(sParty_Crissy), }, [TRAINER_RICK] = @@ -7390,7 +7389,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Rick), + .party = TRAINER_PARTY(sParty_Rick), }, [TRAINER_LYLE] = @@ -7402,7 +7401,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lyle), + .party = TRAINER_PARTY(sParty_Lyle), }, [TRAINER_JOSE] = @@ -7414,7 +7413,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jose), + .party = TRAINER_PARTY(sParty_Jose), }, [TRAINER_DOUG] = @@ -7426,7 +7425,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Doug), + .party = TRAINER_PARTY(sParty_Doug), }, [TRAINER_GREG] = @@ -7438,7 +7437,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Greg), + .party = TRAINER_PARTY(sParty_Greg), }, [TRAINER_KENT] = @@ -7450,7 +7449,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Kent), + .party = TRAINER_PARTY(sParty_Kent), }, [TRAINER_JAMES_1] = @@ -7462,7 +7461,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_James1), + .party = TRAINER_PARTY(sParty_James1), }, [TRAINER_JAMES_2] = @@ -7474,7 +7473,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_James2), + .party = TRAINER_PARTY(sParty_James2), }, [TRAINER_JAMES_3] = @@ -7486,7 +7485,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_James3), + .party = TRAINER_PARTY(sParty_James3), }, [TRAINER_JAMES_4] = @@ -7498,7 +7497,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_James4), + .party = TRAINER_PARTY(sParty_James4), }, [TRAINER_JAMES_5] = @@ -7510,7 +7509,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_James5), + .party = TRAINER_PARTY(sParty_James5), }, [TRAINER_BRICE] = @@ -7522,7 +7521,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Brice), + .party = TRAINER_PARTY(sParty_Brice), }, [TRAINER_TRENT_1] = @@ -7534,7 +7533,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Trent1), + .party = TRAINER_PARTY(sParty_Trent1), }, [TRAINER_LENNY] = @@ -7546,7 +7545,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lenny), + .party = TRAINER_PARTY(sParty_Lenny), }, [TRAINER_LUCAS_1] = @@ -7558,7 +7557,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lucas1), + .party = TRAINER_PARTY(sParty_Lucas1), }, [TRAINER_ALAN] = @@ -7570,7 +7569,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Alan), + .party = TRAINER_PARTY(sParty_Alan), }, [TRAINER_CLARK] = @@ -7582,7 +7581,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Clark), + .party = TRAINER_PARTY(sParty_Clark), }, [TRAINER_ERIC] = @@ -7594,7 +7593,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Eric), + .party = TRAINER_PARTY(sParty_Eric), }, [TRAINER_LUCAS_2] = @@ -7606,7 +7605,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Lucas2), + .party = TRAINER_PARTY(sParty_Lucas2), }, [TRAINER_MIKE_1] = @@ -7618,7 +7617,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Mike1), + .party = TRAINER_PARTY(sParty_Mike1), }, [TRAINER_MIKE_2] = @@ -7630,7 +7629,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Mike2), + .party = TRAINER_PARTY(sParty_Mike2), }, [TRAINER_TRENT_2] = @@ -7642,7 +7641,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Trent2), + .party = TRAINER_PARTY(sParty_Trent2), }, [TRAINER_TRENT_3] = @@ -7654,7 +7653,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Trent3), + .party = TRAINER_PARTY(sParty_Trent3), }, [TRAINER_TRENT_4] = @@ -7666,7 +7665,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Trent4), + .party = TRAINER_PARTY(sParty_Trent4), }, [TRAINER_TRENT_5] = @@ -7678,7 +7677,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Trent5), + .party = TRAINER_PARTY(sParty_Trent5), }, [TRAINER_DEZ_AND_LUKE] = @@ -7690,7 +7689,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_DezAndLuke), + .party = TRAINER_PARTY(sParty_DezAndLuke), }, [TRAINER_LEA_AND_JED] = @@ -7702,7 +7701,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_LeaAndJed), + .party = TRAINER_PARTY(sParty_LeaAndJed), }, [TRAINER_KIRA_AND_DAN_1] = @@ -7714,7 +7713,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_KiraAndDan1), + .party = TRAINER_PARTY(sParty_KiraAndDan1), }, [TRAINER_KIRA_AND_DAN_2] = @@ -7726,7 +7725,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_KiraAndDan2), + .party = TRAINER_PARTY(sParty_KiraAndDan2), }, [TRAINER_KIRA_AND_DAN_3] = @@ -7738,7 +7737,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_KiraAndDan3), + .party = TRAINER_PARTY(sParty_KiraAndDan3), }, [TRAINER_KIRA_AND_DAN_4] = @@ -7750,7 +7749,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_KiraAndDan4), + .party = TRAINER_PARTY(sParty_KiraAndDan4), }, [TRAINER_KIRA_AND_DAN_5] = @@ -7762,7 +7761,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_KiraAndDan5), + .party = TRAINER_PARTY(sParty_KiraAndDan5), }, [TRAINER_JOHANNA] = @@ -7774,7 +7773,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Johanna), + .party = TRAINER_PARTY(sParty_Johanna), }, [TRAINER_GERALD] = @@ -7786,7 +7785,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 = TRAINER_PARTY(sParty_Gerald), }, [TRAINER_VIVIAN] = @@ -7798,7 +7797,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Vivian), + .party = TRAINER_PARTY(sParty_Vivian), }, [TRAINER_DANIELLE] = @@ -7810,7 +7809,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_Danielle), + .party = TRAINER_PARTY(sParty_Danielle), }, [TRAINER_HIDEO] = @@ -7822,7 +7821,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 = TRAINER_PARTY(sParty_Hideo), }, [TRAINER_KEIGO] = @@ -7834,7 +7833,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 = TRAINER_PARTY(sParty_Keigo), }, [TRAINER_RILEY] = @@ -7846,7 +7845,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 = TRAINER_PARTY(sParty_Riley), }, [TRAINER_FLINT] = @@ -7858,7 +7857,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Flint), + .party = TRAINER_PARTY(sParty_Flint), }, [TRAINER_ASHLEY] = @@ -7870,7 +7869,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Ashley), + .party = TRAINER_PARTY(sParty_Ashley), }, [TRAINER_WALLY_MAUVILLE] = @@ -7882,7 +7881,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_DEFAULT_MOVES(sParty_WallyMauville), + .party = TRAINER_PARTY(sParty_WallyMauville), }, [TRAINER_WALLY_VR_2] = @@ -7894,7 +7893,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 = TRAINER_PARTY(sParty_WallyVR2), }, [TRAINER_WALLY_VR_3] = @@ -7906,7 +7905,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 = TRAINER_PARTY(sParty_WallyVR3), }, [TRAINER_WALLY_VR_4] = @@ -7918,7 +7917,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 = TRAINER_PARTY(sParty_WallyVR4), }, [TRAINER_WALLY_VR_5] = @@ -7930,7 +7929,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 = TRAINER_PARTY(sParty_WallyVR5), }, [TRAINER_BRENDAN_LILYCOVE_MUDKIP] = @@ -7942,7 +7941,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_DEFAULT_MOVES(sParty_BrendanLilycoveMudkip), + .party = TRAINER_PARTY(sParty_BrendanLilycoveMudkip), }, [TRAINER_BRENDAN_LILYCOVE_TREECKO] = @@ -7954,7 +7953,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_DEFAULT_MOVES(sParty_BrendanLilycoveTreecko), + .party = TRAINER_PARTY(sParty_BrendanLilycoveTreecko), }, [TRAINER_BRENDAN_LILYCOVE_TORCHIC] = @@ -7966,7 +7965,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_DEFAULT_MOVES(sParty_BrendanLilycoveTorchic), + .party = TRAINER_PARTY(sParty_BrendanLilycoveTorchic), }, [TRAINER_MAY_LILYCOVE_MUDKIP] = @@ -7978,7 +7977,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_DEFAULT_MOVES(sParty_MayLilycoveMudkip), + .party = TRAINER_PARTY(sParty_MayLilycoveMudkip), }, [TRAINER_MAY_LILYCOVE_TREECKO] = @@ -7990,7 +7989,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_DEFAULT_MOVES(sParty_MayLilycoveTreecko), + .party = TRAINER_PARTY(sParty_MayLilycoveTreecko), }, [TRAINER_MAY_LILYCOVE_TORCHIC] = @@ -8002,7 +8001,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_DEFAULT_MOVES(sParty_MayLilycoveTorchic), + .party = TRAINER_PARTY(sParty_MayLilycoveTorchic), }, [TRAINER_JONAH] = @@ -8014,7 +8013,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jonah), + .party = TRAINER_PARTY(sParty_Jonah), }, [TRAINER_HENRY] = @@ -8026,7 +8025,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Henry), + .party = TRAINER_PARTY(sParty_Henry), }, [TRAINER_ROGER] = @@ -8038,7 +8037,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Roger), + .party = TRAINER_PARTY(sParty_Roger), }, [TRAINER_ALEXA] = @@ -8050,7 +8049,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_DEFAULT_MOVES(sParty_Alexa), + .party = TRAINER_PARTY(sParty_Alexa), }, [TRAINER_RUBEN] = @@ -8062,7 +8061,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_DEFAULT_MOVES(sParty_Ruben), + .party = TRAINER_PARTY(sParty_Ruben), }, [TRAINER_KOJI_1] = @@ -8074,7 +8073,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Koji1), + .party = TRAINER_PARTY(sParty_Koji1), }, [TRAINER_WAYNE] = @@ -8086,7 +8085,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Wayne), + .party = TRAINER_PARTY(sParty_Wayne), }, [TRAINER_AIDAN] = @@ -8098,7 +8097,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Aidan), + .party = TRAINER_PARTY(sParty_Aidan), }, [TRAINER_REED] = @@ -8110,7 +8109,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Reed), + .party = TRAINER_PARTY(sParty_Reed), }, [TRAINER_TISHA] = @@ -8122,7 +8121,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Tisha), + .party = TRAINER_PARTY(sParty_Tisha), }, [TRAINER_TORI_AND_TIA] = @@ -8134,7 +8133,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_ToriAndTia), + .party = TRAINER_PARTY(sParty_ToriAndTia), }, [TRAINER_KIM_AND_IRIS] = @@ -8146,7 +8145,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_KimAndIris), + .party = TRAINER_PARTY(sParty_KimAndIris), }, [TRAINER_TYRA_AND_IVY] = @@ -8158,7 +8157,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_TyraAndIvy), + .party = TRAINER_PARTY(sParty_TyraAndIvy), }, [TRAINER_MEL_AND_PAUL] = @@ -8170,7 +8169,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_CUSTOM_MOVES(sParty_MelAndPaul), + .party = TRAINER_PARTY(sParty_MelAndPaul), }, [TRAINER_JOHN_AND_JAY_1] = @@ -8182,7 +8181,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 = TRAINER_PARTY(sParty_JohnAndJay1), }, [TRAINER_JOHN_AND_JAY_2] = @@ -8194,7 +8193,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 = TRAINER_PARTY(sParty_JohnAndJay2), }, [TRAINER_JOHN_AND_JAY_3] = @@ -8206,7 +8205,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 = TRAINER_PARTY(sParty_JohnAndJay3), }, [TRAINER_JOHN_AND_JAY_4] = @@ -8218,7 +8217,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 = TRAINER_PARTY(sParty_JohnAndJay4), }, [TRAINER_JOHN_AND_JAY_5] = @@ -8230,7 +8229,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 = TRAINER_PARTY(sParty_JohnAndJay5), }, [TRAINER_RELI_AND_IAN] = @@ -8242,7 +8241,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_ReliAndIan), + .party = TRAINER_PARTY(sParty_ReliAndIan), }, [TRAINER_LILA_AND_ROY_1] = @@ -8254,7 +8253,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_LilaAndRoy1), + .party = TRAINER_PARTY(sParty_LilaAndRoy1), }, [TRAINER_LILA_AND_ROY_2] = @@ -8266,7 +8265,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_LilaAndRoy2), + .party = TRAINER_PARTY(sParty_LilaAndRoy2), }, [TRAINER_LILA_AND_ROY_3] = @@ -8278,7 +8277,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_LilaAndRoy3), + .party = TRAINER_PARTY(sParty_LilaAndRoy3), }, [TRAINER_LILA_AND_ROY_4] = @@ -8290,7 +8289,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_LilaAndRoy4), + .party = TRAINER_PARTY(sParty_LilaAndRoy4), }, [TRAINER_LILA_AND_ROY_5] = @@ -8302,7 +8301,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_LilaAndRoy5), + .party = TRAINER_PARTY(sParty_LilaAndRoy5), }, [TRAINER_LISA_AND_RAY] = @@ -8314,7 +8313,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_LisaAndRay), + .party = TRAINER_PARTY(sParty_LisaAndRay), }, [TRAINER_CHRIS] = @@ -8326,7 +8325,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Chris), + .party = TRAINER_PARTY(sParty_Chris), }, [TRAINER_DAWSON] = @@ -8338,7 +8337,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Dawson), + .party = TRAINER_PARTY(sParty_Dawson), }, [TRAINER_SARAH] = @@ -8350,7 +8349,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Sarah), + .party = TRAINER_PARTY(sParty_Sarah), }, [TRAINER_DARIAN] = @@ -8362,7 +8361,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Darian), + .party = TRAINER_PARTY(sParty_Darian), }, [TRAINER_HAILEY] = @@ -8374,7 +8373,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Hailey), + .party = TRAINER_PARTY(sParty_Hailey), }, [TRAINER_CHANDLER] = @@ -8386,7 +8385,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Chandler), + .party = TRAINER_PARTY(sParty_Chandler), }, [TRAINER_KALEB] = @@ -8398,7 +8397,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Kaleb), + .party = TRAINER_PARTY(sParty_Kaleb), }, [TRAINER_JOSEPH] = @@ -8410,7 +8409,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Joseph), + .party = TRAINER_PARTY(sParty_Joseph), }, [TRAINER_ALYSSA] = @@ -8422,7 +8421,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Alyssa), + .party = TRAINER_PARTY(sParty_Alyssa), }, [TRAINER_MARCOS] = @@ -8434,7 +8433,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Marcos), + .party = TRAINER_PARTY(sParty_Marcos), }, [TRAINER_RHETT] = @@ -8446,7 +8445,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Rhett), + .party = TRAINER_PARTY(sParty_Rhett), }, [TRAINER_TYRON] = @@ -8458,7 +8457,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Tyron), + .party = TRAINER_PARTY(sParty_Tyron), }, [TRAINER_CELINA] = @@ -8470,7 +8469,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Celina), + .party = TRAINER_PARTY(sParty_Celina), }, [TRAINER_BIANCA] = @@ -8482,7 +8481,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Bianca), + .party = TRAINER_PARTY(sParty_Bianca), }, [TRAINER_HAYDEN] = @@ -8494,7 +8493,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Hayden), + .party = TRAINER_PARTY(sParty_Hayden), }, [TRAINER_SOPHIE] = @@ -8506,7 +8505,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Sophie), + .party = TRAINER_PARTY(sParty_Sophie), }, [TRAINER_COBY] = @@ -8518,7 +8517,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Coby), + .party = TRAINER_PARTY(sParty_Coby), }, [TRAINER_LAWRENCE] = @@ -8530,7 +8529,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Lawrence), + .party = TRAINER_PARTY(sParty_Lawrence), }, [TRAINER_WYATT] = @@ -8542,7 +8541,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Wyatt), + .party = TRAINER_PARTY(sParty_Wyatt), }, [TRAINER_ANGELINA] = @@ -8554,7 +8553,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Angelina), + .party = TRAINER_PARTY(sParty_Angelina), }, [TRAINER_KAI] = @@ -8566,7 +8565,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Kai), + .party = TRAINER_PARTY(sParty_Kai), }, [TRAINER_CHARLOTTE] = @@ -8578,7 +8577,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Charlotte), + .party = TRAINER_PARTY(sParty_Charlotte), }, [TRAINER_DEANDRE] = @@ -8590,7 +8589,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Deandre), + .party = TRAINER_PARTY(sParty_Deandre), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_1] = @@ -8602,7 +8601,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout1), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout1), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_2] = @@ -8614,7 +8613,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout2), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout2), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_3] = @@ -8626,7 +8625,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout3), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout3), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_4] = @@ -8638,7 +8637,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout4), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout4), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_5] = @@ -8650,7 +8649,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout5), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout5), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_6] = @@ -8662,7 +8661,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout6), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout6), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_7] = @@ -8674,7 +8673,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout7), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout7), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_8] = @@ -8686,7 +8685,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout8), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout8), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_9] = @@ -8698,7 +8697,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout9), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout9), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_10] = @@ -8710,7 +8709,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout10), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout10), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_11] = @@ -8722,7 +8721,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout11), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout11), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_12] = @@ -8734,7 +8733,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout12), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout12), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_13] = @@ -8746,7 +8745,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout13), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout13), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_14] = @@ -8758,7 +8757,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout14), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout14), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_15] = @@ -8770,7 +8769,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout15), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout15), }, [TRAINER_GRUNT_MAGMA_HIDEOUT_16] = @@ -8782,7 +8781,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout16), + .party = TRAINER_PARTY(sParty_GruntMagmaHideout16), }, [TRAINER_TABITHA_MAGMA_HIDEOUT] = @@ -8794,7 +8793,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_TabithaMagmaHideout), + .party = TRAINER_PARTY(sParty_TabithaMagmaHideout), }, [TRAINER_DARCY] = @@ -8806,7 +8805,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_DEFAULT_MOVES(sParty_Darcy), + .party = TRAINER_PARTY(sParty_Darcy), }, [TRAINER_MAXIE_MOSSDEEP] = @@ -8818,7 +8817,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_DEFAULT_MOVES(sParty_MaxieMossdeep), + .party = TRAINER_PARTY(sParty_MaxieMossdeep), }, [TRAINER_PETE] = @@ -8830,7 +8829,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Pete), + .party = TRAINER_PARTY(sParty_Pete), }, [TRAINER_ISABELLE] = @@ -8842,7 +8841,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Isabelle), + .party = TRAINER_PARTY(sParty_Isabelle), }, [TRAINER_ANDRES_1] = @@ -8854,7 +8853,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Andres1), + .party = TRAINER_PARTY(sParty_Andres1), }, [TRAINER_JOSUE] = @@ -8866,7 +8865,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Josue), + .party = TRAINER_PARTY(sParty_Josue), }, [TRAINER_CAMRON] = @@ -8878,7 +8877,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Camron), + .party = TRAINER_PARTY(sParty_Camron), }, [TRAINER_CORY_1] = @@ -8890,7 +8889,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cory1), + .party = TRAINER_PARTY(sParty_Cory1), }, [TRAINER_CAROLINA] = @@ -8902,7 +8901,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_DEFAULT_MOVES(sParty_Carolina), + .party = TRAINER_PARTY(sParty_Carolina), }, [TRAINER_ELIJAH] = @@ -8914,7 +8913,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Elijah), + .party = TRAINER_PARTY(sParty_Elijah), }, [TRAINER_CELIA] = @@ -8926,7 +8925,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Celia), + .party = TRAINER_PARTY(sParty_Celia), }, [TRAINER_BRYAN] = @@ -8938,7 +8937,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Bryan), + .party = TRAINER_PARTY(sParty_Bryan), }, [TRAINER_BRANDEN] = @@ -8950,7 +8949,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Branden), + .party = TRAINER_PARTY(sParty_Branden), }, [TRAINER_BRYANT] = @@ -8962,7 +8961,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Bryant), + .party = TRAINER_PARTY(sParty_Bryant), }, [TRAINER_SHAYLA] = @@ -8974,7 +8973,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Shayla), + .party = TRAINER_PARTY(sParty_Shayla), }, [TRAINER_KYRA] = @@ -8986,7 +8985,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Kyra), + .party = TRAINER_PARTY(sParty_Kyra), }, [TRAINER_JAIDEN] = @@ -8998,7 +8997,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Jaiden), + .party = TRAINER_PARTY(sParty_Jaiden), }, [TRAINER_ALIX] = @@ -9010,7 +9009,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Alix), + .party = TRAINER_PARTY(sParty_Alix), }, [TRAINER_HELENE] = @@ -9022,7 +9021,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Helene), + .party = TRAINER_PARTY(sParty_Helene), }, [TRAINER_MARLENE] = @@ -9034,7 +9033,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Marlene), + .party = TRAINER_PARTY(sParty_Marlene), }, [TRAINER_DEVAN] = @@ -9046,7 +9045,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Devan), + .party = TRAINER_PARTY(sParty_Devan), }, [TRAINER_JOHNSON] = @@ -9058,7 +9057,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Johnson), + .party = TRAINER_PARTY(sParty_Johnson), }, [TRAINER_MELINA] = @@ -9070,7 +9069,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Melina), + .party = TRAINER_PARTY(sParty_Melina), }, [TRAINER_BRANDI] = @@ -9082,7 +9081,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Brandi), + .party = TRAINER_PARTY(sParty_Brandi), }, [TRAINER_AISHA] = @@ -9094,7 +9093,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Aisha), + .party = TRAINER_PARTY(sParty_Aisha), }, [TRAINER_MAKAYLA] = @@ -9106,7 +9105,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_DEFAULT_MOVES(sParty_Makayla), + .party = TRAINER_PARTY(sParty_Makayla), }, [TRAINER_FABIAN] = @@ -9118,7 +9117,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Fabian), + .party = TRAINER_PARTY(sParty_Fabian), }, [TRAINER_DAYTON] = @@ -9130,7 +9129,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Dayton), + .party = TRAINER_PARTY(sParty_Dayton), }, [TRAINER_RACHEL] = @@ -9142,7 +9141,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Rachel), + .party = TRAINER_PARTY(sParty_Rachel), }, [TRAINER_LEONEL] = @@ -9154,7 +9153,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 = TRAINER_PARTY(sParty_Leonel), }, [TRAINER_CALLIE] = @@ -9166,7 +9165,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Callie), + .party = TRAINER_PARTY(sParty_Callie), }, [TRAINER_CALE] = @@ -9178,7 +9177,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cale), + .party = TRAINER_PARTY(sParty_Cale), }, [TRAINER_MYLES] = @@ -9190,7 +9189,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Myles), + .party = TRAINER_PARTY(sParty_Myles), }, [TRAINER_PAT] = @@ -9202,7 +9201,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Pat), + .party = TRAINER_PARTY(sParty_Pat), }, [TRAINER_CRISTIN_1] = @@ -9214,7 +9213,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_DEFAULT_MOVES(sParty_Cristin1), + .party = TRAINER_PARTY(sParty_Cristin1), }, [TRAINER_MAY_RUSTBORO_TREECKO] = @@ -9226,7 +9225,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_DEFAULT_MOVES(sParty_MayRustboroTreecko), + .party = TRAINER_PARTY(sParty_MayRustboroTreecko), }, [TRAINER_MAY_RUSTBORO_TORCHIC] = @@ -9238,7 +9237,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_DEFAULT_MOVES(sParty_MayRustboroTorchic), + .party = TRAINER_PARTY(sParty_MayRustboroTorchic), }, [TRAINER_ROXANNE_2] = @@ -9250,7 +9249,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Roxanne2), + .party = TRAINER_PARTY(sParty_Roxanne2), }, [TRAINER_ROXANNE_3] = @@ -9262,7 +9261,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Roxanne3), + .party = TRAINER_PARTY(sParty_Roxanne3), }, [TRAINER_ROXANNE_4] = @@ -9274,7 +9273,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Roxanne4), + .party = TRAINER_PARTY(sParty_Roxanne4), }, [TRAINER_ROXANNE_5] = @@ -9286,7 +9285,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Roxanne5), + .party = TRAINER_PARTY(sParty_Roxanne5), }, [TRAINER_BRAWLY_2] = @@ -9298,7 +9297,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Brawly2), + .party = TRAINER_PARTY(sParty_Brawly2), }, [TRAINER_BRAWLY_3] = @@ -9310,7 +9309,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Brawly3), + .party = TRAINER_PARTY(sParty_Brawly3), }, [TRAINER_BRAWLY_4] = @@ -9322,7 +9321,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Brawly4), + .party = TRAINER_PARTY(sParty_Brawly4), }, [TRAINER_BRAWLY_5] = @@ -9334,7 +9333,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Brawly5), + .party = TRAINER_PARTY(sParty_Brawly5), }, [TRAINER_WATTSON_2] = @@ -9346,7 +9345,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Wattson2), + .party = TRAINER_PARTY(sParty_Wattson2), }, [TRAINER_WATTSON_3] = @@ -9358,7 +9357,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Wattson3), + .party = TRAINER_PARTY(sParty_Wattson3), }, [TRAINER_WATTSON_4] = @@ -9370,7 +9369,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Wattson4), + .party = TRAINER_PARTY(sParty_Wattson4), }, [TRAINER_WATTSON_5] = @@ -9382,7 +9381,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Wattson5), + .party = TRAINER_PARTY(sParty_Wattson5), }, [TRAINER_FLANNERY_2] = @@ -9394,7 +9393,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Flannery2), + .party = TRAINER_PARTY(sParty_Flannery2), }, [TRAINER_FLANNERY_3] = @@ -9406,7 +9405,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Flannery3), + .party = TRAINER_PARTY(sParty_Flannery3), }, [TRAINER_FLANNERY_4] = @@ -9418,7 +9417,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Flannery4), + .party = TRAINER_PARTY(sParty_Flannery4), }, [TRAINER_FLANNERY_5] = @@ -9430,7 +9429,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Flannery5), + .party = TRAINER_PARTY(sParty_Flannery5), }, [TRAINER_NORMAN_2] = @@ -9442,7 +9441,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Norman2), + .party = TRAINER_PARTY(sParty_Norman2), }, [TRAINER_NORMAN_3] = @@ -9454,7 +9453,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Norman3), + .party = TRAINER_PARTY(sParty_Norman3), }, [TRAINER_NORMAN_4] = @@ -9466,7 +9465,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Norman4), + .party = TRAINER_PARTY(sParty_Norman4), }, [TRAINER_NORMAN_5] = @@ -9478,7 +9477,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Norman5), + .party = TRAINER_PARTY(sParty_Norman5), }, [TRAINER_WINONA_2] = @@ -9490,7 +9489,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .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 = TRAINER_PARTY(sParty_Winona2), }, [TRAINER_WINONA_3] = @@ -9502,7 +9501,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .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 = TRAINER_PARTY(sParty_Winona3), }, [TRAINER_WINONA_4] = @@ -9514,7 +9513,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .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 = TRAINER_PARTY(sParty_Winona4), }, [TRAINER_WINONA_5] = @@ -9526,7 +9525,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .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 = TRAINER_PARTY(sParty_Winona5), }, [TRAINER_TATE_AND_LIZA_2] = @@ -9538,7 +9537,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_TateAndLiza2), + .party = TRAINER_PARTY(sParty_TateAndLiza2), }, [TRAINER_TATE_AND_LIZA_3] = @@ -9550,7 +9549,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_TateAndLiza3), + .party = TRAINER_PARTY(sParty_TateAndLiza3), }, [TRAINER_TATE_AND_LIZA_4] = @@ -9562,7 +9561,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_TateAndLiza4), + .party = TRAINER_PARTY(sParty_TateAndLiza4), }, [TRAINER_TATE_AND_LIZA_5] = @@ -9574,7 +9573,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_TateAndLiza5), + .party = TRAINER_PARTY(sParty_TateAndLiza5), }, [TRAINER_JUAN_2] = @@ -9586,7 +9585,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Juan2), + .party = TRAINER_PARTY(sParty_Juan2), }, [TRAINER_JUAN_3] = @@ -9598,7 +9597,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Juan3), + .party = TRAINER_PARTY(sParty_Juan3), }, [TRAINER_JUAN_4] = @@ -9610,7 +9609,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Juan4), + .party = TRAINER_PARTY(sParty_Juan4), }, [TRAINER_JUAN_5] = @@ -9622,7 +9621,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, .doubleBattle = TRUE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Juan5), + .party = TRAINER_PARTY(sParty_Juan5), }, [TRAINER_ANGELO] = @@ -9634,7 +9633,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Angelo), + .party = TRAINER_PARTY(sParty_Angelo), }, [TRAINER_DARIUS] = @@ -9646,7 +9645,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_DEFAULT_MOVES(sParty_Darius), + .party = TRAINER_PARTY(sParty_Darius), }, [TRAINER_STEVEN] = @@ -9658,7 +9657,7 @@ const struct Trainer gTrainers[] = { .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY, - .party = ITEM_CUSTOM_MOVES(sParty_Steven), + .party = TRAINER_PARTY(sParty_Steven), }, [TRAINER_ANABEL] = @@ -9670,7 +9669,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_DEFAULT_MOVES(sParty_Anabel), + .party = TRAINER_PARTY(sParty_Anabel), }, [TRAINER_TUCKER] = @@ -9682,7 +9681,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_DEFAULT_MOVES(sParty_Tucker), + .party = TRAINER_PARTY(sParty_Tucker), }, [TRAINER_SPENSER] = @@ -9694,7 +9693,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_DEFAULT_MOVES(sParty_Spenser), + .party = TRAINER_PARTY(sParty_Spenser), }, [TRAINER_GRETA] = @@ -9706,7 +9705,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_DEFAULT_MOVES(sParty_Greta), + .party = TRAINER_PARTY(sParty_Greta), }, [TRAINER_NOLAND] = @@ -9718,7 +9717,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_DEFAULT_MOVES(sParty_Noland), + .party = TRAINER_PARTY(sParty_Noland), }, [TRAINER_LUCY] = @@ -9730,7 +9729,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_DEFAULT_MOVES(sParty_Lucy), + .party = TRAINER_PARTY(sParty_Lucy), }, [TRAINER_BRANDON] = @@ -9742,7 +9741,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_DEFAULT_MOVES(sParty_Brandon), + .party = TRAINER_PARTY(sParty_Brandon), }, [TRAINER_ANDRES_2] = @@ -9754,7 +9753,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Andres2), + .party = TRAINER_PARTY(sParty_Andres2), }, [TRAINER_ANDRES_3] = @@ -9766,7 +9765,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Andres3), + .party = TRAINER_PARTY(sParty_Andres3), }, [TRAINER_ANDRES_4] = @@ -9778,7 +9777,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Andres4), + .party = TRAINER_PARTY(sParty_Andres4), }, [TRAINER_ANDRES_5] = @@ -9790,7 +9789,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Andres5), + .party = TRAINER_PARTY(sParty_Andres5), }, [TRAINER_CORY_2] = @@ -9802,7 +9801,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cory2), + .party = TRAINER_PARTY(sParty_Cory2), }, [TRAINER_CORY_3] = @@ -9814,7 +9813,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cory3), + .party = TRAINER_PARTY(sParty_Cory3), }, [TRAINER_CORY_4] = @@ -9826,7 +9825,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cory4), + .party = TRAINER_PARTY(sParty_Cory4), }, [TRAINER_CORY_5] = @@ -9838,7 +9837,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Cory5), + .party = TRAINER_PARTY(sParty_Cory5), }, [TRAINER_PABLO_2] = @@ -9850,7 +9849,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Pablo2), + .party = TRAINER_PARTY(sParty_Pablo2), }, [TRAINER_PABLO_3] = @@ -9862,7 +9861,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Pablo3), + .party = TRAINER_PARTY(sParty_Pablo3), }, [TRAINER_PABLO_4] = @@ -9874,7 +9873,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Pablo4), + .party = TRAINER_PARTY(sParty_Pablo4), }, [TRAINER_PABLO_5] = @@ -9886,7 +9885,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Pablo5), + .party = TRAINER_PARTY(sParty_Pablo5), }, [TRAINER_KOJI_2] = @@ -9898,7 +9897,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Koji2), + .party = TRAINER_PARTY(sParty_Koji2), }, [TRAINER_KOJI_3] = @@ -9910,7 +9909,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Koji3), + .party = TRAINER_PARTY(sParty_Koji3), }, [TRAINER_KOJI_4] = @@ -9922,7 +9921,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Koji4), + .party = TRAINER_PARTY(sParty_Koji4), }, [TRAINER_KOJI_5] = @@ -9934,7 +9933,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Koji5), + .party = TRAINER_PARTY(sParty_Koji5), }, [TRAINER_CRISTIN_2] = @@ -9946,7 +9945,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_DEFAULT_MOVES(sParty_Cristin2), + .party = TRAINER_PARTY(sParty_Cristin2), }, [TRAINER_CRISTIN_3] = @@ -9958,7 +9957,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_DEFAULT_MOVES(sParty_Cristin3), + .party = TRAINER_PARTY(sParty_Cristin3), }, [TRAINER_CRISTIN_4] = @@ -9970,7 +9969,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_DEFAULT_MOVES(sParty_Cristin4), + .party = TRAINER_PARTY(sParty_Cristin4), }, [TRAINER_CRISTIN_5] = @@ -9982,7 +9981,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_DEFAULT_MOVES(sParty_Cristin5), + .party = TRAINER_PARTY(sParty_Cristin5), }, [TRAINER_FERNANDO_2] = @@ -9994,7 +9993,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Fernando2), + .party = TRAINER_PARTY(sParty_Fernando2), }, [TRAINER_FERNANDO_3] = @@ -10006,7 +10005,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Fernando3), + .party = TRAINER_PARTY(sParty_Fernando3), }, [TRAINER_FERNANDO_4] = @@ -10018,7 +10017,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Fernando4), + .party = TRAINER_PARTY(sParty_Fernando4), }, [TRAINER_FERNANDO_5] = @@ -10030,7 +10029,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Fernando5), + .party = TRAINER_PARTY(sParty_Fernando5), }, [TRAINER_SAWYER_2] = @@ -10042,7 +10041,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_DEFAULT_MOVES(sParty_Sawyer2), + .party = TRAINER_PARTY(sParty_Sawyer2), }, [TRAINER_SAWYER_3] = @@ -10054,7 +10053,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_DEFAULT_MOVES(sParty_Sawyer3), + .party = TRAINER_PARTY(sParty_Sawyer3), }, [TRAINER_SAWYER_4] = @@ -10066,7 +10065,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_DEFAULT_MOVES(sParty_Sawyer4), + .party = TRAINER_PARTY(sParty_Sawyer4), }, [TRAINER_SAWYER_5] = @@ -10078,7 +10077,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_DEFAULT_MOVES(sParty_Sawyer5), + .party = TRAINER_PARTY(sParty_Sawyer5), }, [TRAINER_GABRIELLE_2] = @@ -10090,7 +10089,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Gabrielle2), + .party = TRAINER_PARTY(sParty_Gabrielle2), }, [TRAINER_GABRIELLE_3] = @@ -10102,7 +10101,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Gabrielle3), + .party = TRAINER_PARTY(sParty_Gabrielle3), }, [TRAINER_GABRIELLE_4] = @@ -10114,7 +10113,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Gabrielle4), + .party = TRAINER_PARTY(sParty_Gabrielle4), }, [TRAINER_GABRIELLE_5] = @@ -10126,7 +10125,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Gabrielle5), + .party = TRAINER_PARTY(sParty_Gabrielle5), }, [TRAINER_THALIA_2] = @@ -10138,7 +10137,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Thalia2), + .party = TRAINER_PARTY(sParty_Thalia2), }, [TRAINER_THALIA_3] = @@ -10150,7 +10149,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Thalia3), + .party = TRAINER_PARTY(sParty_Thalia3), }, [TRAINER_THALIA_4] = @@ -10162,7 +10161,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Thalia4), + .party = TRAINER_PARTY(sParty_Thalia4), }, [TRAINER_THALIA_5] = @@ -10174,7 +10173,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Thalia5), + .party = TRAINER_PARTY(sParty_Thalia5), }, [TRAINER_MARIELA] = @@ -10186,7 +10185,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Mariela), + .party = TRAINER_PARTY(sParty_Mariela), }, [TRAINER_ALVARO] = @@ -10198,7 +10197,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Alvaro), + .party = TRAINER_PARTY(sParty_Alvaro), }, [TRAINER_EVERETT] = @@ -10210,7 +10209,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Everett), + .party = TRAINER_PARTY(sParty_Everett), }, [TRAINER_RED] = @@ -10222,7 +10221,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Red), + .party = TRAINER_PARTY(sParty_Red), }, [TRAINER_LEAF] = @@ -10234,7 +10233,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .party = NO_ITEM_DEFAULT_MOVES(sParty_Leaf), + .party = TRAINER_PARTY(sParty_Leaf), }, [TRAINER_BRENDAN_PLACEHOLDER] = @@ -10246,7 +10245,7 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanLinkPlaceholder), + .party = TRAINER_PARTY(sParty_BrendanLinkPlaceholder), }, [TRAINER_MAY_PLACEHOLDER] = @@ -10258,6 +10257,6 @@ const struct Trainer gTrainers[] = { .items = {}, .doubleBattle = FALSE, .aiFlags = 0, - .party = NO_ITEM_DEFAULT_MOVES(sParty_MayLinkPlaceholder), + .party = TRAINER_PARTY(sParty_MayLinkPlaceholder), }, }; diff --git a/src/match_call.c b/src/match_call.c index d5ad380007..4d45b9b436 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1789,33 +1789,14 @@ static void PopulateSpeciesFromTrainerLocation(int matchCallId, u8 *destStr) static void PopulateSpeciesFromTrainerParty(int matchCallId, u8 *destStr) { u16 trainerId; - union TrainerMonPtr party; + const struct TrainerMon *party; u8 monId; const u8 *speciesName; trainerId = GetLastBeatenRematchTrainerId(sMatchCallTrainers[matchCallId].trainerId); party = gTrainers[trainerId].party; monId = Random() % gTrainers[trainerId].partySize; - - switch (gTrainers[trainerId].partyFlags) - { - case 0: - default: - speciesName = GetSpeciesName(party.NoItemDefaultMoves[monId].species); - break; - case F_TRAINER_PARTY_CUSTOM_MOVESET: - speciesName = GetSpeciesName(party.NoItemCustomMoves[monId].species); - break; - case F_TRAINER_PARTY_HELD_ITEM: - speciesName = GetSpeciesName(party.ItemDefaultMoves[monId].species); - break; - case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM: - speciesName = GetSpeciesName(party.ItemCustomMoves[monId].species); - break; - case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED: - speciesName = GetSpeciesName(party.EverythingCustomized[monId].species); - break; - } + speciesName = GetSpeciesName(party[monId].species); StringCopy(destStr, speciesName); } diff --git a/test/battle/trainer_control.c b/test/battle/trainer_control.c index f5ca68e364..cdb06adc25 100644 --- a/test/battle/trainer_control.c +++ b/test/battle/trainer_control.c @@ -11,7 +11,7 @@ #include "constants/battle.h" -static const struct TrainerMonCustomized sTestParty1[] = +static const struct TrainerMon sTestParty1[] = { { .species = SPECIES_WOBBUFFET, @@ -35,28 +35,10 @@ static const struct TrainerMonCustomized sTestParty1[] = }, }; -static const struct TrainerMonNoItemDefaultMoves sTestParty2[] = -{ - { - .species = SPECIES_WOBBUFFET, - .lvl = 5, - }, - { - .species = SPECIES_WOBBUFFET, - .lvl = 6, - } -}; - static const struct Trainer sTestTrainer1 = { .trainerName = _("Test1"), - .party = EVERYTHING_CUSTOMIZED(sTestParty1), -}; - -static const struct Trainer sTestTrainer2 = -{ - .trainerName = _("Test2"), - .party = NO_ITEM_DEFAULT_MOVES(sTestParty2), + .party = TRAINER_PARTY(sTestParty1), }; TEST("CreateNPCTrainerPartyForTrainer generates customized Pokémon") @@ -134,7 +116,7 @@ TEST("CreateNPCTrainerPartyForTrainer generates customized Pokémon") TEST("CreateNPCTrainerPartyForTrainer generates different personalities for different mons") { struct Pokemon *testParty = Alloc(6 * sizeof(struct Pokemon)); - CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainer2, TRUE, BATTLE_TYPE_TRAINER); + CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainer1, TRUE, BATTLE_TYPE_TRAINER); EXPECT(testParty[0].box.personality != testParty[1].box.personality); Free(testParty); }