diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-01-09 15:49:02 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2022-01-10 13:48:08 -0500 |
| commit | 08a18d6e32d5e9d02c42eed46ef7356c3ad41df7 (patch) | |
| tree | 44d3ad18d681d6e3328c411cf8fc7e23cbd9a2f6 /src/data/trainers.h | |
| parent | d0c79e4e479d633b65cb5a821de882416946a975 (diff) | |
Sync/update trainer classes
Diffstat (limited to 'src/data/trainers.h')
| -rw-r--r-- | src/data/trainers.h | 4659 |
1 files changed, 2325 insertions, 2334 deletions
diff --git a/src/data/trainers.h b/src/data/trainers.h index 95e1c5412..49bb15eab 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -1,8918 +1,8909 @@ const struct Trainer gTrainers[] = { [TRAINER_NONE] = { - .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER, - .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_AQUA_LEADER_ARCHIE, .trainerName = _(""), - .items = {}, - .doubleBattle = FALSE, - .aiFlags = 0, - .partySize = 0, - .party = {}, }, - [TRAINER_AQUA_LEADER_1] = { + [TRAINER_AQUA_LEADER] = { .partyFlags = 0, - .trainerClass = CLASS_AQUA_LEADER, + .trainerClass = TRAINER_CLASS_AQUA_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_AQUA_LEADER_ARCHIE, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AquaLeader1), - .party = {.NoItemDefaultMoves = sTrainerMons_AquaLeader1} + .partySize = NELEMS(sParty_AquaLeader), + .party = {.NoItemDefaultMoves = sParty_AquaLeader} }, - [TRAINER_TEAM_AQUA_1] = { + [TRAINER_AQUA_GRUNT_M] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_AQUA, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamAqua1), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamAqua1} + .partySize = NELEMS(sParty_AquaGruntM), + .party = {.NoItemDefaultMoves = sParty_AquaGruntM} }, - [TRAINER_TEAM_AQUA_2] = { + [TRAINER_AQUA_GRUNT_F] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_AQUA, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamAqua2), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamAqua2} + .partySize = NELEMS(sParty_AquaGruntF), + .party = {.NoItemDefaultMoves = sParty_AquaGruntF} }, - [TRAINER_AROMA_LADY_1] = { + [TRAINER_RS_AROMA_LADY] = { .partyFlags = 0, - .trainerClass = CLASS_AROMA_LADY, + .trainerClass = TRAINER_CLASS_RS_AROMA_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_AROMA_LADY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AromaLady1), - .party = {.NoItemDefaultMoves = sTrainerMons_AromaLady1} + .partySize = NELEMS(sParty_RSAromaLady), + .party = {.NoItemDefaultMoves = sParty_RSAromaLady} }, - [TRAINER_RUIN_MANIAC_1] = { + [TRAINER_RS_RUIN_MANIAC] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC, + .trainerClass = TRAINER_CLASS_RS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RS_RUIN_MANIAC, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiac1), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiac1} + .partySize = NELEMS(sParty_RSRuinManiac), + .party = {.NoItemDefaultMoves = sParty_RSRuinManiac} }, - [TRAINER_INTERVIEWER_1] = { + [TRAINER_INTERVIEWER] = { .partyFlags = 0, - .trainerClass = CLASS_INTERVIEWER, + .trainerClass = TRAINER_CLASS_INTERVIEWER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, .trainerPic = TRAINER_PIC_INTERVIEWER, .trainerName = _(""), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Interviewer1), - .party = {.NoItemDefaultMoves = sTrainerMons_Interviewer1} + .partySize = NELEMS(sParty_Interviewer), + .party = {.NoItemDefaultMoves = sParty_Interviewer} }, - [TRAINER_TUBER_1] = { + [TRAINER_RS_TUBER_F] = { .partyFlags = 0, - .trainerClass = CLASS_TUBER, + .trainerClass = TRAINER_CLASS_RS_TUBER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_RS_TUBER_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Tuber1), - .party = {.NoItemDefaultMoves = sTrainerMons_Tuber1} + .partySize = NELEMS(sParty_RSTuberF), + .party = {.NoItemDefaultMoves = sParty_RSTuberF} }, - [TRAINER_TUBER_2] = { + [TRAINER_RS_TUBER_M] = { .partyFlags = 0, - .trainerClass = CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_RS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_TUBER_M, + .trainerPic = TRAINER_PIC_RS_TUBER_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Tuber2), - .party = {.NoItemDefaultMoves = sTrainerMons_Tuber2} + .partySize = NELEMS(sParty_RSTuberM), + .party = {.NoItemDefaultMoves = sParty_RSTuberM} }, - [TRAINER_COOLTRAINER_1] = { + [TRAINER_RS_COOLTRAINER_M] = { .partyFlags = 0, - .trainerClass = CLASS_COOLTRAINER, + .trainerClass = TRAINER_CLASS_RS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_RS_COOLTRAINER_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_Cooltrainer1), - .party = {.NoItemDefaultMoves = sTrainerMons_Cooltrainer1} + .partySize = NELEMS(sParty_RSCooltrainerM), + .party = {.NoItemDefaultMoves = sParty_RSCooltrainerM} }, - [TRAINER_COOLTRAINER_2] = { + [TRAINER_RS_COOLTRAINER_F] = { .partyFlags = 0, - .trainerClass = CLASS_COOLTRAINER, + .trainerClass = TRAINER_CLASS_RS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_RS_COOLTRAINER_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_Cooltrainer2), - .party = {.NoItemDefaultMoves = sTrainerMons_Cooltrainer2} + .partySize = NELEMS(sParty_RSCooltrainerF), + .party = {.NoItemDefaultMoves = sParty_RSCooltrainerF} }, - [TRAINER_HEX_MANIAC_1] = { + [TRAINER_HEX_MANIAC] = { .partyFlags = 0, - .trainerClass = CLASS_HEX_MANIAC, + .trainerClass = TRAINER_CLASS_HEX_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_HEX_MANIAC, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HexManiac1), - .party = {.NoItemDefaultMoves = sTrainerMons_HexManiac1} + .partySize = NELEMS(sParty_HexManiac), + .party = {.NoItemDefaultMoves = sParty_HexManiac} }, - [TRAINER_LADY_1] = { + [TRAINER_RS_LADY] = { .partyFlags = 0, - .trainerClass = CLASS_LADY, + .trainerClass = TRAINER_CLASS_RS_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_LADY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Lady1), - .party = {.NoItemDefaultMoves = sTrainerMons_Lady1} + .partySize = NELEMS(sParty_RSLady), + .party = {.NoItemDefaultMoves = sParty_RSLady} }, - [TRAINER_BEAUTY_1] = { + [TRAINER_RS_BEAUTY] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY, + .trainerClass = TRAINER_CLASS_RS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_BEAUTY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Beauty1), - .party = {.NoItemDefaultMoves = sTrainerMons_Beauty1} + .partySize = NELEMS(sParty_RSBeauty), + .party = {.NoItemDefaultMoves = sParty_RSBeauty} }, - [TRAINER_RICH_BOY_1] = { + [TRAINER_RICH_BOY] = { .partyFlags = 0, - .trainerClass = CLASS_RICH_BOY, + .trainerClass = TRAINER_CLASS_RICH_BOY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_RICH_BOY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RichBoy1), - .party = {.NoItemDefaultMoves = sTrainerMons_RichBoy1} + .partySize = NELEMS(sParty_RichBoy), + .party = {.NoItemDefaultMoves = sParty_RichBoy} }, - [TRAINER_POKEMANIAC_1] = { + [TRAINER_RS_POKEMANIAC] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC, + .trainerClass = TRAINER_CLASS_RS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_RS_POKEMANIAC, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Pokemaniac1), - .party = {.NoItemDefaultMoves = sTrainerMons_Pokemaniac1} + .partySize = NELEMS(sParty_RSPokemaniac), + .party = {.NoItemDefaultMoves = sParty_RSPokemaniac} }, - [TRAINER_SWIMMER_MALE_1] = { + [TRAINER_RS_SWIMMER_M] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE, + .trainerClass = TRAINER_CLASS_RS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_SWIMMER_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMale1), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMale1} + .partySize = NELEMS(sParty_RSSwimmerM), + .party = {.NoItemDefaultMoves = sParty_RSSwimmerM} }, - [TRAINER_BLACK_BELT_1] = { + [TRAINER_RS_BLACK_BELT] = { .partyFlags = 0, - .trainerClass = CLASS_BLACK_BELT, + .trainerClass = TRAINER_CLASS_RS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_RS_BLACK_BELT, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBelt1), - .party = {.NoItemDefaultMoves = sTrainerMons_BlackBelt1} + .partySize = NELEMS(sParty_RSBlackBelt), + .party = {.NoItemDefaultMoves = sParty_RSBlackBelt} }, - [TRAINER_GUITARIST_1] = { + [TRAINER_GUITARIST] = { .partyFlags = 0, - .trainerClass = CLASS_GUITARIST, + .trainerClass = TRAINER_CLASS_GUITARIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_GUITARIST, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Guitarist1), - .party = {.NoItemDefaultMoves = sTrainerMons_Guitarist1} + .partySize = NELEMS(sParty_Guitarist), + .party = {.NoItemDefaultMoves = sParty_Guitarist} }, - [TRAINER_KINDLER_1] = { + [TRAINER_KINDLER] = { .partyFlags = 0, - .trainerClass = CLASS_KINDLER, + .trainerClass = TRAINER_CLASS_KINDLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_KINDLER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Kindler1), - .party = {.NoItemDefaultMoves = sTrainerMons_Kindler1} + .partySize = NELEMS(sParty_Kindler), + .party = {.NoItemDefaultMoves = sParty_Kindler} }, - [TRAINER_CAMPER_1] = { + [TRAINER_RS_CAMPER] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER, + .trainerClass = TRAINER_CLASS_RS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_CAMPER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Camper1), - .party = {.NoItemDefaultMoves = sTrainerMons_Camper1} + .partySize = NELEMS(sParty_RSCamper), + .party = {.NoItemDefaultMoves = sParty_RSCamper} }, - [TRAINER_BUG_MANIAC_1] = { + [TRAINER_BUG_MANIAC] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_MANIAC, + .trainerClass = TRAINER_CLASS_BUG_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BUG_MANIAC, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugManiac1), - .party = {.NoItemDefaultMoves = sTrainerMons_BugManiac1} + .partySize = NELEMS(sParty_BugManiac), + .party = {.NoItemDefaultMoves = sParty_BugManiac} }, - [TRAINER_PSYCHIC_1] = { + [TRAINER_RS_PSYCHIC_M] = { .partyFlags = 0, - .trainerClass = CLASS_PSYCHIC, + .trainerClass = TRAINER_CLASS_RS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_RS_PSYCHIC_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Psychic1), - .party = {.NoItemDefaultMoves = sTrainerMons_Psychic1} + .partySize = NELEMS(sParty_RSPsychicM), + .party = {.NoItemDefaultMoves = sParty_RSPsychicM} }, - [TRAINER_PSYCHIC_2] = { + [TRAINER_RS_PSYCHIC_F] = { .partyFlags = 0, - .trainerClass = CLASS_PSYCHIC, + .trainerClass = TRAINER_CLASS_RS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_RS_PSYCHIC_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Psychic2), - .party = {.NoItemDefaultMoves = sTrainerMons_Psychic2} + .partySize = NELEMS(sParty_RSPsychicF), + .party = {.NoItemDefaultMoves = sParty_RSPsychicF} }, - [TRAINER_GENTLEMAN_1] = { + [TRAINER_RS_GENTLEMAN] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN, + .trainerClass = TRAINER_CLASS_RS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_RS_GENTLEMAN, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Gentleman1), - .party = {.NoItemDefaultMoves = sTrainerMons_Gentleman1} + .partySize = NELEMS(sParty_RSGentleman), + .party = {.NoItemDefaultMoves = sParty_RSGentleman} }, [TRAINER_ELITE_FOUR_SIDNEY] = { .partyFlags = 0, - .trainerClass = CLASS_ELITE_FOUR, + .trainerClass = TRAINER_CLASS_RS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_SIDNEY, .trainerName = _("SIDNEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EliteFourSidney), - .party = {.NoItemDefaultMoves = sTrainerMons_EliteFourSidney} + .partySize = NELEMS(sParty_EliteFourSidney), + .party = {.NoItemDefaultMoves = sParty_EliteFourSidney} }, [TRAINER_ELITE_FOUR_PHOEBE] = { .partyFlags = 0, - .trainerClass = CLASS_ELITE_FOUR, + .trainerClass = TRAINER_CLASS_RS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_PHOEBE, .trainerName = _("PHOEBE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EliteFourPhoebe), - .party = {.NoItemDefaultMoves = sTrainerMons_EliteFourPhoebe} + .partySize = NELEMS(sParty_EliteFourPhoebe), + .party = {.NoItemDefaultMoves = sParty_EliteFourPhoebe} }, [TRAINER_LEADER_ROXANNE] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LEADER_ROXANNE, .trainerName = _("ROXANNE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderRoxanne), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderRoxanne} + .partySize = NELEMS(sParty_LeaderRoxanne), + .party = {.NoItemDefaultMoves = sParty_LeaderRoxanne} }, [TRAINER_LEADER_BRAWLY] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_BRAWLY, .trainerName = _("BRAWLY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderBrawly), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderBrawly} + .partySize = NELEMS(sParty_LeaderBrawly), + .party = {.NoItemDefaultMoves = sParty_LeaderBrawly} }, [TRAINER_LEADER_TATE_LIZA] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA, .trainerName = _("TATE&LIZA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderTateLiza), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderTateLiza} + .partySize = NELEMS(sParty_LeaderTateLiza), + .party = {.NoItemDefaultMoves = sParty_LeaderTateLiza} }, - [TRAINER_SCHOOL_KID_1] = { + [TRAINER_SCHOOL_KID_M] = { .partyFlags = 0, - .trainerClass = CLASS_SCHOOL_KID, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SCHOOL_KID_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SchoolKid1), - .party = {.NoItemDefaultMoves = sTrainerMons_SchoolKid1} + .partySize = NELEMS(sParty_SchoolKidM), + .party = {.NoItemDefaultMoves = sParty_SchoolKidM} }, - [TRAINER_SCHOOL_KID_2] = { + [TRAINER_SCHOOL_KID_F] = { .partyFlags = 0, - .trainerClass = CLASS_SCHOOL_KID, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SCHOOL_KID_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SchoolKid2), - .party = {.NoItemDefaultMoves = sTrainerMons_SchoolKid2} + .partySize = NELEMS(sParty_SchoolKidF), + .party = {.NoItemDefaultMoves = sParty_SchoolKidF} }, - [TRAINER_SR_AND_JR_1] = { + [TRAINER_SR_AND_JR] = { .partyFlags = 0, - .trainerClass = CLASS_SR_AND_JR, + .trainerClass = TRAINER_CLASS_SR_AND_JR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_SR_AND_JR, .trainerName = _(""), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SrAndJr1), - .party = {.NoItemDefaultMoves = sTrainerMons_SrAndJr1} + .partySize = NELEMS(sParty_SrAndJr), + .party = {.NoItemDefaultMoves = sParty_SrAndJr} }, - [TRAINER_POKEFAN_1] = { + [TRAINER_POKEFAN_M] = { .partyFlags = 0, - .trainerClass = CLASS_POKEFAN, + .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Pokefan1), - .party = {.NoItemDefaultMoves = sTrainerMons_Pokefan1} + .partySize = NELEMS(sParty_PokefanM), + .party = {.NoItemDefaultMoves = sParty_PokefanM} }, - [TRAINER_POKEFAN_2] = { + [TRAINER_POKEFAN_F] = { .partyFlags = 0, - .trainerClass = CLASS_POKEFAN, + .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Pokefan2), - .party = {.NoItemDefaultMoves = sTrainerMons_Pokefan2} + .partySize = NELEMS(sParty_PokefanF), + .party = {.NoItemDefaultMoves = sParty_PokefanF} }, - [TRAINER_EXPERT_1] = { + [TRAINER_EXPERT_M] = { .partyFlags = 0, - .trainerClass = CLASS_EXPERT, + .trainerClass = TRAINER_CLASS_EXPERT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_EXPERT_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Expert1), - .party = {.NoItemDefaultMoves = sTrainerMons_Expert1} + .partySize = NELEMS(sParty_ExpertM), + .party = {.NoItemDefaultMoves = sParty_ExpertM} }, - [TRAINER_EXPERT_2] = { + [TRAINER_EXPERT_F] = { .partyFlags = 0, - .trainerClass = CLASS_EXPERT, + .trainerClass = TRAINER_CLASS_EXPERT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_EXPERT_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Expert2), - .party = {.NoItemDefaultMoves = sTrainerMons_Expert2} + .partySize = NELEMS(sParty_ExpertF), + .party = {.NoItemDefaultMoves = sParty_ExpertF} }, - [TRAINER_YOUNGSTER_1] = { + [TRAINER_RS_YOUNGSTER] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER, + .trainerClass = TRAINER_CLASS_RS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_YOUNGSTER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Youngster1), - .party = {.NoItemDefaultMoves = sTrainerMons_Youngster1} + .partySize = NELEMS(sParty_RSYoungster), + .party = {.NoItemDefaultMoves = sParty_RSYoungster} }, - [TRAINER_CHAMPION_1] = { + [TRAINER_RS_CHAMPION] = { .partyFlags = 0, - .trainerClass = CLASS_CHAMPION, + .trainerClass = TRAINER_CLASS_RS_CHAMPION, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CHAMPION_STEVEN, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_Champion1), - .party = {.NoItemDefaultMoves = sTrainerMons_Champion1} + .partySize = NELEMS(sParty_RSChampion), + .party = {.NoItemDefaultMoves = sParty_RSChampion} }, - [TRAINER_FISHERMAN_1] = { + [TRAINER_RS_FISHERMAN] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN, + .trainerClass = TRAINER_CLASS_RS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RS_FISHERMAN, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Fisherman1), - .party = {.NoItemDefaultMoves = sTrainerMons_Fisherman1} + .partySize = NELEMS(sParty_RSFisherman), + .party = {.NoItemDefaultMoves = sParty_RSFisherman} }, - [TRAINER_TRIATHLETE_1] = { + [TRAINER_CYCLING_TRIATHLETE_M] = { .partyFlags = 0, - .trainerClass = CLASS_TRIATHLETE, + .trainerClass = TRAINER_CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Triathlete1), - .party = {.NoItemDefaultMoves = sTrainerMons_Triathlete1} + .partySize = NELEMS(sParty_CyclingTriathleteM), + .party = {.NoItemDefaultMoves = sParty_CyclingTriathleteM} }, - [TRAINER_TRIATHLETE_2] = { + [TRAINER_CYCLING_TRIATHLETE_F] = { .partyFlags = 0, - .trainerClass = CLASS_TRIATHLETE, + .trainerClass = TRAINER_CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Triathlete2), - .party = {.NoItemDefaultMoves = sTrainerMons_Triathlete2} + .partySize = NELEMS(sParty_CyclingTriathleteF), + .party = {.NoItemDefaultMoves = sParty_CyclingTriathleteF} }, - [TRAINER_TRIATHLETE_3] = { + [TRAINER_RUNNING_TRIATHLETE_M] = { .partyFlags = 0, - .trainerClass = CLASS_TRIATHLETE, + .trainerClass = TRAINER_CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Triathlete3), - .party = {.NoItemDefaultMoves = sTrainerMons_Triathlete3} + .partySize = NELEMS(sParty_RunningTriathleteM), + .party = {.NoItemDefaultMoves = sParty_RunningTriathleteM} }, - [TRAINER_TRIATHLETE_4] = { + [TRAINER_RUNNING_TRIATHLETE_F] = { .partyFlags = 0, - .trainerClass = CLASS_TRIATHLETE, + .trainerClass = TRAINER_CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Triathlete4), - .party = {.NoItemDefaultMoves = sTrainerMons_Triathlete4} + .partySize = NELEMS(sParty_RunningTriathleteF), + .party = {.NoItemDefaultMoves = sParty_RunningTriathleteF} }, - [TRAINER_TRIATHLETE_5] = { + [TRAINER_SWIMMING_TRIATHLETE_M] = { .partyFlags = 0, - .trainerClass = CLASS_TRIATHLETE, + .trainerClass = TRAINER_CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Triathlete5), - .party = {.NoItemDefaultMoves = sTrainerMons_Triathlete5} + .partySize = NELEMS(sParty_SwimmingTriathleteM), + .party = {.NoItemDefaultMoves = sParty_SwimmingTriathleteM} }, - [TRAINER_TRIATHLETE_6] = { + [TRAINER_SWIMMING_TRIATHLETE_F] = { .partyFlags = 0, - .trainerClass = CLASS_TRIATHLETE, + .trainerClass = TRAINER_CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Triathlete6), - .party = {.NoItemDefaultMoves = sTrainerMons_Triathlete6} + .partySize = NELEMS(sParty_SwimmingTriathleteF), + .party = {.NoItemDefaultMoves = sParty_SwimmingTriathleteF} }, - [TRAINER_DRAGON_TAMER_1] = { + [TRAINER_DRAGON_TAMER] = { .partyFlags = 0, - .trainerClass = CLASS_DRAGON_TAMER, + .trainerClass = TRAINER_CLASS_DRAGON_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_DRAGON_TAMER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_DragonTamer1), - .party = {.NoItemDefaultMoves = sTrainerMons_DragonTamer1} + .partySize = NELEMS(sParty_DragonTamer), + .party = {.NoItemDefaultMoves = sParty_DragonTamer} }, - [TRAINER_BIRD_KEEPER_1] = { + [TRAINER_RS_BIRD_KEEPER] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER, + .trainerClass = TRAINER_CLASS_RS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_RS_BIRD_KEEPER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeper1), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeper1} + .partySize = NELEMS(sParty_RSBirdKeeper), + .party = {.NoItemDefaultMoves = sParty_RSBirdKeeper} }, - [TRAINER_NINJA_BOY_1] = { + [TRAINER_NINJA_BOY] = { .partyFlags = 0, - .trainerClass = CLASS_NINJA_BOY, + .trainerClass = TRAINER_CLASS_NINJA_BOY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_NINJA_BOY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_NinjaBoy1), - .party = {.NoItemDefaultMoves = sTrainerMons_NinjaBoy1} + .partySize = NELEMS(sParty_NinjaBoy), + .party = {.NoItemDefaultMoves = sParty_NinjaBoy} }, - [TRAINER_BATTLE_GIRL_1] = { + [TRAINER_BATTLE_GIRL] = { .partyFlags = 0, - .trainerClass = CLASS_BATTLE_GIRL, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BATTLE_GIRL, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BattleGirl1), - .party = {.NoItemDefaultMoves = sTrainerMons_BattleGirl1} + .partySize = NELEMS(sParty_BattleGirl), + .party = {.NoItemDefaultMoves = sParty_BattleGirl} }, - [TRAINER_PARASOL_LADY_1] = { + [TRAINER_PARASOL_LADY] = { .partyFlags = 0, - .trainerClass = CLASS_PARASOL_LADY, + .trainerClass = TRAINER_CLASS_PARASOL_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_PARASOL_LADY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ParasolLady1), - .party = {.NoItemDefaultMoves = sTrainerMons_ParasolLady1} + .partySize = NELEMS(sParty_ParasolLady), + .party = {.NoItemDefaultMoves = sParty_ParasolLady} }, - [TRAINER_SWIMMER_FEMALE_1] = { + [TRAINER_RS_SWIMMER_F] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE, + .trainerClass = TRAINER_CLASS_RS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_SWIMMER_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemale1), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemale1} + .partySize = NELEMS(sParty_RSSwimmerF), + .party = {.NoItemDefaultMoves = sParty_RSSwimmerF} }, - [TRAINER_PICNICKER_1] = { + [TRAINER_RS_PICNICKER] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER, + .trainerClass = TRAINER_CLASS_RS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_RS_PICNICKER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Picnicker1), - .party = {.NoItemDefaultMoves = sTrainerMons_Picnicker1} + .partySize = NELEMS(sParty_RSPicnicker), + .party = {.NoItemDefaultMoves = sParty_RSPicnicker} }, - [TRAINER_TWINS_1] = { + [TRAINER_RS_TWINS] = { .partyFlags = 0, - .trainerClass = CLASS_TWINS, + .trainerClass = TRAINER_CLASS_RS_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_RS_TWINS, .trainerName = _(""), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Twins1), - .party = {.NoItemDefaultMoves = sTrainerMons_Twins1} + .partySize = NELEMS(sParty_RSTwins), + .party = {.NoItemDefaultMoves = sParty_RSTwins} }, - [TRAINER_SAILOR_1] = { + [TRAINER_RS_SAILOR] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR, + .trainerClass = TRAINER_CLASS_RS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_SAILOR, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Sailor1), - .party = {.NoItemDefaultMoves = sTrainerMons_Sailor1} + .partySize = NELEMS(sParty_RSSailor), + .party = {.NoItemDefaultMoves = sParty_RSSailor} }, - [TRAINER_BOARDER_1] = { + [TRAINER_BOARDER_M] = { .partyFlags = 0, - .trainerClass = CLASS_BOARDER, + .trainerClass = TRAINER_CLASS_BOARDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_YOUNGSTER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Boarder1), - .party = {.NoItemDefaultMoves = sTrainerMons_Boarder1} + .partySize = NELEMS(sParty_BoarderM), + .party = {.NoItemDefaultMoves = sParty_BoarderM} }, - [TRAINER_BOARDER_2] = { + [TRAINER_BOARDER_F] = { .partyFlags = 0, - .trainerClass = CLASS_BOARDER, + .trainerClass = TRAINER_CLASS_BOARDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_YOUNGSTER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Boarder2), - .party = {.NoItemDefaultMoves = sTrainerMons_Boarder2} + .partySize = NELEMS(sParty_BoarderF), + .party = {.NoItemDefaultMoves = sParty_BoarderF} }, - [TRAINER_COLLECTOR_1] = { + [TRAINER_COLLECTOR] = { .partyFlags = 0, - .trainerClass = CLASS_COLLECTOR, + .trainerClass = TRAINER_CLASS_COLLECTOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_COLLECTOR, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Collector1), - .party = {.NoItemDefaultMoves = sTrainerMons_Collector1} + .partySize = NELEMS(sParty_Collector), + .party = {.NoItemDefaultMoves = sParty_Collector} }, - [TRAINER_PKMN_TRAINER_2] = { + [TRAINER_WALLY] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER_3, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_WALLY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnTrainer2), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnTrainer2} + .partySize = NELEMS(sParty_Wally), + .party = {.NoItemDefaultMoves = sParty_Wally} }, - [TRAINER_PKMN_TRAINER_3] = { + [TRAINER_BRENDAN] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER_3, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_BRENDAN_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnTrainer3), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnTrainer3} + .partySize = NELEMS(sParty_Brendan), + .party = {.NoItemDefaultMoves = sParty_Brendan} }, - [TRAINER_PKMN_TRAINER_4] = { + [TRAINER_BRENDAN_2] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER_3, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_BRENDAN_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnTrainer4), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnTrainer4} + .partySize = NELEMS(sParty_Brendan2), + .party = {.NoItemDefaultMoves = sParty_Brendan2} }, - [TRAINER_PKMN_TRAINER_5] = { + [TRAINER_BRENDAN_3] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER_3, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_BRENDAN_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnTrainer5), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnTrainer5} + .partySize = NELEMS(sParty_Brendan3), + .party = {.NoItemDefaultMoves = sParty_Brendan3} }, - [TRAINER_PKMN_TRAINER_6] = { + [TRAINER_MAY] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER_3, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_MAY_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnTrainer6), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnTrainer6} + .partySize = NELEMS(sParty_May), + .party = {.NoItemDefaultMoves = sParty_May} }, - [TRAINER_PKMN_TRAINER_7] = { + [TRAINER_MAY_2] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER_3, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_MAY_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnTrainer7), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnTrainer7} + .partySize = NELEMS(sParty_May2), + .party = {.NoItemDefaultMoves = sParty_May2} }, - [TRAINER_PKMN_TRAINER_8] = { + [TRAINER_MAY_3] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_TRAINER_3, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_MAY_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnTrainer8), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnTrainer8} + .partySize = NELEMS(sParty_May3), + .party = {.NoItemDefaultMoves = sParty_May3} }, - [TRAINER_PKMN_BREEDER_1] = { + [TRAINER_RS_PKMN_BREEDER_M] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_BREEDER, + .trainerClass = TRAINER_CLASS_RS_PKMN_BREEDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M, + .trainerPic = TRAINER_PIC_RS_POKEMON_BREEDER_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnBreeder1), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnBreeder1} + .partySize = NELEMS(sParty_RSPkmnBreederM), + .party = {.NoItemDefaultMoves = sParty_RSPkmnBreederM} }, - [TRAINER_PKMN_BREEDER_2] = { + [TRAINER_RS_PKMN_BREEDER_F] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_BREEDER, + .trainerClass = TRAINER_CLASS_RS_PKMN_BREEDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_POKEMON_BREEDER_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnBreeder2), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnBreeder2} + .partySize = NELEMS(sParty_RSPkmnBreederF), + .party = {.NoItemDefaultMoves = sParty_RSPkmnBreederF} }, - [TRAINER_PKMN_RANGER_1] = { + [TRAINER_RS_PKMN_RANGER_M] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_RANGER, + .trainerClass = TRAINER_CLASS_RS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_RS_POKEMON_RANGER_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRanger1), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnRanger1} + .partySize = NELEMS(sParty_RSPkmnRangerM), + .party = {.NoItemDefaultMoves = sParty_RSPkmnRangerM} }, - [TRAINER_PKMN_RANGER_2] = { + [TRAINER_RS_PKMN_RANGER_F] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_RANGER, + .trainerClass = TRAINER_CLASS_RS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_RS_POKEMON_RANGER_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRanger2), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnRanger2} + .partySize = NELEMS(sParty_RSPkmnRangerF), + .party = {.NoItemDefaultMoves = sParty_RSPkmnRangerF} }, - [TRAINER_MAGMA_LEADER_1] = { + [TRAINER_MAGMA_LEADER] = { .partyFlags = 0, - .trainerClass = CLASS_MAGMA_LEADER, + .trainerClass = TRAINER_CLASS_MAGMA_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, .trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_MagmaLeader1), - .party = {.NoItemDefaultMoves = sTrainerMons_MagmaLeader1} + .partySize = NELEMS(sParty_MagmaLeader), + .party = {.NoItemDefaultMoves = sParty_MagmaLeader} }, - [TRAINER_TEAM_MAGMA_1] = { + [TRAINER_MAGMA_GRUNT_M] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_MAGMA, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamMagma1), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamMagma1} + .partySize = NELEMS(sParty_MagmaGruntM), + .party = {.NoItemDefaultMoves = sParty_MagmaGruntM} }, - [TRAINER_TEAM_MAGMA_2] = { + [TRAINER_MAMGA_GRUNT_F] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_MAGMA, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamMagma2), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamMagma2} + .partySize = NELEMS(sParty_MagmaGruntF), + .party = {.NoItemDefaultMoves = sParty_MagmaGruntF} }, - [TRAINER_LASS_1] = { + [TRAINER_RS_LASS] = { .partyFlags = 0, - .trainerClass = CLASS_LASS, + .trainerClass = TRAINER_CLASS_RS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_LASS, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Lass1), - .party = {.NoItemDefaultMoves = sTrainerMons_Lass1} + .partySize = NELEMS(sParty_RSLass), + .party = {.NoItemDefaultMoves = sParty_RSLass} }, - [TRAINER_BUG_CATCHER_1] = { + [TRAINER_RS_BUG_CATCHER] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER, + .trainerClass = TRAINER_CLASS_RS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher1), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher1} + .partySize = NELEMS(sParty_RSBugCatcher), + .party = {.NoItemDefaultMoves = sParty_RSBugCatcher} }, - [TRAINER_HIKER_1] = { + [TRAINER_RS_HIKER] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER, + .trainerClass = TRAINER_CLASS_RS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RS_HIKER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Hiker1), - .party = {.NoItemDefaultMoves = sTrainerMons_Hiker1} + .partySize = NELEMS(sParty_RSHiker), + .party = {.NoItemDefaultMoves = sParty_RSHiker} }, - [TRAINER_YOUNG_COUPLE_1] = { + [TRAINER_RS_YOUNG_COUPLE] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNG_COUPLE, + .trainerClass = TRAINER_CLASS_RS_YOUNG_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_RS_YOUNG_COUPLE, .trainerName = _(""), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungCouple1), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungCouple1} + .partySize = NELEMS(sParty_RSYoungCouple), + .party = {.NoItemDefaultMoves = sParty_RSYoungCouple} }, - [TRAINER_OLD_COUPLE_1] = { + [TRAINER_OLD_COUPLE] = { .partyFlags = 0, - .trainerClass = CLASS_OLD_COUPLE, + .trainerClass = TRAINER_CLASS_OLD_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_OLD_COUPLE, .trainerName = _(""), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_OldCouple1), - .party = {.NoItemDefaultMoves = sTrainerMons_OldCouple1} + .partySize = NELEMS(sParty_OldCouple), + .party = {.NoItemDefaultMoves = sParty_OldCouple} }, - [TRAINER_SIS_AND_BRO_1] = { + [TRAINER_RS_SIS_AND_BRO] = { .partyFlags = 0, - .trainerClass = CLASS_SIS_AND_BRO, + .trainerClass = TRAINER_CLASS_RS_SIS_AND_BRO, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_RS_SIS_AND_BRO, .trainerName = _(""), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SisAndBro1), - .party = {.NoItemDefaultMoves = sTrainerMons_SisAndBro1} + .partySize = NELEMS(sParty_RSSisAndBro), + .party = {.NoItemDefaultMoves = sParty_RSSisAndBro} }, [TRAINER_AQUA_ADMIN_MATT] = { .partyFlags = 0, - .trainerClass = CLASS_AQUA_ADMIN, + .trainerClass = TRAINER_CLASS_AQUA_ADMIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_AQUA_ADMIN_M, .trainerName = _("MATT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AquaAdminMatt), - .party = {.NoItemDefaultMoves = sTrainerMons_AquaAdminMatt} + .partySize = NELEMS(sParty_AquaAdminMatt), + .party = {.NoItemDefaultMoves = sParty_AquaAdminMatt} }, [TRAINER_AQUA_ADMIN_SHELLY] = { .partyFlags = 0, - .trainerClass = CLASS_AQUA_ADMIN, + .trainerClass = TRAINER_CLASS_AQUA_ADMIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_AQUA_ADMIN_F, .trainerName = _("SHELLY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AquaAdminShelly), - .party = {.NoItemDefaultMoves = sTrainerMons_AquaAdminShelly} + .partySize = NELEMS(sParty_AquaAdminShelly), + .party = {.NoItemDefaultMoves = sParty_AquaAdminShelly} }, [TRAINER_MAGMA_ADMIN_TABITHA] = { .partyFlags = 0, - .trainerClass = CLASS_MAGMA_ADMIN, + .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, .trainerPic = TRAINER_PIC_MAGMA_ADMIN_M, .trainerName = _("TABITHA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_MagmaAdminTabitha), - .party = {.NoItemDefaultMoves = sTrainerMons_MagmaAdminTabitha} + .partySize = NELEMS(sParty_MagmaAdminTabitha), + .party = {.NoItemDefaultMoves = sParty_MagmaAdminTabitha} }, [TRAINER_MAGMA_ADMIN_COURTNEY] = { .partyFlags = 0, - .trainerClass = CLASS_MAGMA_ADMIN, + .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, .trainerPic = TRAINER_PIC_MAGMA_ADMIN_F, .trainerName = _("COURTNEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_MagmaAdminCourtney), - .party = {.NoItemDefaultMoves = sTrainerMons_MagmaAdminCourtney} + .partySize = NELEMS(sParty_MagmaAdminCourtney), + .party = {.NoItemDefaultMoves = sParty_MagmaAdminCourtney} }, [TRAINER_LEADER_WATTSON] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_WATTSON, .trainerName = _("WATTSON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderWattson), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderWattson} + .partySize = NELEMS(sParty_LeaderWattson), + .party = {.NoItemDefaultMoves = sParty_LeaderWattson} }, [TRAINER_LEADER_FLANNERY] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LEADER_FLANNERY, .trainerName = _("FLANNERY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderFlannery), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderFlannery} + .partySize = NELEMS(sParty_LeaderFlannery), + .party = {.NoItemDefaultMoves = sParty_LeaderFlannery} }, [TRAINER_LEADER_NORMAN] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_NORMAN, .trainerName = _("NORMAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderNorman), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderNorman} + .partySize = NELEMS(sParty_LeaderNorman), + .party = {.NoItemDefaultMoves = sParty_LeaderNorman} }, [TRAINER_LEADER_WINONA] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LEADER_WINONA, .trainerName = _("WINONA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderWinona), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderWinona} + .partySize = NELEMS(sParty_LeaderWinona), + .party = {.NoItemDefaultMoves = sParty_LeaderWinona} }, [TRAINER_LEADER_WALLACE] = { .partyFlags = 0, - .trainerClass = CLASS_LEADER, + .trainerClass = TRAINER_CLASS_RS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_WALLACE, .trainerName = _("WALLACE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LeaderWallace), - .party = {.NoItemDefaultMoves = sTrainerMons_LeaderWallace} + .partySize = NELEMS(sParty_LeaderWallace), + .party = {.NoItemDefaultMoves = sParty_LeaderWallace} }, [TRAINER_ELITE_FOUR_GLACIA] = { .partyFlags = 0, - .trainerClass = CLASS_ELITE_FOUR, + .trainerClass = TRAINER_CLASS_RS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_GLACIA, .trainerName = _("GLACIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EliteFourGlacia), - .party = {.NoItemDefaultMoves = sTrainerMons_EliteFourGlacia} + .partySize = NELEMS(sParty_EliteFourGlacia), + .party = {.NoItemDefaultMoves = sParty_EliteFourGlacia} }, [TRAINER_ELITE_FOUR_DRAKE] = { .partyFlags = 0, - .trainerClass = CLASS_ELITE_FOUR, + .trainerClass = TRAINER_CLASS_RS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_DRAKE, .trainerName = _("DRAKE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EliteFourDrake), - .party = {.NoItemDefaultMoves = sTrainerMons_EliteFourDrake} + .partySize = NELEMS(sParty_EliteFourDrake), + .party = {.NoItemDefaultMoves = sParty_EliteFourDrake} }, [TRAINER_YOUNGSTER_BEN] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("BEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterBen), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterBen} + .partySize = NELEMS(sParty_YoungsterBen), + .party = {.NoItemDefaultMoves = sParty_YoungsterBen} }, [TRAINER_YOUNGSTER_CALVIN] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("CALVIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterCalvin), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterCalvin} + .partySize = NELEMS(sParty_YoungsterCalvin), + .party = {.NoItemDefaultMoves = sParty_YoungsterCalvin} }, [TRAINER_YOUNGSTER_JOSH] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("JOSH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterJosh), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterJosh} + .partySize = NELEMS(sParty_YoungsterJosh), + .party = {.NoItemDefaultMoves = sParty_YoungsterJosh} }, [TRAINER_YOUNGSTER_TIMMY] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("TIMMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterTimmy), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterTimmy} + .partySize = NELEMS(sParty_YoungsterTimmy), + .party = {.NoItemDefaultMoves = sParty_YoungsterTimmy} }, [TRAINER_YOUNGSTER_JOEY] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("JOEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterJoey), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterJoey} + .partySize = NELEMS(sParty_YoungsterJoey), + .party = {.NoItemDefaultMoves = sParty_YoungsterJoey} }, [TRAINER_YOUNGSTER_DAN] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("DAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterDan), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterDan} + .partySize = NELEMS(sParty_YoungsterDan), + .party = {.NoItemDefaultMoves = sParty_YoungsterDan} }, [TRAINER_YOUNGSTER_CHAD] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("CHAD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterChad), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterChad} + .partySize = NELEMS(sParty_YoungsterChad), + .party = {.NoItemDefaultMoves = sParty_YoungsterChad} }, [TRAINER_YOUNGSTER_TYLER] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("TYLER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterTyler), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterTyler} + .partySize = NELEMS(sParty_YoungsterTyler), + .party = {.NoItemDefaultMoves = sParty_YoungsterTyler} }, [TRAINER_YOUNGSTER_EDDIE] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("EDDIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterEddie), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterEddie} + .partySize = NELEMS(sParty_YoungsterEddie), + .party = {.NoItemDefaultMoves = sParty_YoungsterEddie} }, [TRAINER_YOUNGSTER_DILLON] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("DILLON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterDillon), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterDillon} + .partySize = NELEMS(sParty_YoungsterDillon), + .party = {.NoItemDefaultMoves = sParty_YoungsterDillon} }, [TRAINER_YOUNGSTER_YASU] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("YASU"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterYasu), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterYasu} + .partySize = NELEMS(sParty_YoungsterYasu), + .party = {.NoItemDefaultMoves = sParty_YoungsterYasu} }, [TRAINER_YOUNGSTER_DAVE] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("DAVE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterDave), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterDave} + .partySize = NELEMS(sParty_YoungsterDave), + .party = {.NoItemDefaultMoves = sParty_YoungsterDave} }, [TRAINER_YOUNGSTER_BEN_2] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("BEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterBen2), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterBen2} + .partySize = NELEMS(sParty_YoungsterBen2), + .party = {.NoItemDefaultMoves = sParty_YoungsterBen2} }, [TRAINER_BUG_CATCHER_RICK] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("RICK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherRick), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherRick} + .partySize = NELEMS(sParty_BugCatcherRick), + .party = {.NoItemDefaultMoves = sParty_BugCatcherRick} }, [TRAINER_BUG_CATCHER_DOUG] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("DOUG"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherDoug), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherDoug} + .partySize = NELEMS(sParty_BugCatcherDoug), + .party = {.NoItemDefaultMoves = sParty_BugCatcherDoug} }, [TRAINER_BUG_CATCHER_SAMMY] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("SAMMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherSammy), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherSammy} + .partySize = NELEMS(sParty_BugCatcherSammy), + .party = {.NoItemDefaultMoves = sParty_BugCatcherSammy} }, [TRAINER_BUG_CATCHER_COLTON] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("COLTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherColton), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherColton} + .partySize = NELEMS(sParty_BugCatcherColton), + .party = {.NoItemDefaultMoves = sParty_BugCatcherColton} }, [TRAINER_BUG_CATCHER_GREG] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("GREG"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherGreg), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherGreg} + .partySize = NELEMS(sParty_BugCatcherGreg), + .party = {.NoItemDefaultMoves = sParty_BugCatcherGreg} }, [TRAINER_BUG_CATCHER_JAMES] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("JAMES"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherJames), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherJames} + .partySize = NELEMS(sParty_BugCatcherJames), + .party = {.NoItemDefaultMoves = sParty_BugCatcherJames} }, [TRAINER_BUG_CATCHER_KENT] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("KENT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherKent), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherKent} + .partySize = NELEMS(sParty_BugCatcherKent), + .party = {.NoItemDefaultMoves = sParty_BugCatcherKent} }, [TRAINER_BUG_CATCHER_ROBBY] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("ROBBY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherRobby), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherRobby} + .partySize = NELEMS(sParty_BugCatcherRobby), + .party = {.NoItemDefaultMoves = sParty_BugCatcherRobby} }, [TRAINER_BUG_CATCHER_CALE] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("CALE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherCale), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherCale} + .partySize = NELEMS(sParty_BugCatcherCale), + .party = {.NoItemDefaultMoves = sParty_BugCatcherCale} }, [TRAINER_BUG_CATCHER_KEIGO] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("KEIGO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherKeigo), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherKeigo} + .partySize = NELEMS(sParty_BugCatcherKeigo), + .party = {.NoItemDefaultMoves = sParty_BugCatcherKeigo} }, [TRAINER_BUG_CATCHER_ELIJAH] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("ELIJAH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherElijah), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherElijah} + .partySize = NELEMS(sParty_BugCatcherElijah), + .party = {.NoItemDefaultMoves = sParty_BugCatcherElijah} }, [TRAINER_BUG_CATCHER_2] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher2), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher2} + .partySize = NELEMS(sParty_BugCatcher2), + .party = {.NoItemDefaultMoves = sParty_BugCatcher2} }, [TRAINER_BUG_CATCHER_BRENT] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("BRENT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherBrent), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherBrent} + .partySize = NELEMS(sParty_BugCatcherBrent), + .party = {.NoItemDefaultMoves = sParty_BugCatcherBrent} }, [TRAINER_BUG_CATCHER_CONNER] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("CONNER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherConner), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherConner} + .partySize = NELEMS(sParty_BugCatcherConner), + .party = {.NoItemDefaultMoves = sParty_BugCatcherConner} }, [TRAINER_LASS_JANICE] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("JANICE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassJanice), - .party = {.NoItemDefaultMoves = sTrainerMons_LassJanice} + .partySize = NELEMS(sParty_LassJanice), + .party = {.NoItemDefaultMoves = sParty_LassJanice} }, [TRAINER_LASS_SALLY] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("SALLY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassSally), - .party = {.NoItemDefaultMoves = sTrainerMons_LassSally} + .partySize = NELEMS(sParty_LassSally), + .party = {.NoItemDefaultMoves = sParty_LassSally} }, [TRAINER_LASS_ROBIN] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("ROBIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassRobin), - .party = {.NoItemDefaultMoves = sTrainerMons_LassRobin} + .partySize = NELEMS(sParty_LassRobin), + .party = {.NoItemDefaultMoves = sParty_LassRobin} }, [TRAINER_LASS_CRISSY] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("CRISSY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassCrissy), - .party = {.NoItemDefaultMoves = sTrainerMons_LassCrissy} + .partySize = NELEMS(sParty_LassCrissy), + .party = {.NoItemDefaultMoves = sParty_LassCrissy} }, [TRAINER_LASS_MIRIAM] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("MIRIAM"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassMiriam), - .party = {.NoItemDefaultMoves = sTrainerMons_LassMiriam} + .partySize = NELEMS(sParty_LassMiriam), + .party = {.NoItemDefaultMoves = sParty_LassMiriam} }, [TRAINER_LASS_IRIS] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("IRIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassIris), - .party = {.NoItemDefaultMoves = sTrainerMons_LassIris} + .partySize = NELEMS(sParty_LassIris), + .party = {.NoItemDefaultMoves = sParty_LassIris} }, [TRAINER_LASS_RELI] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("RELI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassReli), - .party = {.NoItemDefaultMoves = sTrainerMons_LassReli} + .partySize = NELEMS(sParty_LassReli), + .party = {.NoItemDefaultMoves = sParty_LassReli} }, [TRAINER_LASS_ALI] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("ALI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassAli), - .party = {.NoItemDefaultMoves = sTrainerMons_LassAli} + .partySize = NELEMS(sParty_LassAli), + .party = {.NoItemDefaultMoves = sParty_LassAli} }, [TRAINER_LASS_2] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Lass2), - .party = {.NoItemDefaultMoves = sTrainerMons_Lass2} + .partySize = NELEMS(sParty_Lass2), + .party = {.NoItemDefaultMoves = sParty_Lass2} }, [TRAINER_LASS_HALEY] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("HALEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassHaley), - .party = {.NoItemDefaultMoves = sTrainerMons_LassHaley} + .partySize = NELEMS(sParty_LassHaley), + .party = {.NoItemDefaultMoves = sParty_LassHaley} }, [TRAINER_LASS_ANN] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("ANN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassAnn), - .party = {.NoItemDefaultMoves = sTrainerMons_LassAnn} + .partySize = NELEMS(sParty_LassAnn), + .party = {.NoItemDefaultMoves = sParty_LassAnn} }, [TRAINER_LASS_DAWN] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("DAWN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassDawn), - .party = {.NoItemDefaultMoves = sTrainerMons_LassDawn} + .partySize = NELEMS(sParty_LassDawn), + .party = {.NoItemDefaultMoves = sParty_LassDawn} }, [TRAINER_LASS_PAIGE] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("PAIGE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassPaige), - .party = {.NoItemDefaultMoves = sTrainerMons_LassPaige} + .partySize = NELEMS(sParty_LassPaige), + .party = {.NoItemDefaultMoves = sParty_LassPaige} }, [TRAINER_LASS_ANDREA] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("ANDREA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassAndrea), - .party = {.NoItemDefaultMoves = sTrainerMons_LassAndrea} + .partySize = NELEMS(sParty_LassAndrea), + .party = {.NoItemDefaultMoves = sParty_LassAndrea} }, [TRAINER_LASS_MEGAN] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("MEGAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassMegan), - .party = {.NoItemDefaultMoves = sTrainerMons_LassMegan} + .partySize = NELEMS(sParty_LassMegan), + .party = {.NoItemDefaultMoves = sParty_LassMegan} }, [TRAINER_LASS_JULIA] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("JULIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassJulia), - .party = {.NoItemDefaultMoves = sTrainerMons_LassJulia} + .partySize = NELEMS(sParty_LassJulia), + .party = {.NoItemDefaultMoves = sParty_LassJulia} }, [TRAINER_LASS_KAY] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("KAY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassKay), - .party = {.NoItemDefaultMoves = sTrainerMons_LassKay} + .partySize = NELEMS(sParty_LassKay), + .party = {.NoItemDefaultMoves = sParty_LassKay} }, [TRAINER_LASS_LISA] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("LISA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassLisa), - .party = {.NoItemDefaultMoves = sTrainerMons_LassLisa} + .partySize = NELEMS(sParty_LassLisa), + .party = {.NoItemDefaultMoves = sParty_LassLisa} }, [TRAINER_SAILOR_EDMOND] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("EDMOND"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorEdmond), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorEdmond} + .partySize = NELEMS(sParty_SailorEdmond), + .party = {.NoItemDefaultMoves = sParty_SailorEdmond} }, [TRAINER_SAILOR_TREVOR] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("TREVOR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorTrevor), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorTrevor} + .partySize = NELEMS(sParty_SailorTrevor), + .party = {.NoItemDefaultMoves = sParty_SailorTrevor} }, [TRAINER_SAILOR_LEONARD] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("LEONARD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorLeonard), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorLeonard} + .partySize = NELEMS(sParty_SailorLeonard), + .party = {.NoItemDefaultMoves = sParty_SailorLeonard} }, [TRAINER_SAILOR_DUNCAN] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("DUNCAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorDuncan), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorDuncan} + .partySize = NELEMS(sParty_SailorDuncan), + .party = {.NoItemDefaultMoves = sParty_SailorDuncan} }, [TRAINER_SAILOR_HUEY] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("HUEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorHuey), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorHuey} + .partySize = NELEMS(sParty_SailorHuey), + .party = {.NoItemDefaultMoves = sParty_SailorHuey} }, [TRAINER_SAILOR_DYLAN] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("DYLAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorDylan), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorDylan} + .partySize = NELEMS(sParty_SailorDylan), + .party = {.NoItemDefaultMoves = sParty_SailorDylan} }, [TRAINER_SAILOR_PHILLIP] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("PHILLIP"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorPhillip), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorPhillip} + .partySize = NELEMS(sParty_SailorPhillip), + .party = {.NoItemDefaultMoves = sParty_SailorPhillip} }, [TRAINER_SAILOR_DWAYNE] = { .partyFlags = 0, - .trainerClass = CLASS_SAILOR_2, + .trainerClass = TRAINER_CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("DWAYNE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SailorDwayne), - .party = {.NoItemDefaultMoves = sTrainerMons_SailorDwayne} + .partySize = NELEMS(sParty_SailorDwayne), + .party = {.NoItemDefaultMoves = sParty_SailorDwayne} }, [TRAINER_CAMPER_LIAM] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("LIAM"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperLiam), - .party = {.NoItemCustomMoves = sTrainerMons_CamperLiam} + .partySize = NELEMS(sParty_CamperLiam), + .party = {.NoItemCustomMoves = sParty_CamperLiam} }, [TRAINER_CAMPER_SHANE] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("SHANE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperShane), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperShane} + .partySize = NELEMS(sParty_CamperShane), + .party = {.NoItemDefaultMoves = sParty_CamperShane} }, [TRAINER_CAMPER_ETHAN] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("ETHAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperEthan), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperEthan} + .partySize = NELEMS(sParty_CamperEthan), + .party = {.NoItemDefaultMoves = sParty_CamperEthan} }, [TRAINER_CAMPER_RICKY] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("RICKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperRicky), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperRicky} + .partySize = NELEMS(sParty_CamperRicky), + .party = {.NoItemDefaultMoves = sParty_CamperRicky} }, [TRAINER_CAMPER_JEFF] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("JEFF"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperJeff), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperJeff} + .partySize = NELEMS(sParty_CamperJeff), + .party = {.NoItemDefaultMoves = sParty_CamperJeff} }, [TRAINER_CAMPER_2] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Camper2), - .party = {.NoItemDefaultMoves = sTrainerMons_Camper2} + .partySize = NELEMS(sParty_Camper2), + .party = {.NoItemDefaultMoves = sParty_Camper2} }, [TRAINER_CAMPER_CHRIS] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("CHRIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperChris), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperChris} + .partySize = NELEMS(sParty_CamperChris), + .party = {.NoItemDefaultMoves = sParty_CamperChris} }, [TRAINER_CAMPER_DREW] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("DREW"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperDrew), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperDrew} + .partySize = NELEMS(sParty_CamperDrew), + .party = {.NoItemDefaultMoves = sParty_CamperDrew} }, [TRAINER_PICNICKER_DIANA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("DIANA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerDiana), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerDiana} + .partySize = NELEMS(sParty_PicnickerDiana), + .party = {.NoItemDefaultMoves = sParty_PicnickerDiana} }, [TRAINER_PICNICKER_NANCY] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("NANCY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerNancy), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerNancy} + .partySize = NELEMS(sParty_PicnickerNancy), + .party = {.NoItemDefaultMoves = sParty_PicnickerNancy} }, [TRAINER_PICNICKER_ISABELLE] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ISABELLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerIsabelle), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerIsabelle} + .partySize = NELEMS(sParty_PicnickerIsabelle), + .party = {.NoItemDefaultMoves = sParty_PicnickerIsabelle} }, [TRAINER_PICNICKER_KELSEY] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("KELSEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerKelsey), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerKelsey} + .partySize = NELEMS(sParty_PicnickerKelsey), + .party = {.NoItemDefaultMoves = sParty_PicnickerKelsey} }, [TRAINER_PICNICKER_ALICIA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ALICIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerAlicia), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerAlicia} + .partySize = NELEMS(sParty_PicnickerAlicia), + .party = {.NoItemDefaultMoves = sParty_PicnickerAlicia} }, [TRAINER_PICNICKER_CAITLIN] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("CAITLIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerCaitlin), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerCaitlin} + .partySize = NELEMS(sParty_PicnickerCaitlin), + .party = {.NoItemDefaultMoves = sParty_PicnickerCaitlin} }, [TRAINER_PICNICKER_HEIDI] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("HEIDI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerHeidi), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerHeidi} + .partySize = NELEMS(sParty_PicnickerHeidi), + .party = {.NoItemDefaultMoves = sParty_PicnickerHeidi} }, [TRAINER_PICNICKER_CAROL] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("CAROL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerCarol), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerCarol} + .partySize = NELEMS(sParty_PicnickerCarol), + .party = {.NoItemDefaultMoves = sParty_PicnickerCarol} }, [TRAINER_PICNICKER_SOFIA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("SOFIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerSofia), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerSofia} + .partySize = NELEMS(sParty_PicnickerSofia), + .party = {.NoItemDefaultMoves = sParty_PicnickerSofia} }, [TRAINER_PICNICKER_MARTHA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("MARTHA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerMartha), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerMartha} + .partySize = NELEMS(sParty_PicnickerMartha), + .party = {.NoItemDefaultMoves = sParty_PicnickerMartha} }, [TRAINER_PICNICKER_TINA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("TINA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerTina), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerTina} + .partySize = NELEMS(sParty_PicnickerTina), + .party = {.NoItemDefaultMoves = sParty_PicnickerTina} }, [TRAINER_PICNICKER_HANNAH] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("HANNAH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerHannah), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerHannah} + .partySize = NELEMS(sParty_PicnickerHannah), + .party = {.NoItemDefaultMoves = sParty_PicnickerHannah} }, [TRAINER_POKEMANIAC_MARK] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("MARK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacMark), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacMark} + .partySize = NELEMS(sParty_PokemaniacMark), + .party = {.NoItemDefaultMoves = sParty_PokemaniacMark} }, [TRAINER_POKEMANIAC_HERMAN] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("HERMAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacHerman), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacHerman} + .partySize = NELEMS(sParty_PokemaniacHerman), + .party = {.NoItemDefaultMoves = sParty_PokemaniacHerman} }, [TRAINER_POKEMANIAC_COOPER] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("COOPER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacCooper), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacCooper} + .partySize = NELEMS(sParty_PokemaniacCooper), + .party = {.NoItemDefaultMoves = sParty_PokemaniacCooper} }, [TRAINER_POKEMANIAC_STEVE] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("STEVE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacSteve), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacSteve} + .partySize = NELEMS(sParty_PokemaniacSteve), + .party = {.NoItemDefaultMoves = sParty_PokemaniacSteve} }, [TRAINER_POKEMANIAC_WINSTON] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("WINSTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacWinston), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacWinston} + .partySize = NELEMS(sParty_PokemaniacWinston), + .party = {.NoItemDefaultMoves = sParty_PokemaniacWinston} }, [TRAINER_POKEMANIAC_DAWSON] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("DAWSON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacDawson), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacDawson} + .partySize = NELEMS(sParty_PokemaniacDawson), + .party = {.NoItemDefaultMoves = sParty_PokemaniacDawson} }, [TRAINER_POKEMANIAC_ASHTON] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("ASHTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacAshton), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacAshton} + .partySize = NELEMS(sParty_PokemaniacAshton), + .party = {.NoItemDefaultMoves = sParty_PokemaniacAshton} }, [TRAINER_SUPER_NERD_JOVAN] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("JOVAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdJovan), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdJovan} + .partySize = NELEMS(sParty_SuperNerdJovan), + .party = {.NoItemDefaultMoves = sParty_SuperNerdJovan} }, [TRAINER_SUPER_NERD_MIGUEL] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("MIGUEL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdMiguel), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdMiguel} + .partySize = NELEMS(sParty_SuperNerdMiguel), + .party = {.NoItemDefaultMoves = sParty_SuperNerdMiguel} }, [TRAINER_SUPER_NERD_AIDAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("AIDAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdAidan), - .party = {.NoItemCustomMoves = sTrainerMons_SuperNerdAidan} + .partySize = NELEMS(sParty_SuperNerdAidan), + .party = {.NoItemCustomMoves = sParty_SuperNerdAidan} }, [TRAINER_SUPER_NERD_GLENN] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("GLENN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdGlenn), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdGlenn} + .partySize = NELEMS(sParty_SuperNerdGlenn), + .party = {.NoItemDefaultMoves = sParty_SuperNerdGlenn} }, [TRAINER_SUPER_NERD_LESLIE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("LESLIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdLeslie), - .party = {.NoItemCustomMoves = sTrainerMons_SuperNerdLeslie} + .partySize = NELEMS(sParty_SuperNerdLeslie), + .party = {.NoItemCustomMoves = sParty_SuperNerdLeslie} }, [TRAINER_SUPER_NERD_1] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerd1), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerd1} + .partySize = NELEMS(sParty_SuperNerd1), + .party = {.NoItemDefaultMoves = sParty_SuperNerd1} }, [TRAINER_SUPER_NERD_2] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerd2), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerd2} + .partySize = NELEMS(sParty_SuperNerd2), + .party = {.NoItemDefaultMoves = sParty_SuperNerd2} }, [TRAINER_SUPER_NERD_3] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerd3), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerd3} + .partySize = NELEMS(sParty_SuperNerd3), + .party = {.NoItemDefaultMoves = sParty_SuperNerd3} }, [TRAINER_SUPER_NERD_ERIK] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("ERIK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdErik), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdErik} + .partySize = NELEMS(sParty_SuperNerdErik), + .party = {.NoItemDefaultMoves = sParty_SuperNerdErik} }, [TRAINER_SUPER_NERD_AVERY] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("AVERY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdAvery), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdAvery} + .partySize = NELEMS(sParty_SuperNerdAvery), + .party = {.NoItemDefaultMoves = sParty_SuperNerdAvery} }, [TRAINER_SUPER_NERD_DEREK] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("DEREK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdDerek), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdDerek} + .partySize = NELEMS(sParty_SuperNerdDerek), + .party = {.NoItemDefaultMoves = sParty_SuperNerdDerek} }, [TRAINER_SUPER_NERD_ZAC] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("ZAC"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdZac), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdZac} + .partySize = NELEMS(sParty_SuperNerdZac), + .party = {.NoItemDefaultMoves = sParty_SuperNerdZac} }, [TRAINER_HIKER_MARCOS] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("MARCOS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerMarcos), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerMarcos} + .partySize = NELEMS(sParty_HikerMarcos), + .party = {.NoItemDefaultMoves = sParty_HikerMarcos} }, [TRAINER_HIKER_FRANKLIN] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("FRANKLIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerFranklin), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerFranklin} + .partySize = NELEMS(sParty_HikerFranklin), + .party = {.NoItemDefaultMoves = sParty_HikerFranklin} }, [TRAINER_HIKER_NOB] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("NOB"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerNob), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerNob} + .partySize = NELEMS(sParty_HikerNob), + .party = {.NoItemDefaultMoves = sParty_HikerNob} }, [TRAINER_HIKER_WAYNE] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("WAYNE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerWayne), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerWayne} + .partySize = NELEMS(sParty_HikerWayne), + .party = {.NoItemDefaultMoves = sParty_HikerWayne} }, [TRAINER_HIKER_ALAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("ALAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerAlan), - .party = {.NoItemCustomMoves = sTrainerMons_HikerAlan} + .partySize = NELEMS(sParty_HikerAlan), + .party = {.NoItemCustomMoves = sParty_HikerAlan} }, [TRAINER_HIKER_BRICE] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("BRICE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerBrice), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerBrice} + .partySize = NELEMS(sParty_HikerBrice), + .party = {.NoItemDefaultMoves = sParty_HikerBrice} }, [TRAINER_HIKER_CLARK] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("CLARK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerClark), - .party = {.NoItemCustomMoves = sTrainerMons_HikerClark} + .partySize = NELEMS(sParty_HikerClark), + .party = {.NoItemCustomMoves = sParty_HikerClark} }, [TRAINER_HIKER_TRENT] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("TRENT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerTrent), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerTrent} + .partySize = NELEMS(sParty_HikerTrent), + .party = {.NoItemDefaultMoves = sParty_HikerTrent} }, [TRAINER_HIKER_DUDLEY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("DUDLEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerDudley), - .party = {.NoItemCustomMoves = sTrainerMons_HikerDudley} + .partySize = NELEMS(sParty_HikerDudley), + .party = {.NoItemCustomMoves = sParty_HikerDudley} }, [TRAINER_HIKER_ALLEN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("ALLEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerAllen), - .party = {.NoItemCustomMoves = sTrainerMons_HikerAllen} + .partySize = NELEMS(sParty_HikerAllen), + .party = {.NoItemCustomMoves = sParty_HikerAllen} }, [TRAINER_HIKER_ERIC] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("ERIC"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerEric), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerEric} + .partySize = NELEMS(sParty_HikerEric), + .party = {.NoItemDefaultMoves = sParty_HikerEric} }, [TRAINER_HIKER_LENNY] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("LENNY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerLenny), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerLenny} + .partySize = NELEMS(sParty_HikerLenny), + .party = {.NoItemDefaultMoves = sParty_HikerLenny} }, [TRAINER_HIKER_OLIVER] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("OLIVER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerOliver), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerOliver} + .partySize = NELEMS(sParty_HikerOliver), + .party = {.NoItemDefaultMoves = sParty_HikerOliver} }, [TRAINER_HIKER_LUCAS] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("LUCAS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerLucas), - .party = {.NoItemCustomMoves = sTrainerMons_HikerLucas} + .partySize = NELEMS(sParty_HikerLucas), + .party = {.NoItemCustomMoves = sParty_HikerLucas} }, [TRAINER_BIKER_JARED] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("JARED"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerJared), - .party = {.NoItemCustomMoves = sTrainerMons_BikerJared} + .partySize = NELEMS(sParty_BikerJared), + .party = {.NoItemCustomMoves = sParty_BikerJared} }, [TRAINER_BIKER_MALIK] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("MALIK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerMalik), - .party = {.NoItemCustomMoves = sTrainerMons_BikerMalik} + .partySize = NELEMS(sParty_BikerMalik), + .party = {.NoItemCustomMoves = sParty_BikerMalik} }, [TRAINER_BIKER_ERNEST] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("ERNEST"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerErnest), - .party = {.NoItemCustomMoves = sTrainerMons_BikerErnest} + .partySize = NELEMS(sParty_BikerErnest), + .party = {.NoItemCustomMoves = sParty_BikerErnest} }, [TRAINER_BIKER_ALEX] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("ALEX"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerAlex), - .party = {.NoItemCustomMoves = sTrainerMons_BikerAlex} + .partySize = NELEMS(sParty_BikerAlex), + .party = {.NoItemCustomMoves = sParty_BikerAlex} }, [TRAINER_BIKER_LAO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("LAO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerLao), - .party = {.NoItemCustomMoves = sTrainerMons_BikerLao} + .partySize = NELEMS(sParty_BikerLao), + .party = {.NoItemCustomMoves = sParty_BikerLao} }, [TRAINER_BIKER_1] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Biker1), - .party = {.NoItemDefaultMoves = sTrainerMons_Biker1} + .partySize = NELEMS(sParty_Biker1), + .party = {.NoItemDefaultMoves = sParty_Biker1} }, [TRAINER_BIKER_HIDEO] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("HIDEO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerHideo), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerHideo} + .partySize = NELEMS(sParty_BikerHideo), + .party = {.NoItemDefaultMoves = sParty_BikerHideo} }, [TRAINER_BIKER_RUBEN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("RUBEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerRuben), - .party = {.NoItemCustomMoves = sTrainerMons_BikerRuben} + .partySize = NELEMS(sParty_BikerRuben), + .party = {.NoItemCustomMoves = sParty_BikerRuben} }, [TRAINER_BIKER_BILLY] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("BILLY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerBilly), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerBilly} + .partySize = NELEMS(sParty_BikerBilly), + .party = {.NoItemDefaultMoves = sParty_BikerBilly} }, [TRAINER_BIKER_NIKOLAS] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("NIKOLAS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerNikolas), - .party = {.NoItemCustomMoves = sTrainerMons_BikerNikolas} + .partySize = NELEMS(sParty_BikerNikolas), + .party = {.NoItemCustomMoves = sParty_BikerNikolas} }, [TRAINER_BIKER_JAXON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("JAXON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerJaxon), - .party = {.NoItemCustomMoves = sTrainerMons_BikerJaxon} + .partySize = NELEMS(sParty_BikerJaxon), + .party = {.NoItemCustomMoves = sParty_BikerJaxon} }, [TRAINER_BIKER_WILLIAM] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("WILLIAM"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerWilliam), - .party = {.NoItemCustomMoves = sTrainerMons_BikerWilliam} + .partySize = NELEMS(sParty_BikerWilliam), + .party = {.NoItemCustomMoves = sParty_BikerWilliam} }, [TRAINER_BIKER_LUKAS] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("LUKAS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerLukas), - .party = {.NoItemCustomMoves = sTrainerMons_BikerLukas} + .partySize = NELEMS(sParty_BikerLukas), + .party = {.NoItemCustomMoves = sParty_BikerLukas} }, [TRAINER_BIKER_ISAAC] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("ISAAC"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerIsaac), - .party = {.NoItemCustomMoves = sTrainerMons_BikerIsaac} + .partySize = NELEMS(sParty_BikerIsaac), + .party = {.NoItemCustomMoves = sParty_BikerIsaac} }, [TRAINER_BIKER_GERALD] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("GERALD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerGerald), - .party = {.NoItemCustomMoves = sTrainerMons_BikerGerald} + .partySize = NELEMS(sParty_BikerGerald), + .party = {.NoItemCustomMoves = sParty_BikerGerald} }, [TRAINER_BURGLAR_1] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Burglar1), - .party = {.NoItemDefaultMoves = sTrainerMons_Burglar1} + .partySize = NELEMS(sParty_Burglar1), + .party = {.NoItemDefaultMoves = sParty_Burglar1} }, [TRAINER_BURGLAR_2] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Burglar2), - .party = {.NoItemDefaultMoves = sTrainerMons_Burglar2} + .partySize = NELEMS(sParty_Burglar2), + .party = {.NoItemDefaultMoves = sParty_Burglar2} }, [TRAINER_BURGLAR_3] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Burglar3), - .party = {.NoItemDefaultMoves = sTrainerMons_Burglar3} + .partySize = NELEMS(sParty_Burglar3), + .party = {.NoItemDefaultMoves = sParty_Burglar3} }, [TRAINER_BURGLAR_QUINN] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _("QUINN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BurglarQuinn), - .party = {.NoItemDefaultMoves = sTrainerMons_BurglarQuinn} + .partySize = NELEMS(sParty_BurglarQuinn), + .party = {.NoItemDefaultMoves = sParty_BurglarQuinn} }, [TRAINER_BURGLAR_RAMON] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _("RAMON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BurglarRamon), - .party = {.NoItemDefaultMoves = sTrainerMons_BurglarRamon} + .partySize = NELEMS(sParty_BurglarRamon), + .party = {.NoItemDefaultMoves = sParty_BurglarRamon} }, [TRAINER_BURGLAR_DUSTY] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _("DUSTY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BurglarDusty), - .party = {.NoItemDefaultMoves = sTrainerMons_BurglarDusty} + .partySize = NELEMS(sParty_BurglarDusty), + .party = {.NoItemDefaultMoves = sParty_BurglarDusty} }, [TRAINER_BURGLAR_ARNIE] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _("ARNIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BurglarArnie), - .party = {.NoItemDefaultMoves = sTrainerMons_BurglarArnie} + .partySize = NELEMS(sParty_BurglarArnie), + .party = {.NoItemDefaultMoves = sParty_BurglarArnie} }, [TRAINER_BURGLAR_4] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Burglar4), - .party = {.NoItemDefaultMoves = sTrainerMons_Burglar4} + .partySize = NELEMS(sParty_Burglar4), + .party = {.NoItemDefaultMoves = sParty_Burglar4} }, [TRAINER_BURGLAR_SIMON] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _("SIMON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BurglarSimon), - .party = {.NoItemDefaultMoves = sTrainerMons_BurglarSimon} + .partySize = NELEMS(sParty_BurglarSimon), + .party = {.NoItemDefaultMoves = sParty_BurglarSimon} }, [TRAINER_BURGLAR_LEWIS] = { .partyFlags = 0, - .trainerClass = CLASS_BURGLAR, + .trainerClass = TRAINER_CLASS_BURGLAR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_BURGLAR, .trainerName = _("LEWIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BurglarLewis), - .party = {.NoItemDefaultMoves = sTrainerMons_BurglarLewis} + .partySize = NELEMS(sParty_BurglarLewis), + .party = {.NoItemDefaultMoves = sParty_BurglarLewis} }, [TRAINER_ENGINEER_BAILY] = { .partyFlags = 0, - .trainerClass = CLASS_ENGINEER, + .trainerClass = TRAINER_CLASS_ENGINEER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_ENGINEER, .trainerName = _("BAILY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EngineerBaily), - .party = {.NoItemDefaultMoves = sTrainerMons_EngineerBaily} + .partySize = NELEMS(sParty_EngineerBaily), + .party = {.NoItemDefaultMoves = sParty_EngineerBaily} }, [TRAINER_ENGINEER_BRAXTON] = { .partyFlags = 0, - .trainerClass = CLASS_ENGINEER, + .trainerClass = TRAINER_CLASS_ENGINEER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_ENGINEER, .trainerName = _("BRAXTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EngineerBraxton), - .party = {.NoItemDefaultMoves = sTrainerMons_EngineerBraxton} + .partySize = NELEMS(sParty_EngineerBraxton), + .party = {.NoItemDefaultMoves = sParty_EngineerBraxton} }, [TRAINER_ENGINEER_BERNIE] = { .partyFlags = 0, - .trainerClass = CLASS_ENGINEER, + .trainerClass = TRAINER_CLASS_ENGINEER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_ENGINEER, .trainerName = _("BERNIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EngineerBernie), - .party = {.NoItemDefaultMoves = sTrainerMons_EngineerBernie} + .partySize = NELEMS(sParty_EngineerBernie), + .party = {.NoItemDefaultMoves = sParty_EngineerBernie} }, [TRAINER_FISHERMAN_DALE] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("DALE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanDale), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanDale} + .partySize = NELEMS(sParty_FishermanDale), + .party = {.NoItemDefaultMoves = sParty_FishermanDale} }, [TRAINER_FISHERMAN_BARNY] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("BARNY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanBarny), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanBarny} + .partySize = NELEMS(sParty_FishermanBarny), + .party = {.NoItemDefaultMoves = sParty_FishermanBarny} }, [TRAINER_FISHERMAN_NED] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("NED"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanNed), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanNed} + .partySize = NELEMS(sParty_FishermanNed), + .party = {.NoItemDefaultMoves = sParty_FishermanNed} }, [TRAINER_FISHERMAN_CHIP] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("CHIP"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanChip), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanChip} + .partySize = NELEMS(sParty_FishermanChip), + .party = {.NoItemDefaultMoves = sParty_FishermanChip} }, [TRAINER_FISHERMAN_HANK] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("HANK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanHank), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanHank} + .partySize = NELEMS(sParty_FishermanHank), + .party = {.NoItemDefaultMoves = sParty_FishermanHank} }, [TRAINER_FISHERMAN_ELLIOT] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("ELLIOT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanElliot), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanElliot} + .partySize = NELEMS(sParty_FishermanElliot), + .party = {.NoItemDefaultMoves = sParty_FishermanElliot} }, [TRAINER_FISHERMAN_RONALD] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("RONALD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanRonald), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanRonald} + .partySize = NELEMS(sParty_FishermanRonald), + .party = {.NoItemDefaultMoves = sParty_FishermanRonald} }, [TRAINER_FISHERMAN_CLAUDE] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("CLAUDE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanClaude), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanClaude} + .partySize = NELEMS(sParty_FishermanClaude), + .party = {.NoItemDefaultMoves = sParty_FishermanClaude} }, [TRAINER_FISHERMAN_WADE] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("WADE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanWade), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanWade} + .partySize = NELEMS(sParty_FishermanWade), + .party = {.NoItemDefaultMoves = sParty_FishermanWade} }, [TRAINER_FISHERMAN_NOLAN] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("NOLAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanNolan), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanNolan} + .partySize = NELEMS(sParty_FishermanNolan), + .party = {.NoItemDefaultMoves = sParty_FishermanNolan} }, [TRAINER_FISHERMAN_ANDREW] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("ANDREW"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanAndrew), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanAndrew} + .partySize = NELEMS(sParty_FishermanAndrew), + .party = {.NoItemDefaultMoves = sParty_FishermanAndrew} }, [TRAINER_SWIMMER_MALE_LUIS] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("LUIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleLuis), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleLuis} + .partySize = NELEMS(sParty_SwimmerMaleLuis), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleLuis} }, [TRAINER_SWIMMER_MALE_RICHARD] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("RICHARD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleRichard), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleRichard} + .partySize = NELEMS(sParty_SwimmerMaleRichard), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleRichard} }, [TRAINER_SWIMMER_MALE_REECE] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("REECE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleReece), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleReece} + .partySize = NELEMS(sParty_SwimmerMaleReece), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleReece} }, [TRAINER_SWIMMER_MALE_MATTHEW] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("MATTHEW"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleMatthew), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleMatthew} + .partySize = NELEMS(sParty_SwimmerMaleMatthew), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleMatthew} }, [TRAINER_SWIMMER_MALE_DOUGLAS] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("DOUGLAS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleDouglas), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleDouglas} + .partySize = NELEMS(sParty_SwimmerMaleDouglas), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleDouglas} }, [TRAINER_SWIMMER_MALE_DAVID] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("DAVID"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleDavid), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleDavid} + .partySize = NELEMS(sParty_SwimmerMaleDavid), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleDavid} }, [TRAINER_SWIMMER_MALE_TONY] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("TONY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleTony), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleTony} + .partySize = NELEMS(sParty_SwimmerMaleTony), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleTony} }, [TRAINER_SWIMMER_MALE_AXLE] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("AXLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleAxle), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleAxle} + .partySize = NELEMS(sParty_SwimmerMaleAxle), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleAxle} }, [TRAINER_SWIMMER_MALE_BARRY] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("BARRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleBarry), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleBarry} + .partySize = NELEMS(sParty_SwimmerMaleBarry), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleBarry} }, [TRAINER_SWIMMER_MALE_DEAN] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("DEAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleDean), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleDean} + .partySize = NELEMS(sParty_SwimmerMaleDean), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleDean} }, [TRAINER_SWIMMER_MALE_DARRIN] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("DARRIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleDarrin), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleDarrin} + .partySize = NELEMS(sParty_SwimmerMaleDarrin), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleDarrin} }, [TRAINER_SWIMMER_MALE_SPENCER] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("SPENCER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleSpencer), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleSpencer} + .partySize = NELEMS(sParty_SwimmerMaleSpencer), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleSpencer} }, [TRAINER_SWIMMER_MALE_JACK] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("JACK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleJack), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleJack} + .partySize = NELEMS(sParty_SwimmerMaleJack), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleJack} }, [TRAINER_SWIMMER_MALE_JEROME] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("JEROME"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleJerome), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleJerome} + .partySize = NELEMS(sParty_SwimmerMaleJerome), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleJerome} }, [TRAINER_SWIMMER_MALE_ROLAND] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("ROLAND"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleRoland), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleRoland} + .partySize = NELEMS(sParty_SwimmerMaleRoland), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleRoland} }, [TRAINER_CUE_BALL_KOJI] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("KOJI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallKoji), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallKoji} + .partySize = NELEMS(sParty_CueBallKoji), + .party = {.NoItemDefaultMoves = sParty_CueBallKoji} }, [TRAINER_CUE_BALL_LUKE] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("LUKE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallLuke), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallLuke} + .partySize = NELEMS(sParty_CueBallLuke), + .party = {.NoItemDefaultMoves = sParty_CueBallLuke} }, [TRAINER_CUE_BALL_CAMRON] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("CAMRON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallCamron), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallCamron} + .partySize = NELEMS(sParty_CueBallCamron), + .party = {.NoItemDefaultMoves = sParty_CueBallCamron} }, [TRAINER_CUE_BALL_RAUL] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("RAUL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallRaul), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallRaul} + .partySize = NELEMS(sParty_CueBallRaul), + .party = {.NoItemDefaultMoves = sParty_CueBallRaul} }, [TRAINER_CUE_BALL_ISAIAH] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("ISAIAH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallIsaiah), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallIsaiah} + .partySize = NELEMS(sParty_CueBallIsaiah), + .party = {.NoItemDefaultMoves = sParty_CueBallIsaiah} }, [TRAINER_CUE_BALL_ZEEK] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("ZEEK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallZeek), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallZeek} + .partySize = NELEMS(sParty_CueBallZeek), + .party = {.NoItemDefaultMoves = sParty_CueBallZeek} }, [TRAINER_CUE_BALL_JAMAL] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("JAMAL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallJamal), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallJamal} + .partySize = NELEMS(sParty_CueBallJamal), + .party = {.NoItemDefaultMoves = sParty_CueBallJamal} }, [TRAINER_CUE_BALL_COREY] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("COREY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallCorey), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallCorey} + .partySize = NELEMS(sParty_CueBallCorey), + .party = {.NoItemDefaultMoves = sParty_CueBallCorey} }, [TRAINER_CUE_BALL_CHASE] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("CHASE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallChase), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallChase} + .partySize = NELEMS(sParty_CueBallChase), + .party = {.NoItemDefaultMoves = sParty_CueBallChase} }, [TRAINER_GAMER_HUGO] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("HUGO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerHugo), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerHugo} + .partySize = NELEMS(sParty_GamerHugo), + .party = {.NoItemDefaultMoves = sParty_GamerHugo} }, [TRAINER_GAMER_JASPER] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("JASPER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerJasper), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerJasper} + .partySize = NELEMS(sParty_GamerJasper), + .party = {.NoItemDefaultMoves = sParty_GamerJasper} }, [TRAINER_GAMER_DIRK] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("DIRK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerDirk), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerDirk} + .partySize = NELEMS(sParty_GamerDirk), + .party = {.NoItemDefaultMoves = sParty_GamerDirk} }, [TRAINER_GAMER_DARIAN] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("DARIAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerDarian), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerDarian} + .partySize = NELEMS(sParty_GamerDarian), + .party = {.NoItemDefaultMoves = sParty_GamerDarian} }, [TRAINER_GAMER_STAN] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("STAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerStan), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerStan} + .partySize = NELEMS(sParty_GamerStan), + .party = {.NoItemDefaultMoves = sParty_GamerStan} }, [TRAINER_GAMER_1] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Gamer1), - .party = {.NoItemDefaultMoves = sTrainerMons_Gamer1} + .partySize = NELEMS(sParty_Gamer1), + .party = {.NoItemDefaultMoves = sParty_Gamer1} }, [TRAINER_GAMER_RICH] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("RICH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerRich), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerRich} + .partySize = NELEMS(sParty_GamerRich), + .party = {.NoItemDefaultMoves = sParty_GamerRich} }, [TRAINER_BEAUTY_BRIDGET] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("BRIDGET"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyBridget), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyBridget} + .partySize = NELEMS(sParty_BeautyBridget), + .party = {.NoItemDefaultMoves = sParty_BeautyBridget} }, [TRAINER_BEAUTY_TAMIA] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("TAMIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyTamia), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyTamia} + .partySize = NELEMS(sParty_BeautyTamia), + .party = {.NoItemDefaultMoves = sParty_BeautyTamia} }, [TRAINER_BEAUTY_LORI] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("LORI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyLori), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyLori} + .partySize = NELEMS(sParty_BeautyLori), + .party = {.NoItemDefaultMoves = sParty_BeautyLori} }, [TRAINER_BEAUTY_LOLA] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("LOLA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyLola), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyLola} + .partySize = NELEMS(sParty_BeautyLola), + .party = {.NoItemDefaultMoves = sParty_BeautyLola} }, [TRAINER_BEAUTY_SHEILA] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("SHEILA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautySheila), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautySheila} + .partySize = NELEMS(sParty_BeautySheila), + .party = {.NoItemDefaultMoves = sParty_BeautySheila} }, [TRAINER_SWIMMER_FEMALE_TIFFANY] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("TIFFANY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleTiffany), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleTiffany} + .partySize = NELEMS(sParty_SwimmerFemaleTiffany), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleTiffany} }, [TRAINER_SWIMMER_FEMALE_NORA] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("NORA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleNora), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleNora} + .partySize = NELEMS(sParty_SwimmerFemaleNora), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleNora} }, [TRAINER_SWIMMER_FEMALE_MELISSA] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("MELISSA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleMelissa), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleMelissa} + .partySize = NELEMS(sParty_SwimmerFemaleMelissa), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleMelissa} }, [TRAINER_BEAUTY_GRACE] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("GRACE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyGrace), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyGrace} + .partySize = NELEMS(sParty_BeautyGrace), + .party = {.NoItemDefaultMoves = sParty_BeautyGrace} }, [TRAINER_BEAUTY_OLIVIA] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("OLIVIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyOlivia), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyOlivia} + .partySize = NELEMS(sParty_BeautyOlivia), + .party = {.NoItemDefaultMoves = sParty_BeautyOlivia} }, [TRAINER_BEAUTY_LAUREN] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("LAUREN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyLauren), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyLauren} + .partySize = NELEMS(sParty_BeautyLauren), + .party = {.NoItemDefaultMoves = sParty_BeautyLauren} }, [TRAINER_SWIMMER_FEMALE_ANYA] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("ANYA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleAnya), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleAnya} + .partySize = NELEMS(sParty_SwimmerFemaleAnya), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleAnya} }, [TRAINER_SWIMMER_FEMALE_ALICE] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("ALICE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleAlice), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleAlice} + .partySize = NELEMS(sParty_SwimmerFemaleAlice), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleAlice} }, [TRAINER_SWIMMER_FEMALE_CONNIE] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("CONNIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleConnie), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleConnie} + .partySize = NELEMS(sParty_SwimmerFemaleConnie), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleConnie} }, [TRAINER_SWIMMER_FEMALE_SHIRLEY] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("SHIRLEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleShirley), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleShirley} + .partySize = NELEMS(sParty_SwimmerFemaleShirley), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleShirley} }, [TRAINER_PSYCHIC_JOHAN] = { .partyFlags = 0, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("JOHAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicJohan), - .party = {.NoItemDefaultMoves = sTrainerMons_PsychicJohan} + .partySize = NELEMS(sParty_PsychicJohan), + .party = {.NoItemDefaultMoves = sParty_PsychicJohan} }, [TRAINER_PSYCHIC_TYRON] = { .partyFlags = 0, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("TYRON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicTyron), - .party = {.NoItemDefaultMoves = sTrainerMons_PsychicTyron} + .partySize = NELEMS(sParty_PsychicTyron), + .party = {.NoItemDefaultMoves = sParty_PsychicTyron} }, [TRAINER_PSYCHIC_CAMERON] = { .partyFlags = 0, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("CAMERON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicCameron), - .party = {.NoItemDefaultMoves = sTrainerMons_PsychicCameron} + .partySize = NELEMS(sParty_PsychicCameron), + .party = {.NoItemDefaultMoves = sParty_PsychicCameron} }, [TRAINER_PSYCHIC_PRESTON] = { .partyFlags = 0, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("PRESTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicPreston), - .party = {.NoItemDefaultMoves = sTrainerMons_PsychicPreston} + .partySize = NELEMS(sParty_PsychicPreston), + .party = {.NoItemDefaultMoves = sParty_PsychicPreston} }, [TRAINER_ROCKER_RANDALL] = { .partyFlags = 0, - .trainerClass = CLASS_ROCKER, + .trainerClass = TRAINER_CLASS_ROCKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_ROCKER, .trainerName = _("RANDALL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RockerRandall), - .party = {.NoItemDefaultMoves = sTrainerMons_RockerRandall} + .partySize = NELEMS(sParty_RockerRandall), + .party = {.NoItemDefaultMoves = sParty_RockerRandall} }, [TRAINER_ROCKER_LUCA] = { .partyFlags = 0, - .trainerClass = CLASS_ROCKER, + .trainerClass = TRAINER_CLASS_ROCKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_ROCKER, .trainerName = _("LUCA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RockerLuca), - .party = {.NoItemDefaultMoves = sTrainerMons_RockerLuca} + .partySize = NELEMS(sParty_RockerLuca), + .party = {.NoItemDefaultMoves = sParty_RockerLuca} }, [TRAINER_JUGGLER_DALTON] = { .partyFlags = 0, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("DALTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerDalton), - .party = {.NoItemDefaultMoves = sTrainerMons_JugglerDalton} + .partySize = NELEMS(sParty_JugglerDalton), + .party = {.NoItemDefaultMoves = sParty_JugglerDalton} }, [TRAINER_JUGGLER_NELSON] = { .partyFlags = 0, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("NELSON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerNelson), - .party = {.NoItemDefaultMoves = sTrainerMons_JugglerNelson} + .partySize = NELEMS(sParty_JugglerNelson), + .party = {.NoItemDefaultMoves = sParty_JugglerNelson} }, [TRAINER_JUGGLER_KIRK] = { .partyFlags = 0, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("KIRK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerKirk), - .party = {.NoItemDefaultMoves = sTrainerMons_JugglerKirk} + .partySize = NELEMS(sParty_JugglerKirk), + .party = {.NoItemDefaultMoves = sParty_JugglerKirk} }, [TRAINER_JUGGLER_SHAWN] = { .partyFlags = 0, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("SHAWN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerShawn), - .party = {.NoItemDefaultMoves = sTrainerMons_JugglerShawn} + .partySize = NELEMS(sParty_JugglerShawn), + .party = {.NoItemDefaultMoves = sParty_JugglerShawn} }, [TRAINER_JUGGLER_GREGORY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("GREGORY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerGregory), - .party = {.NoItemCustomMoves = sTrainerMons_JugglerGregory} + .partySize = NELEMS(sParty_JugglerGregory), + .party = {.NoItemCustomMoves = sParty_JugglerGregory} }, [TRAINER_JUGGLER_EDWARD] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("EDWARD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerEdward), - .party = {.NoItemCustomMoves = sTrainerMons_JugglerEdward} + .partySize = NELEMS(sParty_JugglerEdward), + .party = {.NoItemCustomMoves = sParty_JugglerEdward} }, [TRAINER_JUGGLER_KAYDEN] = { .partyFlags = 0, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("KAYDEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerKayden), - .party = {.NoItemDefaultMoves = sTrainerMons_JugglerKayden} + .partySize = NELEMS(sParty_JugglerKayden), + .party = {.NoItemDefaultMoves = sParty_JugglerKayden} }, [TRAINER_JUGGLER_NATE] = { .partyFlags = 0, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("NATE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerNate), - .party = {.NoItemDefaultMoves = sTrainerMons_JugglerNate} + .partySize = NELEMS(sParty_JugglerNate), + .party = {.NoItemDefaultMoves = sParty_JugglerNate} }, [TRAINER_TAMER_PHIL] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("PHIL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerPhil), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerPhil} + .partySize = NELEMS(sParty_TamerPhil), + .party = {.NoItemDefaultMoves = sParty_TamerPhil} }, [TRAINER_TAMER_EDGAR] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("EDGAR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerEdgar), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerEdgar} + .partySize = NELEMS(sParty_TamerEdgar), + .party = {.NoItemDefaultMoves = sParty_TamerEdgar} }, [TRAINER_TAMER_JASON] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("JASON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerJason), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerJason} + .partySize = NELEMS(sParty_TamerJason), + .party = {.NoItemDefaultMoves = sParty_TamerJason} }, [TRAINER_TAMER_COLE] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("COLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerCole), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerCole} + .partySize = NELEMS(sParty_TamerCole), + .party = {.NoItemDefaultMoves = sParty_TamerCole} }, [TRAINER_TAMER_VINCENT] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("VINCENT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerVincent), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerVincent} + .partySize = NELEMS(sParty_TamerVincent), + .party = {.NoItemDefaultMoves = sParty_TamerVincent} }, [TRAINER_TAMER_JOHN] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("JOHN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerJohn), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerJohn} + .partySize = NELEMS(sParty_TamerJohn), + .party = {.NoItemDefaultMoves = sParty_TamerJohn} }, [TRAINER_BIRD_KEEPER_SEBASTIAN] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("SEBASTIAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperSebastian), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperSebastian} + .partySize = NELEMS(sParty_BirdKeeperSebastian), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperSebastian} }, [TRAINER_BIRD_KEEPER_PERRY] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("PERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperPerry), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperPerry} + .partySize = NELEMS(sParty_BirdKeeperPerry), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperPerry} }, [TRAINER_BIRD_KEEPER_ROBERT] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("ROBERT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperRobert), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperRobert} + .partySize = NELEMS(sParty_BirdKeeperRobert), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperRobert} }, [TRAINER_BIRD_KEEPER_DONALD] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("DONALD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperDonald), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperDonald} + .partySize = NELEMS(sParty_BirdKeeperDonald), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperDonald} }, [TRAINER_BIRD_KEEPER_BENNY] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("BENNY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperBenny), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperBenny} + .partySize = NELEMS(sParty_BirdKeeperBenny), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperBenny} }, [TRAINER_BIRD_KEEPER_EDWIN] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("EDWIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperEdwin), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperEdwin} + .partySize = NELEMS(sParty_BirdKeeperEdwin), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperEdwin} }, [TRAINER_BIRD_KEEPER_CHESTER] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CHESTER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperChester), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperChester} + .partySize = NELEMS(sParty_BirdKeeperChester), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperChester} }, [TRAINER_BIRD_KEEPER_WILTON] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("WILTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperWilton), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperWilton} + .partySize = NELEMS(sParty_BirdKeeperWilton), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperWilton} }, [TRAINER_BIRD_KEEPER_RAMIRO] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("RAMIRO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperRamiro), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperRamiro} + .partySize = NELEMS(sParty_BirdKeeperRamiro), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperRamiro} }, [TRAINER_BIRD_KEEPER_JACOB] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("JACOB"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperJacob), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperJacob} + .partySize = NELEMS(sParty_BirdKeeperJacob), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperJacob} }, [TRAINER_BIRD_KEEPER_ROGER] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("ROGER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperRoger), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperRoger} + .partySize = NELEMS(sParty_BirdKeeperRoger), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperRoger} }, [TRAINER_BIRD_KEEPER_REED] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("REED"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperReed), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperReed} + .partySize = NELEMS(sParty_BirdKeeperReed), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperReed} }, [TRAINER_BIRD_KEEPER_KEITH] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("KEITH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperKeith), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperKeith} + .partySize = NELEMS(sParty_BirdKeeperKeith), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperKeith} }, [TRAINER_BIRD_KEEPER_CARTER] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CARTER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperCarter), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperCarter} + .partySize = NELEMS(sParty_BirdKeeperCarter), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperCarter} }, [TRAINER_BIRD_KEEPER_MITCH] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MITCH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperMitch), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperMitch} + .partySize = NELEMS(sParty_BirdKeeperMitch), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperMitch} }, [TRAINER_BIRD_KEEPER_BECK] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("BECK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperBeck), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperBeck} + .partySize = NELEMS(sParty_BirdKeeperBeck), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperBeck} }, [TRAINER_BIRD_KEEPER_MARLON] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MARLON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperMarlon), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperMarlon} + .partySize = NELEMS(sParty_BirdKeeperMarlon), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperMarlon} }, [TRAINER_BLACK_BELT_KOICHI] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("KOICHI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltKoichi), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltKoichi} + .partySize = NELEMS(sParty_BlackBeltKoichi), + .party = {.ItemDefaultMoves = sParty_BlackBeltKoichi} }, [TRAINER_BLACK_BELT_MIKE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("MIKE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltMike), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltMike} + .partySize = NELEMS(sParty_BlackBeltMike), + .party = {.ItemDefaultMoves = sParty_BlackBeltMike} }, [TRAINER_BLACK_BELT_HIDEKI] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("HIDEKI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltHideki), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltHideki} + .partySize = NELEMS(sParty_BlackBeltHideki), + .party = {.ItemDefaultMoves = sParty_BlackBeltHideki} }, [TRAINER_BLACK_BELT_AARON] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("AARON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltAaron), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltAaron} + .partySize = NELEMS(sParty_BlackBeltAaron), + .party = {.ItemDefaultMoves = sParty_BlackBeltAaron} }, [TRAINER_BLACK_BELT_HITOSHI] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("HITOSHI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltHitoshi), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltHitoshi} + .partySize = NELEMS(sParty_BlackBeltHitoshi), + .party = {.ItemDefaultMoves = sParty_BlackBeltHitoshi} }, [TRAINER_BLACK_BELT_ATSUSHI] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("ATSUSHI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltAtsushi), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltAtsushi} + .partySize = NELEMS(sParty_BlackBeltAtsushi), + .party = {.ItemDefaultMoves = sParty_BlackBeltAtsushi} }, [TRAINER_BLACK_BELT_KIYO] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("KIYO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltKiyo), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltKiyo} + .partySize = NELEMS(sParty_BlackBeltKiyo), + .party = {.ItemDefaultMoves = sParty_BlackBeltKiyo} }, [TRAINER_BLACK_BELT_TAKASHI] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("TAKASHI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltTakashi), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltTakashi} + .partySize = NELEMS(sParty_BlackBeltTakashi), + .party = {.ItemDefaultMoves = sParty_BlackBeltTakashi} }, [TRAINER_BLACK_BELT_DAISUKE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("DAISUKE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltDaisuke), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltDaisuke} + .partySize = NELEMS(sParty_BlackBeltDaisuke), + .party = {.ItemDefaultMoves = sParty_BlackBeltDaisuke} }, [TRAINER_RIVAL_OAKS_LAB_SQUIRTLE] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalOaksLabSquirtle), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalOaksLabSquirtle} + .partySize = NELEMS(sParty_RivalOaksLabSquirtle), + .party = {.NoItemDefaultMoves = sParty_RivalOaksLabSquirtle} }, [TRAINER_RIVAL_OAKS_LAB_BULBASAUR] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalOaksLabBulbasaur), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalOaksLabBulbasaur} + .partySize = NELEMS(sParty_RivalOaksLabBulbasaur), + .party = {.NoItemDefaultMoves = sParty_RivalOaksLabBulbasaur} }, [TRAINER_RIVAL_OAKS_LAB_CHARMANDER] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalOaksLabCharmander), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalOaksLabCharmander} + .partySize = NELEMS(sParty_RivalOaksLabCharmander), + .party = {.NoItemDefaultMoves = sParty_RivalOaksLabCharmander} }, [TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalRoute22EarlySquirtle), - .party = {.NoItemCustomMoves = sTrainerMons_RivalRoute22EarlySquirtle} + .partySize = NELEMS(sParty_RivalRoute22EarlySquirtle), + .party = {.NoItemCustomMoves = sParty_RivalRoute22EarlySquirtle} }, [TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalRoute22EarlyBulbasaur), - .party = {.NoItemCustomMoves = sTrainerMons_RivalRoute22EarlyBulbasaur} + .partySize = NELEMS(sParty_RivalRoute22EarlyBulbasaur), + .party = {.NoItemCustomMoves = sParty_RivalRoute22EarlyBulbasaur} }, [TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalRoute22EarlyCharmander), - .party = {.NoItemCustomMoves = sTrainerMons_RivalRoute22EarlyCharmander} + .partySize = NELEMS(sParty_RivalRoute22EarlyCharmander), + .party = {.NoItemCustomMoves = sParty_RivalRoute22EarlyCharmander} }, [TRAINER_RIVAL_CERULEAN_SQUIRTLE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalCeruleanSquirtle), - .party = {.NoItemCustomMoves = sTrainerMons_RivalCeruleanSquirtle} + .partySize = NELEMS(sParty_RivalCeruleanSquirtle), + .party = {.NoItemCustomMoves = sParty_RivalCeruleanSquirtle} }, [TRAINER_RIVAL_CERULEAN_BULBASAUR] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalCeruleanBulbasaur), - .party = {.NoItemCustomMoves = sTrainerMons_RivalCeruleanBulbasaur} + .partySize = NELEMS(sParty_RivalCeruleanBulbasaur), + .party = {.NoItemCustomMoves = sParty_RivalCeruleanBulbasaur} }, [TRAINER_RIVAL_CERULEAN_CHARMANDER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL, + .trainerClass = TRAINER_CLASS_RIVAL_EARLY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_1, + .trainerPic = TRAINER_PIC_RIVAL_EARLY, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalCeruleanCharmander), - .party = {.NoItemCustomMoves = sTrainerMons_RivalCeruleanCharmander} + .partySize = NELEMS(sParty_RivalCeruleanCharmander), + .party = {.NoItemCustomMoves = sParty_RivalCeruleanCharmander} }, [TRAINER_SCIENTIST_TED] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("TED"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistTed), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistTed} + .partySize = NELEMS(sParty_ScientistTed), + .party = {.NoItemDefaultMoves = sParty_ScientistTed} }, [TRAINER_SCIENTIST_CONNOR] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("CONNOR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistConnor), - .party = {.NoItemCustomMoves = sTrainerMons_ScientistConnor} + .partySize = NELEMS(sParty_ScientistConnor), + .party = {.NoItemCustomMoves = sParty_ScientistConnor} }, [TRAINER_SCIENTIST_JERRY] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("JERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistJerry), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistJerry} + .partySize = NELEMS(sParty_ScientistJerry), + .party = {.NoItemDefaultMoves = sParty_ScientistJerry} }, [TRAINER_SCIENTIST_JOSE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("JOSE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistJose), - .party = {.NoItemCustomMoves = sTrainerMons_ScientistJose} + .partySize = NELEMS(sParty_ScientistJose), + .party = {.NoItemCustomMoves = sParty_ScientistJose} }, [TRAINER_SCIENTIST_RODNEY] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("RODNEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistRodney), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistRodney} + .partySize = NELEMS(sParty_ScientistRodney), + .party = {.NoItemDefaultMoves = sParty_ScientistRodney} }, [TRAINER_SCIENTIST_BEAU] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("BEAU"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistBeau), - .party = {.NoItemCustomMoves = sTrainerMons_ScientistBeau} + .partySize = NELEMS(sParty_ScientistBeau), + .party = {.NoItemCustomMoves = sParty_ScientistBeau} }, [TRAINER_SCIENTIST_TAYLOR] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("TAYLOR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistTaylor), - .party = {.NoItemCustomMoves = sTrainerMons_ScientistTaylor} + .partySize = NELEMS(sParty_ScientistTaylor), + .party = {.NoItemCustomMoves = sParty_ScientistTaylor} }, [TRAINER_SCIENTIST_JOSHUA] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("JOSHUA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistJoshua), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistJoshua} + .partySize = NELEMS(sParty_ScientistJoshua), + .party = {.NoItemDefaultMoves = sParty_ScientistJoshua} }, [TRAINER_SCIENTIST_PARKER] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("PARKER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistParker), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistParker} + .partySize = NELEMS(sParty_ScientistParker), + .party = {.NoItemDefaultMoves = sParty_ScientistParker} }, [TRAINER_SCIENTIST_ED] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("ED"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistEd), - .party = {.NoItemCustomMoves = sTrainerMons_ScientistEd} + .partySize = NELEMS(sParty_ScientistEd), + .party = {.NoItemCustomMoves = sParty_ScientistEd} }, [TRAINER_SCIENTIST_TRAVIS] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("TRAVIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistTravis), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistTravis} + .partySize = NELEMS(sParty_ScientistTravis), + .party = {.NoItemDefaultMoves = sParty_ScientistTravis} }, [TRAINER_SCIENTIST_BRAYDON] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("BRAYDON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistBraydon), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistBraydon} + .partySize = NELEMS(sParty_ScientistBraydon), + .party = {.NoItemDefaultMoves = sParty_ScientistBraydon} }, [TRAINER_SCIENTIST_IVAN] = { .partyFlags = 0, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("IVAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistIvan), - .party = {.NoItemDefaultMoves = sTrainerMons_ScientistIvan} + .partySize = NELEMS(sParty_ScientistIvan), + .party = {.NoItemDefaultMoves = sParty_ScientistIvan} }, [TRAINER_BOSS_GIOVANNI] = { .partyFlags = 0, - .trainerClass = CLASS_BOSS, + .trainerClass = TRAINER_CLASS_BOSS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_LEADER_GIOVANNI, .trainerName = _("GIOVANNI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BossGiovanni), - .party = {.NoItemDefaultMoves = sTrainerMons_BossGiovanni} + .partySize = NELEMS(sParty_BossGiovanni), + .party = {.NoItemDefaultMoves = sParty_BossGiovanni} }, [TRAINER_BOSS_GIOVANNI_2] = { .partyFlags = 0, - .trainerClass = CLASS_BOSS, + .trainerClass = TRAINER_CLASS_BOSS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_LEADER_GIOVANNI, .trainerName = _("GIOVANNI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BossGiovanni2), - .party = {.NoItemDefaultMoves = sTrainerMons_BossGiovanni2} + .partySize = NELEMS(sParty_BossGiovanni2), + .party = {.NoItemDefaultMoves = sParty_BossGiovanni2} }, [TRAINER_LEADER_GIOVANNI] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_LEADER_GIOVANNI, .trainerName = _("GIOVANNI"), .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderGiovanni), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderGiovanni} + .partySize = NELEMS(sParty_LeaderGiovanni), + .party = {.NoItemCustomMoves = sParty_LeaderGiovanni} }, [TRAINER_TEAM_ROCKET_GRUNT] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt} + .partySize = NELEMS(sParty_TeamRocketGrunt), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt} }, [TRAINER_TEAM_ROCKET_GRUNT_2] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt2), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt2} + .partySize = NELEMS(sParty_TeamRocketGrunt2), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt2} }, [TRAINER_TEAM_ROCKET_GRUNT_3] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt3), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt3} + .partySize = NELEMS(sParty_TeamRocketGrunt3), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt3} }, [TRAINER_TEAM_ROCKET_GRUNT_4] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt4), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt4} + .partySize = NELEMS(sParty_TeamRocketGrunt4), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt4} }, [TRAINER_TEAM_ROCKET_GRUNT_5] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt5), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt5} + .partySize = NELEMS(sParty_TeamRocketGrunt5), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt5} }, [TRAINER_TEAM_ROCKET_GRUNT_6] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt6), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt6} + .partySize = NELEMS(sParty_TeamRocketGrunt6), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt6} }, [TRAINER_TEAM_ROCKET_GRUNT_7] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt7), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt7} + .partySize = NELEMS(sParty_TeamRocketGrunt7), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt7} }, [TRAINER_TEAM_ROCKET_GRUNT_8] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt8), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt8} + .partySize = NELEMS(sParty_TeamRocketGrunt8), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt8} }, [TRAINER_TEAM_ROCKET_GRUNT_9] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt9), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt9} + .partySize = NELEMS(sParty_TeamRocketGrunt9), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt9} }, [TRAINER_TEAM_ROCKET_GRUNT_10] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt10), - .party = {.NoItemCustomMoves = sTrainerMons_TeamRocketGrunt10} + .partySize = NELEMS(sParty_TeamRocketGrunt10), + .party = {.NoItemCustomMoves = sParty_TeamRocketGrunt10} }, [TRAINER_TEAM_ROCKET_GRUNT_11] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt11), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt11} + .partySize = NELEMS(sParty_TeamRocketGrunt11), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt11} }, [TRAINER_TEAM_ROCKET_GRUNT_12] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt12), - .party = {.NoItemCustomMoves = sTrainerMons_TeamRocketGrunt12} + .partySize = NELEMS(sParty_TeamRocketGrunt12), + .party = {.NoItemCustomMoves = sParty_TeamRocketGrunt12} }, [TRAINER_TEAM_ROCKET_GRUNT_13] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt13), - .party = {.NoItemCustomMoves = sTrainerMons_TeamRocketGrunt13} + .partySize = NELEMS(sParty_TeamRocketGrunt13), + .party = {.NoItemCustomMoves = sParty_TeamRocketGrunt13} }, [TRAINER_TEAM_ROCKET_GRUNT_14] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt14), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt14} + .partySize = NELEMS(sParty_TeamRocketGrunt14), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt14} }, [TRAINER_TEAM_ROCKET_GRUNT_15] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt15), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt15} + .partySize = NELEMS(sParty_TeamRocketGrunt15), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt15} }, [TRAINER_TEAM_ROCKET_GRUNT_16] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt16), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt16} + .partySize = NELEMS(sParty_TeamRocketGrunt16), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt16} }, [TRAINER_TEAM_ROCKET_GRUNT_17] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt17), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt17} + .partySize = NELEMS(sParty_TeamRocketGrunt17), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt17} }, [TRAINER_TEAM_ROCKET_GRUNT_18] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt18), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt18} + .partySize = NELEMS(sParty_TeamRocketGrunt18), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt18} }, [TRAINER_TEAM_ROCKET_GRUNT_19] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt19), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt19} + .partySize = NELEMS(sParty_TeamRocketGrunt19), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt19} }, [TRAINER_TEAM_ROCKET_GRUNT_20] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt20), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt20} + .partySize = NELEMS(sParty_TeamRocketGrunt20), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt20} }, [TRAINER_TEAM_ROCKET_GRUNT_21] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt21), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt21} + .partySize = NELEMS(sParty_TeamRocketGrunt21), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt21} }, [TRAINER_TEAM_ROCKET_GRUNT_22] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt22), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt22} + .partySize = NELEMS(sParty_TeamRocketGrunt22), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt22} }, [TRAINER_TEAM_ROCKET_GRUNT_23] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt23), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt23} + .partySize = NELEMS(sParty_TeamRocketGrunt23), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt23} }, [TRAINER_TEAM_ROCKET_GRUNT_24] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt24), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt24} + .partySize = NELEMS(sParty_TeamRocketGrunt24), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt24} }, [TRAINER_TEAM_ROCKET_GRUNT_25] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt25), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt25} + .partySize = NELEMS(sParty_TeamRocketGrunt25), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt25} }, [TRAINER_TEAM_ROCKET_GRUNT_26] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt26), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt26} + .partySize = NELEMS(sParty_TeamRocketGrunt26), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt26} }, [TRAINER_TEAM_ROCKET_GRUNT_27] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt27), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt27} + .partySize = NELEMS(sParty_TeamRocketGrunt27), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt27} }, [TRAINER_TEAM_ROCKET_GRUNT_28] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt28), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt28} + .partySize = NELEMS(sParty_TeamRocketGrunt28), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt28} }, [TRAINER_TEAM_ROCKET_GRUNT_29] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt29), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt29} + .partySize = NELEMS(sParty_TeamRocketGrunt29), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt29} }, [TRAINER_TEAM_ROCKET_GRUNT_30] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt30), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt30} + .partySize = NELEMS(sParty_TeamRocketGrunt30), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt30} }, [TRAINER_TEAM_ROCKET_GRUNT_31] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt31), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt31} + .partySize = NELEMS(sParty_TeamRocketGrunt31), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt31} }, [TRAINER_TEAM_ROCKET_GRUNT_32] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt32), - .party = {.NoItemCustomMoves = sTrainerMons_TeamRocketGrunt32} + .partySize = NELEMS(sParty_TeamRocketGrunt32), + .party = {.NoItemCustomMoves = sParty_TeamRocketGrunt32} }, [TRAINER_TEAM_ROCKET_GRUNT_33] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt33), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt33} + .partySize = NELEMS(sParty_TeamRocketGrunt33), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt33} }, [TRAINER_TEAM_ROCKET_GRUNT_34] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt34), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt34} + .partySize = NELEMS(sParty_TeamRocketGrunt34), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt34} }, [TRAINER_TEAM_ROCKET_GRUNT_35] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt35), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt35} + .partySize = NELEMS(sParty_TeamRocketGrunt35), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt35} }, [TRAINER_TEAM_ROCKET_GRUNT_36] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt36), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt36} + .partySize = NELEMS(sParty_TeamRocketGrunt36), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt36} }, [TRAINER_TEAM_ROCKET_GRUNT_37] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt37), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt37} + .partySize = NELEMS(sParty_TeamRocketGrunt37), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt37} }, [TRAINER_TEAM_ROCKET_GRUNT_38] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt38), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt38} + .partySize = NELEMS(sParty_TeamRocketGrunt38), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt38} }, [TRAINER_TEAM_ROCKET_GRUNT_39] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt39), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt39} + .partySize = NELEMS(sParty_TeamRocketGrunt39), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt39} }, [TRAINER_TEAM_ROCKET_GRUNT_40] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt40), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt40} + .partySize = NELEMS(sParty_TeamRocketGrunt40), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt40} }, [TRAINER_TEAM_ROCKET_GRUNT_41] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt41), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt41} + .partySize = NELEMS(sParty_TeamRocketGrunt41), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt41} }, [TRAINER_COOLTRAINER_SAMUEL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("SAMUEL"), .items = {ITEM_SUPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerSamuel), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerSamuel} + .partySize = NELEMS(sParty_CooltrainerSamuel), + .party = {.NoItemCustomMoves = sParty_CooltrainerSamuel} }, [TRAINER_COOLTRAINER_GEORGE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("GEORGE"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerGeorge), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerGeorge} + .partySize = NELEMS(sParty_CooltrainerGeorge), + .party = {.NoItemCustomMoves = sParty_CooltrainerGeorge} }, [TRAINER_COOLTRAINER_COLBY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("COLBY"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerColby), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerColby} + .partySize = NELEMS(sParty_CooltrainerColby), + .party = {.NoItemCustomMoves = sParty_CooltrainerColby} }, [TRAINER_COOLTRAINER_PAUL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("PAUL"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerPaul), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerPaul} + .partySize = NELEMS(sParty_CooltrainerPaul), + .party = {.NoItemCustomMoves = sParty_CooltrainerPaul} }, [TRAINER_COOLTRAINER_ROLANDO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("ROLANDO"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerRolando), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerRolando} + .partySize = NELEMS(sParty_CooltrainerRolando), + .party = {.NoItemCustomMoves = sParty_CooltrainerRolando} }, [TRAINER_COOLTRAINER_GILBERT] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("GILBERT"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerGilbert), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerGilbert} + .partySize = NELEMS(sParty_CooltrainerGilbert), + .party = {.NoItemCustomMoves = sParty_CooltrainerGilbert} }, [TRAINER_COOLTRAINER_OWEN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("OWEN"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerOwen), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerOwen} + .partySize = NELEMS(sParty_CooltrainerOwen), + .party = {.NoItemCustomMoves = sParty_CooltrainerOwen} }, [TRAINER_COOLTRAINER_BERKE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("BERKE"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerBerke), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerBerke} + .partySize = NELEMS(sParty_CooltrainerBerke), + .party = {.NoItemCustomMoves = sParty_CooltrainerBerke} }, [TRAINER_COOLTRAINER_YUJI] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("YUJI"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerYuji), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerYuji} + .partySize = NELEMS(sParty_CooltrainerYuji), + .party = {.NoItemCustomMoves = sParty_CooltrainerYuji} }, [TRAINER_COOLTRAINER_WARREN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("WARREN"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerWarren), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerWarren} + .partySize = NELEMS(sParty_CooltrainerWarren), + .party = {.NoItemCustomMoves = sParty_CooltrainerWarren} }, [TRAINER_COOLTRAINER_MARY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("MARY"), .items = {ITEM_SUPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerMary), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerMary} + .partySize = NELEMS(sParty_CooltrainerMary), + .party = {.NoItemCustomMoves = sParty_CooltrainerMary} }, [TRAINER_COOLTRAINER_CAROLINE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CAROLINE"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerCaroline), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerCaroline} + .partySize = NELEMS(sParty_CooltrainerCaroline), + .party = {.NoItemCustomMoves = sParty_CooltrainerCaroline} }, [TRAINER_COOLTRAINER_ALEXA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("ALEXA"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerAlexa), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerAlexa} + .partySize = NELEMS(sParty_CooltrainerAlexa), + .party = {.NoItemCustomMoves = sParty_CooltrainerAlexa} }, [TRAINER_COOLTRAINER_SHANNON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("SHANNON"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerShannon), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerShannon} + .partySize = NELEMS(sParty_CooltrainerShannon), + .party = {.NoItemCustomMoves = sParty_CooltrainerShannon} }, [TRAINER_COOLTRAINER_NAOMI] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("NAOMI"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerNaomi), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerNaomi} + .partySize = NELEMS(sParty_CooltrainerNaomi), + .party = {.NoItemCustomMoves = sParty_CooltrainerNaomi} }, [TRAINER_COOLTRAINER_BROOKE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("BROOKE"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerBrooke), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerBrooke} + .partySize = NELEMS(sParty_CooltrainerBrooke), + .party = {.NoItemCustomMoves = sParty_CooltrainerBrooke} }, [TRAINER_COOLTRAINER_AUSTINA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("AUSTINA"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerAustina), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerAustina} + .partySize = NELEMS(sParty_CooltrainerAustina), + .party = {.NoItemCustomMoves = sParty_CooltrainerAustina} }, [TRAINER_COOLTRAINER_JULIE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("JULIE"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerJulie), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerJulie} + .partySize = NELEMS(sParty_CooltrainerJulie), + .party = {.NoItemCustomMoves = sParty_CooltrainerJulie} }, [TRAINER_ELITE_FOUR_LORELEI] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_ELITE_FOUR_LORELEI, .trainerName = _("LORELEI"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourLorelei), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourLorelei} + .partySize = NELEMS(sParty_EliteFourLorelei), + .party = {.ItemCustomMoves = sParty_EliteFourLorelei} }, [TRAINER_ELITE_FOUR_BRUNO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_BRUNO, .trainerName = _("BRUNO"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourBruno), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourBruno} + .partySize = NELEMS(sParty_EliteFourBruno), + .party = {.ItemCustomMoves = sParty_EliteFourBruno} }, [TRAINER_ELITE_FOUR_AGATHA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_ELITE_FOUR_AGATHA, .trainerName = _("AGATHA"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourAgatha), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourAgatha} + .partySize = NELEMS(sParty_EliteFourAgatha), + .party = {.ItemCustomMoves = sParty_EliteFourAgatha} }, [TRAINER_ELITE_FOUR_LANCE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_LANCE, .trainerName = _("LANCE"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourLance), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourLance} + .partySize = NELEMS(sParty_EliteFourLance), + .party = {.ItemCustomMoves = sParty_EliteFourLance} }, [TRAINER_LEADER_BROCK] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_BROCK, .trainerName = _("BROCK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderBrock), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderBrock} + .partySize = NELEMS(sParty_LeaderBrock), + .party = {.NoItemCustomMoves = sParty_LeaderBrock} }, [TRAINER_LEADER_MISTY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LEADER_MISTY, .trainerName = _("MISTY"), .items = {ITEM_SUPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderMisty), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderMisty} + .partySize = NELEMS(sParty_LeaderMisty), + .party = {.NoItemCustomMoves = sParty_LeaderMisty} }, [TRAINER_LEADER_LT_SURGE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_LT_SURGE, .trainerName = _("LT. SURGE"), .items = {ITEM_SUPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderLtSurge), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderLtSurge} + .partySize = NELEMS(sParty_LeaderLtSurge), + .party = {.NoItemCustomMoves = sParty_LeaderLtSurge} }, [TRAINER_LEADER_ERIKA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LEADER_ERIKA, .trainerName = _("ERIKA"), .items = {ITEM_HYPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderErika), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderErika} + .partySize = NELEMS(sParty_LeaderErika), + .party = {.NoItemCustomMoves = sParty_LeaderErika} }, [TRAINER_LEADER_KOGA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_KOGA, .trainerName = _("KOGA"), .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderKoga), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderKoga} + .partySize = NELEMS(sParty_LeaderKoga), + .party = {.NoItemCustomMoves = sParty_LeaderKoga} }, [TRAINER_LEADER_BLAINE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_LEADER_BLAINE, .trainerName = _("BLAINE"), .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderBlaine), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderBlaine} + .partySize = NELEMS(sParty_LeaderBlaine), + .party = {.NoItemCustomMoves = sParty_LeaderBlaine} }, [TRAINER_LEADER_SABRINA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_LEADER_2, + .trainerClass = TRAINER_CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LEADER_SABRINA, .trainerName = _("SABRINA"), .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_LeaderSabrina), - .party = {.NoItemCustomMoves = sTrainerMons_LeaderSabrina} + .partySize = NELEMS(sParty_LeaderSabrina), + .party = {.NoItemCustomMoves = sParty_LeaderSabrina} }, [TRAINER_GENTLEMAN_THOMAS] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("THOMAS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanThomas), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanThomas} + .partySize = NELEMS(sParty_GentlemanThomas), + .party = {.NoItemDefaultMoves = sParty_GentlemanThomas} }, [TRAINER_GENTLEMAN_ARTHUR] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("ARTHUR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanArthur), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanArthur} + .partySize = NELEMS(sParty_GentlemanArthur), + .party = {.NoItemDefaultMoves = sParty_GentlemanArthur} }, [TRAINER_GENTLEMAN_TUCKER] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("TUCKER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanTucker), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanTucker} + .partySize = NELEMS(sParty_GentlemanTucker), + .party = {.NoItemDefaultMoves = sParty_GentlemanTucker} }, [TRAINER_GENTLEMAN_NORTON] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("NORTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanNorton), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanNorton} + .partySize = NELEMS(sParty_GentlemanNorton), + .party = {.NoItemDefaultMoves = sParty_GentlemanNorton} }, [TRAINER_GENTLEMAN_WALTER] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("WALTER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanWalter), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanWalter} + .partySize = NELEMS(sParty_GentlemanWalter), + .party = {.NoItemDefaultMoves = sParty_GentlemanWalter} }, [TRAINER_RIVAL_SS_ANNE_SQUIRTLE] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalSsAnneSquirtle), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalSsAnneSquirtle} + .partySize = NELEMS(sParty_RivalSsAnneSquirtle), + .party = {.NoItemDefaultMoves = sParty_RivalSsAnneSquirtle} }, [TRAINER_RIVAL_SS_ANNE_BULBASAUR] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalSsAnneBulbasaur), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalSsAnneBulbasaur} + .partySize = NELEMS(sParty_RivalSsAnneBulbasaur), + .party = {.NoItemDefaultMoves = sParty_RivalSsAnneBulbasaur} }, [TRAINER_RIVAL_SS_ANNE_CHARMANDER] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalSsAnneCharmander), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalSsAnneCharmander} + .partySize = NELEMS(sParty_RivalSsAnneCharmander), + .party = {.NoItemDefaultMoves = sParty_RivalSsAnneCharmander} }, [TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalPokenonTowerSquirtle), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalPokenonTowerSquirtle} + .partySize = NELEMS(sParty_RivalPokenonTowerSquirtle), + .party = {.NoItemDefaultMoves = sParty_RivalPokenonTowerSquirtle} }, [TRAINER_RIVAL_POKENON_TOWER_BULBASAUR] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalPokenonTowerBulbasaur), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalPokenonTowerBulbasaur} + .partySize = NELEMS(sParty_RivalPokenonTowerBulbasaur), + .party = {.NoItemDefaultMoves = sParty_RivalPokenonTowerBulbasaur} }, [TRAINER_RIVAL_POKENON_TOWER_CHARMANDER] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalPokenonTowerCharmander), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalPokenonTowerCharmander} + .partySize = NELEMS(sParty_RivalPokenonTowerCharmander), + .party = {.NoItemDefaultMoves = sParty_RivalPokenonTowerCharmander} }, [TRAINER_RIVAL_SILPH_SQUIRTLE] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalSilphSquirtle), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalSilphSquirtle} + .partySize = NELEMS(sParty_RivalSilphSquirtle), + .party = {.NoItemDefaultMoves = sParty_RivalSilphSquirtle} }, [TRAINER_RIVAL_SILPH_BULBASAUR] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalSilphBulbasaur), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalSilphBulbasaur} + .partySize = NELEMS(sParty_RivalSilphBulbasaur), + .party = {.NoItemDefaultMoves = sParty_RivalSilphBulbasaur} }, [TRAINER_RIVAL_SILPH_CHARMANDER] = { .partyFlags = 0, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalSilphCharmander), - .party = {.NoItemDefaultMoves = sTrainerMons_RivalSilphCharmander} + .partySize = NELEMS(sParty_RivalSilphCharmander), + .party = {.NoItemDefaultMoves = sParty_RivalSilphCharmander} }, [TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalRoute22LateSquirtle), - .party = {.NoItemCustomMoves = sTrainerMons_RivalRoute22LateSquirtle} + .partySize = NELEMS(sParty_RivalRoute22LateSquirtle), + .party = {.NoItemCustomMoves = sParty_RivalRoute22LateSquirtle} }, [TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalRoute22LateBulbasaur), - .party = {.NoItemCustomMoves = sTrainerMons_RivalRoute22LateBulbasaur} + .partySize = NELEMS(sParty_RivalRoute22LateBulbasaur), + .party = {.NoItemCustomMoves = sParty_RivalRoute22LateBulbasaur} }, [TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RIVAL_2, + .trainerClass = TRAINER_CLASS_RIVAL_LATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_2, + .trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_RivalRoute22LateCharmander), - .party = {.NoItemCustomMoves = sTrainerMons_RivalRoute22LateCharmander} + .partySize = NELEMS(sParty_RivalRoute22LateCharmander), + .party = {.NoItemCustomMoves = sParty_RivalRoute22LateCharmander} }, [TRAINER_CHAMPION_FIRST_SQUIRTLE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CHAMPION_2, + .trainerClass = TRAINER_CLASS_CHAMPION, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_ChampionFirstSquirtle), - .party = {.ItemCustomMoves = sTrainerMons_ChampionFirstSquirtle} + .partySize = NELEMS(sParty_ChampionFirstSquirtle), + .party = {.ItemCustomMoves = sParty_ChampionFirstSquirtle} }, [TRAINER_CHAMPION_FIRST_BULBASAUR] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CHAMPION_2, + .trainerClass = TRAINER_CLASS_CHAMPION, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_ChampionFirstBulbasaur), - .party = {.ItemCustomMoves = sTrainerMons_ChampionFirstBulbasaur} + .partySize = NELEMS(sParty_ChampionFirstBulbasaur), + .party = {.ItemCustomMoves = sParty_ChampionFirstBulbasaur} }, [TRAINER_CHAMPION_FIRST_CHARMANDER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CHAMPION_2, + .trainerClass = TRAINER_CLASS_CHAMPION, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_ChampionFirstCharmander), - .party = {.ItemCustomMoves = sTrainerMons_ChampionFirstCharmander} + .partySize = NELEMS(sParty_ChampionFirstCharmander), + .party = {.ItemCustomMoves = sParty_ChampionFirstCharmander} }, [TRAINER_CHANNELER_PATRICIA] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("PATRICIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerPatricia), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerPatricia} + .partySize = NELEMS(sParty_ChannelerPatricia), + .party = {.NoItemDefaultMoves = sParty_ChannelerPatricia} }, [TRAINER_CHANNELER_CARLY] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("CARLY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerCarly), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerCarly} + .partySize = NELEMS(sParty_ChannelerCarly), + .party = {.NoItemDefaultMoves = sParty_ChannelerCarly} }, [TRAINER_CHANNELER_HOPE] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("HOPE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerHope), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerHope} + .partySize = NELEMS(sParty_ChannelerHope), + .party = {.NoItemDefaultMoves = sParty_ChannelerHope} }, [TRAINER_CHANNELER_PAULA] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("PAULA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerPaula), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerPaula} + .partySize = NELEMS(sParty_ChannelerPaula), + .party = {.NoItemDefaultMoves = sParty_ChannelerPaula} }, [TRAINER_CHANNELER_LAUREL] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("LAUREL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerLaurel), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerLaurel} + .partySize = NELEMS(sParty_ChannelerLaurel), + .party = {.NoItemDefaultMoves = sParty_ChannelerLaurel} }, [TRAINER_CHANNELER_JODY] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("JODY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerJody), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerJody} + .partySize = NELEMS(sParty_ChannelerJody), + .party = {.NoItemDefaultMoves = sParty_ChannelerJody} }, [TRAINER_CHANNELER_TAMMY] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("TAMMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerTammy), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerTammy} + .partySize = NELEMS(sParty_ChannelerTammy), + .party = {.NoItemDefaultMoves = sParty_ChannelerTammy} }, [TRAINER_CHANNELER_RUTH] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("RUTH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerRuth), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerRuth} + .partySize = NELEMS(sParty_ChannelerRuth), + .party = {.NoItemDefaultMoves = sParty_ChannelerRuth} }, [TRAINER_CHANNELER_KARINA] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("KARINA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerKarina), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerKarina} + .partySize = NELEMS(sParty_ChannelerKarina), + .party = {.NoItemDefaultMoves = sParty_ChannelerKarina} }, [TRAINER_CHANNELER_JANAE] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("JANAE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerJanae), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerJanae} + .partySize = NELEMS(sParty_ChannelerJanae), + .party = {.NoItemDefaultMoves = sParty_ChannelerJanae} }, [TRAINER_CHANNELER_ANGELICA] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("ANGELICA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerAngelica), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerAngelica} + .partySize = NELEMS(sParty_ChannelerAngelica), + .party = {.NoItemDefaultMoves = sParty_ChannelerAngelica} }, [TRAINER_CHANNELER_EMILIA] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("EMILIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerEmilia), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerEmilia} + .partySize = NELEMS(sParty_ChannelerEmilia), + .party = {.NoItemDefaultMoves = sParty_ChannelerEmilia} }, [TRAINER_CHANNELER_JENNIFER] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("JENNIFER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerJennifer), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerJennifer} + .partySize = NELEMS(sParty_ChannelerJennifer), + .party = {.NoItemDefaultMoves = sParty_ChannelerJennifer} }, [TRAINER_CHANNELER_1] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler1), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler1} + .partySize = NELEMS(sParty_Channeler1), + .party = {.NoItemDefaultMoves = sParty_Channeler1} }, [TRAINER_CHANNELER_2] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler2), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler2} + .partySize = NELEMS(sParty_Channeler2), + .party = {.NoItemDefaultMoves = sParty_Channeler2} }, [TRAINER_CHANNELER_3] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler3), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler3} + .partySize = NELEMS(sParty_Channeler3), + .party = {.NoItemDefaultMoves = sParty_Channeler3} }, [TRAINER_CHANNELER_4] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler4), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler4} + .partySize = NELEMS(sParty_Channeler4), + .party = {.NoItemDefaultMoves = sParty_Channeler4} }, [TRAINER_CHANNELER_5] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler5), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler5} + .partySize = NELEMS(sParty_Channeler5), + .party = {.NoItemDefaultMoves = sParty_Channeler5} }, [TRAINER_CHANNELER_6] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler6), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler6} + .partySize = NELEMS(sParty_Channeler6), + .party = {.NoItemDefaultMoves = sParty_Channeler6} }, [TRAINER_CHANNELER_7] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler7), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler7} + .partySize = NELEMS(sParty_Channeler7), + .party = {.NoItemDefaultMoves = sParty_Channeler7} }, [TRAINER_CHANNELER_8] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Channeler8), - .party = {.NoItemDefaultMoves = sTrainerMons_Channeler8} + .partySize = NELEMS(sParty_Channeler8), + .party = {.NoItemDefaultMoves = sParty_Channeler8} }, [TRAINER_CHANNELER_AMANDA] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("AMANDA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerAmanda), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerAmanda} + .partySize = NELEMS(sParty_ChannelerAmanda), + .party = {.NoItemDefaultMoves = sParty_ChannelerAmanda} }, [TRAINER_CHANNELER_STACY] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("STACY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerStacy), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerStacy} + .partySize = NELEMS(sParty_ChannelerStacy), + .party = {.NoItemDefaultMoves = sParty_ChannelerStacy} }, [TRAINER_CHANNELER_TASHA] = { .partyFlags = 0, - .trainerClass = CLASS_CHANNELER, + .trainerClass = TRAINER_CLASS_CHANNELER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_CHANNELER, .trainerName = _("TASHA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ChannelerTasha), - .party = {.NoItemDefaultMoves = sTrainerMons_ChannelerTasha} + .partySize = NELEMS(sParty_ChannelerTasha), + .party = {.NoItemDefaultMoves = sParty_ChannelerTasha} }, [TRAINER_HIKER_JEREMY] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("JEREMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerJeremy), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerJeremy} + .partySize = NELEMS(sParty_HikerJeremy), + .party = {.NoItemDefaultMoves = sParty_HikerJeremy} }, [TRAINER_PICNICKER_ALMA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ALMA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerAlma), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerAlma} + .partySize = NELEMS(sParty_PicnickerAlma), + .party = {.NoItemDefaultMoves = sParty_PicnickerAlma} }, [TRAINER_PICNICKER_SUSIE] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("SUSIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerSusie), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerSusie} + .partySize = NELEMS(sParty_PicnickerSusie), + .party = {.NoItemDefaultMoves = sParty_PicnickerSusie} }, [TRAINER_PICNICKER_VALERIE] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("VALERIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerValerie), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerValerie} + .partySize = NELEMS(sParty_PicnickerValerie), + .party = {.NoItemDefaultMoves = sParty_PicnickerValerie} }, [TRAINER_PICNICKER_GWEN] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("GWEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerGwen), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerGwen} + .partySize = NELEMS(sParty_PicnickerGwen), + .party = {.NoItemDefaultMoves = sParty_PicnickerGwen} }, [TRAINER_BIKER_VIRGIL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("VIRGIL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerVirgil), - .party = {.NoItemCustomMoves = sTrainerMons_BikerVirgil} + .partySize = NELEMS(sParty_BikerVirgil), + .party = {.NoItemCustomMoves = sParty_BikerVirgil} }, [TRAINER_CAMPER_FLINT] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("FLINT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperFlint), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperFlint} + .partySize = NELEMS(sParty_CamperFlint), + .party = {.NoItemDefaultMoves = sParty_CamperFlint} }, [TRAINER_PICNICKER_MISSY] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("MISSY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerMissy), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerMissy} + .partySize = NELEMS(sParty_PicnickerMissy), + .party = {.NoItemDefaultMoves = sParty_PicnickerMissy} }, [TRAINER_PICNICKER_IRENE] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("IRENE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerIrene), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerIrene} + .partySize = NELEMS(sParty_PicnickerIrene), + .party = {.NoItemDefaultMoves = sParty_PicnickerIrene} }, [TRAINER_PICNICKER_DANA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("DANA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerDana), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerDana} + .partySize = NELEMS(sParty_PicnickerDana), + .party = {.NoItemDefaultMoves = sParty_PicnickerDana} }, [TRAINER_PICNICKER_ARIANA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ARIANA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerAriana), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerAriana} + .partySize = NELEMS(sParty_PicnickerAriana), + .party = {.NoItemDefaultMoves = sParty_PicnickerAriana} }, [TRAINER_PICNICKER_LEAH] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("LEAH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerLeah), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerLeah} + .partySize = NELEMS(sParty_PicnickerLeah), + .party = {.NoItemDefaultMoves = sParty_PicnickerLeah} }, [TRAINER_CAMPER_JUSTIN] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("JUSTIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperJustin), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperJustin} + .partySize = NELEMS(sParty_CamperJustin), + .party = {.NoItemDefaultMoves = sParty_CamperJustin} }, [TRAINER_PICNICKER_YAZMIN] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("YAZMIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerYazmin), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerYazmin} + .partySize = NELEMS(sParty_PicnickerYazmin), + .party = {.NoItemDefaultMoves = sParty_PicnickerYazmin} }, [TRAINER_PICNICKER_KINDRA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("KINDRA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerKindra), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerKindra} + .partySize = NELEMS(sParty_PicnickerKindra), + .party = {.NoItemDefaultMoves = sParty_PicnickerKindra} }, [TRAINER_PICNICKER_BECKY] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("BECKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerBecky), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerBecky} + .partySize = NELEMS(sParty_PicnickerBecky), + .party = {.NoItemDefaultMoves = sParty_PicnickerBecky} }, [TRAINER_PICNICKER_CELIA] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("CELIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerCelia), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerCelia} + .partySize = NELEMS(sParty_PicnickerCelia), + .party = {.NoItemDefaultMoves = sParty_PicnickerCelia} }, [TRAINER_GENTLEMAN_BROOKS] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("BROOKS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanBrooks), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanBrooks} + .partySize = NELEMS(sParty_GentlemanBrooks), + .party = {.NoItemDefaultMoves = sParty_GentlemanBrooks} }, [TRAINER_GENTLEMAN_LAMAR] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("LAMAR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanLamar), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanLamar} + .partySize = NELEMS(sParty_GentlemanLamar), + .party = {.NoItemDefaultMoves = sParty_GentlemanLamar} }, [TRAINER_TWINS_ELI_ANNE] = { .partyFlags = 0, - .trainerClass = CLASS_TWINS_2, + .trainerClass = TRAINER_CLASS_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("ELI & ANNE"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TwinsEliAnne), - .party = {.NoItemDefaultMoves = sTrainerMons_TwinsEliAnne} + .partySize = NELEMS(sParty_TwinsEliAnne), + .party = {.NoItemDefaultMoves = sParty_TwinsEliAnne} }, [TRAINER_COOL_COUPLE_RAY_TYRA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOL_COUPLE, + .trainerClass = TRAINER_CLASS_COOL_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOL_COUPLE, .trainerName = _("RAY & TYRA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CoolCoupleRayTyra), - .party = {.NoItemCustomMoves = sTrainerMons_CoolCoupleRayTyra} + .partySize = NELEMS(sParty_CoolCoupleRayTyra), + .party = {.NoItemCustomMoves = sParty_CoolCoupleRayTyra} }, [TRAINER_YOUNG_COUPLE_GIA_JES] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNG_COUPLE_2, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_YOUNG_COUPLE, .trainerName = _("GIA & JES"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungCoupleGiaJes), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungCoupleGiaJes} + .partySize = NELEMS(sParty_YoungCoupleGiaJes), + .party = {.NoItemDefaultMoves = sParty_YoungCoupleGiaJes} }, [TRAINER_TWINS_KIRI_JAN] = { .partyFlags = 0, - .trainerClass = CLASS_TWINS_2, + .trainerClass = TRAINER_CLASS_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("KIRI & JAN"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TwinsKiriJan), - .party = {.NoItemDefaultMoves = sTrainerMons_TwinsKiriJan} + .partySize = NELEMS(sParty_TwinsKiriJan), + .party = {.NoItemDefaultMoves = sParty_TwinsKiriJan} }, [TRAINER_CRUSH_KIN_RON_MYA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_KIN, + .trainerClass = TRAINER_CLASS_CRUSH_KIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_KIN, .trainerName = _("RON & MYA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushKinRonMya), - .party = {.ItemDefaultMoves = sTrainerMons_CrushKinRonMya} + .partySize = NELEMS(sParty_CrushKinRonMya), + .party = {.ItemDefaultMoves = sParty_CrushKinRonMya} }, [TRAINER_YOUNG_COUPLE_LEA_JED] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNG_COUPLE_2, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_YOUNG_COUPLE, .trainerName = _("LEA & JED"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungCoupleLeaJed), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungCoupleLeaJed} + .partySize = NELEMS(sParty_YoungCoupleLeaJed), + .party = {.NoItemDefaultMoves = sParty_YoungCoupleLeaJed} }, [TRAINER_SIS_AND_BRO_LIA_LUC] = { .partyFlags = 0, - .trainerClass = CLASS_SIS_AND_BRO_2, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SIS_AND_BRO, .trainerName = _("LIA & LUC"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SisAndBroLiaLuc), - .party = {.NoItemDefaultMoves = sTrainerMons_SisAndBroLiaLuc} + .partySize = NELEMS(sParty_SisAndBroLiaLuc), + .party = {.NoItemDefaultMoves = sParty_SisAndBroLiaLuc} }, [TRAINER_SIS_AND_BRO_LIL_IAN] = { .partyFlags = 0, - .trainerClass = CLASS_SIS_AND_BRO_2, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SIS_AND_BRO, .trainerName = _("LIL & IAN"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SisAndBroLilIan), - .party = {.NoItemDefaultMoves = sTrainerMons_SisAndBroLilIan} + .partySize = NELEMS(sParty_SisAndBroLilIan), + .party = {.NoItemDefaultMoves = sParty_SisAndBroLilIan} }, [TRAINER_BUG_CATCHER_3] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher3), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher3} + .partySize = NELEMS(sParty_BugCatcher3), + .party = {.NoItemDefaultMoves = sParty_BugCatcher3} }, [TRAINER_BUG_CATCHER_4] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher4), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher4} + .partySize = NELEMS(sParty_BugCatcher4), + .party = {.NoItemDefaultMoves = sParty_BugCatcher4} }, [TRAINER_BUG_CATCHER_5] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher5), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher5} + .partySize = NELEMS(sParty_BugCatcher5), + .party = {.NoItemDefaultMoves = sParty_BugCatcher5} }, [TRAINER_BUG_CATCHER_6] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher6), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher6} + .partySize = NELEMS(sParty_BugCatcher6), + .party = {.NoItemDefaultMoves = sParty_BugCatcher6} }, [TRAINER_BUG_CATCHER_7] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher7), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher7} + .partySize = NELEMS(sParty_BugCatcher7), + .party = {.NoItemDefaultMoves = sParty_BugCatcher7} }, [TRAINER_BUG_CATCHER_8] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcher8), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcher8} + .partySize = NELEMS(sParty_BugCatcher8), + .party = {.NoItemDefaultMoves = sParty_BugCatcher8} }, [TRAINER_YOUNGSTER_BEN_3] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("BEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterBen3), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterBen3} + .partySize = NELEMS(sParty_YoungsterBen3), + .party = {.NoItemDefaultMoves = sParty_YoungsterBen3} }, [TRAINER_YOUNGSTER_BEN_4] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("BEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterBen4), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterBen4} + .partySize = NELEMS(sParty_YoungsterBen4), + .party = {.NoItemDefaultMoves = sParty_YoungsterBen4} }, [TRAINER_YOUNGSTER_CHAD_2] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("CHAD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterChad2), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterChad2} + .partySize = NELEMS(sParty_YoungsterChad2), + .party = {.NoItemDefaultMoves = sParty_YoungsterChad2} }, [TRAINER_LASS_RELI_2] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("RELI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassReli2), - .party = {.NoItemDefaultMoves = sTrainerMons_LassReli2} + .partySize = NELEMS(sParty_LassReli2), + .party = {.NoItemDefaultMoves = sParty_LassReli2} }, [TRAINER_LASS_RELI_3] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("RELI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassReli3), - .party = {.NoItemDefaultMoves = sTrainerMons_LassReli3} + .partySize = NELEMS(sParty_LassReli3), + .party = {.NoItemDefaultMoves = sParty_LassReli3} }, [TRAINER_YOUNGSTER_TIMMY_2] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("TIMMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterTimmy2), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterTimmy2} + .partySize = NELEMS(sParty_YoungsterTimmy2), + .party = {.NoItemDefaultMoves = sParty_YoungsterTimmy2} }, [TRAINER_YOUNGSTER_TIMMY_3] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("TIMMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterTimmy3), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterTimmy3} + .partySize = NELEMS(sParty_YoungsterTimmy3), + .party = {.NoItemDefaultMoves = sParty_YoungsterTimmy3} }, [TRAINER_YOUNGSTER_TIMMY_4] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("TIMMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterTimmy4), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterTimmy4} + .partySize = NELEMS(sParty_YoungsterTimmy4), + .party = {.NoItemDefaultMoves = sParty_YoungsterTimmy4} }, [TRAINER_YOUNGSTER_CHAD_3] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("CHAD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterChad3), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterChad3} + .partySize = NELEMS(sParty_YoungsterChad3), + .party = {.NoItemDefaultMoves = sParty_YoungsterChad3} }, [TRAINER_LASS_JANICE_2] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("JANICE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassJanice2), - .party = {.NoItemDefaultMoves = sTrainerMons_LassJanice2} + .partySize = NELEMS(sParty_LassJanice2), + .party = {.NoItemDefaultMoves = sParty_LassJanice2} }, [TRAINER_LASS_JANICE_3] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("JANICE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassJanice3), - .party = {.NoItemDefaultMoves = sTrainerMons_LassJanice3} + .partySize = NELEMS(sParty_LassJanice3), + .party = {.NoItemDefaultMoves = sParty_LassJanice3} }, [TRAINER_YOUNGSTER_CHAD_4] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("CHAD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterChad4), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterChad4} + .partySize = NELEMS(sParty_YoungsterChad4), + .party = {.NoItemDefaultMoves = sParty_YoungsterChad4} }, [TRAINER_HIKER_FRANKLIN_2] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("FRANKLIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerFranklin2), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerFranklin2} + .partySize = NELEMS(sParty_HikerFranklin2), + .party = {.NoItemDefaultMoves = sParty_HikerFranklin2} }, [TRAINER_PKMN_PROF_PROF_OAK] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_PROF, + .trainerClass = TRAINER_CLASS_PKMN_PROF, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_PROFESSOR_OAK, .trainerName = _("PROF. OAK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnProfProfOak), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnProfProfOak} + .partySize = NELEMS(sParty_PkmnProfProfOak), + .party = {.NoItemDefaultMoves = sParty_PkmnProfProfOak} }, [TRAINER_PLAYER_BRENDAN] = { .partyFlags = 0, - .trainerClass = CLASS_PLAYER, + .trainerClass = TRAINER_CLASS_PLAYER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RS_BRENDAN_2, .trainerName = _("BRENDAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PlayerBrendan), - .party = {.NoItemDefaultMoves = sTrainerMons_PlayerBrendan} + .partySize = NELEMS(sParty_PlayerBrendan), + .party = {.NoItemDefaultMoves = sParty_PlayerBrendan} }, [TRAINER_PLAYER_MAY] = { .partyFlags = 0, - .trainerClass = CLASS_PLAYER, + .trainerClass = TRAINER_CLASS_PLAYER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_RS_MAY_2, .trainerName = _("MAY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PlayerMay), - .party = {.NoItemDefaultMoves = sTrainerMons_PlayerMay} + .partySize = NELEMS(sParty_PlayerMay), + .party = {.NoItemDefaultMoves = sParty_PlayerMay} }, [TRAINER_PLAYER_RED] = { .partyFlags = 0, - .trainerClass = CLASS_PLAYER, + .trainerClass = TRAINER_CLASS_PLAYER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_RED, .trainerName = _("RED"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PlayerRed), - .party = {.NoItemDefaultMoves = sTrainerMons_PlayerRed} + .partySize = NELEMS(sParty_PlayerRed), + .party = {.NoItemDefaultMoves = sParty_PlayerRed} }, [TRAINER_PLAYER_LEAF] = { .partyFlags = 0, - .trainerClass = CLASS_PLAYER, + .trainerClass = TRAINER_CLASS_PLAYER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LEAF, .trainerName = _("LEAF"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PlayerLeaf), - .party = {.NoItemDefaultMoves = sTrainerMons_PlayerLeaf} + .partySize = NELEMS(sParty_PlayerLeaf), + .party = {.NoItemDefaultMoves = sParty_PlayerLeaf} }, [TRAINER_TEAM_ROCKET_GRUNT_42] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_F, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt42), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt42} + .partySize = NELEMS(sParty_TeamRocketGrunt42), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt42} }, [TRAINER_PSYCHIC_JACLYN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PSYCHIC_F, .trainerName = _("JACLYN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicJaclyn), - .party = {.NoItemCustomMoves = sTrainerMons_PsychicJaclyn} + .partySize = NELEMS(sParty_PsychicJaclyn), + .party = {.NoItemCustomMoves = sParty_PsychicJaclyn} }, [TRAINER_CRUSH_GIRL_SHARON] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("SHARON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlSharon), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlSharon} + .partySize = NELEMS(sParty_CrushGirlSharon), + .party = {.ItemDefaultMoves = sParty_CrushGirlSharon} }, [TRAINER_TUBER_AMIRA] = { .partyFlags = 0, - .trainerClass = CLASS_TUBER_3, + .trainerClass = TRAINER_CLASS_TUBER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("AMIRA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TuberAmira), - .party = {.NoItemDefaultMoves = sTrainerMons_TuberAmira} + .partySize = NELEMS(sParty_TuberAmira), + .party = {.NoItemDefaultMoves = sParty_TuberAmira} }, [TRAINER_PKMN_BREEDER_ALIZE] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_BREEDER_2, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER, .trainerName = _("ALIZE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnBreederAlize), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnBreederAlize} + .partySize = NELEMS(sParty_PkmnBreederAlize), + .party = {.NoItemDefaultMoves = sParty_PkmnBreederAlize} }, [TRAINER_PKMN_RANGER_NICOLAS] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, .trainerName = _("NICOLAS"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerNicolas), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerNicolas} + .partySize = NELEMS(sParty_PkmnRangerNicolas), + .party = {.NoItemCustomMoves = sParty_PkmnRangerNicolas} }, [TRAINER_PKMN_RANGER_MADELINE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, .trainerName = _("MADELINE"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerMadeline), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerMadeline} + .partySize = NELEMS(sParty_PkmnRangerMadeline), + .party = {.NoItemCustomMoves = sParty_PkmnRangerMadeline} }, [TRAINER_AROMA_LADY_NIKKI] = { .partyFlags = 0, - .trainerClass = CLASS_AROMA_LADY_2, + .trainerClass = TRAINER_CLASS_AROMA_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_AROMA_LADY, .trainerName = _("NIKKI"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AromaLadyNikki), - .party = {.NoItemDefaultMoves = sTrainerMons_AromaLadyNikki} + .partySize = NELEMS(sParty_AromaLadyNikki), + .party = {.NoItemDefaultMoves = sParty_AromaLadyNikki} }, [TRAINER_RUIN_MANIAC_STANLY] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("STANLY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacStanly), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiacStanly} + .partySize = NELEMS(sParty_RuinManiacStanly), + .party = {.NoItemDefaultMoves = sParty_RuinManiacStanly} }, [TRAINER_LADY_JACKI] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_LADY_2, + .trainerClass = TRAINER_CLASS_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LADY, .trainerName = _("JACKI"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LadyJacki), - .party = {.ItemDefaultMoves = sTrainerMons_LadyJacki} + .partySize = NELEMS(sParty_LadyJacki), + .party = {.ItemDefaultMoves = sParty_LadyJacki} }, [TRAINER_PAINTER_DAISY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PAINTER, + .trainerClass = TRAINER_CLASS_PAINTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_PAINTER, .trainerName = _("DAISY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PainterDaisy), - .party = {.NoItemCustomMoves = sTrainerMons_PainterDaisy} + .partySize = NELEMS(sParty_PainterDaisy), + .party = {.NoItemCustomMoves = sParty_PainterDaisy} }, [TRAINER_BIKER_GOON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("GOON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerGoon), - .party = {.NoItemCustomMoves = sTrainerMons_BikerGoon} + .partySize = NELEMS(sParty_BikerGoon), + .party = {.NoItemCustomMoves = sParty_BikerGoon} }, [TRAINER_BIKER_GOON_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("GOON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerGoon2), - .party = {.NoItemCustomMoves = sTrainerMons_BikerGoon2} + .partySize = NELEMS(sParty_BikerGoon2), + .party = {.NoItemCustomMoves = sParty_BikerGoon2} }, [TRAINER_BIKER_GOON_3] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("GOON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerGoon3), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerGoon3} + .partySize = NELEMS(sParty_BikerGoon3), + .party = {.NoItemDefaultMoves = sParty_BikerGoon3} }, [TRAINER_BIKER_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_Biker2), - .party = {.NoItemDefaultMoves = sTrainerMons_Biker2} + .partySize = NELEMS(sParty_Biker2), + .party = {.NoItemDefaultMoves = sParty_Biker2} }, [TRAINER_BUG_CATCHER_ANTHONY] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("ANTHONY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherAnthony), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherAnthony} + .partySize = NELEMS(sParty_BugCatcherAnthony), + .party = {.NoItemDefaultMoves = sParty_BugCatcherAnthony} }, [TRAINER_BUG_CATCHER_CHARLIE] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("CHARLIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherCharlie), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherCharlie} + .partySize = NELEMS(sParty_BugCatcherCharlie), + .party = {.NoItemDefaultMoves = sParty_BugCatcherCharlie} }, [TRAINER_TWINS_ELI_ANNE_2] = { .partyFlags = 0, - .trainerClass = CLASS_TWINS_2, + .trainerClass = TRAINER_CLASS_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("ELI & ANNE"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TwinsEliAnne2), - .party = {.NoItemDefaultMoves = sTrainerMons_TwinsEliAnne2} + .partySize = NELEMS(sParty_TwinsEliAnne2), + .party = {.NoItemDefaultMoves = sParty_TwinsEliAnne2} }, [TRAINER_YOUNGSTER_JOHNSON] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("JOHNSON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterJohnson), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterJohnson} + .partySize = NELEMS(sParty_YoungsterJohnson), + .party = {.NoItemDefaultMoves = sParty_YoungsterJohnson} }, [TRAINER_BIKER_RICARDO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("RICARDO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerRicardo), - .party = {.NoItemCustomMoves = sTrainerMons_BikerRicardo} + .partySize = NELEMS(sParty_BikerRicardo), + .party = {.NoItemCustomMoves = sParty_BikerRicardo} }, [TRAINER_BIKER_JAREN] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("JAREN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerJaren), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerJaren} + .partySize = NELEMS(sParty_BikerJaren), + .party = {.NoItemDefaultMoves = sParty_BikerJaren} }, [TRAINER_TEAM_ROCKET_GRUNT_43] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt43), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt43} + .partySize = NELEMS(sParty_TeamRocketGrunt43), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt43} }, [TRAINER_TEAM_ROCKET_GRUNT_44] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt44), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt44} + .partySize = NELEMS(sParty_TeamRocketGrunt44), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt44} }, [TRAINER_TEAM_ROCKET_GRUNT_45] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt45), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt45} + .partySize = NELEMS(sParty_TeamRocketGrunt45), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt45} }, [TRAINER_TEAM_ROCKET_GRUNT_46] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt46), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt46} + .partySize = NELEMS(sParty_TeamRocketGrunt46), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt46} }, [TRAINER_TEAM_ROCKET_GRUNT_47] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt47), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt47} + .partySize = NELEMS(sParty_TeamRocketGrunt47), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt47} }, [TRAINER_TEAM_ROCKET_GRUNT_48] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt48), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt48} + .partySize = NELEMS(sParty_TeamRocketGrunt48), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt48} }, [TRAINER_TEAM_ROCKET_ADMIN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_F, .trainerName = _("ADMIN"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_TeamRocketAdmin), - .party = {.NoItemCustomMoves = sTrainerMons_TeamRocketAdmin} + .partySize = NELEMS(sParty_TeamRocketAdmin), + .party = {.NoItemCustomMoves = sParty_TeamRocketAdmin} }, [TRAINER_TEAM_ROCKET_ADMIN_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("ADMIN"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_TeamRocketAdmin2), - .party = {.NoItemCustomMoves = sTrainerMons_TeamRocketAdmin2} + .partySize = NELEMS(sParty_TeamRocketAdmin2), + .party = {.NoItemCustomMoves = sParty_TeamRocketAdmin2} }, [TRAINER_SCIENTIST_GIDEON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_SCIENTIST, + .trainerClass = TRAINER_CLASS_SCIENTIST, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SCIENTIST, .trainerName = _("GIDEON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_ScientistGideon), - .party = {.NoItemCustomMoves = sTrainerMons_ScientistGideon} + .partySize = NELEMS(sParty_ScientistGideon), + .party = {.NoItemCustomMoves = sParty_ScientistGideon} }, [TRAINER_SWIMMER_FEMALE_AMARA] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("AMARA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleAmara), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleAmara} + .partySize = NELEMS(sParty_SwimmerFemaleAmara), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleAmara} }, [TRAINER_SWIMMER_FEMALE_MARIA] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("MARIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleMaria), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleMaria} + .partySize = NELEMS(sParty_SwimmerFemaleMaria), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleMaria} }, [TRAINER_SWIMMER_FEMALE_ABIGAIL] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("ABIGAIL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleAbigail), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleAbigail} + .partySize = NELEMS(sParty_SwimmerFemaleAbigail), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleAbigail} }, [TRAINER_SWIMMER_MALE_FINN] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("FINN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleFinn), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleFinn} + .partySize = NELEMS(sParty_SwimmerMaleFinn), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleFinn} }, [TRAINER_SWIMMER_MALE_GARRETT] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("GARRETT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleGarrett), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleGarrett} + .partySize = NELEMS(sParty_SwimmerMaleGarrett), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleGarrett} }, [TRAINER_FISHERMAN_TOMMY] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("TOMMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanTommy), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanTommy} + .partySize = NELEMS(sParty_FishermanTommy), + .party = {.NoItemDefaultMoves = sParty_FishermanTommy} }, [TRAINER_CRUSH_GIRL_TANYA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("TANYA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlTanya), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlTanya} + .partySize = NELEMS(sParty_CrushGirlTanya), + .party = {.ItemDefaultMoves = sParty_CrushGirlTanya} }, [TRAINER_BLACK_BELT_SHEA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("SHEA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltShea), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltShea} + .partySize = NELEMS(sParty_BlackBeltShea), + .party = {.ItemDefaultMoves = sParty_BlackBeltShea} }, [TRAINER_BLACK_BELT_HUGH] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("HUGH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltHugh), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltHugh} + .partySize = NELEMS(sParty_BlackBeltHugh), + .party = {.ItemDefaultMoves = sParty_BlackBeltHugh} }, [TRAINER_CAMPER_BRYCE] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("BRYCE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperBryce), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperBryce} + .partySize = NELEMS(sParty_CamperBryce), + .party = {.NoItemDefaultMoves = sParty_CamperBryce} }, [TRAINER_PICNICKER_CLAIRE] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("CLAIRE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerClaire), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerClaire} + .partySize = NELEMS(sParty_PicnickerClaire), + .party = {.NoItemDefaultMoves = sParty_PicnickerClaire} }, [TRAINER_CRUSH_KIN_MIK_KIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_KIN, + .trainerClass = TRAINER_CLASS_CRUSH_KIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_KIN, .trainerName = _("MIK & KIA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushKinMikKia), - .party = {.ItemDefaultMoves = sTrainerMons_CrushKinMikKia} + .partySize = NELEMS(sParty_CrushKinMikKia), + .party = {.ItemDefaultMoves = sParty_CrushKinMikKia} }, [TRAINER_AROMA_LADY_VIOLET] = { .partyFlags = 0, - .trainerClass = CLASS_AROMA_LADY_2, + .trainerClass = TRAINER_CLASS_AROMA_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_AROMA_LADY, .trainerName = _("VIOLET"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AromaLadyViolet), - .party = {.NoItemDefaultMoves = sTrainerMons_AromaLadyViolet} + .partySize = NELEMS(sParty_AromaLadyViolet), + .party = {.NoItemDefaultMoves = sParty_AromaLadyViolet} }, [TRAINER_TUBER_ALEXIS] = { .partyFlags = 0, - .trainerClass = CLASS_TUBER_3, + .trainerClass = TRAINER_CLASS_TUBER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("ALEXIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TuberAlexis), - .party = {.NoItemDefaultMoves = sTrainerMons_TuberAlexis} + .partySize = NELEMS(sParty_TuberAlexis), + .party = {.NoItemDefaultMoves = sParty_TuberAlexis} }, [TRAINER_TWINS_JOY_MEG] = { .partyFlags = 0, - .trainerClass = CLASS_TWINS_2, + .trainerClass = TRAINER_CLASS_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("JOY & MEG"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TwinsJoyMeg), - .party = {.NoItemDefaultMoves = sTrainerMons_TwinsJoyMeg} + .partySize = NELEMS(sParty_TwinsJoyMeg), + .party = {.NoItemDefaultMoves = sParty_TwinsJoyMeg} }, [TRAINER_SWIMMER_FEMALE_TISHA] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("TISHA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleTisha), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleTisha} + .partySize = NELEMS(sParty_SwimmerFemaleTisha), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleTisha} }, [TRAINER_PAINTER_CELINA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PAINTER, + .trainerClass = TRAINER_CLASS_PAINTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_PAINTER, .trainerName = _("CELINA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PainterCelina), - .party = {.NoItemCustomMoves = sTrainerMons_PainterCelina} + .partySize = NELEMS(sParty_PainterCelina), + .party = {.NoItemCustomMoves = sParty_PainterCelina} }, [TRAINER_PAINTER_RAYNA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PAINTER, + .trainerClass = TRAINER_CLASS_PAINTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_PAINTER, .trainerName = _("RAYNA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PainterRayna), - .party = {.NoItemCustomMoves = sTrainerMons_PainterRayna} + .partySize = NELEMS(sParty_PainterRayna), + .party = {.NoItemCustomMoves = sParty_PainterRayna} }, [TRAINER_LADY_GILLIAN] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_LADY_2, + .trainerClass = TRAINER_CLASS_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LADY, .trainerName = _("GILLIAN"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LadyGillian), - .party = {.ItemDefaultMoves = sTrainerMons_LadyGillian} + .partySize = NELEMS(sParty_LadyGillian), + .party = {.ItemDefaultMoves = sParty_LadyGillian} }, [TRAINER_YOUNGSTER_DESTIN] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("DESTIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterDestin), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterDestin} + .partySize = NELEMS(sParty_YoungsterDestin), + .party = {.NoItemDefaultMoves = sParty_YoungsterDestin} }, [TRAINER_SWIMMER_MALE_TOBY] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("TOBY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleToby), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleToby} + .partySize = NELEMS(sParty_SwimmerMaleToby), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleToby} }, [TRAINER_TEAM_ROCKET_GRUNT_49] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt49), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt49} + .partySize = NELEMS(sParty_TeamRocketGrunt49), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt49} }, [TRAINER_TEAM_ROCKET_GRUNT_50] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt50), - .party = {.NoItemCustomMoves = sTrainerMons_TeamRocketGrunt50} + .partySize = NELEMS(sParty_TeamRocketGrunt50), + .party = {.NoItemCustomMoves = sParty_TeamRocketGrunt50} }, [TRAINER_TEAM_ROCKET_GRUNT_51] = { .partyFlags = 0, - .trainerClass = CLASS_TEAM_ROCKET, + .trainerClass = TRAINER_CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, .trainerPic = TRAINER_PIC_ROCKET_GRUNT_F, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TeamRocketGrunt51), - .party = {.NoItemDefaultMoves = sTrainerMons_TeamRocketGrunt51} + .partySize = NELEMS(sParty_TeamRocketGrunt51), + .party = {.NoItemDefaultMoves = sParty_TeamRocketGrunt51} }, [TRAINER_BIRD_KEEPER_MILO] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MILO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperMilo), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperMilo} + .partySize = NELEMS(sParty_BirdKeeperMilo), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperMilo} }, [TRAINER_BIRD_KEEPER_CHAZ] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CHAZ"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperChaz), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperChaz} + .partySize = NELEMS(sParty_BirdKeeperChaz), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperChaz} }, [TRAINER_BIRD_KEEPER_HAROLD] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("HAROLD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperHarold), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperHarold} + .partySize = NELEMS(sParty_BirdKeeperHarold), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperHarold} }, [TRAINER_FISHERMAN_TYLOR] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("TYLOR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanTylor), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanTylor} + .partySize = NELEMS(sParty_FishermanTylor), + .party = {.NoItemDefaultMoves = sParty_FishermanTylor} }, [TRAINER_SWIMMER_MALE_MYMO] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("MYMO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleMymo), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleMymo} + .partySize = NELEMS(sParty_SwimmerMaleMymo), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleMymo} }, [TRAINER_SWIMMER_FEMALE_NICOLE] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("NICOLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleNicole), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleNicole} + .partySize = NELEMS(sParty_SwimmerFemaleNicole), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleNicole} }, [TRAINER_SIS_AND_BRO_AVA_GEB] = { .partyFlags = 0, - .trainerClass = CLASS_SIS_AND_BRO_2, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SIS_AND_BRO, .trainerName = _("AVA & GEB"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SisAndBroAvaGeb), - .party = {.NoItemDefaultMoves = sTrainerMons_SisAndBroAvaGeb} + .partySize = NELEMS(sParty_SisAndBroAvaGeb), + .party = {.NoItemDefaultMoves = sParty_SisAndBroAvaGeb} }, [TRAINER_AROMA_LADY_ROSE] = { .partyFlags = 0, - .trainerClass = CLASS_AROMA_LADY_2, + .trainerClass = TRAINER_CLASS_AROMA_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_AROMA_LADY, .trainerName = _("ROSE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AromaLadyRose), - .party = {.NoItemDefaultMoves = sTrainerMons_AromaLadyRose} + .partySize = NELEMS(sParty_AromaLadyRose), + .party = {.NoItemDefaultMoves = sParty_AromaLadyRose} }, [TRAINER_SWIMMER_MALE_SAMIR] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("SAMIR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleSamir), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleSamir} + .partySize = NELEMS(sParty_SwimmerMaleSamir), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleSamir} }, [TRAINER_SWIMMER_FEMALE_DENISE] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("DENISE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleDenise), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleDenise} + .partySize = NELEMS(sParty_SwimmerFemaleDenise), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleDenise} }, [TRAINER_TWINS_MIU_MIA] = { .partyFlags = 0, - .trainerClass = CLASS_TWINS_2, + .trainerClass = TRAINER_CLASS_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("MIU & MIA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TwinsMiuMia), - .party = {.NoItemDefaultMoves = sTrainerMons_TwinsMiuMia} + .partySize = NELEMS(sParty_TwinsMiuMia), + .party = {.NoItemDefaultMoves = sParty_TwinsMiuMia} }, [TRAINER_HIKER_EARL] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("EARL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerEarl), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerEarl} + .partySize = NELEMS(sParty_HikerEarl), + .party = {.NoItemDefaultMoves = sParty_HikerEarl} }, [TRAINER_RUIN_MANIAC_FOSTER] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("FOSTER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacFoster), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiacFoster} + .partySize = NELEMS(sParty_RuinManiacFoster), + .party = {.NoItemDefaultMoves = sParty_RuinManiacFoster} }, [TRAINER_RUIN_MANIAC_LARRY] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("LARRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacLarry), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiacLarry} + .partySize = NELEMS(sParty_RuinManiacLarry), + .party = {.NoItemDefaultMoves = sParty_RuinManiacLarry} }, [TRAINER_HIKER_DARYL] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("DARYL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerDaryl), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerDaryl} + .partySize = NELEMS(sParty_HikerDaryl), + .party = {.NoItemDefaultMoves = sParty_HikerDaryl} }, [TRAINER_POKEMANIAC_HECTOR] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("HECTOR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacHector), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacHector} + .partySize = NELEMS(sParty_PokemaniacHector), + .party = {.NoItemDefaultMoves = sParty_PokemaniacHector} }, [TRAINER_PSYCHIC_DARIO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("DARIO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicDario), - .party = {.NoItemCustomMoves = sTrainerMons_PsychicDario} + .partySize = NELEMS(sParty_PsychicDario), + .party = {.NoItemCustomMoves = sParty_PsychicDario} }, [TRAINER_PSYCHIC_RODETTE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PSYCHIC_F, .trainerName = _("RODETTE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicRodette), - .party = {.NoItemCustomMoves = sTrainerMons_PsychicRodette} + .partySize = NELEMS(sParty_PsychicRodette), + .party = {.NoItemCustomMoves = sParty_PsychicRodette} }, [TRAINER_AROMA_LADY_MIAH] = { .partyFlags = 0, - .trainerClass = CLASS_AROMA_LADY_2, + .trainerClass = TRAINER_CLASS_AROMA_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_AROMA_LADY, .trainerName = _("MIAH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_AromaLadyMiah), - .party = {.NoItemDefaultMoves = sTrainerMons_AromaLadyMiah} + .partySize = NELEMS(sParty_AromaLadyMiah), + .party = {.NoItemDefaultMoves = sParty_AromaLadyMiah} }, [TRAINER_YOUNG_COUPLE_EVE_JON] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNG_COUPLE_2, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_YOUNG_COUPLE, .trainerName = _("EVE & JON"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungCoupleEveJon), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungCoupleEveJon} + .partySize = NELEMS(sParty_YoungCoupleEveJon), + .party = {.NoItemDefaultMoves = sParty_YoungCoupleEveJon} }, [TRAINER_JUGGLER_MASON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("MASON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerMason), - .party = {.NoItemCustomMoves = sTrainerMons_JugglerMason} + .partySize = NELEMS(sParty_JugglerMason), + .party = {.NoItemCustomMoves = sParty_JugglerMason} }, [TRAINER_CRUSH_GIRL_CYNDY] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("CYNDY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlCyndy), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlCyndy} + .partySize = NELEMS(sParty_CrushGirlCyndy), + .party = {.ItemDefaultMoves = sParty_CrushGirlCyndy} }, [TRAINER_CRUSH_GIRL_JOCELYN] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("JOCELYN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlJocelyn), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlJocelyn} + .partySize = NELEMS(sParty_CrushGirlJocelyn), + .party = {.ItemDefaultMoves = sParty_CrushGirlJocelyn} }, [TRAINER_TAMER_EVAN] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("EVAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerEvan), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerEvan} + .partySize = NELEMS(sParty_TamerEvan), + .party = {.NoItemDefaultMoves = sParty_TamerEvan} }, [TRAINER_POKEMANIAC_MARK_2] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("MARK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacMark2), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacMark2} + .partySize = NELEMS(sParty_PokemaniacMark2), + .party = {.NoItemDefaultMoves = sParty_PokemaniacMark2} }, [TRAINER_PKMN_RANGER_LOGAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, .trainerName = _("LOGAN"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerLogan), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerLogan} + .partySize = NELEMS(sParty_PkmnRangerLogan), + .party = {.NoItemCustomMoves = sParty_PkmnRangerLogan} }, [TRAINER_PKMN_RANGER_JACKSON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, .trainerName = _("JACKSON"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerJackson), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerJackson} + .partySize = NELEMS(sParty_PkmnRangerJackson), + .party = {.NoItemCustomMoves = sParty_PkmnRangerJackson} }, [TRAINER_PKMN_RANGER_BETH] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, .trainerName = _("BETH"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerBeth), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnRangerBeth} + .partySize = NELEMS(sParty_PkmnRangerBeth), + .party = {.NoItemDefaultMoves = sParty_PkmnRangerBeth} }, [TRAINER_PKMN_RANGER_KATELYN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, .trainerName = _("KATELYN"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerKatelyn), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerKatelyn} + .partySize = NELEMS(sParty_PkmnRangerKatelyn), + .party = {.NoItemCustomMoves = sParty_PkmnRangerKatelyn} }, [TRAINER_COOLTRAINER_LEROY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("LEROY"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerLeroy), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerLeroy} + .partySize = NELEMS(sParty_CooltrainerLeroy), + .party = {.NoItemCustomMoves = sParty_CooltrainerLeroy} }, [TRAINER_COOLTRAINER_MICHELLE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("MICHELLE"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerMichelle), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerMichelle} + .partySize = NELEMS(sParty_CooltrainerMichelle), + .party = {.NoItemCustomMoves = sParty_CooltrainerMichelle} }, [TRAINER_COOL_COUPLE_LEX_NYA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOL_COUPLE, + .trainerClass = TRAINER_CLASS_COOL_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOL_COUPLE, .trainerName = _("LEX & NYA"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CoolCoupleLexNya), - .party = {.NoItemCustomMoves = sTrainerMons_CoolCoupleLexNya} + .partySize = NELEMS(sParty_CoolCoupleLexNya), + .party = {.NoItemCustomMoves = sParty_CoolCoupleLexNya} }, [TRAINER_RUIN_MANIAC_BRANDON] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("BRANDON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacBrandon), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiacBrandon} + .partySize = NELEMS(sParty_RuinManiacBrandon), + .party = {.NoItemDefaultMoves = sParty_RuinManiacBrandon} }, [TRAINER_RUIN_MANIAC_BENJAMIN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("BENJAMIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacBenjamin), - .party = {.NoItemCustomMoves = sTrainerMons_RuinManiacBenjamin} + .partySize = NELEMS(sParty_RuinManiacBenjamin), + .party = {.NoItemCustomMoves = sParty_RuinManiacBenjamin} }, [TRAINER_PAINTER_EDNA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PAINTER, + .trainerClass = TRAINER_CLASS_PAINTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_PAINTER, .trainerName = _("EDNA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PainterEdna), - .party = {.NoItemCustomMoves = sTrainerMons_PainterEdna} + .partySize = NELEMS(sParty_PainterEdna), + .party = {.NoItemCustomMoves = sParty_PainterEdna} }, [TRAINER_GENTLEMAN_CLIFFORD] = { .partyFlags = 0, - .trainerClass = CLASS_GENTLEMAN_2, + .trainerClass = TRAINER_CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("CLIFFORD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GentlemanClifford), - .party = {.NoItemDefaultMoves = sTrainerMons_GentlemanClifford} + .partySize = NELEMS(sParty_GentlemanClifford), + .party = {.NoItemDefaultMoves = sParty_GentlemanClifford} }, [TRAINER_LADY_SELPHY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_LADY_2, + .trainerClass = TRAINER_CLASS_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_LADY, .trainerName = _("SELPHY"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LadySelphy), - .party = {.ItemCustomMoves = sTrainerMons_LadySelphy} + .partySize = NELEMS(sParty_LadySelphy), + .party = {.ItemCustomMoves = sParty_LadySelphy} }, [TRAINER_RUIN_MANIAC_LAWSON] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("LAWSON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacLawson), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiacLawson} + .partySize = NELEMS(sParty_RuinManiacLawson), + .party = {.NoItemDefaultMoves = sParty_RuinManiacLawson} }, [TRAINER_PSYCHIC_LAURA] = { .partyFlags = 0, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PSYCHIC_F, .trainerName = _("LAURA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicLaura), - .party = {.NoItemDefaultMoves = sTrainerMons_PsychicLaura} + .partySize = NELEMS(sParty_PsychicLaura), + .party = {.NoItemDefaultMoves = sParty_PsychicLaura} }, [TRAINER_PKMN_BREEDER_BETHANY] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_BREEDER_2, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER, .trainerName = _("BETHANY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnBreederBethany), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnBreederBethany} + .partySize = NELEMS(sParty_PkmnBreederBethany), + .party = {.NoItemDefaultMoves = sParty_PkmnBreederBethany} }, [TRAINER_PKMN_BREEDER_ALLISON] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_BREEDER_2, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER, .trainerName = _("ALLISON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnBreederAllison), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnBreederAllison} + .partySize = NELEMS(sParty_PkmnBreederAllison), + .party = {.NoItemDefaultMoves = sParty_PkmnBreederAllison} }, [TRAINER_BUG_CATCHER_GARRET] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("GARRET"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherGarret), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherGarret} + .partySize = NELEMS(sParty_BugCatcherGarret), + .party = {.NoItemDefaultMoves = sParty_BugCatcherGarret} }, [TRAINER_BUG_CATCHER_JONAH] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("JONAH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherJonah), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherJonah} + .partySize = NELEMS(sParty_BugCatcherJonah), + .party = {.NoItemDefaultMoves = sParty_BugCatcherJonah} }, [TRAINER_BUG_CATCHER_VANCE] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("VANCE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherVance), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherVance} + .partySize = NELEMS(sParty_BugCatcherVance), + .party = {.NoItemDefaultMoves = sParty_BugCatcherVance} }, [TRAINER_YOUNGSTER_NASH] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("NASH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterNash), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterNash} + .partySize = NELEMS(sParty_YoungsterNash), + .party = {.NoItemDefaultMoves = sParty_YoungsterNash} }, [TRAINER_YOUNGSTER_CORDELL] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("CORDELL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterCordell), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterCordell} + .partySize = NELEMS(sParty_YoungsterCordell), + .party = {.NoItemDefaultMoves = sParty_YoungsterCordell} }, [TRAINER_LASS_DALIA] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("DALIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassDalia), - .party = {.NoItemDefaultMoves = sTrainerMons_LassDalia} + .partySize = NELEMS(sParty_LassDalia), + .party = {.NoItemDefaultMoves = sParty_LassDalia} }, [TRAINER_LASS_JOANA] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("JOANA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassJoana), - .party = {.NoItemDefaultMoves = sTrainerMons_LassJoana} + .partySize = NELEMS(sParty_LassJoana), + .party = {.NoItemDefaultMoves = sParty_LassJoana} }, [TRAINER_CAMPER_RILEY] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("RILEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperRiley), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperRiley} + .partySize = NELEMS(sParty_CamperRiley), + .party = {.NoItemDefaultMoves = sParty_CamperRiley} }, [TRAINER_PICNICKER_MARCY] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("MARCY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerMarcy), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerMarcy} + .partySize = NELEMS(sParty_PicnickerMarcy), + .party = {.NoItemDefaultMoves = sParty_PicnickerMarcy} }, [TRAINER_RUIN_MANIAC_LAYTON] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("LAYTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacLayton), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiacLayton} + .partySize = NELEMS(sParty_RuinManiacLayton), + .party = {.NoItemDefaultMoves = sParty_RuinManiacLayton} }, [TRAINER_PICNICKER_KELSEY_2] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("KELSEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerKelsey2), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerKelsey2} + .partySize = NELEMS(sParty_PicnickerKelsey2), + .party = {.NoItemDefaultMoves = sParty_PicnickerKelsey2} }, [TRAINER_PICNICKER_KELSEY_3] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("KELSEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerKelsey3), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerKelsey3} + .partySize = NELEMS(sParty_PicnickerKelsey3), + .party = {.NoItemDefaultMoves = sParty_PicnickerKelsey3} }, [TRAINER_PICNICKER_KELSEY_4] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("KELSEY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerKelsey4), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerKelsey4} + .partySize = NELEMS(sParty_PicnickerKelsey4), + .party = {.NoItemDefaultMoves = sParty_PicnickerKelsey4} }, [TRAINER_CAMPER_RICKY_2] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("RICKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperRicky2), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperRicky2} + .partySize = NELEMS(sParty_CamperRicky2), + .party = {.NoItemDefaultMoves = sParty_CamperRicky2} }, [TRAINER_CAMPER_RICKY_3] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("RICKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperRicky3), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperRicky3} + .partySize = NELEMS(sParty_CamperRicky3), + .party = {.NoItemDefaultMoves = sParty_CamperRicky3} }, [TRAINER_CAMPER_RICKY_4] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("RICKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperRicky4), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperRicky4} + .partySize = NELEMS(sParty_CamperRicky4), + .party = {.NoItemDefaultMoves = sParty_CamperRicky4} }, [TRAINER_CAMPER_JEFF_2] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("JEFF"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperJeff2), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperJeff2} + .partySize = NELEMS(sParty_CamperJeff2), + .party = {.NoItemDefaultMoves = sParty_CamperJeff2} }, [TRAINER_CAMPER_JEFF_3] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("JEFF"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperJeff3), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperJeff3} + .partySize = NELEMS(sParty_CamperJeff3), + .party = {.NoItemDefaultMoves = sParty_CamperJeff3} }, [TRAINER_CAMPER_JEFF_4] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("JEFF"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperJeff4), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperJeff4} + .partySize = NELEMS(sParty_CamperJeff4), + .party = {.NoItemDefaultMoves = sParty_CamperJeff4} }, [TRAINER_PICNICKER_ISABELLE_2] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ISABELLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerIsabelle2), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerIsabelle2} + .partySize = NELEMS(sParty_PicnickerIsabelle2), + .party = {.NoItemDefaultMoves = sParty_PicnickerIsabelle2} }, [TRAINER_PICNICKER_ISABELLE_3] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ISABELLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerIsabelle3), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerIsabelle3} + .partySize = NELEMS(sParty_PicnickerIsabelle3), + .party = {.NoItemDefaultMoves = sParty_PicnickerIsabelle3} }, [TRAINER_PICNICKER_ISABELLE_4] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ISABELLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerIsabelle4), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerIsabelle4} + .partySize = NELEMS(sParty_PicnickerIsabelle4), + .party = {.NoItemDefaultMoves = sParty_PicnickerIsabelle4} }, [TRAINER_YOUNGSTER_YASU_2] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("YASU"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterYasu2), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterYasu2} + .partySize = NELEMS(sParty_YoungsterYasu2), + .party = {.NoItemDefaultMoves = sParty_YoungsterYasu2} }, [TRAINER_YOUNGSTER_YASU_3] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("YASU"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterYasu3), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterYasu3} + .partySize = NELEMS(sParty_YoungsterYasu3), + .party = {.NoItemDefaultMoves = sParty_YoungsterYasu3} }, [TRAINER_ENGINEER_BERNIE_2] = { .partyFlags = 0, - .trainerClass = CLASS_ENGINEER, + .trainerClass = TRAINER_CLASS_ENGINEER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_ENGINEER, .trainerName = _("BERNIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_EngineerBernie2), - .party = {.NoItemDefaultMoves = sTrainerMons_EngineerBernie2} + .partySize = NELEMS(sParty_EngineerBernie2), + .party = {.NoItemDefaultMoves = sParty_EngineerBernie2} }, [TRAINER_GAMER_DARIAN_2] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("DARIAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerDarian2), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerDarian2} + .partySize = NELEMS(sParty_GamerDarian2), + .party = {.NoItemDefaultMoves = sParty_GamerDarian2} }, [TRAINER_CAMPER_CHRIS_2] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("CHRIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperChris2), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperChris2} + .partySize = NELEMS(sParty_CamperChris2), + .party = {.NoItemDefaultMoves = sParty_CamperChris2} }, [TRAINER_CAMPER_CHRIS_3] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("CHRIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperChris3), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperChris3} + .partySize = NELEMS(sParty_CamperChris3), + .party = {.NoItemDefaultMoves = sParty_CamperChris3} }, [TRAINER_CAMPER_CHRIS_4] = { .partyFlags = 0, - .trainerClass = CLASS_CAMPER_2, + .trainerClass = TRAINER_CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("CHRIS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CamperChris4), - .party = {.NoItemDefaultMoves = sTrainerMons_CamperChris4} + .partySize = NELEMS(sParty_CamperChris4), + .party = {.NoItemDefaultMoves = sParty_CamperChris4} }, [TRAINER_PICNICKER_ALICIA_2] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ALICIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerAlicia2), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerAlicia2} + .partySize = NELEMS(sParty_PicnickerAlicia2), + .party = {.NoItemDefaultMoves = sParty_PicnickerAlicia2} }, [TRAINER_PICNICKER_ALICIA_3] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ALICIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerAlicia3), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerAlicia3} + .partySize = NELEMS(sParty_PicnickerAlicia3), + .party = {.NoItemDefaultMoves = sParty_PicnickerAlicia3} }, [TRAINER_PICNICKER_ALICIA_4] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ALICIA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerAlicia4), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerAlicia4} + .partySize = NELEMS(sParty_PicnickerAlicia4), + .party = {.NoItemDefaultMoves = sParty_PicnickerAlicia4} }, [TRAINER_HIKER_JEREMY_2] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("JEREMY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerJeremy2), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerJeremy2} + .partySize = NELEMS(sParty_HikerJeremy2), + .party = {.NoItemDefaultMoves = sParty_HikerJeremy2} }, [TRAINER_POKEMANIAC_MARK_3] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("MARK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacMark3), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacMark3} + .partySize = NELEMS(sParty_PokemaniacMark3), + .party = {.NoItemDefaultMoves = sParty_PokemaniacMark3} }, [TRAINER_POKEMANIAC_HERMAN_2] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("HERMAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacHerman2), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacHerman2} + .partySize = NELEMS(sParty_PokemaniacHerman2), + .party = {.NoItemDefaultMoves = sParty_PokemaniacHerman2} }, [TRAINER_POKEMANIAC_HERMAN_3] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("HERMAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacHerman3), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacHerman3} + .partySize = NELEMS(sParty_PokemaniacHerman3), + .party = {.NoItemDefaultMoves = sParty_PokemaniacHerman3} }, [TRAINER_HIKER_TRENT_2] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("TRENT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerTrent2), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerTrent2} + .partySize = NELEMS(sParty_HikerTrent2), + .party = {.NoItemDefaultMoves = sParty_HikerTrent2} }, [TRAINER_LASS_MEGAN_2] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("MEGAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassMegan2), - .party = {.NoItemDefaultMoves = sTrainerMons_LassMegan2} + .partySize = NELEMS(sParty_LassMegan2), + .party = {.NoItemDefaultMoves = sParty_LassMegan2} }, [TRAINER_LASS_MEGAN_3] = { .partyFlags = 0, - .trainerClass = CLASS_LASS_2, + .trainerClass = TRAINER_CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_LASS, .trainerName = _("MEGAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_LassMegan3), - .party = {.NoItemDefaultMoves = sTrainerMons_LassMegan3} + .partySize = NELEMS(sParty_LassMegan3), + .party = {.NoItemDefaultMoves = sParty_LassMegan3} }, [TRAINER_SUPER_NERD_GLENN_2] = { .partyFlags = 0, - .trainerClass = CLASS_SUPER_NERD, + .trainerClass = TRAINER_CLASS_SUPER_NERD, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_SUPER_NERD, .trainerName = _("GLENN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SuperNerdGlenn2), - .party = {.NoItemDefaultMoves = sTrainerMons_SuperNerdGlenn2} + .partySize = NELEMS(sParty_SuperNerdGlenn2), + .party = {.NoItemDefaultMoves = sParty_SuperNerdGlenn2} }, [TRAINER_GAMER_RICH_2] = { .partyFlags = 0, - .trainerClass = CLASS_GAMER, + .trainerClass = TRAINER_CLASS_GAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_GAMER, .trainerName = _("RICH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_GamerRich2), - .party = {.NoItemDefaultMoves = sTrainerMons_GamerRich2} + .partySize = NELEMS(sParty_GamerRich2), + .party = {.NoItemDefaultMoves = sParty_GamerRich2} }, [TRAINER_BIKER_JAREN_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("JAREN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerJaren2), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerJaren2} + .partySize = NELEMS(sParty_BikerJaren2), + .party = {.NoItemDefaultMoves = sParty_BikerJaren2} }, [TRAINER_FISHERMAN_ELLIOT_2] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("ELLIOT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanElliot2), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanElliot2} + .partySize = NELEMS(sParty_FishermanElliot2), + .party = {.NoItemDefaultMoves = sParty_FishermanElliot2} }, [TRAINER_ROCKER_LUCA_2] = { .partyFlags = 0, - .trainerClass = CLASS_ROCKER, + .trainerClass = TRAINER_CLASS_ROCKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_ROCKER, .trainerName = _("LUCA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RockerLuca2), - .party = {.NoItemDefaultMoves = sTrainerMons_RockerLuca2} + .partySize = NELEMS(sParty_RockerLuca2), + .party = {.NoItemDefaultMoves = sParty_RockerLuca2} }, [TRAINER_BEAUTY_SHEILA_2] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("SHEILA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautySheila2), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautySheila2} + .partySize = NELEMS(sParty_BeautySheila2), + .party = {.NoItemDefaultMoves = sParty_BeautySheila2} }, [TRAINER_BIRD_KEEPER_ROBERT_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("ROBERT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperRobert2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperRobert2} + .partySize = NELEMS(sParty_BirdKeeperRobert2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperRobert2} }, [TRAINER_BIRD_KEEPER_ROBERT_3] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("ROBERT"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperRobert3), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperRobert3} + .partySize = NELEMS(sParty_BirdKeeperRobert3), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperRobert3} }, [TRAINER_PICNICKER_SUSIE_2] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("SUSIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerSusie2), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerSusie2} + .partySize = NELEMS(sParty_PicnickerSusie2), + .party = {.NoItemDefaultMoves = sParty_PicnickerSusie2} }, [TRAINER_PICNICKER_SUSIE_3] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("SUSIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerSusie3), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerSusie3} + .partySize = NELEMS(sParty_PicnickerSusie3), + .party = {.NoItemDefaultMoves = sParty_PicnickerSusie3} }, [TRAINER_PICNICKER_SUSIE_4] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("SUSIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerSusie4), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerSusie4} + .partySize = NELEMS(sParty_PicnickerSusie4), + .party = {.NoItemDefaultMoves = sParty_PicnickerSusie4} }, [TRAINER_BIKER_LUKAS_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("LUKAS"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerLukas2), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerLukas2} + .partySize = NELEMS(sParty_BikerLukas2), + .party = {.NoItemDefaultMoves = sParty_BikerLukas2} }, [TRAINER_BIRD_KEEPER_BENNY_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("BENNY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperBenny2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperBenny2} + .partySize = NELEMS(sParty_BirdKeeperBenny2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperBenny2} }, [TRAINER_BIRD_KEEPER_BENNY_3] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("BENNY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperBenny3), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperBenny3} + .partySize = NELEMS(sParty_BirdKeeperBenny3), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperBenny3} }, [TRAINER_BIRD_KEEPER_MARLON_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MARLON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperMarlon2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperMarlon2} + .partySize = NELEMS(sParty_BirdKeeperMarlon2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperMarlon2} }, [TRAINER_BIRD_KEEPER_MARLON_3] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MARLON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperMarlon3), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperMarlon3} + .partySize = NELEMS(sParty_BirdKeeperMarlon3), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperMarlon3} }, [TRAINER_BEAUTY_GRACE_2] = { .partyFlags = 0, - .trainerClass = CLASS_BEAUTY_2, + .trainerClass = TRAINER_CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("GRACE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BeautyGrace2), - .party = {.NoItemDefaultMoves = sTrainerMons_BeautyGrace2} + .partySize = NELEMS(sParty_BeautyGrace2), + .party = {.NoItemDefaultMoves = sParty_BeautyGrace2} }, [TRAINER_BIRD_KEEPER_CHESTER_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CHESTER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperChester2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperChester2} + .partySize = NELEMS(sParty_BirdKeeperChester2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperChester2} }, [TRAINER_BIRD_KEEPER_CHESTER_3] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CHESTER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperChester3), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperChester3} + .partySize = NELEMS(sParty_BirdKeeperChester3), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperChester3} }, [TRAINER_PICNICKER_BECKY_2] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("BECKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerBecky2), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerBecky2} + .partySize = NELEMS(sParty_PicnickerBecky2), + .party = {.NoItemDefaultMoves = sParty_PicnickerBecky2} }, [TRAINER_PICNICKER_BECKY_3] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("BECKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerBecky3), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerBecky3} + .partySize = NELEMS(sParty_PicnickerBecky3), + .party = {.NoItemDefaultMoves = sParty_PicnickerBecky3} }, [TRAINER_PICNICKER_BECKY_4] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("BECKY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerBecky4), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerBecky4} + .partySize = NELEMS(sParty_PicnickerBecky4), + .party = {.NoItemDefaultMoves = sParty_PicnickerBecky4} }, [TRAINER_CRUSH_KIN_RON_MYA_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_KIN, + .trainerClass = TRAINER_CLASS_CRUSH_KIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_KIN, .trainerName = _("RON & MYA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushKinRonMya2), - .party = {.ItemDefaultMoves = sTrainerMons_CrushKinRonMya2} + .partySize = NELEMS(sParty_CrushKinRonMya2), + .party = {.ItemDefaultMoves = sParty_CrushKinRonMya2} }, [TRAINER_CRUSH_KIN_RON_MYA_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_KIN, + .trainerClass = TRAINER_CLASS_CRUSH_KIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_KIN, .trainerName = _("RON & MYA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushKinRonMya3), - .party = {.ItemDefaultMoves = sTrainerMons_CrushKinRonMya3} + .partySize = NELEMS(sParty_CrushKinRonMya3), + .party = {.ItemDefaultMoves = sParty_CrushKinRonMya3} }, [TRAINER_CRUSH_KIN_RON_MYA_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_KIN, + .trainerClass = TRAINER_CLASS_CRUSH_KIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_KIN, .trainerName = _("RON & MYA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushKinRonMya4), - .party = {.ItemDefaultMoves = sTrainerMons_CrushKinRonMya4} + .partySize = NELEMS(sParty_CrushKinRonMya4), + .party = {.ItemDefaultMoves = sParty_CrushKinRonMya4} }, [TRAINER_BIKER_RUBEN_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("RUBEN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerRuben2), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerRuben2} + .partySize = NELEMS(sParty_BikerRuben2), + .party = {.NoItemDefaultMoves = sParty_BikerRuben2} }, [TRAINER_CUE_BALL_CAMRON_2] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("CAMRON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallCamron2), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallCamron2} + .partySize = NELEMS(sParty_CueBallCamron2), + .party = {.NoItemDefaultMoves = sParty_CueBallCamron2} }, [TRAINER_BIKER_JAXON_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIKER, + .trainerClass = TRAINER_CLASS_BIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BIKER, .trainerName = _("JAXON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BikerJaxon2), - .party = {.NoItemDefaultMoves = sTrainerMons_BikerJaxon2} + .partySize = NELEMS(sParty_BikerJaxon2), + .party = {.NoItemDefaultMoves = sParty_BikerJaxon2} }, [TRAINER_CUE_BALL_ISAIAH_2] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("ISAIAH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallIsaiah2), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallIsaiah2} + .partySize = NELEMS(sParty_CueBallIsaiah2), + .party = {.NoItemDefaultMoves = sParty_CueBallIsaiah2} }, [TRAINER_CUE_BALL_COREY_2] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("COREY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallCorey2), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallCorey2} + .partySize = NELEMS(sParty_CueBallCorey2), + .party = {.NoItemDefaultMoves = sParty_CueBallCorey2} }, [TRAINER_BIRD_KEEPER_JACOB_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("JACOB"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperJacob2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperJacob2} + .partySize = NELEMS(sParty_BirdKeeperJacob2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperJacob2} }, [TRAINER_BIRD_KEEPER_JACOB_3] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("JACOB"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperJacob3), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperJacob3} + .partySize = NELEMS(sParty_BirdKeeperJacob3), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperJacob3} }, [TRAINER_SWIMMER_FEMALE_ALICE_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("ALICE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleAlice2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleAlice2} + .partySize = NELEMS(sParty_SwimmerFemaleAlice2), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleAlice2} }, [TRAINER_SWIMMER_MALE_DARRIN_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("DARRIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleDarrin2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleDarrin2} + .partySize = NELEMS(sParty_SwimmerMaleDarrin2), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleDarrin2} }, [TRAINER_PICNICKER_MISSY_2] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("MISSY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerMissy2), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerMissy2} + .partySize = NELEMS(sParty_PicnickerMissy2), + .party = {.NoItemDefaultMoves = sParty_PicnickerMissy2} }, [TRAINER_PICNICKER_MISSY_3] = { .partyFlags = 0, - .trainerClass = CLASS_PICNICKER_2, + .trainerClass = TRAINER_CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("MISSY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PicnickerMissy3), - .party = {.NoItemDefaultMoves = sTrainerMons_PicnickerMissy3} + .partySize = NELEMS(sParty_PicnickerMissy3), + .party = {.NoItemDefaultMoves = sParty_PicnickerMissy3} }, [TRAINER_FISHERMAN_WADE_2] = { .partyFlags = 0, - .trainerClass = CLASS_FISHERMAN_2, + .trainerClass = TRAINER_CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("WADE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_FishermanWade2), - .party = {.NoItemDefaultMoves = sTrainerMons_FishermanWade2} + .partySize = NELEMS(sParty_FishermanWade2), + .party = {.NoItemDefaultMoves = sParty_FishermanWade2} }, [TRAINER_SWIMMER_MALE_JACK_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("JACK"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleJack2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleJack2} + .partySize = NELEMS(sParty_SwimmerMaleJack2), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleJack2} }, [TRAINER_SIS_AND_BRO_LIL_IAN_2] = { .partyFlags = 0, - .trainerClass = CLASS_SIS_AND_BRO_2, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SIS_AND_BRO, .trainerName = _("LIL & IAN"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SisAndBroLilIan2), - .party = {.NoItemDefaultMoves = sTrainerMons_SisAndBroLilIan2} + .partySize = NELEMS(sParty_SisAndBroLilIan2), + .party = {.NoItemDefaultMoves = sParty_SisAndBroLilIan2} }, [TRAINER_SIS_AND_BRO_LIL_IAN_3] = { .partyFlags = 0, - .trainerClass = CLASS_SIS_AND_BRO_2, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SIS_AND_BRO, .trainerName = _("LIL & IAN"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SisAndBroLilIan3), - .party = {.NoItemDefaultMoves = sTrainerMons_SisAndBroLilIan3} + .partySize = NELEMS(sParty_SisAndBroLilIan3), + .party = {.NoItemDefaultMoves = sParty_SisAndBroLilIan3} }, [TRAINER_SWIMMER_MALE_FINN_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("FINN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleFinn2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleFinn2} + .partySize = NELEMS(sParty_SwimmerMaleFinn2), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleFinn2} }, [TRAINER_CRUSH_GIRL_SHARON_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("SHARON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlSharon2), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlSharon2} + .partySize = NELEMS(sParty_CrushGirlSharon2), + .party = {.ItemDefaultMoves = sParty_CrushGirlSharon2} }, [TRAINER_CRUSH_GIRL_SHARON_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("SHARON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlSharon3), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlSharon3} + .partySize = NELEMS(sParty_CrushGirlSharon3), + .party = {.ItemDefaultMoves = sParty_CrushGirlSharon3} }, [TRAINER_CRUSH_GIRL_TANYA_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("TANYA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlTanya2), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlTanya2} + .partySize = NELEMS(sParty_CrushGirlTanya2), + .party = {.ItemDefaultMoves = sParty_CrushGirlTanya2} }, [TRAINER_CRUSH_GIRL_TANYA_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("TANYA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlTanya3), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlTanya3} + .partySize = NELEMS(sParty_CrushGirlTanya3), + .party = {.ItemDefaultMoves = sParty_CrushGirlTanya3} }, [TRAINER_BLACK_BELT_SHEA_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("SHEA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltShea2), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltShea2} + .partySize = NELEMS(sParty_BlackBeltShea2), + .party = {.ItemDefaultMoves = sParty_BlackBeltShea2} }, [TRAINER_BLACK_BELT_SHEA_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("SHEA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltShea3), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltShea3} + .partySize = NELEMS(sParty_BlackBeltShea3), + .party = {.ItemDefaultMoves = sParty_BlackBeltShea3} }, [TRAINER_BLACK_BELT_HUGH_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("HUGH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltHugh2), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltHugh2} + .partySize = NELEMS(sParty_BlackBeltHugh2), + .party = {.ItemDefaultMoves = sParty_BlackBeltHugh2} }, [TRAINER_BLACK_BELT_HUGH_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_BLACK_BELT_2, + .trainerClass = TRAINER_CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("HUGH"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BlackBeltHugh3), - .party = {.ItemDefaultMoves = sTrainerMons_BlackBeltHugh3} + .partySize = NELEMS(sParty_BlackBeltHugh3), + .party = {.ItemDefaultMoves = sParty_BlackBeltHugh3} }, [TRAINER_CRUSH_KIN_MIK_KIA_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_KIN, + .trainerClass = TRAINER_CLASS_CRUSH_KIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_KIN, .trainerName = _("MIK & KIA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushKinMikKia2), - .party = {.ItemDefaultMoves = sTrainerMons_CrushKinMikKia2} + .partySize = NELEMS(sParty_CrushKinMikKia2), + .party = {.ItemDefaultMoves = sParty_CrushKinMikKia2} }, [TRAINER_CRUSH_KIN_MIK_KIA_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_KIN, + .trainerClass = TRAINER_CLASS_CRUSH_KIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_KIN, .trainerName = _("MIK & KIA"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushKinMikKia3), - .party = {.ItemDefaultMoves = sTrainerMons_CrushKinMikKia3} + .partySize = NELEMS(sParty_CrushKinMikKia3), + .party = {.ItemDefaultMoves = sParty_CrushKinMikKia3} }, [TRAINER_TUBER_AMIRA_2] = { .partyFlags = 0, - .trainerClass = CLASS_TUBER_3, + .trainerClass = TRAINER_CLASS_TUBER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("AMIRA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TuberAmira2), - .party = {.NoItemDefaultMoves = sTrainerMons_TuberAmira2} + .partySize = NELEMS(sParty_TuberAmira2), + .party = {.NoItemDefaultMoves = sParty_TuberAmira2} }, [TRAINER_TWINS_JOY_MEG_2] = { .partyFlags = 0, - .trainerClass = CLASS_TWINS_2, + .trainerClass = TRAINER_CLASS_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("JOY & MEG"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TwinsJoyMeg2), - .party = {.NoItemDefaultMoves = sTrainerMons_TwinsJoyMeg2} + .partySize = NELEMS(sParty_TwinsJoyMeg2), + .party = {.NoItemDefaultMoves = sParty_TwinsJoyMeg2} }, [TRAINER_PAINTER_RAYNA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PAINTER, + .trainerClass = TRAINER_CLASS_PAINTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_PAINTER, .trainerName = _("RAYNA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PainterRayna2), - .party = {.NoItemCustomMoves = sTrainerMons_PainterRayna2} + .partySize = NELEMS(sParty_PainterRayna2), + .party = {.NoItemCustomMoves = sParty_PainterRayna2} }, [TRAINER_YOUNGSTER_DESTIN_2] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNGSTER_2, + .trainerClass = TRAINER_CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_YOUNGSTER, .trainerName = _("DESTIN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungsterDestin2), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungsterDestin2} + .partySize = NELEMS(sParty_YoungsterDestin2), + .party = {.NoItemDefaultMoves = sParty_YoungsterDestin2} }, [TRAINER_PKMN_BREEDER_ALIZE_2] = { .partyFlags = 0, - .trainerClass = CLASS_PKMN_BREEDER_2, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER, .trainerName = _("ALIZE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PkmnBreederAlize2), - .party = {.NoItemDefaultMoves = sTrainerMons_PkmnBreederAlize2} + .partySize = NELEMS(sParty_PkmnBreederAlize2), + .party = {.NoItemDefaultMoves = sParty_PkmnBreederAlize2} }, [TRAINER_YOUNG_COUPLE_GIA_JES_2] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNG_COUPLE_2, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_YOUNG_COUPLE, .trainerName = _("GIA & JES"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungCoupleGiaJes2), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungCoupleGiaJes2} + .partySize = NELEMS(sParty_YoungCoupleGiaJes2), + .party = {.NoItemDefaultMoves = sParty_YoungCoupleGiaJes2} }, [TRAINER_YOUNG_COUPLE_GIA_JES_3] = { .partyFlags = 0, - .trainerClass = CLASS_YOUNG_COUPLE_2, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_YOUNG_COUPLE, .trainerName = _("GIA & JES"), .items = {}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_YoungCoupleGiaJes3), - .party = {.NoItemDefaultMoves = sTrainerMons_YoungCoupleGiaJes3} + .partySize = NELEMS(sParty_YoungCoupleGiaJes3), + .party = {.NoItemDefaultMoves = sParty_YoungCoupleGiaJes3} }, [TRAINER_BIRD_KEEPER_MILO_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MILO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperMilo2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperMilo2} + .partySize = NELEMS(sParty_BirdKeeperMilo2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperMilo2} }, [TRAINER_BIRD_KEEPER_CHAZ_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CHAZ"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperChaz2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperChaz2} + .partySize = NELEMS(sParty_BirdKeeperChaz2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperChaz2} }, [TRAINER_BIRD_KEEPER_HAROLD_2] = { .partyFlags = 0, - .trainerClass = CLASS_BIRD_KEEPER_2, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("HAROLD"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BirdKeeperHarold2), - .party = {.NoItemDefaultMoves = sTrainerMons_BirdKeeperHarold2} + .partySize = NELEMS(sParty_BirdKeeperHarold2), + .party = {.NoItemDefaultMoves = sParty_BirdKeeperHarold2} }, [TRAINER_SWIMMER_FEMALE_NICOLE_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("NICOLE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleNicole2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleNicole2} + .partySize = NELEMS(sParty_SwimmerFemaleNicole2), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleNicole2} }, [TRAINER_PSYCHIC_JACLYN_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PSYCHIC_F, .trainerName = _("JACLYN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicJaclyn2), - .party = {.NoItemCustomMoves = sTrainerMons_PsychicJaclyn2} + .partySize = NELEMS(sParty_PsychicJaclyn2), + .party = {.NoItemCustomMoves = sParty_PsychicJaclyn2} }, [TRAINER_SWIMMER_MALE_SAMIR_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("SAMIR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleSamir2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleSamir2} + .partySize = NELEMS(sParty_SwimmerMaleSamir2), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleSamir2} }, [TRAINER_HIKER_EARL_2] = { .partyFlags = 0, - .trainerClass = CLASS_HIKER_2, + .trainerClass = TRAINER_CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("EARL"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_HikerEarl2), - .party = {.NoItemDefaultMoves = sTrainerMons_HikerEarl2} + .partySize = NELEMS(sParty_HikerEarl2), + .party = {.NoItemDefaultMoves = sParty_HikerEarl2} }, [TRAINER_RUIN_MANIAC_LARRY_2] = { .partyFlags = 0, - .trainerClass = CLASS_RUIN_MANIAC_2, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("LARRY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_RuinManiacLarry2), - .party = {.NoItemDefaultMoves = sTrainerMons_RuinManiacLarry2} + .partySize = NELEMS(sParty_RuinManiacLarry2), + .party = {.NoItemDefaultMoves = sParty_RuinManiacLarry2} }, [TRAINER_POKEMANIAC_HECTOR_2] = { .partyFlags = 0, - .trainerClass = CLASS_POKEMANIAC_2, + .trainerClass = TRAINER_CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("HECTOR"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PokemaniacHector2), - .party = {.NoItemDefaultMoves = sTrainerMons_PokemaniacHector2} + .partySize = NELEMS(sParty_PokemaniacHector2), + .party = {.NoItemDefaultMoves = sParty_PokemaniacHector2} }, [TRAINER_PSYCHIC_DARIO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("DARIO"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicDario2), - .party = {.NoItemCustomMoves = sTrainerMons_PsychicDario2} + .partySize = NELEMS(sParty_PsychicDario2), + .party = {.NoItemCustomMoves = sParty_PsychicDario2} }, [TRAINER_PSYCHIC_RODETTE_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PSYCHIC_2, + .trainerClass = TRAINER_CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_PSYCHIC_F, .trainerName = _("RODETTE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_PsychicRodette2), - .party = {.NoItemCustomMoves = sTrainerMons_PsychicRodette2} + .partySize = NELEMS(sParty_PsychicRodette2), + .party = {.NoItemCustomMoves = sParty_PsychicRodette2} }, [TRAINER_JUGGLER_MASON_2] = { .partyFlags = 0, - .trainerClass = CLASS_JUGGLER, + .trainerClass = TRAINER_CLASS_JUGGLER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_JUGGLER, .trainerName = _("MASON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_JugglerMason2), - .party = {.NoItemDefaultMoves = sTrainerMons_JugglerMason2} + .partySize = NELEMS(sParty_JugglerMason2), + .party = {.NoItemDefaultMoves = sParty_JugglerMason2} }, [TRAINER_PKMN_RANGER_NICOLAS_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, .trainerName = _("NICOLAS"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerNicolas2), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerNicolas2} + .partySize = NELEMS(sParty_PkmnRangerNicolas2), + .party = {.NoItemCustomMoves = sParty_PkmnRangerNicolas2} }, [TRAINER_PKMN_RANGER_MADELINE_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, .trainerName = _("MADELINE"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerMadeline2), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerMadeline2} + .partySize = NELEMS(sParty_PkmnRangerMadeline2), + .party = {.NoItemCustomMoves = sParty_PkmnRangerMadeline2} }, [TRAINER_CRUSH_GIRL_CYNDY_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CRUSH_GIRL, + .trainerClass = TRAINER_CLASS_CRUSH_GIRL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, .trainerPic = TRAINER_PIC_CRUSH_GIRL, .trainerName = _("CYNDY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CrushGirlCyndy2), - .party = {.ItemDefaultMoves = sTrainerMons_CrushGirlCyndy2} + .partySize = NELEMS(sParty_CrushGirlCyndy2), + .party = {.ItemDefaultMoves = sParty_CrushGirlCyndy2} }, [TRAINER_TAMER_EVAN_2] = { .partyFlags = 0, - .trainerClass = CLASS_TAMER, + .trainerClass = TRAINER_CLASS_TAMER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, .trainerPic = TRAINER_PIC_TAMER, .trainerName = _("EVAN"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_TamerEvan2), - .party = {.NoItemDefaultMoves = sTrainerMons_TamerEvan2} + .partySize = NELEMS(sParty_TamerEvan2), + .party = {.NoItemDefaultMoves = sParty_TamerEvan2} }, [TRAINER_PKMN_RANGER_JACKSON_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, .trainerName = _("JACKSON"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerJackson2), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerJackson2} + .partySize = NELEMS(sParty_PkmnRangerJackson2), + .party = {.NoItemCustomMoves = sParty_PkmnRangerJackson2} }, [TRAINER_PKMN_RANGER_KATELYN_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_PKMN_RANGER_2, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, .trainerName = _("KATELYN"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_PkmnRangerKatelyn2), - .party = {.NoItemCustomMoves = sTrainerMons_PkmnRangerKatelyn2} + .partySize = NELEMS(sParty_PkmnRangerKatelyn2), + .party = {.NoItemCustomMoves = sParty_PkmnRangerKatelyn2} }, [TRAINER_COOLTRAINER_LEROY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("LEROY"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerLeroy2), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerLeroy2} + .partySize = NELEMS(sParty_CooltrainerLeroy2), + .party = {.NoItemCustomMoves = sParty_CooltrainerLeroy2} }, [TRAINER_COOLTRAINER_MICHELLE_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("MICHELLE"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CooltrainerMichelle2), - .party = {.NoItemCustomMoves = sTrainerMons_CooltrainerMichelle2} + .partySize = NELEMS(sParty_CooltrainerMichelle2), + .party = {.NoItemCustomMoves = sParty_CooltrainerMichelle2} }, [TRAINER_COOL_COUPLE_LEX_NYA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = CLASS_COOL_COUPLE, + .trainerClass = TRAINER_CLASS_COOL_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, .trainerPic = TRAINER_PIC_COOL_COUPLE, .trainerName = _("LEX & NYA"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = TRUE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_CoolCoupleLexNya2), - .party = {.NoItemCustomMoves = sTrainerMons_CoolCoupleLexNya2} + .partySize = NELEMS(sParty_CoolCoupleLexNya2), + .party = {.NoItemCustomMoves = sParty_CoolCoupleLexNya2} }, [TRAINER_BUG_CATCHER_COLTON_2] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("COLTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherColton2), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherColton2} + .partySize = NELEMS(sParty_BugCatcherColton2), + .party = {.NoItemDefaultMoves = sParty_BugCatcherColton2} }, [TRAINER_BUG_CATCHER_COLTON_3] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("COLTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherColton3), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherColton3} + .partySize = NELEMS(sParty_BugCatcherColton3), + .party = {.NoItemDefaultMoves = sParty_BugCatcherColton3} }, [TRAINER_BUG_CATCHER_COLTON_4] = { .partyFlags = 0, - .trainerClass = CLASS_BUG_CATCHER_2, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("COLTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_BugCatcherColton4), - .party = {.NoItemDefaultMoves = sTrainerMons_BugCatcherColton4} + .partySize = NELEMS(sParty_BugCatcherColton4), + .party = {.NoItemDefaultMoves = sParty_BugCatcherColton4} }, [TRAINER_SWIMMER_MALE_MATTHEW_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("MATTHEW"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleMatthew2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleMatthew2} + .partySize = NELEMS(sParty_SwimmerMaleMatthew2), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleMatthew2} }, [TRAINER_SWIMMER_MALE_TONY_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_MALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("TONY"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerMaleTony2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerMaleTony2} + .partySize = NELEMS(sParty_SwimmerMaleTony2), + .party = {.NoItemDefaultMoves = sParty_SwimmerMaleTony2} }, [TRAINER_SWIMMER_FEMALE_MELISSA_2] = { .partyFlags = 0, - .trainerClass = CLASS_SWIMMER_FEMALE_2, + .trainerClass = TRAINER_CLASS_SWIMMER_F, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("MELISSA"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_SwimmerFemaleMelissa2), - .party = {.NoItemDefaultMoves = sTrainerMons_SwimmerFemaleMelissa2} + .partySize = NELEMS(sParty_SwimmerFemaleMelissa2), + .party = {.NoItemDefaultMoves = sParty_SwimmerFemaleMelissa2} }, [TRAINER_ELITE_FOUR_LORELEI_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_LORELEI, .trainerName = _("LORELEI"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourLorelei2), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourLorelei2} + .partySize = NELEMS(sParty_EliteFourLorelei2), + .party = {.ItemCustomMoves = sParty_EliteFourLorelei2} }, [TRAINER_ELITE_FOUR_BRUNO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_BRUNO, .trainerName = _("BRUNO"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourBruno2), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourBruno2} + .partySize = NELEMS(sParty_EliteFourBruno2), + .party = {.ItemCustomMoves = sParty_EliteFourBruno2} }, [TRAINER_ELITE_FOUR_AGATHA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_AGATHA, .trainerName = _("AGATHA"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourAgatha2), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourAgatha2} + .partySize = NELEMS(sParty_EliteFourAgatha2), + .party = {.ItemCustomMoves = sParty_EliteFourAgatha2} }, [TRAINER_ELITE_FOUR_LANCE_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_ELITE_FOUR_2, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, .trainerPic = TRAINER_PIC_ELITE_FOUR_LANCE, .trainerName = _("LANCE"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_EliteFourLance2), - .party = {.ItemCustomMoves = sTrainerMons_EliteFourLance2} + .partySize = NELEMS(sParty_EliteFourLance2), + .party = {.ItemCustomMoves = sParty_EliteFourLance2} }, [TRAINER_CHAMPION_REMATCH_SQUIRTLE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CHAMPION_2, + .trainerClass = TRAINER_CLASS_CHAMPION, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_ChampionRematchSquirtle), - .party = {.ItemCustomMoves = sTrainerMons_ChampionRematchSquirtle} + .partySize = NELEMS(sParty_ChampionRematchSquirtle), + .party = {.ItemCustomMoves = sParty_ChampionRematchSquirtle} }, [TRAINER_CHAMPION_REMATCH_BULBASAUR] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CHAMPION_2, + .trainerClass = TRAINER_CLASS_CHAMPION, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_ChampionRematchBulbasaur), - .party = {.ItemCustomMoves = sTrainerMons_ChampionRematchBulbasaur} + .partySize = NELEMS(sParty_ChampionRematchBulbasaur), + .party = {.ItemCustomMoves = sParty_ChampionRematchBulbasaur} }, [TRAINER_CHAMPION_REMATCH_CHARMANDER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, - .trainerClass = CLASS_CHAMPION_2, + .trainerClass = TRAINER_CLASS_CHAMPION, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, - .partySize = NELEMS(sTrainerMons_ChampionRematchCharmander), - .party = {.ItemCustomMoves = sTrainerMons_ChampionRematchCharmander} + .partySize = NELEMS(sParty_ChampionRematchCharmander), + .party = {.ItemCustomMoves = sParty_ChampionRematchCharmander} }, [TRAINER_CUE_BALL_PAXTON] = { .partyFlags = 0, - .trainerClass = CLASS_CUE_BALL, + .trainerClass = TRAINER_CLASS_CUE_BALL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .trainerPic = TRAINER_PIC_CUE_BALL, .trainerName = _("PAXTON"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, - .partySize = NELEMS(sTrainerMons_CueBallPaxton), - .party = {.NoItemDefaultMoves = sTrainerMons_CueBallPaxton} + .partySize = NELEMS(sParty_CueBallPaxton), + .party = {.NoItemDefaultMoves = sParty_CueBallPaxton} }, }; |