diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/graphics/trainers.h | 8 | ||||
| -rw-r--r-- | src/data/pokemon/trainer_class_lookups.h | 4 | ||||
| -rw-r--r-- | src/data/text/trainer_class_names.h | 134 | ||||
| -rw-r--r-- | src/data/trainer_graphics/front_pic_anims.h | 190 | ||||
| -rw-r--r-- | src/data/trainer_graphics/front_pic_tables.h | 8 | ||||
| -rw-r--r-- | src/data/trainers.h | 34 |
6 files changed, 190 insertions, 188 deletions
diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 79ba703ba..3de77d6ec 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -151,11 +151,11 @@ const u32 gTrainerPalette_SchoolKidF[] = INCBIN_U32("graphics/trainers/palettes/ const u32 gTrainerFrontPic_SrAndJr[] = INCBIN_U32("graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz"); const u32 gTrainerPalette_SrAndJr[] = INCBIN_U32("graphics/trainers/palettes/sr_and_jr.gbapal.lz"); -const u32 gTrainerFrontPic_WinstrateM[] = INCBIN_U32("graphics/trainers/front_pics/winstrate_m_front_pic.4bpp.lz"); -const u32 gTrainerPalette_WinstrateM[] = INCBIN_U32("graphics/trainers/palettes/winstrate_m.gbapal.lz"); +const u32 gTrainerFrontPic_PokefanM[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_m_front_pic.4bpp.lz"); +const u32 gTrainerPalette_PokefanM[] = INCBIN_U32("graphics/trainers/palettes/pokefan_m.gbapal.lz"); -const u32 gTrainerFrontPic_WinstrateF[] = INCBIN_U32("graphics/trainers/front_pics/winstrate_f_front_pic.4bpp.lz"); -const u32 gTrainerPalette_WinstrateF[] = INCBIN_U32("graphics/trainers/palettes/winstrate_f.gbapal.lz"); +const u32 gTrainerFrontPic_PokefanF[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_f_front_pic.4bpp.lz"); +const u32 gTrainerPalette_PokefanF[] = INCBIN_U32("graphics/trainers/palettes/pokefan_f.gbapal.lz"); const u32 gTrainerFrontPic_Youngster[] = INCBIN_U32("graphics/trainers/front_pics/youngster_front_pic.4bpp.lz"); const u32 gTrainerPalette_Youngster[] = INCBIN_U32("graphics/trainers/palettes/youngster.gbapal.lz"); diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index 02b2016c1..90ceec811 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -44,8 +44,8 @@ const u8 gFacilityClassToPicIndex[] = TRAINER_PIC_SCHOOL_KID_M, // FACILITY_CLASS_SCHOOL_KID_M TRAINER_PIC_SCHOOL_KID_F, // FACILITY_CLASS_SCHOOL_KID_F TRAINER_PIC_SR_AND_JR, // FACILITY_CLASS_SR_AND_JR - TRAINER_PIC_WINSTRATE_M, // FACILITY_CLASS_POKEFAN_1 - TRAINER_PIC_WINSTRATE_F, // FACILITY_CLASS_POKEFAN_2 + TRAINER_PIC_POKEFAN_M, // FACILITY_CLASS_POKEFAN_1 + TRAINER_PIC_POKEFAN_F, // FACILITY_CLASS_POKEFAN_2 TRAINER_PIC_YOUNGSTER, // FACILITY_CLASS_YOUNGSTER TRAINER_PIC_CHAMPION_WALLACE, // FACILITY_CLASS_CHAMPION TRAINER_PIC_FISHERMAN, // FACILITY_CLASS_FISHERMAN diff --git a/src/data/text/trainer_class_names.h b/src/data/text/trainer_class_names.h index 7a126a128..62529d06e 100644 --- a/src/data/text/trainer_class_names.h +++ b/src/data/text/trainer_class_names.h @@ -1,73 +1,75 @@ +#include "constants/trainers.h" + #ifndef GUARD_TRAINER_CLASS_NAMES_H #define GUARD_TRAINER_CLASS_NAMES_H const u8 gTrainerClassNames[][13] = { - _("{PKMN} TRAINER"), - _("{PKMN} TRAINER"), - _("HIKER"), - _("TEAM AQUA"), - _("{PKMN} BREEDER"), - _("COOLTRAINER"), - _("BIRD KEEPER"), - _("COLLECTOR"), - _("SWIMMER♂"), - _("TEAM MAGMA"), - _("EXPERT"), - _("AQUA ADMIN"), - _("BLACK BELT"), - _("AQUA LEADER"), - _("HEX MANIAC"), - _("AROMA LADY"), - _("RUIN MANIAC"), - _("INTERVIEWER"), - _("TUBER"), - _("TUBER"), - _("LADY"), - _("BEAUTY"), - _("RICH BOY"), - _("POKéMANIAC"), - _("GUITARIST"), - _("KINDLER"), - _("CAMPER"), - _("PICNICKER"), - _("BUG MANIAC"), - _("PSYCHIC"), - _("GENTLEMAN"), - _("ELITE FOUR"), - _("LEADER"), - _("SCHOOL KID"), - _("SR. AND JR."), - _("WINSTRATE"), - _("POKéFAN"), - _("YOUNGSTER"), - _("CHAMPION"), - _("FISHERMAN"), - _("TRIATHLETE"), - _("DRAGON TAMER"), - _("NINJA BOY"), - _("BATTLE GIRL"), - _("PARASOL LADY"), - _("SWIMMER♀"), - _("TWINS"), - _("SAILOR"), - _("COOLTRAINER"), - _("MAGMA ADMIN"), - _("{PKMN} TRAINER"), - _("BUG CATCHER"), - _("{PKMN} RANGER"), - _("MAGMA LEADER"), - _("LASS"), - _("YOUNG COUPLE"), - _("OLD COUPLE"), - _("SIS AND BRO"), - _("SALON MAIDEN"), - _("DOME ACE"), - _("PALACE MAVEN"), - _("ARENA TYCOON"), - _("FACTORY HEAD"), - _("PIKE QUEEN"), - _("PYRAMID KING"), - _("{PKMN} TRAINER"), + [TRAINER_CLASS_PKMN_TRAINER_1] = _("{PKMN} TRAINER"), + [TRAINER_CLASS_PKMN_TRAINER_2] = _("{PKMN} TRAINER"), + [TRAINER_CLASS_HIKER] = _("HIKER"), + [TRAINER_CLASS_TEAM_AQUA] = _("TEAM AQUA"), + [TRAINER_CLASS_PKMN_BREEDER] = _("{PKMN} BREEDER"), + [TRAINER_CLASS_COOLTRAINER_1] = _("COOLTRAINER"), + [TRAINER_CLASS_BIRD_KEEPER] = _("BIRD KEEPER"), + [TRAINER_CLASS_COLLECTOR] = _("COLLECTOR"), + [TRAINER_CLASS_SWIMMER_M] = _("SWIMMER♂"), + [TRAINER_CLASS_TEAM_MAGMA] = _("TEAM MAGMA"), + [TRAINER_CLASS_EXPERT] = _("EXPERT"), + [TRAINER_CLASS_AQUA_ADMIN] = _("AQUA ADMIN"), + [TRAINER_CLASS_BLACK_BELT] = _("BLACK BELT"), + [TRAINER_CLASS_AQUA_LEADER] = _("AQUA LEADER"), + [TRAINER_CLASS_HEX_MANIAC] = _("HEX MANIAC"), + [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_LADY] = _("LADY"), + [TRAINER_CLASS_BEAUTY] = _("BEAUTY"), + [TRAINER_CLASS_RICH_BOY] = _("RICH BOY"), + [TRAINER_CLASS_POKEMANIAC] = _("POKéMANIAC"), + [TRAINER_CLASS_GUITARIST] = _("GUITARIST"), + [TRAINER_CLASS_KINDLER] = _("KINDLER"), + [TRAINER_CLASS_CAMPER] = _("CAMPER"), + [TRAINER_CLASS_PICNICKER] = _("PICNICKER"), + [TRAINER_CLASS_BUG_MANIAC] = _("BUG MANIAC"), + [TRAINER_CLASS_PSYCHIC] = _("PSYCHIC"), + [TRAINER_CLASS_GENTLEMAN] = _("GENTLEMAN"), + [TRAINER_CLASS_ELITE_FOUR] = _("ELITE FOUR"), + [TRAINER_CLASS_LEADER] = _("LEADER"), + [TRAINER_CLASS_SCHOOL_KID] = _("SCHOOL KID"), + [TRAINER_CLASS_SR_AND_JR] = _("SR. AND JR."), + [TRAINER_CLASS_WINSTRATE] = _("WINSTRATE"), + [TRAINER_CLASS_POKEFAN] = _("POKéFAN"), + [TRAINER_CLASS_YOUNGSTER] = _("YOUNGSTER"), + [TRAINER_CLASS_CHAMPION] = _("CHAMPION"), + [TRAINER_CLASS_FISHERMAN] = _("FISHERMAN"), + [TRAINER_CLASS_TRIATHLETE] = _("TRIATHLETE"), + [TRAINER_CLASS_DRAGON_TAMER] = _("DRAGON TAMER"), + [TRAINER_CLASS_NINJA_BOY] = _("NINJA BOY"), + [TRAINER_CLASS_BATTLE_GIRL] = _("BATTLE GIRL"), + [TRAINER_CLASS_PARASOL_LADY] = _("PARASOL LADY"), + [TRAINER_CLASS_SWIMMER_F] = _("SWIMMER♀"), + [TRAINER_CLASS_TWINS] = _("TWINS"), + [TRAINER_CLASS_SAILOR] = _("SAILOR"), + [TRAINER_CLASS_COOLTRAINER_2] = _("COOLTRAINER"), + [TRAINER_CLASS_MAGMA_ADMIN] = _("MAGMA ADMIN"), + [TRAINER_CLASS_PKMN_TRAINER_3] = _("{PKMN} TRAINER"), + [TRAINER_CLASS_BUG_CATCHER] = _("BUG CATCHER"), + [TRAINER_CLASS_PKMN_RANGER] = _("{PKMN} RANGER"), + [TRAINER_CLASS_MAGMA_LEADER] = _("MAGMA LEADER"), + [TRAINER_CLASS_LASS] = _("LASS"), + [TRAINER_CLASS_YOUNG_COUPLE] = _("YOUNG COUPLE"), + [TRAINER_CLASS_OLD_COUPLE] = _("OLD COUPLE"), + [TRAINER_CLASS_SIS_AND_BRO] = _("SIS AND BRO"), + [TRAINER_CLASS_SALON_MAIDEN] = _("SALON MAIDEN"), + [TRAINER_CLASS_DOME_ACE] = _("DOME ACE"), + [TRAINER_CLASS_PALACE_MAVEN] = _("PALACE MAVEN"), + [TRAINER_CLASS_ARENA_TYCOON] = _("ARENA TYCOON"), + [TRAINER_CLASS_FACTORY_HEAD] = _("FACTORY HEAD"), + [TRAINER_CLASS_PIKE_QUEEN] = _("PIKE QUEEN"), + [TRAINER_CLASS_PYRAMID_KING] = _("PYRAMID KING"), + [TRAINER_CLASS_PKMN_TRAINER_4] = _("{PKMN} TRAINER"), }; #endif diff --git a/src/data/trainer_graphics/front_pic_anims.h b/src/data/trainer_graphics/front_pic_anims.h index b72726506..537cd557c 100644 --- a/src/data/trainer_graphics/front_pic_anims.h +++ b/src/data/trainer_graphics/front_pic_anims.h @@ -202,11 +202,11 @@ const union AnimCmd *const gTrainerFrontAnims_SrAndJr[] ={ gAnimCmd_General_Frame0, }; -const union AnimCmd *const gTrainerFrontAnims_WinstrateM[] ={ +const union AnimCmd *const gTrainerFrontAnims_PokefanM[] ={ gAnimCmd_General_Frame0, }; -const union AnimCmd *const gTrainerFrontAnims_WinstrateF[] ={ +const union AnimCmd *const gTrainerFrontAnims_PokefanF[] ={ gAnimCmd_General_Frame0, }; @@ -372,97 +372,97 @@ const union AnimCmd *const gTrainerFrontAnims_RubySapphireMay[] ={ 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_BirdKeeper, // TRAINER_PIC_BIRD_KEEPER - gTrainerFrontAnims_Collector, // TRAINER_PIC_COLLECTOR - gTrainerFrontAnims_AquaGruntF, // TRAINER_PIC_AQUA_GRUNT_F - gTrainerFrontAnims_SwimmerM, // TRAINER_PIC_SWIMMER_M - gTrainerFrontAnims_MagmaGruntM, // TRAINER_PIC_MAGMA_GRUNT_M - gTrainerFrontAnims_ExpertM, // TRAINER_PIC_EXPERT_M - gTrainerFrontAnims_AquaAdminM, // TRAINER_PIC_AQUA_ADMIN_M - gTrainerFrontAnims_BlackBelt, // TRAINER_PIC_BLACK_BELT - gTrainerFrontAnims_AquaAdminF, // TRAINER_PIC_AQUA_ADMIN_F - gTrainerFrontAnims_AquaLeaderArchie, // TRAINER_PIC_AQUA_LEADER_ARCHIE - gTrainerFrontAnims_HexManiac, // TRAINER_PIC_HEX_MANIAC - gTrainerFrontAnims_AromaLady, // TRAINER_PIC_AROMA_LADY - gTrainerFrontAnims_RuinManiac, // TRAINER_PIC_RUIN_MANIAC - 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_Lady, // TRAINER_PIC_LADY - gTrainerFrontAnims_Beauty, // TRAINER_PIC_BEAUTY - gTrainerFrontAnims_RichBoy, // TRAINER_PIC_RICH_BOY - gTrainerFrontAnims_ExpertF, // TRAINER_PIC_EXPERT_F - gTrainerFrontAnims_Pokemaniac, // TRAINER_PIC_POKEMANIAC - gTrainerFrontAnims_MagmaGruntF, // TRAINER_PIC_MAGMA_GRUNT_F - gTrainerFrontAnims_Guitarist, // TRAINER_PIC_GUITARIST - gTrainerFrontAnims_Kindler, // TRAINER_PIC_KINDLER - gTrainerFrontAnims_Camper, // TRAINER_PIC_CAMPER - gTrainerFrontAnims_Picnicker, // TRAINER_PIC_PICNICKER - gTrainerFrontAnims_BugManiac, // TRAINER_PIC_BUG_MANIAC - gTrainerFrontAnims_PokemonBreederM, // TRAINER_PIC_POKEMON_BREEDER_M - gTrainerFrontAnims_PsychicM, // TRAINER_PIC_PSYCHIC_M - gTrainerFrontAnims_PsychicF, // TRAINER_PIC_PSYCHIC_F - gTrainerFrontAnims_Gentleman, // TRAINER_PIC_GENTLEMAN - gTrainerFrontAnims_EliteFourSidney, // TRAINER_PIC_ELITE_FOUR_SIDNEY - gTrainerFrontAnims_EliteFourPhoebe, // TRAINER_PIC_ELITE_FOUR_PHOEBE - gTrainerFrontAnims_EliteFourGlacia, // TRAINER_PIC_ELITE_FOUR_GLACIA - gTrainerFrontAnims_EliteFourDrake, // TRAINER_PIC_ELITE_FOUR_DRAKE - gTrainerFrontAnims_LeaderRoxanne, // TRAINER_PIC_LEADER_ROXANNE - gTrainerFrontAnims_LeaderBrawly, // TRAINER_PIC_LEADER_BRAWLY - gTrainerFrontAnims_LeaderWattson, // TRAINER_PIC_LEADER_WATTSON - gTrainerFrontAnims_LeaderFlannery, // TRAINER_PIC_LEADER_FLANNERY - gTrainerFrontAnims_LeaderNorman, // TRAINER_PIC_LEADER_NORMAN - gTrainerFrontAnims_LeaderWinona, // TRAINER_PIC_LEADER_WINONA - gTrainerFrontAnims_LeaderTateAndLiza, // TRAINER_PIC_LEADER_TATE_AND_LIZA - gTrainerFrontAnims_LeaderJuan, // TRAINER_PIC_LEADER_JUAN - gTrainerFrontAnims_SchoolKidM, // TRAINER_PIC_SCHOOL_KID_M - gTrainerFrontAnims_SchoolKidF, // TRAINER_PIC_SCHOOL_KID_F - gTrainerFrontAnims_SrAndJr, // TRAINER_PIC_SR_AND_JR - gTrainerFrontAnims_WinstrateM, // TRAINER_PIC_WINSTRATE_M - gTrainerFrontAnims_WinstrateF, // TRAINER_PIC_WINSTRATE_F - gTrainerFrontAnims_Youngster, // TRAINER_PIC_YOUNGSTER - gTrainerFrontAnims_ChampionWallace, // TRAINER_PIC_CHAMPION_WALLACE - gTrainerFrontAnims_Fisherman, // TRAINER_PIC_FISHERMAN - gTrainerFrontAnims_CyclingTriathleteM, // TRAINER_PIC_CYCLING_TRIATHLETE_M - gTrainerFrontAnims_CyclingTriathleteF, // TRAINER_PIC_CYCLING_TRIATHLETE_F - gTrainerFrontAnims_RunningTriathleteM, // TRAINER_PIC_RUNNING_TRIATHLETE_M - gTrainerFrontAnims_RunningTriathleteF, // TRAINER_PIC_RUNNING_TRIATHLETE_F - gTrainerFrontAnims_SwimmingTriathleteM, // TRAINER_PIC_SWIMMING_TRIATHLETE_M - gTrainerFrontAnims_SwimmingTriathleteF, // TRAINER_PIC_SWIMMING_TRIATHLETE_F - gTrainerFrontAnims_DragonTamer, // TRAINER_PIC_DRAGON_TAMER - gTrainerFrontAnims_NinjaBoy, // TRAINER_PIC_NINJA_BOY - gTrainerFrontAnims_BattleGirl, // TRAINER_PIC_BATTLE_GIRL - gTrainerFrontAnims_ParasolLady, // TRAINER_PIC_PARASOL_LADY - gTrainerFrontAnims_SwimmerF, // TRAINER_PIC_SWIMMER_F - gTrainerFrontAnims_Twins, // TRAINER_PIC_TWINS - gTrainerFrontAnims_Sailor, // TRAINER_PIC_SAILOR - gTrainerFrontAnims_MagmaAdmin, // TRAINER_PIC_MAGMA_ADMIN - gTrainerFrontAnims_Wally, // TRAINER_PIC_WALLY - gTrainerFrontAnims_Brendan, // TRAINER_PIC_BRENDAN - gTrainerFrontAnims_May, // TRAINER_PIC_MAY - gTrainerFrontAnims_BugCatcher, // TRAINER_PIC_BUG_CATCHER - gTrainerFrontAnims_PokemonRangerM, // TRAINER_PIC_POKEMON_RANGER_M - gTrainerFrontAnims_PokemonRangerF, // TRAINER_PIC_POKEMON_RANGER_F - gTrainerFrontAnims_MagmaLeaderMaxie, // TRAINER_PIC_MAGMA_LEADER_MAXIE - gTrainerFrontAnims_Lass, // TRAINER_PIC_LASS - gTrainerFrontAnims_YoungCouple, // TRAINER_PIC_YOUNG_COUPLE - gTrainerFrontAnims_OldCouple, // TRAINER_PIC_OLD_COUPLE - gTrainerFrontAnims_SisAndBro, // TRAINER_PIC_SIS_AND_BRO - gTrainerFrontAnims_Steven, // TRAINER_PIC_STEVEN - gTrainerFrontAnims_SalonMaidenAnabel, // TRAINER_PIC_SALON_MAIDEN_ANABEL - gTrainerFrontAnims_DomeAceTucker, // TRAINER_PIC_DOME_ACE_TUCKER - gTrainerFrontAnims_PalaceMavenSpenser, // TRAINER_PIC_PALACE_MAVEN_SPENSER - gTrainerFrontAnims_ArenaTycoonGreta, // TRAINER_PIC_ARENA_TYCOON_GRETA - gTrainerFrontAnims_FactoryHeadNoland, // TRAINER_PIC_FACTORY_HEAD_NOLAND - gTrainerFrontAnims_PikeQueenLucy, // TRAINER_PIC_PIKE_QUEEN_LUCY - 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_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_BirdKeeper, // TRAINER_PIC_BIRD_KEEPER + gTrainerFrontAnims_Collector, // TRAINER_PIC_COLLECTOR + gTrainerFrontAnims_AquaGruntF, // TRAINER_PIC_AQUA_GRUNT_F + gTrainerFrontAnims_SwimmerM, // TRAINER_PIC_SWIMMER_M + gTrainerFrontAnims_MagmaGruntM, // TRAINER_PIC_MAGMA_GRUNT_M + gTrainerFrontAnims_ExpertM, // TRAINER_PIC_EXPERT_M + gTrainerFrontAnims_AquaAdminM, // TRAINER_PIC_AQUA_ADMIN_M + gTrainerFrontAnims_BlackBelt, // TRAINER_PIC_BLACK_BELT + gTrainerFrontAnims_AquaAdminF, // TRAINER_PIC_AQUA_ADMIN_F + gTrainerFrontAnims_AquaLeaderArchie, // TRAINER_PIC_AQUA_LEADER_ARCHIE + gTrainerFrontAnims_HexManiac, // TRAINER_PIC_HEX_MANIAC + gTrainerFrontAnims_AromaLady, // TRAINER_PIC_AROMA_LADY + gTrainerFrontAnims_RuinManiac, // TRAINER_PIC_RUIN_MANIAC + 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_Lady, // TRAINER_PIC_LADY + gTrainerFrontAnims_Beauty, // TRAINER_PIC_BEAUTY + gTrainerFrontAnims_RichBoy, // TRAINER_PIC_RICH_BOY + gTrainerFrontAnims_ExpertF, // TRAINER_PIC_EXPERT_F + gTrainerFrontAnims_Pokemaniac, // TRAINER_PIC_POKEMANIAC + gTrainerFrontAnims_MagmaGruntF, // TRAINER_PIC_MAGMA_GRUNT_F + gTrainerFrontAnims_Guitarist, // TRAINER_PIC_GUITARIST + gTrainerFrontAnims_Kindler, // TRAINER_PIC_KINDLER + gTrainerFrontAnims_Camper, // TRAINER_PIC_CAMPER + gTrainerFrontAnims_Picnicker, // TRAINER_PIC_PICNICKER + gTrainerFrontAnims_BugManiac, // TRAINER_PIC_BUG_MANIAC + gTrainerFrontAnims_PokemonBreederM, // TRAINER_PIC_POKEMON_BREEDER_M + gTrainerFrontAnims_PsychicM, // TRAINER_PIC_PSYCHIC_M + gTrainerFrontAnims_PsychicF, // TRAINER_PIC_PSYCHIC_F + gTrainerFrontAnims_Gentleman, // TRAINER_PIC_GENTLEMAN + gTrainerFrontAnims_EliteFourSidney, // TRAINER_PIC_ELITE_FOUR_SIDNEY + gTrainerFrontAnims_EliteFourPhoebe, // TRAINER_PIC_ELITE_FOUR_PHOEBE + gTrainerFrontAnims_EliteFourGlacia, // TRAINER_PIC_ELITE_FOUR_GLACIA + gTrainerFrontAnims_EliteFourDrake, // TRAINER_PIC_ELITE_FOUR_DRAKE + gTrainerFrontAnims_LeaderRoxanne, // TRAINER_PIC_LEADER_ROXANNE + gTrainerFrontAnims_LeaderBrawly, // TRAINER_PIC_LEADER_BRAWLY + gTrainerFrontAnims_LeaderWattson, // TRAINER_PIC_LEADER_WATTSON + gTrainerFrontAnims_LeaderFlannery, // TRAINER_PIC_LEADER_FLANNERY + gTrainerFrontAnims_LeaderNorman, // TRAINER_PIC_LEADER_NORMAN + gTrainerFrontAnims_LeaderWinona, // TRAINER_PIC_LEADER_WINONA + gTrainerFrontAnims_LeaderTateAndLiza, // TRAINER_PIC_LEADER_TATE_AND_LIZA + gTrainerFrontAnims_LeaderJuan, // TRAINER_PIC_LEADER_JUAN + gTrainerFrontAnims_SchoolKidM, // TRAINER_PIC_SCHOOL_KID_M + gTrainerFrontAnims_SchoolKidF, // TRAINER_PIC_SCHOOL_KID_F + gTrainerFrontAnims_SrAndJr, // TRAINER_PIC_SR_AND_JR + gTrainerFrontAnims_PokefanM, // TRAINER_PIC_POKEFAN_M + gTrainerFrontAnims_PokefanF, // TRAINER_PIC_POKEFAN_F + gTrainerFrontAnims_Youngster, // TRAINER_PIC_YOUNGSTER + gTrainerFrontAnims_ChampionWallace, // TRAINER_PIC_CHAMPION_WALLACE + gTrainerFrontAnims_Fisherman, // TRAINER_PIC_FISHERMAN + gTrainerFrontAnims_CyclingTriathleteM, // TRAINER_PIC_CYCLING_TRIATHLETE_M + gTrainerFrontAnims_CyclingTriathleteF, // TRAINER_PIC_CYCLING_TRIATHLETE_F + gTrainerFrontAnims_RunningTriathleteM, // TRAINER_PIC_RUNNING_TRIATHLETE_M + gTrainerFrontAnims_RunningTriathleteF, // TRAINER_PIC_RUNNING_TRIATHLETE_F + gTrainerFrontAnims_SwimmingTriathleteM, // TRAINER_PIC_SWIMMING_TRIATHLETE_M + gTrainerFrontAnims_SwimmingTriathleteF, // TRAINER_PIC_SWIMMING_TRIATHLETE_F + gTrainerFrontAnims_DragonTamer, // TRAINER_PIC_DRAGON_TAMER + gTrainerFrontAnims_NinjaBoy, // TRAINER_PIC_NINJA_BOY + gTrainerFrontAnims_BattleGirl, // TRAINER_PIC_BATTLE_GIRL + gTrainerFrontAnims_ParasolLady, // TRAINER_PIC_PARASOL_LADY + gTrainerFrontAnims_SwimmerF, // TRAINER_PIC_SWIMMER_F + gTrainerFrontAnims_Twins, // TRAINER_PIC_TWINS + gTrainerFrontAnims_Sailor, // TRAINER_PIC_SAILOR + gTrainerFrontAnims_MagmaAdmin, // TRAINER_PIC_MAGMA_ADMIN + gTrainerFrontAnims_Wally, // TRAINER_PIC_WALLY + gTrainerFrontAnims_Brendan, // TRAINER_PIC_BRENDAN + gTrainerFrontAnims_May, // TRAINER_PIC_MAY + gTrainerFrontAnims_BugCatcher, // TRAINER_PIC_BUG_CATCHER + gTrainerFrontAnims_PokemonRangerM, // TRAINER_PIC_POKEMON_RANGER_M + gTrainerFrontAnims_PokemonRangerF, // TRAINER_PIC_POKEMON_RANGER_F + gTrainerFrontAnims_MagmaLeaderMaxie, // TRAINER_PIC_MAGMA_LEADER_MAXIE + gTrainerFrontAnims_Lass, // TRAINER_PIC_LASS + gTrainerFrontAnims_YoungCouple, // TRAINER_PIC_YOUNG_COUPLE + gTrainerFrontAnims_OldCouple, // TRAINER_PIC_OLD_COUPLE + gTrainerFrontAnims_SisAndBro, // TRAINER_PIC_SIS_AND_BRO + gTrainerFrontAnims_Steven, // TRAINER_PIC_STEVEN + gTrainerFrontAnims_SalonMaidenAnabel, // TRAINER_PIC_SALON_MAIDEN_ANABEL + gTrainerFrontAnims_DomeAceTucker, // TRAINER_PIC_DOME_ACE_TUCKER + gTrainerFrontAnims_PalaceMavenSpenser, // TRAINER_PIC_PALACE_MAVEN_SPENSER + gTrainerFrontAnims_ArenaTycoonGreta, // TRAINER_PIC_ARENA_TYCOON_GRETA + gTrainerFrontAnims_FactoryHeadNoland, // TRAINER_PIC_FACTORY_HEAD_NOLAND + gTrainerFrontAnims_PikeQueenLucy, // TRAINER_PIC_PIKE_QUEEN_LUCY + 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 }; diff --git a/src/data/trainer_graphics/front_pic_tables.h b/src/data/trainer_graphics/front_pic_tables.h index db80c9d4f..d8f8c2492 100644 --- a/src/data/trainer_graphics/front_pic_tables.h +++ b/src/data/trainer_graphics/front_pic_tables.h @@ -148,8 +148,8 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] = gTrainerFrontPic_SchoolKidM, 0x800, 48, gTrainerFrontPic_SchoolKidF, 0x800, 49, gTrainerFrontPic_SrAndJr, 0x1000, 50, - gTrainerFrontPic_WinstrateM, 0x1000, 51, - gTrainerFrontPic_WinstrateF, 0x800, 52, + gTrainerFrontPic_PokefanM, 0x1000, 51, + gTrainerFrontPic_PokefanF, 0x800, 52, gTrainerFrontPic_Youngster, 0x800, 53, gTrainerFrontPic_ChampionWallace, 0x1000, 54, gTrainerFrontPic_Fisherman, 0x800, 55, @@ -245,8 +245,8 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] = gTrainerPalette_SchoolKidM, 48, gTrainerPalette_SchoolKidF, 49, gTrainerPalette_SrAndJr, 50, - gTrainerPalette_WinstrateM, 51, - gTrainerPalette_WinstrateF, 52, + gTrainerPalette_PokefanM, 51, + gTrainerPalette_PokefanF, 52, gTrainerPalette_Youngster, 53, gTrainerPalette_ChampionWallace, 54, gTrainerPalette_Fisherman, 55, diff --git a/src/data/trainers.h b/src/data/trainers.h index 214a72df1..fe087d166 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -4092,7 +4092,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("VICTOR"), .items = {}, .doubleBattle = FALSE, @@ -4106,7 +4106,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("MIGUEL"), .items = {}, .doubleBattle = FALSE, @@ -4120,7 +4120,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("COLTON"), .items = {}, .doubleBattle = FALSE, @@ -4134,7 +4134,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("MIGUEL"), .items = {}, .doubleBattle = FALSE, @@ -4148,7 +4148,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("MIGUEL"), .items = {}, .doubleBattle = FALSE, @@ -4162,7 +4162,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("MIGUEL"), .items = {}, .doubleBattle = FALSE, @@ -4176,7 +4176,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("MIGUEL"), .items = {}, .doubleBattle = FALSE, @@ -4190,7 +4190,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("VICTORIA"), .items = {}, .doubleBattle = FALSE, @@ -4204,7 +4204,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("VANESSA"), .items = {}, .doubleBattle = FALSE, @@ -4218,7 +4218,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("BETHANY"), .items = {}, .doubleBattle = FALSE, @@ -4232,7 +4232,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("ISABEL"), .items = {}, .doubleBattle = FALSE, @@ -4246,7 +4246,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("ISABEL"), .items = {}, .doubleBattle = FALSE, @@ -4260,7 +4260,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("ISABEL"), .items = {}, .doubleBattle = FALSE, @@ -4274,7 +4274,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("ISABEL"), .items = {}, .doubleBattle = FALSE, @@ -4288,7 +4288,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("ISABEL"), .items = {}, .doubleBattle = FALSE, @@ -7032,7 +7032,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("ANNIKA"), .items = {}, .doubleBattle = FALSE, @@ -9790,7 +9790,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("KALEB"), .items = {}, .doubleBattle = FALSE, |