diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-17 17:11:34 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-17 17:11:34 -0400 |
| commit | 97dc0a6903d0b08e26d18cac5713e0fc38727fd1 (patch) | |
| tree | 6cb86dd190a6885ea4464ec5c2fe4efec5ba1c55 /src | |
| parent | 0b708aeadec55bcc0e9916e5c56ad50714995b98 (diff) | |
Trainer dump pass 2; flag refactoring
Diffstat (limited to 'src')
| -rw-r--r-- | src/help_system_812B1E0.c | 6 | ||||
| -rw-r--r-- | src/main_menu.c | 2 | ||||
| -rw-r--r-- | src/pokemon.c | 10 | ||||
| -rw-r--r-- | src/trainers.c | 1060 | ||||
| -rw-r--r-- | src/vs_seeker.c | 8 |
5 files changed, 543 insertions, 543 deletions
diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c index afb792072..51b9c2762 100644 --- a/src/help_system_812B1E0.c +++ b/src/help_system_812B1E0.c @@ -1185,7 +1185,7 @@ static bool8 sub_812B780(u8 id) case 30: case 32: case 33: - return FlagGet(FLAG_UNK820); + return FlagGet(FLAG_0x820); case 28: case 40: return sub_812BB10(); @@ -1251,7 +1251,7 @@ static bool8 sub_812B780(u8 id) return TRUE; return FALSE; case 15: - return FlagGet(FLAG_UNK820); + return FlagGet(FLAG_0x820); case 16: case 17: return sub_812BB10(); @@ -1325,7 +1325,7 @@ static bool8 sub_812B780(u8 id) switch (id) { case 5: - return FlagGet(FLAG_UNK820); + return FlagGet(FLAG_0x820); case 6: return FlagGet(FLAG_0x821); } diff --git a/src/main_menu.c b/src/main_menu.c index 72056d750..edb84afa2 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -671,7 +671,7 @@ static void PrintBadgeCount(void) u8 *ptr; u32 flagId; u8 nbadges = 0; - for (flagId = FLAG_UNK820; flagId < FLAG_UNK820 + 8; flagId++) + for (flagId = FLAG_0x820; flagId < FLAG_0x820 + 8; flagId++) { if (FlagGet(flagId)) nbadges++; diff --git a/src/pokemon.c b/src/pokemon.c index 5433dd593..20a3d10b7 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2362,25 +2362,25 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de // In FRLG, the Battle Tower and opponent checks are stubbed here. if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER))) { - if (FlagGet(FLAG_UNK820) + if (FlagGet(FLAG_0x820) && !GetBattlerSide(battlerIdAtk)) attack = (110 * attack) / 100; } if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER))) { - if (FlagGet(FLAG_UNK824) + if (FlagGet(FLAG_0x824) && !GetBattlerSide(battlerIdDef)) defense = (110 * defense) / 100; } if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER))) { - if (FlagGet(FLAG_UNK826) + if (FlagGet(FLAG_0x826) && !GetBattlerSide(battlerIdAtk)) spAttack = (110 * spAttack) / 100; } if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | /*BATTLE_TYPE_BATTLE_TOWER |*/ BATTLE_TYPE_EREADER_TRAINER))) { - if (FlagGet(FLAG_UNK826) + if (FlagGet(FLAG_0x826) && !GetBattlerSide(battlerIdDef)) spDefense = (110 * spDefense) / 100; } @@ -3634,7 +3634,7 @@ static u8 SendMonToPC(struct Pokemon* mon) gSpecialVar_MonBoxId = boxNo; gSpecialVar_MonBoxPos = boxPos; if (get_unknown_box_id() != boxNo) - FlagClear(FLAG_UNK843); + FlagClear(FLAG_0x843); VarSet(VAR_0x4037, boxNo); return MON_GIVEN_TO_PC; } diff --git a/src/trainers.c b/src/trainers.c index 9b90ae294..cf778d297 100644 --- a/src/trainers.c +++ b/src/trainers.c @@ -11678,7 +11678,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_TRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_AQUA_LEADER, + .trainerPic = TRAINER_PIC_AQUA_LEADER_ARCHIE, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11690,7 +11690,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_AQUA_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_AQUA_LEADER, + .trainerPic = TRAINER_PIC_AQUA_LEADER_ARCHIE, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11702,7 +11702,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_AQUA, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11714,7 +11714,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_AQUA, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_AQUA_2, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11726,7 +11726,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_AROMA_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_AROMA_LADY, + .trainerPic = TRAINER_PIC_RS_AROMA_LADY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11738,7 +11738,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_RUIN_MANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_RUIN_MANIAC, + .trainerPic = TRAINER_PIC_RS_RUIN_MANIAC, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11762,7 +11762,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TUBER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, - .trainerPic = TRAINER_PIC_TUBER, + .trainerPic = TRAINER_PIC_RS_TUBER_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11774,7 +11774,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TUBER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_TUBER_2, + .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11786,7 +11786,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOLTRAINER, + .trainerPic = TRAINER_PIC_RS_COOLTRAINER_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11798,7 +11798,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOLTRAINER_2, + .trainerPic = TRAINER_PIC_RS_COOLTRAINER_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11822,7 +11822,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LADY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_LADY, + .trainerPic = TRAINER_PIC_RS_LADY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11834,7 +11834,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BEAUTY, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_BEAUTY, + .trainerPic = TRAINER_PIC_RS_BEAUTY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11858,7 +11858,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEMANIAC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, - .trainerPic = TRAINER_PIC_POKEMANIAC, + .trainerPic = TRAINER_PIC_RS_POKEMANIAC, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11870,7 +11870,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_MALE, + .trainerPic = TRAINER_PIC_RS_SWIMMER_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11882,7 +11882,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BLACK_BELT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerPic = TRAINER_PIC_RS_BLACK_BELT, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11918,7 +11918,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER, + .trainerPic = TRAINER_PIC_RS_CAMPER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11942,7 +11942,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_PSYCHIC, + .trainerPic = TRAINER_PIC_RS_PSYCHIC_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11954,7 +11954,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PSYCHIC, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_PSYCHIC_2, + .trainerPic = TRAINER_PIC_RS_PSYCHIC_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11966,7 +11966,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_GENTLEMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, - .trainerPic = TRAINER_PIC_GENTLEMAN, + .trainerPic = TRAINER_PIC_RS_GENTLEMAN, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -11978,7 +11978,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, - .trainerPic = TRAINER_PIC_SIDNEY, + .trainerPic = TRAINER_PIC_ELITE_FOUR_SIDNEY, .trainerName = _("SIDNEY"), .items = {}, .doubleBattle = FALSE, @@ -11990,7 +11990,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, - .trainerPic = TRAINER_PIC_PHOEBE, + .trainerPic = TRAINER_PIC_ELITE_FOUR_PHOEBE, .trainerName = _("PHOEBE"), .items = {}, .doubleBattle = FALSE, @@ -12002,7 +12002,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_ROXANNE, + .trainerPic = TRAINER_PIC_LEADER_ROXANNE, .trainerName = _("ROXANNE"), .items = {}, .doubleBattle = FALSE, @@ -12014,7 +12014,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BRAWLY, + .trainerPic = TRAINER_PIC_LEADER_BRAWLY, .trainerName = _("BRAWLY"), .items = {}, .doubleBattle = FALSE, @@ -12026,7 +12026,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_TATE_LIZA, + .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA, .trainerName = _("TATE&LIZA"), .items = {}, .doubleBattle = TRUE, @@ -12038,7 +12038,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SCHOOL_KID, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_SCHOOL_KID, + .trainerPic = TRAINER_PIC_SCHOOL_KID_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12050,7 +12050,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SCHOOL_KID, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_SCHOOL_KID_2, + .trainerPic = TRAINER_PIC_SCHOOL_KID_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12074,7 +12074,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_POKEFAN, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12086,7 +12086,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_POKEFAN_2, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12098,7 +12098,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_EXPERT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_EXPERT, + .trainerPic = TRAINER_PIC_EXPERT_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12110,7 +12110,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_EXPERT, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_EXPERT_2, + .trainerPic = TRAINER_PIC_EXPERT_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12122,7 +12122,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_YOUNGSTER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BOARDER, + .trainerPic = TRAINER_PIC_RS_YOUNGSTER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12134,7 +12134,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CHAMPION, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CHAMPION, + .trainerPic = TRAINER_PIC_CHAMPION_STEVEN, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12146,7 +12146,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerPic = TRAINER_PIC_RS_FISHERMAN, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12158,7 +12158,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_TRIATHLETE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12170,7 +12170,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_TRIATHLETE_2, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12182,7 +12182,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_TRIATHLETE_3, + .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12194,7 +12194,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_TRIATHLETE_4, + .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12206,7 +12206,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_TRIATHLETE_5, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12218,7 +12218,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TRIATHLETE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_TRIATHLETE_6, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12242,7 +12242,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerPic = TRAINER_PIC_RS_BIRD_KEEPER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12290,7 +12290,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE, + .trainerPic = TRAINER_PIC_RS_SWIMMER_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12302,7 +12302,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, - .trainerPic = TRAINER_PIC_PICNICKER, + .trainerPic = TRAINER_PIC_RS_PICNICKER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12314,7 +12314,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_TWINS, + .trainerPic = TRAINER_PIC_RS_TWINS, .trainerName = _(""), .items = {}, .doubleBattle = TRUE, @@ -12326,7 +12326,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SAILOR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_SAILOR, + .trainerPic = TRAINER_PIC_RS_SAILOR, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12338,7 +12338,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BOARDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BOARDER, + .trainerPic = TRAINER_PIC_RS_YOUNGSTER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12350,7 +12350,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BOARDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BOARDER, + .trainerPic = TRAINER_PIC_RS_YOUNGSTER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12374,7 +12374,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_TRAINER_3, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_PKMN_TRAINER, + .trainerPic = TRAINER_PIC_WALLY, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12386,7 +12386,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_TRAINER_3, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_PKMN_TRAINER_2, + .trainerPic = TRAINER_PIC_RS_BRENDAN_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12398,7 +12398,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_TRAINER_3, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_PKMN_TRAINER_2, + .trainerPic = TRAINER_PIC_RS_BRENDAN_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12410,7 +12410,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_TRAINER_3, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_PKMN_TRAINER_2, + .trainerPic = TRAINER_PIC_RS_BRENDAN_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12422,7 +12422,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_TRAINER_3, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_PKMN_TRAINER_3, + .trainerPic = TRAINER_PIC_RS_MAY_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12434,7 +12434,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_TRAINER_3, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_PKMN_TRAINER_3, + .trainerPic = TRAINER_PIC_RS_MAY_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12446,7 +12446,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_TRAINER_3, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_PKMN_TRAINER_3, + .trainerPic = TRAINER_PIC_RS_MAY_1, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12458,7 +12458,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_BREEDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_PKMN_BREEDER, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12470,7 +12470,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_BREEDER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_PKMN_BREEDER_2, + .trainerPic = TRAINER_PIC_RS_POKEMON_BREEDER_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12482,7 +12482,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_PKMN_RANGER, + .trainerPic = TRAINER_PIC_RS_POKEMON_RANGER_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12494,7 +12494,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_RANGER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_PKMN_RANGER_2, + .trainerPic = TRAINER_PIC_RS_POKEMON_RANGER_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12506,7 +12506,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_MAGMA_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, - .trainerPic = TRAINER_PIC_MAGMA_LEADER, + .trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12518,7 +12518,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_MAGMA, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, - .trainerPic = TRAINER_PIC_TEAM_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12530,7 +12530,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_MAGMA, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, - .trainerPic = TRAINER_PIC_TEAM_MAGMA_2, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12542,7 +12542,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_LASS, + .trainerPic = TRAINER_PIC_RS_LASS, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12554,7 +12554,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER, + .trainerPic = TRAINER_PIC_RS_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12566,7 +12566,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER, + .trainerPic = TRAINER_PIC_RS_HIKER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -12578,7 +12578,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_YOUNG_COUPLE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, - .trainerPic = TRAINER_PIC_YOUNG_COUPLE, + .trainerPic = TRAINER_PIC_RS_YOUNG_COUPLE, .trainerName = _(""), .items = {}, .doubleBattle = TRUE, @@ -12602,7 +12602,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SIS_AND_BRO, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SIS_AND_BRO, + .trainerPic = TRAINER_PIC_RS_SIS_AND_BRO, .trainerName = _(""), .items = {}, .doubleBattle = TRUE, @@ -12614,7 +12614,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_AQUA_ADMIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_MATT, + .trainerPic = TRAINER_PIC_AQUA_ADMIN_M, .trainerName = _("MATT"), .items = {}, .doubleBattle = FALSE, @@ -12626,7 +12626,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_AQUA_ADMIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_SHELLY, + .trainerPic = TRAINER_PIC_AQUA_ADMIN_F, .trainerName = _("SHELLY"), .items = {}, .doubleBattle = FALSE, @@ -12638,7 +12638,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_MAGMA_ADMIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, - .trainerPic = TRAINER_PIC_TABITHA, + .trainerPic = TRAINER_PIC_MAGMA_ADMIN_M, .trainerName = _("TABITHA"), .items = {}, .doubleBattle = FALSE, @@ -12650,7 +12650,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_MAGMA_ADMIN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, - .trainerPic = TRAINER_PIC_COURTNEY, + .trainerPic = TRAINER_PIC_MAGMA_ADMIN_F, .trainerName = _("COURTNEY"), .items = {}, .doubleBattle = FALSE, @@ -12662,7 +12662,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_WATTSON, + .trainerPic = TRAINER_PIC_LEADER_WATTSON, .trainerName = _("WATTSON"), .items = {}, .doubleBattle = FALSE, @@ -12674,7 +12674,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_FLANNERY, + .trainerPic = TRAINER_PIC_LEADER_FLANNERY, .trainerName = _("FLANNERY"), .items = {}, .doubleBattle = FALSE, @@ -12686,7 +12686,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_NORMAN, + .trainerPic = TRAINER_PIC_LEADER_NORMAN, .trainerName = _("NORMAN"), .items = {}, .doubleBattle = FALSE, @@ -12698,7 +12698,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_WINONA, + .trainerPic = TRAINER_PIC_LEADER_WINONA, .trainerName = _("WINONA"), .items = {}, .doubleBattle = FALSE, @@ -12710,7 +12710,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LEADER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_WALLACE, + .trainerPic = TRAINER_PIC_LEADER_WALLACE, .trainerName = _("WALLACE"), .items = {}, .doubleBattle = FALSE, @@ -12722,7 +12722,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, - .trainerPic = TRAINER_PIC_GLACIA, + .trainerPic = TRAINER_PIC_ELITE_FOUR_GLACIA, .trainerName = _("GLACIA"), .items = {}, .doubleBattle = FALSE, @@ -12734,7 +12734,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_ELITE_FOUR, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, - .trainerPic = TRAINER_PIC_DRAKE, + .trainerPic = TRAINER_PIC_ELITE_FOUR_DRAKE, .trainerName = _("DRAKE"), .items = {}, .doubleBattle = FALSE, @@ -12902,7 +12902,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("RICK"), .items = {}, .doubleBattle = FALSE, @@ -12914,7 +12914,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("DOUG"), .items = {}, .doubleBattle = FALSE, @@ -12926,7 +12926,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("SAMMY"), .items = {}, .doubleBattle = FALSE, @@ -12938,7 +12938,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("COLTON"), .items = {}, .doubleBattle = FALSE, @@ -12950,7 +12950,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("GREG"), .items = {}, .doubleBattle = FALSE, @@ -12962,7 +12962,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("JAMES"), .items = {}, .doubleBattle = FALSE, @@ -12974,7 +12974,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("KENT"), .items = {}, .doubleBattle = FALSE, @@ -12986,7 +12986,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("ROBBY"), .items = {}, .doubleBattle = FALSE, @@ -12998,7 +12998,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("CALE"), .items = {}, .doubleBattle = FALSE, @@ -13010,7 +13010,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("KEIGO"), .items = {}, .doubleBattle = FALSE, @@ -13022,7 +13022,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("ELIJAH"), .items = {}, .doubleBattle = FALSE, @@ -13034,7 +13034,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -13046,7 +13046,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("BRENT"), .items = {}, .doubleBattle = FALSE, @@ -13058,7 +13058,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("CONNER"), .items = {}, .doubleBattle = FALSE, @@ -13070,7 +13070,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("JANICE"), .items = {}, .doubleBattle = FALSE, @@ -13082,7 +13082,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("SALLY"), .items = {}, .doubleBattle = FALSE, @@ -13094,7 +13094,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("ROBIN"), .items = {}, .doubleBattle = FALSE, @@ -13106,7 +13106,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("CRISSY"), .items = {}, .doubleBattle = FALSE, @@ -13118,7 +13118,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("MIRIAM"), .items = {}, .doubleBattle = FALSE, @@ -13130,7 +13130,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("IRIS"), .items = {}, .doubleBattle = FALSE, @@ -13142,7 +13142,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("RELI"), .items = {}, .doubleBattle = FALSE, @@ -13154,7 +13154,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("ALI"), .items = {}, .doubleBattle = FALSE, @@ -13166,7 +13166,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -13178,7 +13178,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("HALEY"), .items = {}, .doubleBattle = FALSE, @@ -13190,7 +13190,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("ANN"), .items = {}, .doubleBattle = FALSE, @@ -13202,7 +13202,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("DAWN"), .items = {}, .doubleBattle = FALSE, @@ -13214,7 +13214,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("PAIGE"), .items = {}, .doubleBattle = FALSE, @@ -13226,7 +13226,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("ANDREA"), .items = {}, .doubleBattle = FALSE, @@ -13238,7 +13238,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("MEGAN"), .items = {}, .doubleBattle = FALSE, @@ -13250,7 +13250,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("JULIA"), .items = {}, .doubleBattle = FALSE, @@ -13262,7 +13262,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("KAY"), .items = {}, .doubleBattle = FALSE, @@ -13274,7 +13274,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("LISA"), .items = {}, .doubleBattle = FALSE, @@ -13286,7 +13286,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SAILOR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_SAILOR_2, + .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("EDMOND"), .items = {}, .doubleBattle = FALSE, @@ -13298,7 +13298,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SAILOR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_SAILOR_2, + .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("TREVOR"), .items = {}, .doubleBattle = FALSE, @@ -13310,7 +13310,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SAILOR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_SAILOR_2, + .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("LEONARD"), .items = {}, .doubleBattle = FALSE, @@ -13322,7 +13322,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SAILOR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_SAILOR_2, + .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("DUNCAN"), .items = {}, .doubleBattle = FALSE, @@ -13334,7 +13334,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SAILOR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_SAILOR_2, + .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("HUEY"), .items = {}, .doubleBattle = FALSE, @@ -13346,7 +13346,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SAILOR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_SAILOR_2, + .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("DYLAN"), .items = {}, .doubleBattle = FALSE, @@ -13358,7 +13358,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SAILOR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_SAILOR_2, + .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("PHILLIP"), .items = {}, .doubleBattle = FALSE, @@ -13370,7 +13370,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SAILOR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_SAILOR_2, + .trainerPic = TRAINER_PIC_SAILOR, .trainerName = _("DWAYNE"), .items = {}, .doubleBattle = FALSE, @@ -13382,7 +13382,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("LIAM"), .items = {}, .doubleBattle = FALSE, @@ -13394,7 +13394,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("SHANE"), .items = {}, .doubleBattle = FALSE, @@ -13406,7 +13406,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("ETHAN"), .items = {}, .doubleBattle = FALSE, @@ -13418,7 +13418,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("RICKY"), .items = {}, .doubleBattle = FALSE, @@ -13430,7 +13430,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("JEFF"), .items = {}, .doubleBattle = FALSE, @@ -13442,7 +13442,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -13454,7 +13454,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("CHRIS"), .items = {}, .doubleBattle = FALSE, @@ -13466,7 +13466,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("DREW"), .items = {}, .doubleBattle = FALSE, @@ -13478,7 +13478,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("DIANA"), .items = {}, .doubleBattle = FALSE, @@ -13490,7 +13490,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("NANCY"), .items = {}, .doubleBattle = FALSE, @@ -13502,7 +13502,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ISABELLE"), .items = {}, .doubleBattle = FALSE, @@ -13514,7 +13514,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("KELSEY"), .items = {}, .doubleBattle = FALSE, @@ -13526,7 +13526,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ALICIA"), .items = {}, .doubleBattle = FALSE, @@ -13538,7 +13538,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("CAITLIN"), .items = {}, .doubleBattle = FALSE, @@ -13550,7 +13550,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("HEIDI"), .items = {}, .doubleBattle = FALSE, @@ -13562,7 +13562,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("CAROL"), .items = {}, .doubleBattle = FALSE, @@ -13574,7 +13574,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("SOFIA"), .items = {}, .doubleBattle = FALSE, @@ -13586,7 +13586,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("MARTHA"), .items = {}, .doubleBattle = FALSE, @@ -13598,7 +13598,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("TINA"), .items = {}, .doubleBattle = FALSE, @@ -13610,7 +13610,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("HANNAH"), .items = {}, .doubleBattle = FALSE, @@ -13622,7 +13622,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEMANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, - .trainerPic = TRAINER_PIC_POKEMANIAC_2, + .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("MARK"), .items = {}, .doubleBattle = FALSE, @@ -13634,7 +13634,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEMANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, - .trainerPic = TRAINER_PIC_POKEMANIAC_2, + .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("HERMAN"), .items = {}, .doubleBattle = FALSE, @@ -13646,7 +13646,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEMANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, - .trainerPic = TRAINER_PIC_POKEMANIAC_2, + .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("COOPER"), .items = {}, .doubleBattle = FALSE, @@ -13658,7 +13658,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEMANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, - .trainerPic = TRAINER_PIC_POKEMANIAC_2, + .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("STEVE"), .items = {}, .doubleBattle = FALSE, @@ -13670,7 +13670,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEMANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, - .trainerPic = TRAINER_PIC_POKEMANIAC_2, + .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("WINSTON"), .items = {}, .doubleBattle = FALSE, @@ -13682,7 +13682,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEMANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, - .trainerPic = TRAINER_PIC_POKEMANIAC_2, + .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("DAWSON"), .items = {}, .doubleBattle = FALSE, @@ -13694,7 +13694,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEMANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, - .trainerPic = TRAINER_PIC_POKEMANIAC_2, + .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("ASHTON"), .items = {}, .doubleBattle = FALSE, @@ -13850,7 +13850,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("MARCOS"), .items = {}, .doubleBattle = FALSE, @@ -13862,7 +13862,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("FRANKLIN"), .items = {}, .doubleBattle = FALSE, @@ -13874,7 +13874,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("NOB"), .items = {}, .doubleBattle = FALSE, @@ -13886,7 +13886,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("WAYNE"), .items = {}, .doubleBattle = FALSE, @@ -13898,7 +13898,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("ALAN"), .items = {}, .doubleBattle = FALSE, @@ -13910,7 +13910,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("BRICE"), .items = {}, .doubleBattle = FALSE, @@ -13922,7 +13922,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("CLARK"), .items = {}, .doubleBattle = FALSE, @@ -13934,7 +13934,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("TRENT"), .items = {}, .doubleBattle = FALSE, @@ -13946,7 +13946,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("DUDLEY"), .items = {}, .doubleBattle = FALSE, @@ -13958,7 +13958,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("ALLEN"), .items = {}, .doubleBattle = FALSE, @@ -13970,7 +13970,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("ERIC"), .items = {}, .doubleBattle = FALSE, @@ -13982,7 +13982,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("LENNY"), .items = {}, .doubleBattle = FALSE, @@ -13994,7 +13994,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("OLIVER"), .items = {}, .doubleBattle = FALSE, @@ -14006,7 +14006,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("LUCAS"), .items = {}, .doubleBattle = FALSE, @@ -14354,7 +14354,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN_2, + .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("DALE"), .items = {}, .doubleBattle = FALSE, @@ -14366,7 +14366,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN_2, + .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("BARNY"), .items = {}, .doubleBattle = FALSE, @@ -14378,7 +14378,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN_2, + .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("NED"), .items = {}, .doubleBattle = FALSE, @@ -14390,7 +14390,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN_2, + .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("CHIP"), .items = {}, .doubleBattle = FALSE, @@ -14402,7 +14402,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN_2, + .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("HANK"), .items = {}, .doubleBattle = FALSE, @@ -14414,7 +14414,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN_2, + .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("ELLIOT"), .items = {}, .doubleBattle = FALSE, @@ -14426,7 +14426,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN_2, + .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("RONALD"), .items = {}, .doubleBattle = FALSE, @@ -14438,7 +14438,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN_2, + .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("CLAUDE"), .items = {}, .doubleBattle = FALSE, @@ -14450,7 +14450,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN_2, + .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("WADE"), .items = {}, .doubleBattle = FALSE, @@ -14462,7 +14462,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN_2, + .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("NOLAN"), .items = {}, .doubleBattle = FALSE, @@ -14474,7 +14474,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN_2, + .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("ANDREW"), .items = {}, .doubleBattle = FALSE, @@ -14486,7 +14486,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("LUIS"), .items = {}, .doubleBattle = FALSE, @@ -14498,7 +14498,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("RICHARD"), .items = {}, .doubleBattle = FALSE, @@ -14510,7 +14510,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("REECE"), .items = {}, .doubleBattle = FALSE, @@ -14522,7 +14522,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("MATTHEW"), .items = {}, .doubleBattle = FALSE, @@ -14534,7 +14534,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("DOUGLAS"), .items = {}, .doubleBattle = FALSE, @@ -14546,7 +14546,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("DAVID"), .items = {}, .doubleBattle = FALSE, @@ -14558,7 +14558,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("TONY"), .items = {}, .doubleBattle = FALSE, @@ -14570,7 +14570,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("AXLE"), .items = {}, .doubleBattle = FALSE, @@ -14582,7 +14582,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("BARRY"), .items = {}, .doubleBattle = FALSE, @@ -14594,7 +14594,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("DEAN"), .items = {}, .doubleBattle = FALSE, @@ -14606,7 +14606,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("DARRIN"), .items = {}, .doubleBattle = FALSE, @@ -14618,7 +14618,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("SPENCER"), .items = {}, .doubleBattle = FALSE, @@ -14630,7 +14630,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("JACK"), .items = {}, .doubleBattle = FALSE, @@ -14642,7 +14642,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("JEROME"), .items = {}, .doubleBattle = FALSE, @@ -14654,7 +14654,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("ROLAND"), .items = {}, .doubleBattle = FALSE, @@ -14858,7 +14858,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BEAUTY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_BEAUTY_2, + .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("BRIDGET"), .items = {}, .doubleBattle = FALSE, @@ -14870,7 +14870,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BEAUTY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_BEAUTY_2, + .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("TAMIA"), .items = {}, .doubleBattle = FALSE, @@ -14882,7 +14882,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BEAUTY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_BEAUTY_2, + .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("LORI"), .items = {}, .doubleBattle = FALSE, @@ -14894,7 +14894,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BEAUTY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_BEAUTY_2, + .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("LOLA"), .items = {}, .doubleBattle = FALSE, @@ -14906,7 +14906,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BEAUTY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_BEAUTY_2, + .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("SHEILA"), .items = {}, .doubleBattle = FALSE, @@ -14918,7 +14918,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("TIFFANY"), .items = {}, .doubleBattle = FALSE, @@ -14930,7 +14930,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("NORA"), .items = {}, .doubleBattle = FALSE, @@ -14942,7 +14942,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("MELISSA"), .items = {}, .doubleBattle = FALSE, @@ -14954,7 +14954,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BEAUTY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_BEAUTY_2, + .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("GRACE"), .items = {}, .doubleBattle = FALSE, @@ -14966,7 +14966,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BEAUTY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_BEAUTY_2, + .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("OLIVIA"), .items = {}, .doubleBattle = FALSE, @@ -14978,7 +14978,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BEAUTY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("LAUREN"), .items = {}, .doubleBattle = FALSE, @@ -14990,7 +14990,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("ANYA"), .items = {}, .doubleBattle = FALSE, @@ -15002,7 +15002,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("ALICE"), .items = {}, .doubleBattle = FALSE, @@ -15014,7 +15014,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("CONNIE"), .items = {}, .doubleBattle = FALSE, @@ -15026,7 +15026,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("SHIRLEY"), .items = {}, .doubleBattle = FALSE, @@ -15038,7 +15038,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PSYCHIC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_PSYCHIC_3, + .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("JOHAN"), .items = {}, .doubleBattle = FALSE, @@ -15050,7 +15050,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PSYCHIC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_PSYCHIC_3, + .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("TYRON"), .items = {}, .doubleBattle = FALSE, @@ -15062,7 +15062,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PSYCHIC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_PSYCHIC_3, + .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("CAMERON"), .items = {}, .doubleBattle = FALSE, @@ -15074,7 +15074,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PSYCHIC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_PSYCHIC_3, + .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("PRESTON"), .items = {}, .doubleBattle = FALSE, @@ -15278,7 +15278,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("SEBASTIAN"), .items = {}, .doubleBattle = FALSE, @@ -15290,7 +15290,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("PERRY"), .items = {}, .doubleBattle = FALSE, @@ -15302,7 +15302,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("ROBERT"), .items = {}, .doubleBattle = FALSE, @@ -15314,7 +15314,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("DONALD"), .items = {}, .doubleBattle = FALSE, @@ -15326,7 +15326,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("BENNY"), .items = {}, .doubleBattle = FALSE, @@ -15338,7 +15338,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("EDWIN"), .items = {}, .doubleBattle = FALSE, @@ -15350,7 +15350,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CHESTER"), .items = {}, .doubleBattle = FALSE, @@ -15362,7 +15362,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("WILTON"), .items = {}, .doubleBattle = FALSE, @@ -15374,7 +15374,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("RAMIRO"), .items = {}, .doubleBattle = FALSE, @@ -15386,7 +15386,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("JACOB"), .items = {}, .doubleBattle = FALSE, @@ -15398,7 +15398,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("ROGER"), .items = {}, .doubleBattle = FALSE, @@ -15410,7 +15410,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("REED"), .items = {}, .doubleBattle = FALSE, @@ -15422,7 +15422,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("KEITH"), .items = {}, .doubleBattle = FALSE, @@ -15434,7 +15434,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CARTER"), .items = {}, .doubleBattle = FALSE, @@ -15446,7 +15446,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MITCH"), .items = {}, .doubleBattle = FALSE, @@ -15458,7 +15458,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("BECK"), .items = {}, .doubleBattle = FALSE, @@ -15470,7 +15470,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MARLON"), .items = {}, .doubleBattle = FALSE, @@ -15482,7 +15482,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_BLACK_BELT_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT_2, + .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("KOICHI"), .items = {}, .doubleBattle = FALSE, @@ -15494,7 +15494,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_BLACK_BELT_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT_2, + .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("MIKE"), .items = {}, .doubleBattle = FALSE, @@ -15506,7 +15506,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_BLACK_BELT_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT_2, + .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("HIDEKI"), .items = {}, .doubleBattle = FALSE, @@ -15518,7 +15518,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_BLACK_BELT_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT_2, + .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("AARON"), .items = {}, .doubleBattle = FALSE, @@ -15530,7 +15530,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_BLACK_BELT_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT_2, + .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("HITOSHI"), .items = {}, .doubleBattle = FALSE, @@ -15542,7 +15542,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_BLACK_BELT_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT_2, + .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("ATSUSHI"), .items = {}, .doubleBattle = FALSE, @@ -15554,7 +15554,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_BLACK_BELT_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT_2, + .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("KIYO"), .items = {}, .doubleBattle = FALSE, @@ -15566,7 +15566,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_BLACK_BELT_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT_2, + .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("TAKASHI"), .items = {}, .doubleBattle = FALSE, @@ -15578,7 +15578,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_BLACK_BELT_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT_2, + .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("DAISUKE"), .items = {}, .doubleBattle = FALSE, @@ -15590,7 +15590,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_RIVAL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL, + .trainerPic = TRAINER_PIC_RIVAL_1, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, @@ -15602,7 +15602,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_RIVAL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL, + .trainerPic = TRAINER_PIC_RIVAL_1, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, @@ -15614,7 +15614,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_RIVAL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL, + .trainerPic = TRAINER_PIC_RIVAL_1, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, @@ -15626,7 +15626,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_RIVAL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL, + .trainerPic = TRAINER_PIC_RIVAL_1, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, @@ -15638,7 +15638,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_RIVAL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL, + .trainerPic = TRAINER_PIC_RIVAL_1, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, @@ -15650,7 +15650,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_RIVAL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL, + .trainerPic = TRAINER_PIC_RIVAL_1, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, @@ -15662,7 +15662,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_RIVAL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL, + .trainerPic = TRAINER_PIC_RIVAL_1, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, @@ -15674,7 +15674,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_RIVAL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL, + .trainerPic = TRAINER_PIC_RIVAL_1, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, @@ -15686,7 +15686,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_RIVAL, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL, + .trainerPic = TRAINER_PIC_RIVAL_1, .trainerName = _("TERRY"), .items = {}, .doubleBattle = FALSE, @@ -15854,7 +15854,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BOSS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_BOSS, + .trainerPic = TRAINER_PIC_LEADER_GIOVANNI, .trainerName = _("GIOVANNI"), .items = {}, .doubleBattle = FALSE, @@ -15866,7 +15866,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BOSS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_BOSS, + .trainerPic = TRAINER_PIC_LEADER_GIOVANNI, .trainerName = _("GIOVANNI"), .items = {}, .doubleBattle = FALSE, @@ -15878,7 +15878,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_LEADER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_BOSS, + .trainerPic = TRAINER_PIC_LEADER_GIOVANNI, .trainerName = _("GIOVANNI"), .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, @@ -15890,7 +15890,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -15902,7 +15902,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -15914,7 +15914,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -15926,7 +15926,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -15938,7 +15938,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -15950,7 +15950,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -15962,7 +15962,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -15974,7 +15974,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -15986,7 +15986,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -15998,7 +15998,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16010,7 +16010,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16022,7 +16022,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16034,7 +16034,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16046,7 +16046,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16058,7 +16058,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16070,7 +16070,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16082,7 +16082,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16094,7 +16094,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16106,7 +16106,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16118,7 +16118,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16130,7 +16130,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16142,7 +16142,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16154,7 +16154,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16166,7 +16166,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16178,7 +16178,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16190,7 +16190,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16202,7 +16202,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16214,7 +16214,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16226,7 +16226,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16238,7 +16238,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16250,7 +16250,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16262,7 +16262,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16274,7 +16274,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16286,7 +16286,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16298,7 +16298,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16310,7 +16310,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16322,7 +16322,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16334,7 +16334,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16346,7 +16346,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16358,7 +16358,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16370,7 +16370,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -16382,7 +16382,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOLTRAINER_3, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("SAMUEL"), .items = {ITEM_SUPER_POTION}, .doubleBattle = FALSE, @@ -16394,7 +16394,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOLTRAINER_3, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("GEORGE"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, @@ -16406,7 +16406,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOLTRAINER_3, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("COLBY"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, @@ -16418,7 +16418,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOLTRAINER_3, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("PAUL"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -16430,7 +16430,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOLTRAINER_3, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("ROLANDO"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, @@ -16442,7 +16442,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOLTRAINER_3, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("GILBERT"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, @@ -16454,7 +16454,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOLTRAINER_3, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("OWEN"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, @@ -16466,7 +16466,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOLTRAINER_3, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("BERKE"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -16478,7 +16478,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOLTRAINER_3, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("YUJI"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, @@ -16490,7 +16490,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOLTRAINER_3, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("WARREN"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, @@ -16502,7 +16502,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_COOLTRAINER_4, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("MARY"), .items = {ITEM_SUPER_POTION}, .doubleBattle = FALSE, @@ -16514,7 +16514,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_COOLTRAINER_4, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CAROLINE"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, @@ -16526,7 +16526,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_COOLTRAINER_4, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("ALEXA"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -16538,7 +16538,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_COOLTRAINER_4, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("SHANNON"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -16550,7 +16550,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_COOLTRAINER_4, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("NAOMI"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, @@ -16562,7 +16562,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_COOLTRAINER_4, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("BROOKE"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -16574,7 +16574,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_COOLTRAINER_4, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("AUSTINA"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -16586,7 +16586,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_COOLTRAINER_4, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("JULIE"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, @@ -16598,7 +16598,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_ELITE_FOUR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LORELEI, + .trainerPic = TRAINER_PIC_ELITE_FOUR_LORELEI, .trainerName = _("LORELEI"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -16610,7 +16610,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_ELITE_FOUR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, - .trainerPic = TRAINER_PIC_BRUNO, + .trainerPic = TRAINER_PIC_ELITE_FOUR_BRUNO, .trainerName = _("BRUNO"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -16622,7 +16622,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_ELITE_FOUR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_AGATHA, + .trainerPic = TRAINER_PIC_ELITE_FOUR_AGATHA, .trainerName = _("AGATHA"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -16634,7 +16634,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_ELITE_FOUR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, - .trainerPic = TRAINER_PIC_LANCE, + .trainerPic = TRAINER_PIC_ELITE_FOUR_LANCE, .trainerName = _("LANCE"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -16646,7 +16646,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_LEADER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BROCK, + .trainerPic = TRAINER_PIC_LEADER_BROCK, .trainerName = _("BROCK"), .items = {}, .doubleBattle = FALSE, @@ -16658,7 +16658,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_LEADER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_MISTY, + .trainerPic = TRAINER_PIC_LEADER_MISTY, .trainerName = _("MISTY"), .items = {ITEM_SUPER_POTION}, .doubleBattle = FALSE, @@ -16670,7 +16670,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_LEADER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_LT_SURGE, + .trainerPic = TRAINER_PIC_LEADER_LT_SURGE, .trainerName = _("LT. SURGE"), .items = {ITEM_SUPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, @@ -16682,7 +16682,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_LEADER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_ERIKA, + .trainerPic = TRAINER_PIC_LEADER_ERIKA, .trainerName = _("ERIKA"), .items = {ITEM_HYPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, @@ -16694,7 +16694,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_LEADER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_KOGA, + .trainerPic = TRAINER_PIC_LEADER_KOGA, .trainerName = _("KOGA"), .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, @@ -16706,7 +16706,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_LEADER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BLAINE, + .trainerPic = TRAINER_PIC_LEADER_BLAINE, .trainerName = _("BLAINE"), .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, @@ -16718,7 +16718,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_LEADER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SABRINA, + .trainerPic = TRAINER_PIC_LEADER_SABRINA, .trainerName = _("SABRINA"), .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_FULL_HEAL}, .doubleBattle = FALSE, @@ -16730,7 +16730,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_GENTLEMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, - .trainerPic = TRAINER_PIC_GENTLEMAN_2, + .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("THOMAS"), .items = {}, .doubleBattle = FALSE, @@ -16742,7 +16742,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_GENTLEMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, - .trainerPic = TRAINER_PIC_GENTLEMAN_2, + .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("ARTHUR"), .items = {}, .doubleBattle = FALSE, @@ -16754,7 +16754,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_GENTLEMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, - .trainerPic = TRAINER_PIC_GENTLEMAN_2, + .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("TUCKER"), .items = {}, .doubleBattle = FALSE, @@ -16766,7 +16766,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_GENTLEMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, - .trainerPic = TRAINER_PIC_GENTLEMAN_2, + .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("NORTON"), .items = {}, .doubleBattle = FALSE, @@ -16778,7 +16778,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_GENTLEMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, - .trainerPic = TRAINER_PIC_GENTLEMAN_2, + .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("WALTER"), .items = {}, .doubleBattle = FALSE, @@ -16934,7 +16934,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_CHAMPION_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_3, + .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -16946,7 +16946,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_CHAMPION_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_3, + .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -16958,7 +16958,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_CHAMPION_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_3, + .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -17258,7 +17258,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("JEREMY"), .items = {}, .doubleBattle = FALSE, @@ -17270,7 +17270,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ALMA"), .items = {}, .doubleBattle = FALSE, @@ -17282,7 +17282,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("SUSIE"), .items = {}, .doubleBattle = FALSE, @@ -17294,7 +17294,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("VALERIE"), .items = {}, .doubleBattle = FALSE, @@ -17306,7 +17306,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("GWEN"), .items = {}, .doubleBattle = FALSE, @@ -17330,7 +17330,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("FLINT"), .items = {}, .doubleBattle = FALSE, @@ -17342,7 +17342,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("MISSY"), .items = {}, .doubleBattle = FALSE, @@ -17354,7 +17354,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("IRENE"), .items = {}, .doubleBattle = FALSE, @@ -17366,7 +17366,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("DANA"), .items = {}, .doubleBattle = FALSE, @@ -17378,7 +17378,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ARIANA"), .items = {}, .doubleBattle = FALSE, @@ -17390,7 +17390,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("LEAH"), .items = {}, .doubleBattle = FALSE, @@ -17402,7 +17402,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("JUSTIN"), .items = {}, .doubleBattle = FALSE, @@ -17414,7 +17414,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("YAZMIN"), .items = {}, .doubleBattle = FALSE, @@ -17426,7 +17426,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("KINDRA"), .items = {}, .doubleBattle = FALSE, @@ -17438,7 +17438,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("BECKY"), .items = {}, .doubleBattle = FALSE, @@ -17450,7 +17450,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("CELIA"), .items = {}, .doubleBattle = FALSE, @@ -17462,7 +17462,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_GENTLEMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, - .trainerPic = TRAINER_PIC_GENTLEMAN_2, + .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("BROOKS"), .items = {}, .doubleBattle = FALSE, @@ -17474,7 +17474,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_GENTLEMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, - .trainerPic = TRAINER_PIC_GENTLEMAN_2, + .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("LAMAR"), .items = {}, .doubleBattle = FALSE, @@ -17486,7 +17486,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TWINS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_TWINS_2, + .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("ELI & ANNE"), .items = {}, .doubleBattle = TRUE, @@ -17510,7 +17510,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_YOUNG_COUPLE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, - .trainerPic = TRAINER_PIC_YOUNG_COUPLE_2, + .trainerPic = TRAINER_PIC_YOUNG_COUPLE, .trainerName = _("GIA & JES"), .items = {}, .doubleBattle = TRUE, @@ -17522,7 +17522,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TWINS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_TWINS_2, + .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("KIRI & JAN"), .items = {}, .doubleBattle = TRUE, @@ -17546,7 +17546,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_YOUNG_COUPLE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, - .trainerPic = TRAINER_PIC_YOUNG_COUPLE_2, + .trainerPic = TRAINER_PIC_YOUNG_COUPLE, .trainerName = _("LEA & JED"), .items = {}, .doubleBattle = TRUE, @@ -17558,7 +17558,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SIS_AND_BRO_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SIS_AND_BRO_2, + .trainerPic = TRAINER_PIC_SIS_AND_BRO, .trainerName = _("LIA & LUC"), .items = {}, .doubleBattle = TRUE, @@ -17570,7 +17570,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SIS_AND_BRO_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SIS_AND_BRO_2, + .trainerPic = TRAINER_PIC_SIS_AND_BRO, .trainerName = _("LIL & IAN"), .items = {}, .doubleBattle = TRUE, @@ -17582,7 +17582,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -17594,7 +17594,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -17606,7 +17606,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -17618,7 +17618,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -17630,7 +17630,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -17642,7 +17642,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _(""), .items = {}, .doubleBattle = FALSE, @@ -17690,7 +17690,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("RELI"), .items = {}, .doubleBattle = FALSE, @@ -17702,7 +17702,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("RELI"), .items = {}, .doubleBattle = FALSE, @@ -17762,7 +17762,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("JANICE"), .items = {}, .doubleBattle = FALSE, @@ -17774,7 +17774,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("JANICE"), .items = {}, .doubleBattle = FALSE, @@ -17798,7 +17798,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("FRANKLIN"), .items = {}, .doubleBattle = FALSE, @@ -17810,7 +17810,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_PROF, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_PROF_OAK, + .trainerPic = TRAINER_PIC_PROFESSOR_OAK, .trainerName = _("PROF. OAK"), .items = {}, .doubleBattle = FALSE, @@ -17822,7 +17822,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PLAYER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BRENDAN, + .trainerPic = TRAINER_PIC_RS_BRENDAN_2, .trainerName = _("BRENDAN"), .items = {}, .doubleBattle = FALSE, @@ -17834,7 +17834,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PLAYER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_MAY, + .trainerPic = TRAINER_PIC_RS_MAY_2, .trainerName = _("MAY"), .items = {}, .doubleBattle = FALSE, @@ -17870,7 +17870,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET_2, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_F, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -17882,7 +17882,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_PSYCHIC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PSYCHIC_4, + .trainerPic = TRAINER_PIC_PSYCHIC_F, .trainerName = _("JACLYN"), .items = {}, .doubleBattle = FALSE, @@ -17906,7 +17906,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TUBER_3, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, - .trainerPic = TRAINER_PIC_TUBER_3, + .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("AMIRA"), .items = {}, .doubleBattle = FALSE, @@ -17918,7 +17918,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_BREEDER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_PKMN_BREEDER_3, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, .trainerName = _("ALIZE"), .items = {}, .doubleBattle = FALSE, @@ -17930,7 +17930,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_PKMN_RANGER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_PKMN_RANGER_3, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, .trainerName = _("NICOLAS"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -17942,7 +17942,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_PKMN_RANGER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PKMN_RANGER_4, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, .trainerName = _("MADELINE"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -17954,7 +17954,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_AROMA_LADY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_AROMA_LADY_2, + .trainerPic = TRAINER_PIC_AROMA_LADY, .trainerName = _("NIKKI"), .items = {}, .doubleBattle = FALSE, @@ -17966,7 +17966,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_RUIN_MANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_RUIN_MANIAC_2, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("STANLY"), .items = {}, .doubleBattle = FALSE, @@ -17978,7 +17978,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_LADY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_LADY_2, + .trainerPic = TRAINER_PIC_LADY, .trainerName = _("JACKI"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -18050,7 +18050,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("ANTHONY"), .items = {}, .doubleBattle = FALSE, @@ -18062,7 +18062,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("CHARLIE"), .items = {}, .doubleBattle = FALSE, @@ -18074,7 +18074,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TWINS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_TWINS_2, + .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("ELI & ANNE"), .items = {}, .doubleBattle = TRUE, @@ -18122,7 +18122,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -18134,7 +18134,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -18146,7 +18146,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -18158,7 +18158,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -18170,7 +18170,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -18182,7 +18182,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -18194,7 +18194,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET_2, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_F, .trainerName = _("ADMIN"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, @@ -18206,7 +18206,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("ADMIN"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, @@ -18230,7 +18230,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("AMARA"), .items = {}, .doubleBattle = FALSE, @@ -18242,7 +18242,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("MARIA"), .items = {}, .doubleBattle = FALSE, @@ -18254,7 +18254,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("ABIGAIL"), .items = {}, .doubleBattle = FALSE, @@ -18266,7 +18266,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("FINN"), .items = {}, .doubleBattle = FALSE, @@ -18278,7 +18278,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("GARRETT"), .items = {}, .doubleBattle = FALSE, @@ -18290,7 +18290,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN_2, + .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("TOMMY"), .items = {}, .doubleBattle = FALSE, @@ -18314,7 +18314,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_BLACK_BELT_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT_2, + .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("SHEA"), .items = {}, .doubleBattle = FALSE, @@ -18326,7 +18326,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_BLACK_BELT_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT_2, + .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("HUGH"), .items = {}, .doubleBattle = FALSE, @@ -18338,7 +18338,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("BRYCE"), .items = {}, .doubleBattle = FALSE, @@ -18350,7 +18350,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("CLAIRE"), .items = {}, .doubleBattle = FALSE, @@ -18374,7 +18374,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_AROMA_LADY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_AROMA_LADY_2, + .trainerPic = TRAINER_PIC_AROMA_LADY, .trainerName = _("VIOLET"), .items = {}, .doubleBattle = FALSE, @@ -18386,7 +18386,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TUBER_3, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, - .trainerPic = TRAINER_PIC_TUBER_3, + .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("ALEXIS"), .items = {}, .doubleBattle = FALSE, @@ -18398,7 +18398,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TWINS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_TWINS_2, + .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("JOY & MEG"), .items = {}, .doubleBattle = TRUE, @@ -18410,7 +18410,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("TISHA"), .items = {}, .doubleBattle = FALSE, @@ -18446,7 +18446,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_LADY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_LADY_2, + .trainerPic = TRAINER_PIC_LADY, .trainerName = _("GILLIAN"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -18470,7 +18470,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("TOBY"), .items = {}, .doubleBattle = FALSE, @@ -18482,7 +18482,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -18494,7 +18494,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_M, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -18506,7 +18506,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TEAM_ROCKET, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, - .trainerPic = TRAINER_PIC_TEAM_ROCKET_2, + .trainerPic = TRAINER_PIC_ROCKET_GRUNT_F, .trainerName = _("GRUNT"), .items = {}, .doubleBattle = FALSE, @@ -18518,7 +18518,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MILO"), .items = {}, .doubleBattle = FALSE, @@ -18530,7 +18530,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CHAZ"), .items = {}, .doubleBattle = FALSE, @@ -18542,7 +18542,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("HAROLD"), .items = {}, .doubleBattle = FALSE, @@ -18554,7 +18554,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN_2, + .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("TYLOR"), .items = {}, .doubleBattle = FALSE, @@ -18566,7 +18566,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("MYMO"), .items = {}, .doubleBattle = FALSE, @@ -18578,7 +18578,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("NICOLE"), .items = {}, .doubleBattle = FALSE, @@ -18590,7 +18590,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SIS_AND_BRO_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SIS_AND_BRO_2, + .trainerPic = TRAINER_PIC_SIS_AND_BRO, .trainerName = _("AVA & GEB"), .items = {}, .doubleBattle = TRUE, @@ -18602,7 +18602,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_AROMA_LADY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_AROMA_LADY_2, + .trainerPic = TRAINER_PIC_AROMA_LADY, .trainerName = _("ROSE"), .items = {}, .doubleBattle = FALSE, @@ -18614,7 +18614,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("SAMIR"), .items = {}, .doubleBattle = FALSE, @@ -18626,7 +18626,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("DENISE"), .items = {}, .doubleBattle = FALSE, @@ -18638,7 +18638,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TWINS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_TWINS_2, + .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("MIU & MIA"), .items = {}, .doubleBattle = TRUE, @@ -18650,7 +18650,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("EARL"), .items = {}, .doubleBattle = FALSE, @@ -18662,7 +18662,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_RUIN_MANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_RUIN_MANIAC_2, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("FOSTER"), .items = {}, .doubleBattle = FALSE, @@ -18674,7 +18674,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_RUIN_MANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_RUIN_MANIAC_2, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("LARRY"), .items = {}, .doubleBattle = FALSE, @@ -18686,7 +18686,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("DARYL"), .items = {}, .doubleBattle = FALSE, @@ -18698,7 +18698,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEMANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, - .trainerPic = TRAINER_PIC_POKEMANIAC_2, + .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("HECTOR"), .items = {}, .doubleBattle = FALSE, @@ -18710,7 +18710,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_PSYCHIC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_PSYCHIC_3, + .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("DARIO"), .items = {}, .doubleBattle = FALSE, @@ -18722,7 +18722,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_PSYCHIC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PSYCHIC_4, + .trainerPic = TRAINER_PIC_PSYCHIC_F, .trainerName = _("RODETTE"), .items = {}, .doubleBattle = FALSE, @@ -18734,7 +18734,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_AROMA_LADY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_AROMA_LADY_2, + .trainerPic = TRAINER_PIC_AROMA_LADY, .trainerName = _("MIAH"), .items = {}, .doubleBattle = FALSE, @@ -18746,7 +18746,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_YOUNG_COUPLE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, - .trainerPic = TRAINER_PIC_YOUNG_COUPLE_2, + .trainerPic = TRAINER_PIC_YOUNG_COUPLE, .trainerName = _("EVE & JON"), .items = {}, .doubleBattle = TRUE, @@ -18806,7 +18806,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEMANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, - .trainerPic = TRAINER_PIC_POKEMANIAC_2, + .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("MARK"), .items = {}, .doubleBattle = FALSE, @@ -18818,7 +18818,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_PKMN_RANGER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_PKMN_RANGER_3, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, .trainerName = _("LOGAN"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -18830,7 +18830,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_PKMN_RANGER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_PKMN_RANGER_3, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, .trainerName = _("JACKSON"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -18842,7 +18842,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_RANGER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PKMN_RANGER_4, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, .trainerName = _("BETH"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -18854,7 +18854,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_PKMN_RANGER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PKMN_RANGER_4, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, .trainerName = _("KATELYN"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -18866,7 +18866,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOLTRAINER_3, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("LEROY"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -18878,7 +18878,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_COOLTRAINER_4, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("MICHELLE"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, @@ -18902,7 +18902,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_RUIN_MANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_RUIN_MANIAC_2, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("BRANDON"), .items = {}, .doubleBattle = FALSE, @@ -18914,7 +18914,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_RUIN_MANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_RUIN_MANIAC_2, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("BENJAMIN"), .items = {}, .doubleBattle = FALSE, @@ -18938,7 +18938,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_GENTLEMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, - .trainerPic = TRAINER_PIC_GENTLEMAN_2, + .trainerPic = TRAINER_PIC_GENTLEMAN, .trainerName = _("CLIFFORD"), .items = {}, .doubleBattle = FALSE, @@ -18950,7 +18950,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_LADY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_LADY_2, + .trainerPic = TRAINER_PIC_LADY, .trainerName = _("SELPHY"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -18962,7 +18962,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_RUIN_MANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_RUIN_MANIAC_2, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("LAWSON"), .items = {}, .doubleBattle = FALSE, @@ -18974,7 +18974,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PSYCHIC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PSYCHIC_4, + .trainerPic = TRAINER_PIC_PSYCHIC_F, .trainerName = _("LAURA"), .items = {}, .doubleBattle = FALSE, @@ -18986,7 +18986,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_BREEDER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_PKMN_BREEDER_3, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, .trainerName = _("BETHANY"), .items = {}, .doubleBattle = FALSE, @@ -18998,7 +18998,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_BREEDER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_PKMN_BREEDER_3, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, .trainerName = _("ALLISON"), .items = {}, .doubleBattle = FALSE, @@ -19010,7 +19010,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("GARRET"), .items = {}, .doubleBattle = FALSE, @@ -19022,7 +19022,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("JONAH"), .items = {}, .doubleBattle = FALSE, @@ -19034,7 +19034,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("VANCE"), .items = {}, .doubleBattle = FALSE, @@ -19070,7 +19070,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("DALIA"), .items = {}, .doubleBattle = FALSE, @@ -19082,7 +19082,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("JOANA"), .items = {}, .doubleBattle = FALSE, @@ -19094,7 +19094,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("RILEY"), .items = {}, .doubleBattle = FALSE, @@ -19106,7 +19106,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("MARCY"), .items = {}, .doubleBattle = FALSE, @@ -19118,7 +19118,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_RUIN_MANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_RUIN_MANIAC_2, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("LAYTON"), .items = {}, .doubleBattle = FALSE, @@ -19130,7 +19130,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("KELSEY"), .items = {}, .doubleBattle = FALSE, @@ -19142,7 +19142,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("KELSEY"), .items = {}, .doubleBattle = FALSE, @@ -19154,7 +19154,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("KELSEY"), .items = {}, .doubleBattle = FALSE, @@ -19166,7 +19166,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("RICKY"), .items = {}, .doubleBattle = FALSE, @@ -19178,7 +19178,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("RICKY"), .items = {}, .doubleBattle = FALSE, @@ -19190,7 +19190,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("RICKY"), .items = {}, .doubleBattle = FALSE, @@ -19202,7 +19202,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("JEFF"), .items = {}, .doubleBattle = FALSE, @@ -19214,7 +19214,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("JEFF"), .items = {}, .doubleBattle = FALSE, @@ -19226,7 +19226,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("JEFF"), .items = {}, .doubleBattle = FALSE, @@ -19238,7 +19238,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ISABELLE"), .items = {}, .doubleBattle = FALSE, @@ -19250,7 +19250,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ISABELLE"), .items = {}, .doubleBattle = FALSE, @@ -19262,7 +19262,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ISABELLE"), .items = {}, .doubleBattle = FALSE, @@ -19322,7 +19322,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("CHRIS"), .items = {}, .doubleBattle = FALSE, @@ -19334,7 +19334,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("CHRIS"), .items = {}, .doubleBattle = FALSE, @@ -19346,7 +19346,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_CAMPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_CAMPER_2, + .trainerPic = TRAINER_PIC_CAMPER, .trainerName = _("CHRIS"), .items = {}, .doubleBattle = FALSE, @@ -19358,7 +19358,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ALICIA"), .items = {}, .doubleBattle = FALSE, @@ -19370,7 +19370,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ALICIA"), .items = {}, .doubleBattle = FALSE, @@ -19382,7 +19382,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("ALICIA"), .items = {}, .doubleBattle = FALSE, @@ -19394,7 +19394,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("JEREMY"), .items = {}, .doubleBattle = FALSE, @@ -19406,7 +19406,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEMANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, - .trainerPic = TRAINER_PIC_POKEMANIAC_2, + .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("MARK"), .items = {}, .doubleBattle = FALSE, @@ -19418,7 +19418,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEMANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, - .trainerPic = TRAINER_PIC_POKEMANIAC_2, + .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("HERMAN"), .items = {}, .doubleBattle = FALSE, @@ -19430,7 +19430,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEMANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, - .trainerPic = TRAINER_PIC_POKEMANIAC_2, + .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("HERMAN"), .items = {}, .doubleBattle = FALSE, @@ -19442,7 +19442,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("TRENT"), .items = {}, .doubleBattle = FALSE, @@ -19454,7 +19454,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("MEGAN"), .items = {}, .doubleBattle = FALSE, @@ -19466,7 +19466,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_LASS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_LASS_2, + .trainerPic = TRAINER_PIC_LASS, .trainerName = _("MEGAN"), .items = {}, .doubleBattle = FALSE, @@ -19514,7 +19514,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN_2, + .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("ELLIOT"), .items = {}, .doubleBattle = FALSE, @@ -19538,7 +19538,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BEAUTY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_BEAUTY_2, + .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("SHEILA"), .items = {}, .doubleBattle = FALSE, @@ -19550,7 +19550,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("ROBERT"), .items = {}, .doubleBattle = FALSE, @@ -19562,7 +19562,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("ROBERT"), .items = {}, .doubleBattle = FALSE, @@ -19574,7 +19574,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("SUSIE"), .items = {}, .doubleBattle = FALSE, @@ -19586,7 +19586,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("SUSIE"), .items = {}, .doubleBattle = FALSE, @@ -19598,7 +19598,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("SUSIE"), .items = {}, .doubleBattle = FALSE, @@ -19622,7 +19622,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("BENNY"), .items = {}, .doubleBattle = FALSE, @@ -19634,7 +19634,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("BENNY"), .items = {}, .doubleBattle = FALSE, @@ -19646,7 +19646,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MARLON"), .items = {}, .doubleBattle = FALSE, @@ -19658,7 +19658,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MARLON"), .items = {}, .doubleBattle = FALSE, @@ -19670,7 +19670,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BEAUTY_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_BEAUTY_2, + .trainerPic = TRAINER_PIC_BEAUTY, .trainerName = _("GRACE"), .items = {}, .doubleBattle = FALSE, @@ -19682,7 +19682,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CHESTER"), .items = {}, .doubleBattle = FALSE, @@ -19694,7 +19694,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CHESTER"), .items = {}, .doubleBattle = FALSE, @@ -19706,7 +19706,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("BECKY"), .items = {}, .doubleBattle = FALSE, @@ -19718,7 +19718,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("BECKY"), .items = {}, .doubleBattle = FALSE, @@ -19730,7 +19730,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("BECKY"), .items = {}, .doubleBattle = FALSE, @@ -19838,7 +19838,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("JACOB"), .items = {}, .doubleBattle = FALSE, @@ -19850,7 +19850,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("JACOB"), .items = {}, .doubleBattle = FALSE, @@ -19862,7 +19862,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("ALICE"), .items = {}, .doubleBattle = FALSE, @@ -19874,7 +19874,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("DARRIN"), .items = {}, .doubleBattle = FALSE, @@ -19886,7 +19886,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("MISSY"), .items = {}, .doubleBattle = FALSE, @@ -19898,7 +19898,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PICNICKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PICNICKER_2, + .trainerPic = TRAINER_PIC_PICNICKER, .trainerName = _("MISSY"), .items = {}, .doubleBattle = FALSE, @@ -19910,7 +19910,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_FISHERMAN_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_FISHERMAN_2, + .trainerPic = TRAINER_PIC_FISHERMAN, .trainerName = _("WADE"), .items = {}, .doubleBattle = FALSE, @@ -19922,7 +19922,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("JACK"), .items = {}, .doubleBattle = FALSE, @@ -19934,7 +19934,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SIS_AND_BRO_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SIS_AND_BRO_2, + .trainerPic = TRAINER_PIC_SIS_AND_BRO, .trainerName = _("LIL & IAN"), .items = {}, .doubleBattle = TRUE, @@ -19946,7 +19946,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SIS_AND_BRO_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SIS_AND_BRO_2, + .trainerPic = TRAINER_PIC_SIS_AND_BRO, .trainerName = _("LIL & IAN"), .items = {}, .doubleBattle = TRUE, @@ -19958,7 +19958,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("FINN"), .items = {}, .doubleBattle = FALSE, @@ -20018,7 +20018,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_BLACK_BELT_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT_2, + .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("SHEA"), .items = {}, .doubleBattle = FALSE, @@ -20030,7 +20030,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_BLACK_BELT_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT_2, + .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("SHEA"), .items = {}, .doubleBattle = FALSE, @@ -20042,7 +20042,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_BLACK_BELT_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT_2, + .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("HUGH"), .items = {}, .doubleBattle = FALSE, @@ -20054,7 +20054,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_BLACK_BELT_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_BLACK_BELT_2, + .trainerPic = TRAINER_PIC_BLACK_BELT, .trainerName = _("HUGH"), .items = {}, .doubleBattle = FALSE, @@ -20090,7 +20090,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TUBER_3, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, - .trainerPic = TRAINER_PIC_TUBER_3, + .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("AMIRA"), .items = {}, .doubleBattle = FALSE, @@ -20102,7 +20102,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_TWINS_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_TWINS_2, + .trainerPic = TRAINER_PIC_TWINS, .trainerName = _("JOY & MEG"), .items = {}, .doubleBattle = TRUE, @@ -20138,7 +20138,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_PKMN_BREEDER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, - .trainerPic = TRAINER_PIC_PKMN_BREEDER_3, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, .trainerName = _("ALIZE"), .items = {}, .doubleBattle = FALSE, @@ -20150,7 +20150,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_YOUNG_COUPLE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, - .trainerPic = TRAINER_PIC_YOUNG_COUPLE_2, + .trainerPic = TRAINER_PIC_YOUNG_COUPLE, .trainerName = _("GIA & JES"), .items = {}, .doubleBattle = TRUE, @@ -20162,7 +20162,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_YOUNG_COUPLE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, - .trainerPic = TRAINER_PIC_YOUNG_COUPLE_2, + .trainerPic = TRAINER_PIC_YOUNG_COUPLE, .trainerName = _("GIA & JES"), .items = {}, .doubleBattle = TRUE, @@ -20174,7 +20174,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("MILO"), .items = {}, .doubleBattle = FALSE, @@ -20186,7 +20186,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("CHAZ"), .items = {}, .doubleBattle = FALSE, @@ -20198,7 +20198,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BIRD_KEEPER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_BIRD_KEEPER_2, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, .trainerName = _("HAROLD"), .items = {}, .doubleBattle = FALSE, @@ -20210,7 +20210,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("NICOLE"), .items = {}, .doubleBattle = FALSE, @@ -20222,7 +20222,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_PSYCHIC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PSYCHIC_4, + .trainerPic = TRAINER_PIC_PSYCHIC_F, .trainerName = _("JACLYN"), .items = {}, .doubleBattle = FALSE, @@ -20234,7 +20234,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("SAMIR"), .items = {}, .doubleBattle = FALSE, @@ -20246,7 +20246,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_HIKER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_HIKER_2, + .trainerPic = TRAINER_PIC_HIKER, .trainerName = _("EARL"), .items = {}, .doubleBattle = FALSE, @@ -20258,7 +20258,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_RUIN_MANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, - .trainerPic = TRAINER_PIC_RUIN_MANIAC_2, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, .trainerName = _("LARRY"), .items = {}, .doubleBattle = FALSE, @@ -20270,7 +20270,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_POKEMANIAC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, - .trainerPic = TRAINER_PIC_POKEMANIAC_2, + .trainerPic = TRAINER_PIC_POKEMANIAC, .trainerName = _("HECTOR"), .items = {}, .doubleBattle = FALSE, @@ -20282,7 +20282,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_PSYCHIC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, - .trainerPic = TRAINER_PIC_PSYCHIC_3, + .trainerPic = TRAINER_PIC_PSYCHIC_M, .trainerName = _("DARIO"), .items = {}, .doubleBattle = FALSE, @@ -20294,7 +20294,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_PSYCHIC_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PSYCHIC_4, + .trainerPic = TRAINER_PIC_PSYCHIC_F, .trainerName = _("RODETTE"), .items = {}, .doubleBattle = FALSE, @@ -20318,7 +20318,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_PKMN_RANGER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_PKMN_RANGER_3, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, .trainerName = _("NICOLAS"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -20330,7 +20330,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_PKMN_RANGER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PKMN_RANGER_4, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, .trainerName = _("MADELINE"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -20366,7 +20366,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_PKMN_RANGER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_PKMN_RANGER_3, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, .trainerName = _("JACKSON"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -20378,7 +20378,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_PKMN_RANGER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_PKMN_RANGER_4, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, .trainerName = _("KATELYN"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -20390,7 +20390,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOLTRAINER_3, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("LEROY"), .items = {ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -20402,7 +20402,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = CLASS_COOLTRAINER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_COOLTRAINER_4, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("MICHELLE"), .items = {ITEM_HYPER_POTION}, .doubleBattle = FALSE, @@ -20426,7 +20426,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("COLTON"), .items = {}, .doubleBattle = FALSE, @@ -20438,7 +20438,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("COLTON"), .items = {}, .doubleBattle = FALSE, @@ -20450,7 +20450,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_BUG_CATCHER_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_BUG_CATCHER_2, + .trainerPic = TRAINER_PIC_BUG_CATCHER, .trainerName = _("COLTON"), .items = {}, .doubleBattle = FALSE, @@ -20462,7 +20462,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("MATTHEW"), .items = {}, .doubleBattle = FALSE, @@ -20474,7 +20474,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_MALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, - .trainerPic = TRAINER_PIC_SWIMMER_MALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_M, .trainerName = _("TONY"), .items = {}, .doubleBattle = FALSE, @@ -20486,7 +20486,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = CLASS_SWIMMER_FEMALE_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE | F_TRAINER_FEMALE, - .trainerPic = TRAINER_PIC_SWIMMER_FEMALE_2, + .trainerPic = TRAINER_PIC_SWIMMER_F, .trainerName = _("MELISSA"), .items = {}, .doubleBattle = FALSE, @@ -20498,7 +20498,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_ELITE_FOUR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, - .trainerPic = TRAINER_PIC_LORELEI, + .trainerPic = TRAINER_PIC_ELITE_FOUR_LORELEI, .trainerName = _("LORELEI"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -20510,7 +20510,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_ELITE_FOUR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, - .trainerPic = TRAINER_PIC_BRUNO, + .trainerPic = TRAINER_PIC_ELITE_FOUR_BRUNO, .trainerName = _("BRUNO"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -20522,7 +20522,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_ELITE_FOUR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, - .trainerPic = TRAINER_PIC_AGATHA, + .trainerPic = TRAINER_PIC_ELITE_FOUR_AGATHA, .trainerName = _("AGATHA"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -20534,7 +20534,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_ELITE_FOUR_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, - .trainerPic = TRAINER_PIC_LANCE, + .trainerPic = TRAINER_PIC_ELITE_FOUR_LANCE, .trainerName = _("LANCE"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -20546,7 +20546,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_CHAMPION_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_3, + .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -20558,7 +20558,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_CHAMPION_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_3, + .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, @@ -20570,7 +20570,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM, .trainerClass = CLASS_CHAMPION_2, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RIVAL_3, + .trainerPic = TRAINER_PIC_CHAMPION_RIVAL, .trainerName = _("TERRY"), .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, .doubleBattle = FALSE, diff --git a/src/vs_seeker.c b/src/vs_seeker.c index cfc99551a..fee473451 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -1258,19 +1258,19 @@ static void TryGetRematchTrainerIdGivenGameState(const u16 * a0, u8 * a1) *a1 = GetRematchTrainerIdGivenGameState(a0, *a1); break; case 2: - if (!FlagGet(FLAG_SYS_NATIONAL_DEX)) + if (!FlagGet(FLAG_0x896)) *a1 = GetRematchTrainerIdGivenGameState(a0, *a1); break; case 3: - if (!FlagGet(FLAG_SYS_CAVE_SHIP)) + if (!FlagGet(FLAG_0x897)) *a1 = GetRematchTrainerIdGivenGameState(a0, *a1); break; case 4: - if (!FlagGet(FLAG_TRAINER_FLAG_START + 0x32c)) + if (!FlagGet(FLAG_0x82C)) *a1 = GetRematchTrainerIdGivenGameState(a0, *a1); break; case 5: - if (!FlagGet(FLAG_TRAINER_FLAG_START + 0x344)) + if (!FlagGet(FLAG_0x844)) *a1 = GetRematchTrainerIdGivenGameState(a0, *a1); break; } |