diff options
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/pokemon/trainer_class_lookups.h | 156 | ||||
| -rw-r--r-- | src/data/text/trainer_class_names.h | 8 | ||||
| -rw-r--r-- | src/data/trainer_graphics/front_pic_anims.h | 8 | ||||
| -rw-r--r-- | src/data/trainers.h | 262 |
4 files changed, 217 insertions, 217 deletions
diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index 0d3cd0fe7..4d3492e8b 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -4,30 +4,30 @@ const u8 gFacilityClassToPicIndex[] = { [FACILITY_CLASS_HIKER] = TRAINER_PIC_HIKER, - [FACILITY_CLASS_TEAM_AQUA_1] = TRAINER_PIC_AQUA_GRUNT_M, - [FACILITY_CLASS_PKMN_BREEDER_1] = TRAINER_PIC_POKEMON_BREEDER_F, - [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_PIC_COOL_TRAINER_M, + [FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_PIC_AQUA_GRUNT_M, + [FACILITY_CLASS_POKEMON_BREEDER_F] = TRAINER_PIC_POKEMON_BREEDER_F, + [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_PIC_COOLTRAINER_M, [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_PIC_BIRD_KEEPER, [FACILITY_CLASS_COLLECTOR] = TRAINER_PIC_COLLECTOR, - [FACILITY_CLASS_TEAM_AQUA_2] = TRAINER_PIC_AQUA_GRUNT_F, + [FACILITY_CLASS_AQUA_GRUNT_F] = TRAINER_PIC_AQUA_GRUNT_F, [FACILITY_CLASS_SWIMMER_M] = TRAINER_PIC_SWIMMER_M, - [FACILITY_CLASS_TEAM_MAGMA_1] = TRAINER_PIC_MAGMA_GRUNT_M, + [FACILITY_CLASS_MAGMA_GRUNT_M] = TRAINER_PIC_MAGMA_GRUNT_M, [FACILITY_CLASS_EXPERT_M] = TRAINER_PIC_EXPERT_M, [FACILITY_CLASS_BLACK_BELT] = TRAINER_PIC_BLACK_BELT, - [FACILITY_CLASS_AQUA_LEADER] = TRAINER_PIC_AQUA_LEADER_ARCHIE, + [FACILITY_CLASS_AQUA_LEADER_ARCHIE] = TRAINER_PIC_AQUA_LEADER_ARCHIE, [FACILITY_CLASS_HEX_MANIAC] = TRAINER_PIC_HEX_MANIAC, [FACILITY_CLASS_AROMA_LADY] = TRAINER_PIC_AROMA_LADY, [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_PIC_RUIN_MANIAC, [FACILITY_CLASS_INTERVIEWER] = TRAINER_PIC_INTERVIEWER, - [FACILITY_CLASS_TUBER_1] = TRAINER_PIC_TUBER_F, - [FACILITY_CLASS_TUBER_2] = TRAINER_PIC_TUBER_M, - [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_PIC_COOL_TRAINER_F, + [FACILITY_CLASS_TUBER_F] = TRAINER_PIC_TUBER_F, + [FACILITY_CLASS_TUBER_M] = TRAINER_PIC_TUBER_M, + [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_PIC_COOLTRAINER_F, [FACILITY_CLASS_LADY] = TRAINER_PIC_LADY, [FACILITY_CLASS_BEAUTY] = TRAINER_PIC_BEAUTY, [FACILITY_CLASS_RICH_BOY] = TRAINER_PIC_RICH_BOY, - [FACILITY_CLASS_EXPERT_2] = TRAINER_PIC_EXPERT_F, + [FACILITY_CLASS_EXPERT_F] = TRAINER_PIC_EXPERT_F, [FACILITY_CLASS_POKEMANIAC] = TRAINER_PIC_POKEMANIAC, - [FACILITY_CLASS_TEAM_MAGMA_2] = TRAINER_PIC_MAGMA_GRUNT_F, + [FACILITY_CLASS_MAGMA_GRUNT_F] = TRAINER_PIC_MAGMA_GRUNT_F, [FACILITY_CLASS_GUITARIST] = TRAINER_PIC_GUITARIST, [FACILITY_CLASS_KINDLER] = TRAINER_PIC_KINDLER, [FACILITY_CLASS_CAMPER] = TRAINER_PIC_CAMPER, @@ -36,25 +36,25 @@ const u8 gFacilityClassToPicIndex[] = [FACILITY_CLASS_PSYCHIC_M] = TRAINER_PIC_PSYCHIC_M, [FACILITY_CLASS_PSYCHIC_F] = TRAINER_PIC_PSYCHIC_F, [FACILITY_CLASS_GENTLEMAN] = TRAINER_PIC_GENTLEMAN, - [FACILITY_CLASS_ELITE_FOUR_1] = TRAINER_PIC_ELITE_FOUR_SIDNEY, - [FACILITY_CLASS_ELITE_FOUR_2] = TRAINER_PIC_ELITE_FOUR_PHOEBE, - [FACILITY_CLASS_LEADER_1] = TRAINER_PIC_LEADER_ROXANNE, - [FACILITY_CLASS_LEADER_2] = TRAINER_PIC_LEADER_BRAWLY, - [FACILITY_CLASS_LEADER_3] = TRAINER_PIC_LEADER_TATE_AND_LIZA, + [FACILITY_CLASS_ELITE_FOUR_SIDNEY] = TRAINER_PIC_ELITE_FOUR_SIDNEY, + [FACILITY_CLASS_ELITE_FOUR_PHOEBE] = TRAINER_PIC_ELITE_FOUR_PHOEBE, + [FACILITY_CLASS_LEADER_ROXANNE] = TRAINER_PIC_LEADER_ROXANNE, + [FACILITY_CLASS_LEADER_BRAWLY] = TRAINER_PIC_LEADER_BRAWLY, + [FACILITY_CLASS_LEADER_TATE_AND_LIZA] = TRAINER_PIC_LEADER_TATE_AND_LIZA, [FACILITY_CLASS_SCHOOL_KID_M] = TRAINER_PIC_SCHOOL_KID_M, [FACILITY_CLASS_SCHOOL_KID_F] = TRAINER_PIC_SCHOOL_KID_F, [FACILITY_CLASS_SR_AND_JR] = TRAINER_PIC_SR_AND_JR, - [FACILITY_CLASS_POKEFAN_1] = TRAINER_PIC_POKEFAN_M, - [FACILITY_CLASS_POKEFAN_2] = TRAINER_PIC_POKEFAN_F, + [FACILITY_CLASS_POKEFAN_M] = TRAINER_PIC_POKEFAN_M, + [FACILITY_CLASS_POKEFAN_F] = TRAINER_PIC_POKEFAN_F, [FACILITY_CLASS_YOUNGSTER] = TRAINER_PIC_YOUNGSTER, - [FACILITY_CLASS_CHAMPION] = TRAINER_PIC_CHAMPION_WALLACE, + [FACILITY_CLASS_CHAMPION_WALLACE] = TRAINER_PIC_CHAMPION_WALLACE, [FACILITY_CLASS_FISHERMAN] = TRAINER_PIC_FISHERMAN, - [FACILITY_CLASS_TRIATHLETE_1] = TRAINER_PIC_CYCLING_TRIATHLETE_M, - [FACILITY_CLASS_TRIATHLETE_2] = TRAINER_PIC_CYCLING_TRIATHLETE_F, - [FACILITY_CLASS_TRIATHLETE_3] = TRAINER_PIC_RUNNING_TRIATHLETE_M, - [FACILITY_CLASS_TRIATHLETE_4] = TRAINER_PIC_RUNNING_TRIATHLETE_F, - [FACILITY_CLASS_TRIATHLETE_5] = TRAINER_PIC_SWIMMING_TRIATHLETE_M, - [FACILITY_CLASS_TRIATHLETE_6] = TRAINER_PIC_SWIMMING_TRIATHLETE_F, + [FACILITY_CLASS_CYCLING_TRIATHLETE_M] = TRAINER_PIC_CYCLING_TRIATHLETE_M, + [FACILITY_CLASS_CYCLING_TRIATHLETE_F] = TRAINER_PIC_CYCLING_TRIATHLETE_F, + [FACILITY_CLASS_RUNNING_TRIATHLETE_M] = TRAINER_PIC_RUNNING_TRIATHLETE_M, + [FACILITY_CLASS_RUNNING_TRIATHLETE_F] = TRAINER_PIC_RUNNING_TRIATHLETE_F, + [FACILITY_CLASS_SWIMMING_TRIATHLETE_M] = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + [FACILITY_CLASS_SWIMMING_TRIATHLETE_F] = TRAINER_PIC_SWIMMING_TRIATHLETE_F, [FACILITY_CLASS_DRAGON_TAMER] = TRAINER_PIC_DRAGON_TAMER, [FACILITY_CLASS_NINJA_BOY] = TRAINER_PIC_NINJA_BOY, [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_PIC_BATTLE_GIRL, @@ -62,58 +62,58 @@ const u8 gFacilityClassToPicIndex[] = [FACILITY_CLASS_SWIMMER_F] = TRAINER_PIC_SWIMMER_F, [FACILITY_CLASS_TWINS] = TRAINER_PIC_TWINS, [FACILITY_CLASS_SAILOR] = TRAINER_PIC_SAILOR, - [FACILITY_CLASS_PKMN_TRAINER_1] = TRAINER_PIC_WALLY, + [FACILITY_CLASS_PKMN_TRAINER_WALLY] = TRAINER_PIC_WALLY, [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_PIC_BRENDAN, - [FACILITY_CLASS_PKMN_TRAINER_3] = TRAINER_PIC_BRENDAN, - [FACILITY_CLASS_PKMN_TRAINER_4] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_PIC_BRENDAN, [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_PIC_MAY, - [FACILITY_CLASS_PKMN_TRAINER_6] = TRAINER_PIC_MAY, - [FACILITY_CLASS_PKMN_TRAINER_7] = TRAINER_PIC_MAY, - [FACILITY_CLASS_PKMN_BREEDER_2] = TRAINER_PIC_POKEMON_BREEDER_M, + [FACILITY_CLASS_PKMN_TRAINER_MAY_2] = TRAINER_PIC_MAY, + [FACILITY_CLASS_PKMN_TRAINER_MAY_3] = TRAINER_PIC_MAY, + [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_PIC_POKEMON_BREEDER_M, [FACILITY_CLASS_BUG_CATCHER] = TRAINER_PIC_BUG_CATCHER, [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_PIC_POKEMON_RANGER_M, [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_PIC_POKEMON_RANGER_F, - [FACILITY_CLASS_MAGMA_LEADER] = TRAINER_PIC_MAGMA_LEADER_MAXIE, + [FACILITY_CLASS_MAGMA_LEADER_MAXIE] = TRAINER_PIC_MAGMA_LEADER_MAXIE, [FACILITY_CLASS_LASS] = TRAINER_PIC_LASS, [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_PIC_YOUNG_COUPLE, [FACILITY_CLASS_OLD_COUPLE] = TRAINER_PIC_OLD_COUPLE, [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_PIC_SIS_AND_BRO, - [FACILITY_CLASS_PKMN_TRAINER_STEVEN] = TRAINER_PIC_STEVEN, - [FACILITY_CLASS_SALON_MAIDEN] = TRAINER_PIC_SALON_MAIDEN_ANABEL, - [FACILITY_CLASS_DOME_ACE] = TRAINER_PIC_DOME_ACE_TUCKER, - [FACILITY_CLASS_PKMN_TRAINER_RED] = TRAINER_PIC_RED, - [FACILITY_CLASS_PKMN_TRAINER_LEAF] = TRAINER_PIC_LEAF, - [FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN] = TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN, - [FACILITY_CLASS_PKMN_TRAINER_RS_MAY] = TRAINER_PIC_RUBY_SAPPHIRE_MAY, + [FACILITY_CLASS_STEVEN] = TRAINER_PIC_STEVEN, + [FACILITY_CLASS_SALON_MAIDEN_ANABEL] = TRAINER_PIC_SALON_MAIDEN_ANABEL, + [FACILITY_CLASS_DOME_ACE_TUCKER] = TRAINER_PIC_DOME_ACE_TUCKER, + [FACILITY_CLASS_RED] = TRAINER_PIC_RED, + [FACILITY_CLASS_LEAF] = TRAINER_PIC_LEAF, + [FACILITY_CLASS_RS_BRENDAN] = TRAINER_PIC_RS_BRENDAN, + [FACILITY_CLASS_RS_MAY] = TRAINER_PIC_RS_MAY, }; const u8 gFacilityClassToTrainerClass[] = { [FACILITY_CLASS_HIKER] = TRAINER_CLASS_HIKER, - [FACILITY_CLASS_TEAM_AQUA_1] = TRAINER_CLASS_TEAM_AQUA, - [FACILITY_CLASS_PKMN_BREEDER_1] = TRAINER_CLASS_PKMN_BREEDER, - [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_CLASS_COOLTRAINER_1, + [FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_CLASS_TEAM_AQUA, + [FACILITY_CLASS_POKEMON_BREEDER_F] = TRAINER_CLASS_PKMN_BREEDER, + [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_CLASS_COOLTRAINER, [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_CLASS_BIRD_KEEPER, [FACILITY_CLASS_COLLECTOR] = TRAINER_CLASS_COLLECTOR, - [FACILITY_CLASS_TEAM_AQUA_2] = TRAINER_CLASS_TEAM_AQUA, + [FACILITY_CLASS_AQUA_GRUNT_F] = TRAINER_CLASS_TEAM_AQUA, [FACILITY_CLASS_SWIMMER_M] = TRAINER_CLASS_SWIMMER_M, - [FACILITY_CLASS_TEAM_MAGMA_1] = TRAINER_CLASS_TEAM_MAGMA, + [FACILITY_CLASS_MAGMA_GRUNT_M] = TRAINER_CLASS_TEAM_MAGMA, [FACILITY_CLASS_EXPERT_M] = TRAINER_CLASS_EXPERT, [FACILITY_CLASS_BLACK_BELT] = TRAINER_CLASS_BLACK_BELT, - [FACILITY_CLASS_AQUA_LEADER] = TRAINER_CLASS_AQUA_LEADER, + [FACILITY_CLASS_AQUA_LEADER_ARCHIE] = TRAINER_CLASS_AQUA_LEADER, [FACILITY_CLASS_HEX_MANIAC] = TRAINER_CLASS_HEX_MANIAC, [FACILITY_CLASS_AROMA_LADY] = TRAINER_CLASS_AROMA_LADY, [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_CLASS_RUIN_MANIAC, [FACILITY_CLASS_INTERVIEWER] = TRAINER_CLASS_INTERVIEWER, - [FACILITY_CLASS_TUBER_1] = TRAINER_CLASS_TUBER_1, - [FACILITY_CLASS_TUBER_2] = TRAINER_CLASS_TUBER_2, - [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_CLASS_COOLTRAINER_1, + [FACILITY_CLASS_TUBER_F] = TRAINER_CLASS_TUBER_F, + [FACILITY_CLASS_TUBER_M] = TRAINER_CLASS_TUBER_M, + [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_CLASS_COOLTRAINER, [FACILITY_CLASS_LADY] = TRAINER_CLASS_LADY, [FACILITY_CLASS_BEAUTY] = TRAINER_CLASS_BEAUTY, [FACILITY_CLASS_RICH_BOY] = TRAINER_CLASS_RICH_BOY, - [FACILITY_CLASS_EXPERT_2] = TRAINER_CLASS_EXPERT, + [FACILITY_CLASS_EXPERT_F] = TRAINER_CLASS_EXPERT, [FACILITY_CLASS_POKEMANIAC] = TRAINER_CLASS_POKEMANIAC, - [FACILITY_CLASS_TEAM_MAGMA_2] = TRAINER_CLASS_TEAM_MAGMA, + [FACILITY_CLASS_MAGMA_GRUNT_F] = TRAINER_CLASS_TEAM_MAGMA, [FACILITY_CLASS_GUITARIST] = TRAINER_CLASS_GUITARIST, [FACILITY_CLASS_KINDLER] = TRAINER_CLASS_KINDLER, [FACILITY_CLASS_CAMPER] = TRAINER_CLASS_CAMPER, @@ -122,25 +122,25 @@ const u8 gFacilityClassToTrainerClass[] = [FACILITY_CLASS_PSYCHIC_M] = TRAINER_CLASS_PSYCHIC, [FACILITY_CLASS_PSYCHIC_F] = TRAINER_CLASS_PSYCHIC, [FACILITY_CLASS_GENTLEMAN] = TRAINER_CLASS_GENTLEMAN, - [FACILITY_CLASS_ELITE_FOUR_1] = TRAINER_CLASS_ELITE_FOUR, - [FACILITY_CLASS_ELITE_FOUR_2] = TRAINER_CLASS_ELITE_FOUR, - [FACILITY_CLASS_LEADER_1] = TRAINER_CLASS_LEADER, - [FACILITY_CLASS_LEADER_2] = TRAINER_CLASS_LEADER, - [FACILITY_CLASS_LEADER_3] = TRAINER_CLASS_LEADER, + [FACILITY_CLASS_ELITE_FOUR_SIDNEY] = TRAINER_CLASS_ELITE_FOUR, + [FACILITY_CLASS_ELITE_FOUR_PHOEBE] = TRAINER_CLASS_ELITE_FOUR, + [FACILITY_CLASS_LEADER_ROXANNE] = TRAINER_CLASS_LEADER, + [FACILITY_CLASS_LEADER_BRAWLY] = TRAINER_CLASS_LEADER, + [FACILITY_CLASS_LEADER_TATE_AND_LIZA] = TRAINER_CLASS_LEADER, [FACILITY_CLASS_SCHOOL_KID_M] = TRAINER_CLASS_SCHOOL_KID, [FACILITY_CLASS_SCHOOL_KID_F] = TRAINER_CLASS_SCHOOL_KID, [FACILITY_CLASS_SR_AND_JR] = TRAINER_CLASS_SR_AND_JR, - [FACILITY_CLASS_POKEFAN_1] = TRAINER_CLASS_POKEFAN, - [FACILITY_CLASS_POKEFAN_2] = TRAINER_CLASS_POKEFAN, + [FACILITY_CLASS_POKEFAN_M] = TRAINER_CLASS_POKEFAN, + [FACILITY_CLASS_POKEFAN_F] = TRAINER_CLASS_POKEFAN, [FACILITY_CLASS_YOUNGSTER] = TRAINER_CLASS_YOUNGSTER, - [FACILITY_CLASS_CHAMPION] = TRAINER_CLASS_CHAMPION, + [FACILITY_CLASS_CHAMPION_WALLACE] = TRAINER_CLASS_CHAMPION, [FACILITY_CLASS_FISHERMAN] = TRAINER_CLASS_FISHERMAN, - [FACILITY_CLASS_TRIATHLETE_1] = TRAINER_CLASS_TRIATHLETE, - [FACILITY_CLASS_TRIATHLETE_2] = TRAINER_CLASS_TRIATHLETE, - [FACILITY_CLASS_TRIATHLETE_3] = TRAINER_CLASS_TRIATHLETE, - [FACILITY_CLASS_TRIATHLETE_4] = TRAINER_CLASS_TRIATHLETE, - [FACILITY_CLASS_TRIATHLETE_5] = TRAINER_CLASS_TRIATHLETE, - [FACILITY_CLASS_TRIATHLETE_6] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_CYCLING_TRIATHLETE_M] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_CYCLING_TRIATHLETE_F] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_RUNNING_TRIATHLETE_M] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_RUNNING_TRIATHLETE_F] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_SWIMMING_TRIATHLETE_M] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_SWIMMING_TRIATHLETE_F] = TRAINER_CLASS_TRIATHLETE, [FACILITY_CLASS_DRAGON_TAMER] = TRAINER_CLASS_DRAGON_TAMER, [FACILITY_CLASS_NINJA_BOY] = TRAINER_CLASS_NINJA_BOY, [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_CLASS_BATTLE_GIRL, @@ -148,29 +148,29 @@ const u8 gFacilityClassToTrainerClass[] = [FACILITY_CLASS_SWIMMER_F] = TRAINER_CLASS_SWIMMER_F, [FACILITY_CLASS_TWINS] = TRAINER_CLASS_TWINS, [FACILITY_CLASS_SAILOR] = TRAINER_CLASS_SAILOR, - [FACILITY_CLASS_PKMN_TRAINER_1] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_WALLY] = TRAINER_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_3] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_4] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_6] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_7] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_BREEDER_2] = TRAINER_CLASS_PKMN_BREEDER, + [FACILITY_CLASS_PKMN_TRAINER_MAY_2] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_MAY_3] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_CLASS_PKMN_BREEDER, [FACILITY_CLASS_BUG_CATCHER] = TRAINER_CLASS_BUG_CATCHER, [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_CLASS_PKMN_RANGER, [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_CLASS_PKMN_RANGER, - [FACILITY_CLASS_MAGMA_LEADER] = TRAINER_CLASS_MAGMA_LEADER, + [FACILITY_CLASS_MAGMA_LEADER_MAXIE] = TRAINER_CLASS_MAGMA_LEADER, [FACILITY_CLASS_LASS] = TRAINER_CLASS_LASS, [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_CLASS_YOUNG_COUPLE, [FACILITY_CLASS_OLD_COUPLE] = TRAINER_CLASS_OLD_COUPLE, [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_CLASS_SIS_AND_BRO, - [FACILITY_CLASS_PKMN_TRAINER_STEVEN] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_SALON_MAIDEN] = TRAINER_CLASS_SALON_MAIDEN, - [FACILITY_CLASS_DOME_ACE] = TRAINER_CLASS_DOME_ACE, - [FACILITY_CLASS_PKMN_TRAINER_RED] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_LEAF] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_4, - [FACILITY_CLASS_PKMN_TRAINER_RS_MAY] = TRAINER_CLASS_PKMN_TRAINER_4, + [FACILITY_CLASS_STEVEN] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_SALON_MAIDEN_ANABEL] = TRAINER_CLASS_SALON_MAIDEN, + [FACILITY_CLASS_DOME_ACE_TUCKER] = TRAINER_CLASS_DOME_ACE, + [FACILITY_CLASS_RED] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_LEAF] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_RS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_4, + [FACILITY_CLASS_RS_MAY] = TRAINER_CLASS_PKMN_TRAINER_4, }; #endif //POKEEMERALD_TRAINER_CLASS_LOOKUPS_H diff --git a/src/data/text/trainer_class_names.h b/src/data/text/trainer_class_names.h index 62529d06e..2abbfc6d1 100644 --- a/src/data/text/trainer_class_names.h +++ b/src/data/text/trainer_class_names.h @@ -9,7 +9,7 @@ const u8 gTrainerClassNames[][13] = { [TRAINER_CLASS_HIKER] = _("HIKER"), [TRAINER_CLASS_TEAM_AQUA] = _("TEAM AQUA"), [TRAINER_CLASS_PKMN_BREEDER] = _("{PKMN} BREEDER"), - [TRAINER_CLASS_COOLTRAINER_1] = _("COOLTRAINER"), + [TRAINER_CLASS_COOLTRAINER] = _("COOLTRAINER"), [TRAINER_CLASS_BIRD_KEEPER] = _("BIRD KEEPER"), [TRAINER_CLASS_COLLECTOR] = _("COLLECTOR"), [TRAINER_CLASS_SWIMMER_M] = _("SWIMMER♂"), @@ -22,8 +22,8 @@ const u8 gTrainerClassNames[][13] = { [TRAINER_CLASS_AROMA_LADY] = _("AROMA LADY"), [TRAINER_CLASS_RUIN_MANIAC] = _("RUIN MANIAC"), [TRAINER_CLASS_INTERVIEWER] = _("INTERVIEWER"), - [TRAINER_CLASS_TUBER_1] = _("TUBER"), - [TRAINER_CLASS_TUBER_2] = _("TUBER"), + [TRAINER_CLASS_TUBER_F] = _("TUBER"), + [TRAINER_CLASS_TUBER_M] = _("TUBER"), [TRAINER_CLASS_LADY] = _("LADY"), [TRAINER_CLASS_BEAUTY] = _("BEAUTY"), [TRAINER_CLASS_RICH_BOY] = _("RICH BOY"), @@ -52,7 +52,7 @@ const u8 gTrainerClassNames[][13] = { [TRAINER_CLASS_SWIMMER_F] = _("SWIMMER♀"), [TRAINER_CLASS_TWINS] = _("TWINS"), [TRAINER_CLASS_SAILOR] = _("SAILOR"), - [TRAINER_CLASS_COOLTRAINER_2] = _("COOLTRAINER"), + [TRAINER_CLASS_COOLTRAINER_UNUSED] = _("COOLTRAINER"), [TRAINER_CLASS_MAGMA_ADMIN] = _("MAGMA ADMIN"), [TRAINER_CLASS_PKMN_TRAINER_3] = _("{PKMN} TRAINER"), [TRAINER_CLASS_BUG_CATCHER] = _("BUG CATCHER"), diff --git a/src/data/trainer_graphics/front_pic_anims.h b/src/data/trainer_graphics/front_pic_anims.h index 537cd557c..11fb1797f 100644 --- a/src/data/trainer_graphics/front_pic_anims.h +++ b/src/data/trainer_graphics/front_pic_anims.h @@ -375,7 +375,7 @@ const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] = gTrainerFrontAnims_Hiker, // TRAINER_PIC_HIKER gTrainerFrontAnims_AquaGruntM, // TRAINER_PIC_AQUA_GRUNT_M gTrainerFrontAnims_PokemonBreederF, // TRAINER_PIC_POKEMON_BREEDER_F - gTrainerFrontAnims_CoolTrainerM, // TRAINER_PIC_COOL_TRAINER_M + gTrainerFrontAnims_CoolTrainerM, // TRAINER_PIC_COOLTRAINER_M gTrainerFrontAnims_BirdKeeper, // TRAINER_PIC_BIRD_KEEPER gTrainerFrontAnims_Collector, // TRAINER_PIC_COLLECTOR gTrainerFrontAnims_AquaGruntF, // TRAINER_PIC_AQUA_GRUNT_F @@ -392,7 +392,7 @@ const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] = gTrainerFrontAnims_Interviewer, // TRAINER_PIC_INTERVIEWER gTrainerFrontAnims_TuberF, // TRAINER_PIC_TUBER_F gTrainerFrontAnims_TuberM, // TRAINER_PIC_TUBER_M - gTrainerFrontAnims_CoolTrainerF, // TRAINER_PIC_COOL_TRAINER_F + gTrainerFrontAnims_CoolTrainerF, // TRAINER_PIC_COOLTRAINER_F gTrainerFrontAnims_Lady, // TRAINER_PIC_LADY gTrainerFrontAnims_Beauty, // TRAINER_PIC_BEAUTY gTrainerFrontAnims_RichBoy, // TRAINER_PIC_RICH_BOY @@ -463,6 +463,6 @@ const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] = gTrainerFrontAnims_PyramidKingBrandon, // TRAINER_PIC_PYRAMID_KING_BRANDON gTrainerFrontAnims_Red, // TRAINER_PIC_RED gTrainerFrontAnims_Leaf, // TRAINER_PIC_LEAF - gTrainerFrontAnims_RubySapphireBrendan, // TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN - gTrainerFrontAnims_RubySapphireMay, // TRAINER_PIC_RUBY_SAPPHIRE_MAY + gTrainerFrontAnims_RubySapphireBrendan, // TRAINER_PIC_RS_BRENDAN + gTrainerFrontAnims_RubySapphireMay, // TRAINER_PIC_RS_MAY }; 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, |