diff options
Diffstat (limited to 'src/data/trainers.h')
| -rw-r--r-- | src/data/trainers.h | 262 |
1 files changed, 131 insertions, 131 deletions
diff --git a/src/data/trainers.h b/src/data/trainers.h index fe087d166..7ec297eb3 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -156,9 +156,9 @@ const struct Trainer gTrainers[] = { [TRAINER_MARCEL] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("MARCEL"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -534,9 +534,9 @@ const struct Trainer gTrainers[] = { [TRAINER_FELIX] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("FELIX"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -800,7 +800,7 @@ const struct Trainer gTrainers[] = { [TRAINER_LOLA_1] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("LOLA"), @@ -814,7 +814,7 @@ const struct Trainer gTrainers[] = { [TRAINER_AUSTINA] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("AUSTINA"), @@ -828,7 +828,7 @@ const struct Trainer gTrainers[] = { [TRAINER_GWEN] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("GWEN"), @@ -842,7 +842,7 @@ const struct Trainer gTrainers[] = { [TRAINER_LOLA_2] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("LOLA"), @@ -856,7 +856,7 @@ const struct Trainer gTrainers[] = { [TRAINER_LOLA_3] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("LOLA"), @@ -870,7 +870,7 @@ const struct Trainer gTrainers[] = { [TRAINER_LOLA_4] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("LOLA"), @@ -884,7 +884,7 @@ const struct Trainer gTrainers[] = { [TRAINER_LOLA_5] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("LOLA"), @@ -898,7 +898,7 @@ const struct Trainer gTrainers[] = { [TRAINER_RICKY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("RICKY"), @@ -912,7 +912,7 @@ const struct Trainer gTrainers[] = { [TRAINER_SIMON] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("SIMON"), @@ -926,7 +926,7 @@ const struct Trainer gTrainers[] = { [TRAINER_CHARLIE] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("CHARLIE"), @@ -940,7 +940,7 @@ const struct Trainer gTrainers[] = { [TRAINER_RICKY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("RICKY"), @@ -954,7 +954,7 @@ const struct Trainer gTrainers[] = { [TRAINER_RICKY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("RICKY"), @@ -968,7 +968,7 @@ const struct Trainer gTrainers[] = { [TRAINER_RICKY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("RICKY"), @@ -982,7 +982,7 @@ const struct Trainer gTrainers[] = { [TRAINER_RICKY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("RICKY"), @@ -996,9 +996,9 @@ const struct Trainer gTrainers[] = { [TRAINER_RANDALL] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("RANDALL"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1010,9 +1010,9 @@ const struct Trainer gTrainers[] = { [TRAINER_PARKER] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("PARKER"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1024,9 +1024,9 @@ const struct Trainer gTrainers[] = { [TRAINER_GEORGE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("GEORGE"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1038,9 +1038,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BERKE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("BERKE"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1052,9 +1052,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BRAXTON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("BRAXTON"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1066,9 +1066,9 @@ const struct Trainer gTrainers[] = { [TRAINER_VINCENT] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("VINCENT"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1080,9 +1080,9 @@ const struct Trainer gTrainers[] = { [TRAINER_LEROY] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("LEROY"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1094,9 +1094,9 @@ const struct Trainer gTrainers[] = { [TRAINER_WILTON_1] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("WILTON"), .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1108,9 +1108,9 @@ const struct Trainer gTrainers[] = { [TRAINER_EDGAR] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("EDGAR"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1122,9 +1122,9 @@ const struct Trainer gTrainers[] = { [TRAINER_ALBERT] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("ALBERT"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1136,9 +1136,9 @@ const struct Trainer gTrainers[] = { [TRAINER_SAMUEL] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("SAMUEL"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1150,9 +1150,9 @@ const struct Trainer gTrainers[] = { [TRAINER_VITO] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("VITO"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1164,9 +1164,9 @@ const struct Trainer gTrainers[] = { [TRAINER_OWEN] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("OWEN"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1178,9 +1178,9 @@ const struct Trainer gTrainers[] = { [TRAINER_WILTON_2] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("WILTON"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1192,9 +1192,9 @@ const struct Trainer gTrainers[] = { [TRAINER_WILTON_3] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("WILTON"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1206,9 +1206,9 @@ const struct Trainer gTrainers[] = { [TRAINER_WILTON_4] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("WILTON"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1220,9 +1220,9 @@ const struct Trainer gTrainers[] = { [TRAINER_WILTON_5] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("WILTON"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1234,9 +1234,9 @@ const struct Trainer gTrainers[] = { [TRAINER_WARREN] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("WARREN"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1248,9 +1248,9 @@ const struct Trainer gTrainers[] = { [TRAINER_MARY] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("MARY"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1262,9 +1262,9 @@ const struct Trainer gTrainers[] = { [TRAINER_ALEXIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("ALEXIA"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1276,9 +1276,9 @@ const struct Trainer gTrainers[] = { [TRAINER_JODY] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("JODY"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1290,9 +1290,9 @@ const struct Trainer gTrainers[] = { [TRAINER_WENDY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("WENDY"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1304,9 +1304,9 @@ const struct Trainer gTrainers[] = { [TRAINER_KEIRA] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("KEIRA"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1318,9 +1318,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BROOKE_1] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("BROOKE"), .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1332,9 +1332,9 @@ const struct Trainer gTrainers[] = { [TRAINER_JENNIFER] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("JENNIFER"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1346,9 +1346,9 @@ const struct Trainer gTrainers[] = { [TRAINER_HOPE] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("HOPE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1360,9 +1360,9 @@ const struct Trainer gTrainers[] = { [TRAINER_SHANNON] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("SHANNON"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1374,9 +1374,9 @@ const struct Trainer gTrainers[] = { [TRAINER_MICHELLE] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("MICHELLE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1388,9 +1388,9 @@ const struct Trainer gTrainers[] = { [TRAINER_CAROLINE] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CAROLINE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1402,9 +1402,9 @@ const struct Trainer gTrainers[] = { [TRAINER_JULIE] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("JULIE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1416,9 +1416,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BROOKE_2] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("BROOKE"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1430,9 +1430,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BROOKE_3] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("BROOKE"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1444,9 +1444,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BROOKE_4] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("BROOKE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1458,9 +1458,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BROOKE_5] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("BROOKE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -4538,9 +4538,9 @@ const struct Trainer gTrainers[] = { [TRAINER_QUINCY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("QUINCY"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -4552,9 +4552,9 @@ const struct Trainer gTrainers[] = { [TRAINER_KATELYNN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("KATELYNN"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -5840,9 +5840,9 @@ const struct Trainer gTrainers[] = { [TRAINER_DIANNE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("DIANNE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -5854,7 +5854,7 @@ const struct Trainer gTrainers[] = { [TRAINER_JANI] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("JANI"), @@ -7044,9 +7044,9 @@ const struct Trainer gTrainers[] = { [TRAINER_JAZMYN] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER_UNUSED, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("JAZMYN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -7114,9 +7114,9 @@ const struct Trainer gTrainers[] = { [TRAINER_MARLEY] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("MARLEY"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -7562,9 +7562,9 @@ const struct Trainer gTrainers[] = { [TRAINER_MITCHELL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("MITCHELL"), .items = {}, .doubleBattle = FALSE, @@ -7646,9 +7646,9 @@ const struct Trainer gTrainers[] = { [TRAINER_HALLE] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("HALLE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -8080,9 +8080,9 @@ const struct Trainer gTrainers[] = { [TRAINER_ATHENA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("ATHENA"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -8374,9 +8374,9 @@ const struct Trainer gTrainers[] = { [TRAINER_JONATHAN] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("JONATHAN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -9074,9 +9074,9 @@ const struct Trainer gTrainers[] = { [TRAINER_GERALD] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("GERALD"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -9382,9 +9382,9 @@ const struct Trainer gTrainers[] = { [TRAINER_ALEXA] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("ALEXA"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -9396,9 +9396,9 @@ const struct Trainer gTrainers[] = { [TRAINER_RUBEN] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("RUBEN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -9760,7 +9760,7 @@ const struct Trainer gTrainers[] = { [TRAINER_HAILEY] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("HAILEY"), @@ -9774,7 +9774,7 @@ const struct Trainer gTrainers[] = { [TRAINER_CHANDLER] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("CHANDLER"), @@ -10264,9 +10264,9 @@ const struct Trainer gTrainers[] = { [TRAINER_DARCY] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("DARCY"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -10376,9 +10376,9 @@ const struct Trainer gTrainers[] = { [TRAINER_CAROLINA] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CAROLINA"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -10670,9 +10670,9 @@ const struct Trainer gTrainers[] = { [TRAINER_LEONEL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("LEONEL"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -10740,9 +10740,9 @@ const struct Trainer gTrainers[] = { [TRAINER_CRISTIN_1] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CRISTIN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -11594,9 +11594,9 @@ const struct Trainer gTrainers[] = { [TRAINER_CRISTIN_2] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CRISTIN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -11608,9 +11608,9 @@ const struct Trainer gTrainers[] = { [TRAINER_CRISTIN_3] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CRISTIN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -11622,9 +11622,9 @@ const struct Trainer gTrainers[] = { [TRAINER_CRISTIN_4] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CRISTIN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -11636,9 +11636,9 @@ const struct Trainer gTrainers[] = { [TRAINER_CRISTIN_5] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CRISTIN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -11946,7 +11946,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_4, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN, + .trainerPic = TRAINER_PIC_RS_BRENDAN, .trainerName = _("BRENDAN"), .items = {}, .doubleBattle = FALSE, @@ -11960,7 +11960,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_4, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RUBY_SAPPHIRE_MAY, + .trainerPic = TRAINER_PIC_RS_MAY, .trainerName = _("MAY"), .items = {}, .doubleBattle = FALSE, |