ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-29 01:04:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #416 from melthelesbian/fix_pokefan

Browse Source 
fixes pokefan graphics naming
This commit is contained in:
Diegoisawesome 2018-12-02 00:02:43 -06:00 committed by GitHub
commit 145047d438
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 128 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
graphics/trainers/front_pics/winstrate_f_front_pic.png → graphics/trainers/front_pics/pokefan_f_front_pic.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 849 B

After

Width:  |  Height:  |  Size: 849 B

0
graphics/trainers/front_pics/winstrate_m_front_pic.png → graphics/trainers/front_pics/pokefan_m_front_pic.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 786 B

After

Width:  |  Height:  |  Size: 786 B

0
graphics/trainers/palettes/winstrate_f.pal → graphics/trainers/palettes/pokefan_f.pal
View File

0
graphics/trainers/palettes/winstrate_m.pal → graphics/trainers/palettes/pokefan_m.pal
View File

4
include/constants/trainers.h
View File

@ -65,8 +65,8 @@
#define TRAINER_PIC_SCHOOL_KID_M 48 #define TRAINER_PIC_SCHOOL_KID_M 48
#define TRAINER_PIC_SCHOOL_KID_F 49 #define TRAINER_PIC_SCHOOL_KID_F 49
#define TRAINER_PIC_SR_AND_JR 50 #define TRAINER_PIC_SR_AND_JR 50
#define TRAINER_PIC_WINSTRATE_M 51 #define TRAINER_PIC_POKEFAN_M 51
#define TRAINER_PIC_WINSTRATE_F 52 #define TRAINER_PIC_POKEFAN_F 52
#define TRAINER_PIC_YOUNGSTER 53 #define TRAINER_PIC_YOUNGSTER 53
#define TRAINER_PIC_CHAMPION_WALLACE 54 #define TRAINER_PIC_CHAMPION_WALLACE 54
#define TRAINER_PIC_FISHERMAN 55 #define TRAINER_PIC_FISHERMAN 55

8
include/graphics.h
View File

@ -2920,8 +2920,8 @@ extern const u32 gTrainerFrontPic_LeaderJuan[];
extern const u32 gTrainerFrontPic_SchoolKidM[]; extern const u32 gTrainerFrontPic_SchoolKidM[];
extern const u32 gTrainerFrontPic_SchoolKidF[]; extern const u32 gTrainerFrontPic_SchoolKidF[];
extern const u32 gTrainerFrontPic_SrAndJr[]; extern const u32 gTrainerFrontPic_SrAndJr[];
extern const u32 gTrainerFrontPic_WinstrateM[]; extern const u32 gTrainerFrontPic_PokefanM[];
extern const u32 gTrainerFrontPic_WinstrateF[]; extern const u32 gTrainerFrontPic_PokefanF[];
extern const u32 gTrainerFrontPic_Youngster[]; extern const u32 gTrainerFrontPic_Youngster[];
extern const u32 gTrainerFrontPic_ChampionWallace[]; extern const u32 gTrainerFrontPic_ChampionWallace[];
extern const u32 gTrainerFrontPic_Fisherman[]; extern const u32 gTrainerFrontPic_Fisherman[];
@ -3014,8 +3014,8 @@ extern const u32 gTrainerPalette_LeaderJuan[];
extern const u32 gTrainerPalette_SchoolKidM[]; extern const u32 gTrainerPalette_SchoolKidM[];
extern const u32 gTrainerPalette_SchoolKidF[]; extern const u32 gTrainerPalette_SchoolKidF[];
extern const u32 gTrainerPalette_SrAndJr[]; extern const u32 gTrainerPalette_SrAndJr[];
extern const u32 gTrainerPalette_WinstrateM[]; extern const u32 gTrainerPalette_PokefanM[];
extern const u32 gTrainerPalette_WinstrateF[]; extern const u32 gTrainerPalette_PokefanF[];
extern const u32 gTrainerPalette_Youngster[]; extern const u32 gTrainerPalette_Youngster[];
extern const u32 gTrainerPalette_ChampionWallace[]; extern const u32 gTrainerPalette_ChampionWallace[];
extern const u32 gTrainerPalette_Fisherman[]; extern const u32 gTrainerPalette_Fisherman[];

8
src/data/graphics/trainers.h
View File

@ -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 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 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 gTrainerFrontPic_PokefanM[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_m_front_pic.4bpp.lz");
const u32 gTrainerPalette_WinstrateM[] = INCBIN_U32("graphics/trainers/palettes/winstrate_m.gbapal.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 gTrainerFrontPic_PokefanF[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_f_front_pic.4bpp.lz");
const u32 gTrainerPalette_WinstrateF[] = INCBIN_U32("graphics/trainers/palettes/winstrate_f.gbapal.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 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"); const u32 gTrainerPalette_Youngster[] = INCBIN_U32("graphics/trainers/palettes/youngster.gbapal.lz");

4
src/data/pokemon/trainer_class_lookups.h
View File

@ -44,8 +44,8 @@ const u8 gFacilityClassToPicIndex[] =
TRAINER_PIC_SCHOOL_KID_M, // FACILITY_CLASS_SCHOOL_KID_M TRAINER_PIC_SCHOOL_KID_M, // FACILITY_CLASS_SCHOOL_KID_M
TRAINER_PIC_SCHOOL_KID_F, // FACILITY_CLASS_SCHOOL_KID_F TRAINER_PIC_SCHOOL_KID_F, // FACILITY_CLASS_SCHOOL_KID_F
TRAINER_PIC_SR_AND_JR, // FACILITY_CLASS_SR_AND_JR TRAINER_PIC_SR_AND_JR, // FACILITY_CLASS_SR_AND_JR
TRAINER_PIC_WINSTRATE_M, // FACILITY_CLASS_POKEFAN_1 TRAINER_PIC_POKEFAN_M, // FACILITY_CLASS_POKEFAN_1
TRAINER_PIC_WINSTRATE_F, // FACILITY_CLASS_POKEFAN_2 TRAINER_PIC_POKEFAN_F, // FACILITY_CLASS_POKEFAN_2
TRAINER_PIC_YOUNGSTER, // FACILITY_CLASS_YOUNGSTER TRAINER_PIC_YOUNGSTER, // FACILITY_CLASS_YOUNGSTER
TRAINER_PIC_CHAMPION_WALLACE, // FACILITY_CLASS_CHAMPION TRAINER_PIC_CHAMPION_WALLACE, // FACILITY_CLASS_CHAMPION
TRAINER_PIC_FISHERMAN, // FACILITY_CLASS_FISHERMAN TRAINER_PIC_FISHERMAN, // FACILITY_CLASS_FISHERMAN

190
src/data/trainer_graphics/front_pic_anims.h
View File

@ -202,11 +202,11 @@ const union AnimCmd *const gTrainerFrontAnims_SrAndJr[] ={
gAnimCmd_General_Frame0, gAnimCmd_General_Frame0,
}; };
const union AnimCmd *const gTrainerFrontAnims_WinstrateM[] ={ const union AnimCmd *const gTrainerFrontAnims_PokefanM[] ={
gAnimCmd_General_Frame0, gAnimCmd_General_Frame0,
}; };
const union AnimCmd *const gTrainerFrontAnims_WinstrateF[] ={ const union AnimCmd *const gTrainerFrontAnims_PokefanF[] ={
gAnimCmd_General_Frame0, gAnimCmd_General_Frame0,
}; };
@ -372,97 +372,97 @@ const union AnimCmd *const gTrainerFrontAnims_RubySapphireMay[] ={
const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] = const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] =
{ {
gTrainerFrontAnims_Hiker, // TRAINER_PIC_HIKER gTrainerFrontAnims_Hiker, // TRAINER_PIC_HIKER
gTrainerFrontAnims_AquaGruntM, // TRAINER_PIC_AQUA_GRUNT_M gTrainerFrontAnims_AquaGruntM, // TRAINER_PIC_AQUA_GRUNT_M
gTrainerFrontAnims_PokemonBreederF, // TRAINER_PIC_POKEMON_BREEDER_F gTrainerFrontAnims_PokemonBreederF, // TRAINER_PIC_POKEMON_BREEDER_F
gTrainerFrontAnims_CoolTrainerM, // TRAINER_PIC_COOL_TRAINER_M gTrainerFrontAnims_CoolTrainerM, // TRAINER_PIC_COOL_TRAINER_M
gTrainerFrontAnims_BirdKeeper, // TRAINER_PIC_BIRD_KEEPER gTrainerFrontAnims_BirdKeeper, // TRAINER_PIC_BIRD_KEEPER
gTrainerFrontAnims_Collector, // TRAINER_PIC_COLLECTOR gTrainerFrontAnims_Collector, // TRAINER_PIC_COLLECTOR
gTrainerFrontAnims_AquaGruntF, // TRAINER_PIC_AQUA_GRUNT_F gTrainerFrontAnims_AquaGruntF, // TRAINER_PIC_AQUA_GRUNT_F
gTrainerFrontAnims_SwimmerM, // TRAINER_PIC_SWIMMER_M gTrainerFrontAnims_SwimmerM, // TRAINER_PIC_SWIMMER_M
gTrainerFrontAnims_MagmaGruntM, // TRAINER_PIC_MAGMA_GRUNT_M gTrainerFrontAnims_MagmaGruntM, // TRAINER_PIC_MAGMA_GRUNT_M
gTrainerFrontAnims_ExpertM, // TRAINER_PIC_EXPERT_M gTrainerFrontAnims_ExpertM, // TRAINER_PIC_EXPERT_M
gTrainerFrontAnims_AquaAdminM, // TRAINER_PIC_AQUA_ADMIN_M gTrainerFrontAnims_AquaAdminM, // TRAINER_PIC_AQUA_ADMIN_M
gTrainerFrontAnims_BlackBelt, // TRAINER_PIC_BLACK_BELT gTrainerFrontAnims_BlackBelt, // TRAINER_PIC_BLACK_BELT
gTrainerFrontAnims_AquaAdminF, // TRAINER_PIC_AQUA_ADMIN_F gTrainerFrontAnims_AquaAdminF, // TRAINER_PIC_AQUA_ADMIN_F
gTrainerFrontAnims_AquaLeaderArchie, // TRAINER_PIC_AQUA_LEADER_ARCHIE gTrainerFrontAnims_AquaLeaderArchie, // TRAINER_PIC_AQUA_LEADER_ARCHIE
gTrainerFrontAnims_HexManiac, // TRAINER_PIC_HEX_MANIAC gTrainerFrontAnims_HexManiac, // TRAINER_PIC_HEX_MANIAC
gTrainerFrontAnims_AromaLady, // TRAINER_PIC_AROMA_LADY gTrainerFrontAnims_AromaLady, // TRAINER_PIC_AROMA_LADY
gTrainerFrontAnims_RuinManiac, // TRAINER_PIC_RUIN_MANIAC gTrainerFrontAnims_RuinManiac, // TRAINER_PIC_RUIN_MANIAC
gTrainerFrontAnims_Interviewer, // TRAINER_PIC_INTERVIEWER gTrainerFrontAnims_Interviewer, // TRAINER_PIC_INTERVIEWER
gTrainerFrontAnims_TuberF, // TRAINER_PIC_TUBER_F gTrainerFrontAnims_TuberF, // TRAINER_PIC_TUBER_F
gTrainerFrontAnims_TuberM, // TRAINER_PIC_TUBER_M gTrainerFrontAnims_TuberM, // TRAINER_PIC_TUBER_M
gTrainerFrontAnims_CoolTrainerF, // TRAINER_PIC_COOL_TRAINER_F gTrainerFrontAnims_CoolTrainerF, // TRAINER_PIC_COOL_TRAINER_F
gTrainerFrontAnims_Lady, // TRAINER_PIC_LADY gTrainerFrontAnims_Lady, // TRAINER_PIC_LADY
gTrainerFrontAnims_Beauty, // TRAINER_PIC_BEAUTY gTrainerFrontAnims_Beauty, // TRAINER_PIC_BEAUTY
gTrainerFrontAnims_RichBoy, // TRAINER_PIC_RICH_BOY gTrainerFrontAnims_RichBoy, // TRAINER_PIC_RICH_BOY
gTrainerFrontAnims_ExpertF, // TRAINER_PIC_EXPERT_F gTrainerFrontAnims_ExpertF, // TRAINER_PIC_EXPERT_F
gTrainerFrontAnims_Pokemaniac, // TRAINER_PIC_POKEMANIAC gTrainerFrontAnims_Pokemaniac, // TRAINER_PIC_POKEMANIAC
gTrainerFrontAnims_MagmaGruntF, // TRAINER_PIC_MAGMA_GRUNT_F gTrainerFrontAnims_MagmaGruntF, // TRAINER_PIC_MAGMA_GRUNT_F
gTrainerFrontAnims_Guitarist, // TRAINER_PIC_GUITARIST gTrainerFrontAnims_Guitarist, // TRAINER_PIC_GUITARIST
gTrainerFrontAnims_Kindler, // TRAINER_PIC_KINDLER gTrainerFrontAnims_Kindler, // TRAINER_PIC_KINDLER
gTrainerFrontAnims_Camper, // TRAINER_PIC_CAMPER gTrainerFrontAnims_Camper, // TRAINER_PIC_CAMPER
gTrainerFrontAnims_Picnicker, // TRAINER_PIC_PICNICKER gTrainerFrontAnims_Picnicker, // TRAINER_PIC_PICNICKER
gTrainerFrontAnims_BugManiac, // TRAINER_PIC_BUG_MANIAC gTrainerFrontAnims_BugManiac, // TRAINER_PIC_BUG_MANIAC
gTrainerFrontAnims_PokemonBreederM, // TRAINER_PIC_POKEMON_BREEDER_M gTrainerFrontAnims_PokemonBreederM, // TRAINER_PIC_POKEMON_BREEDER_M
gTrainerFrontAnims_PsychicM, // TRAINER_PIC_PSYCHIC_M gTrainerFrontAnims_PsychicM, // TRAINER_PIC_PSYCHIC_M
gTrainerFrontAnims_PsychicF, // TRAINER_PIC_PSYCHIC_F gTrainerFrontAnims_PsychicF, // TRAINER_PIC_PSYCHIC_F
gTrainerFrontAnims_Gentleman, // TRAINER_PIC_GENTLEMAN gTrainerFrontAnims_Gentleman, // TRAINER_PIC_GENTLEMAN
gTrainerFrontAnims_EliteFourSidney, // TRAINER_PIC_ELITE_FOUR_SIDNEY gTrainerFrontAnims_EliteFourSidney, // TRAINER_PIC_ELITE_FOUR_SIDNEY
gTrainerFrontAnims_EliteFourPhoebe, // TRAINER_PIC_ELITE_FOUR_PHOEBE gTrainerFrontAnims_EliteFourPhoebe, // TRAINER_PIC_ELITE_FOUR_PHOEBE
gTrainerFrontAnims_EliteFourGlacia, // TRAINER_PIC_ELITE_FOUR_GLACIA gTrainerFrontAnims_EliteFourGlacia, // TRAINER_PIC_ELITE_FOUR_GLACIA
gTrainerFrontAnims_EliteFourDrake, // TRAINER_PIC_ELITE_FOUR_DRAKE gTrainerFrontAnims_EliteFourDrake, // TRAINER_PIC_ELITE_FOUR_DRAKE
gTrainerFrontAnims_LeaderRoxanne, // TRAINER_PIC_LEADER_ROXANNE gTrainerFrontAnims_LeaderRoxanne, // TRAINER_PIC_LEADER_ROXANNE
gTrainerFrontAnims_LeaderBrawly, // TRAINER_PIC_LEADER_BRAWLY gTrainerFrontAnims_LeaderBrawly, // TRAINER_PIC_LEADER_BRAWLY
gTrainerFrontAnims_LeaderWattson, // TRAINER_PIC_LEADER_WATTSON gTrainerFrontAnims_LeaderWattson, // TRAINER_PIC_LEADER_WATTSON
gTrainerFrontAnims_LeaderFlannery, // TRAINER_PIC_LEADER_FLANNERY gTrainerFrontAnims_LeaderFlannery, // TRAINER_PIC_LEADER_FLANNERY
gTrainerFrontAnims_LeaderNorman, // TRAINER_PIC_LEADER_NORMAN gTrainerFrontAnims_LeaderNorman, // TRAINER_PIC_LEADER_NORMAN
gTrainerFrontAnims_LeaderWinona, // TRAINER_PIC_LEADER_WINONA gTrainerFrontAnims_LeaderWinona, // TRAINER_PIC_LEADER_WINONA
gTrainerFrontAnims_LeaderTateAndLiza, // TRAINER_PIC_LEADER_TATE_AND_LIZA gTrainerFrontAnims_LeaderTateAndLiza, // TRAINER_PIC_LEADER_TATE_AND_LIZA
gTrainerFrontAnims_LeaderJuan, // TRAINER_PIC_LEADER_JUAN gTrainerFrontAnims_LeaderJuan, // TRAINER_PIC_LEADER_JUAN
gTrainerFrontAnims_SchoolKidM, // TRAINER_PIC_SCHOOL_KID_M gTrainerFrontAnims_SchoolKidM, // TRAINER_PIC_SCHOOL_KID_M
gTrainerFrontAnims_SchoolKidF, // TRAINER_PIC_SCHOOL_KID_F gTrainerFrontAnims_SchoolKidF, // TRAINER_PIC_SCHOOL_KID_F
gTrainerFrontAnims_SrAndJr, // TRAINER_PIC_SR_AND_JR gTrainerFrontAnims_SrAndJr, // TRAINER_PIC_SR_AND_JR
gTrainerFrontAnims_WinstrateM, // TRAINER_PIC_WINSTRATE_M gTrainerFrontAnims_PokefanM, // TRAINER_PIC_POKEFAN_M
gTrainerFrontAnims_WinstrateF, // TRAINER_PIC_WINSTRATE_F gTrainerFrontAnims_PokefanF, // TRAINER_PIC_POKEFAN_F
gTrainerFrontAnims_Youngster, // TRAINER_PIC_YOUNGSTER gTrainerFrontAnims_Youngster, // TRAINER_PIC_YOUNGSTER
gTrainerFrontAnims_ChampionWallace, // TRAINER_PIC_CHAMPION_WALLACE gTrainerFrontAnims_ChampionWallace, // TRAINER_PIC_CHAMPION_WALLACE
gTrainerFrontAnims_Fisherman, // TRAINER_PIC_FISHERMAN gTrainerFrontAnims_Fisherman, // TRAINER_PIC_FISHERMAN
gTrainerFrontAnims_CyclingTriathleteM, // TRAINER_PIC_CYCLING_TRIATHLETE_M gTrainerFrontAnims_CyclingTriathleteM, // TRAINER_PIC_CYCLING_TRIATHLETE_M
gTrainerFrontAnims_CyclingTriathleteF, // TRAINER_PIC_CYCLING_TRIATHLETE_F gTrainerFrontAnims_CyclingTriathleteF, // TRAINER_PIC_CYCLING_TRIATHLETE_F
gTrainerFrontAnims_RunningTriathleteM, // TRAINER_PIC_RUNNING_TRIATHLETE_M gTrainerFrontAnims_RunningTriathleteM, // TRAINER_PIC_RUNNING_TRIATHLETE_M
gTrainerFrontAnims_RunningTriathleteF, // TRAINER_PIC_RUNNING_TRIATHLETE_F gTrainerFrontAnims_RunningTriathleteF, // TRAINER_PIC_RUNNING_TRIATHLETE_F
gTrainerFrontAnims_SwimmingTriathleteM, // TRAINER_PIC_SWIMMING_TRIATHLETE_M gTrainerFrontAnims_SwimmingTriathleteM, // TRAINER_PIC_SWIMMING_TRIATHLETE_M
gTrainerFrontAnims_SwimmingTriathleteF, // TRAINER_PIC_SWIMMING_TRIATHLETE_F gTrainerFrontAnims_SwimmingTriathleteF, // TRAINER_PIC_SWIMMING_TRIATHLETE_F
gTrainerFrontAnims_DragonTamer, // TRAINER_PIC_DRAGON_TAMER gTrainerFrontAnims_DragonTamer, // TRAINER_PIC_DRAGON_TAMER
gTrainerFrontAnims_NinjaBoy, // TRAINER_PIC_NINJA_BOY gTrainerFrontAnims_NinjaBoy, // TRAINER_PIC_NINJA_BOY
gTrainerFrontAnims_BattleGirl, // TRAINER_PIC_BATTLE_GIRL gTrainerFrontAnims_BattleGirl, // TRAINER_PIC_BATTLE_GIRL
gTrainerFrontAnims_ParasolLady, // TRAINER_PIC_PARASOL_LADY gTrainerFrontAnims_ParasolLady, // TRAINER_PIC_PARASOL_LADY
gTrainerFrontAnims_SwimmerF, // TRAINER_PIC_SWIMMER_F gTrainerFrontAnims_SwimmerF, // TRAINER_PIC_SWIMMER_F
gTrainerFrontAnims_Twins, // TRAINER_PIC_TWINS gTrainerFrontAnims_Twins, // TRAINER_PIC_TWINS
gTrainerFrontAnims_Sailor, // TRAINER_PIC_SAILOR gTrainerFrontAnims_Sailor, // TRAINER_PIC_SAILOR
gTrainerFrontAnims_MagmaAdmin, // TRAINER_PIC_MAGMA_ADMIN gTrainerFrontAnims_MagmaAdmin, // TRAINER_PIC_MAGMA_ADMIN
gTrainerFrontAnims_Wally, // TRAINER_PIC_WALLY gTrainerFrontAnims_Wally, // TRAINER_PIC_WALLY
gTrainerFrontAnims_Brendan, // TRAINER_PIC_BRENDAN gTrainerFrontAnims_Brendan, // TRAINER_PIC_BRENDAN
gTrainerFrontAnims_May, // TRAINER_PIC_MAY gTrainerFrontAnims_May, // TRAINER_PIC_MAY
gTrainerFrontAnims_BugCatcher, // TRAINER_PIC_BUG_CATCHER gTrainerFrontAnims_BugCatcher, // TRAINER_PIC_BUG_CATCHER
gTrainerFrontAnims_PokemonRangerM, // TRAINER_PIC_POKEMON_RANGER_M gTrainerFrontAnims_PokemonRangerM, // TRAINER_PIC_POKEMON_RANGER_M
gTrainerFrontAnims_PokemonRangerF, // TRAINER_PIC_POKEMON_RANGER_F gTrainerFrontAnims_PokemonRangerF, // TRAINER_PIC_POKEMON_RANGER_F
gTrainerFrontAnims_MagmaLeaderMaxie, // TRAINER_PIC_MAGMA_LEADER_MAXIE gTrainerFrontAnims_MagmaLeaderMaxie, // TRAINER_PIC_MAGMA_LEADER_MAXIE
gTrainerFrontAnims_Lass, // TRAINER_PIC_LASS gTrainerFrontAnims_Lass, // TRAINER_PIC_LASS
gTrainerFrontAnims_YoungCouple, // TRAINER_PIC_YOUNG_COUPLE gTrainerFrontAnims_YoungCouple, // TRAINER_PIC_YOUNG_COUPLE
gTrainerFrontAnims_OldCouple, // TRAINER_PIC_OLD_COUPLE gTrainerFrontAnims_OldCouple, // TRAINER_PIC_OLD_COUPLE
gTrainerFrontAnims_SisAndBro, // TRAINER_PIC_SIS_AND_BRO gTrainerFrontAnims_SisAndBro, // TRAINER_PIC_SIS_AND_BRO
gTrainerFrontAnims_Steven, // TRAINER_PIC_STEVEN gTrainerFrontAnims_Steven, // TRAINER_PIC_STEVEN
gTrainerFrontAnims_SalonMaidenAnabel, // TRAINER_PIC_SALON_MAIDEN_ANABEL gTrainerFrontAnims_SalonMaidenAnabel, // TRAINER_PIC_SALON_MAIDEN_ANABEL
gTrainerFrontAnims_DomeAceTucker, // TRAINER_PIC_DOME_ACE_TUCKER gTrainerFrontAnims_DomeAceTucker, // TRAINER_PIC_DOME_ACE_TUCKER
gTrainerFrontAnims_PalaceMavenSpenser, // TRAINER_PIC_PALACE_MAVEN_SPENSER gTrainerFrontAnims_PalaceMavenSpenser, // TRAINER_PIC_PALACE_MAVEN_SPENSER
gTrainerFrontAnims_ArenaTycoonGreta, // TRAINER_PIC_ARENA_TYCOON_GRETA gTrainerFrontAnims_ArenaTycoonGreta, // TRAINER_PIC_ARENA_TYCOON_GRETA
gTrainerFrontAnims_FactoryHeadNoland, // TRAINER_PIC_FACTORY_HEAD_NOLAND gTrainerFrontAnims_FactoryHeadNoland, // TRAINER_PIC_FACTORY_HEAD_NOLAND
gTrainerFrontAnims_PikeQueenLucy, // TRAINER_PIC_PIKE_QUEEN_LUCY gTrainerFrontAnims_PikeQueenLucy, // TRAINER_PIC_PIKE_QUEEN_LUCY
gTrainerFrontAnims_PyramidKingBrandon, // TRAINER_PIC_PYRAMID_KING_BRANDON gTrainerFrontAnims_PyramidKingBrandon, // TRAINER_PIC_PYRAMID_KING_BRANDON
gTrainerFrontAnims_Red, // TRAINER_PIC_RED gTrainerFrontAnims_Red, // TRAINER_PIC_RED
gTrainerFrontAnims_Leaf, // TRAINER_PIC_LEAF gTrainerFrontAnims_Leaf, // TRAINER_PIC_LEAF
gTrainerFrontAnims_RubySapphireBrendan, // TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN gTrainerFrontAnims_RubySapphireBrendan, // TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN
gTrainerFrontAnims_RubySapphireMay, // TRAINER_PIC_RUBY_SAPPHIRE_MAY gTrainerFrontAnims_RubySapphireMay, // TRAINER_PIC_RUBY_SAPPHIRE_MAY
}; };

8
src/data/trainer_graphics/front_pic_tables.h
View File

@ -148,8 +148,8 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
gTrainerFrontPic_SchoolKidM, 0x800, 48, gTrainerFrontPic_SchoolKidM, 0x800, 48,
gTrainerFrontPic_SchoolKidF, 0x800, 49, gTrainerFrontPic_SchoolKidF, 0x800, 49,
gTrainerFrontPic_SrAndJr, 0x1000, 50, gTrainerFrontPic_SrAndJr, 0x1000, 50,
gTrainerFrontPic_WinstrateM, 0x1000, 51, gTrainerFrontPic_PokefanM, 0x1000, 51,
gTrainerFrontPic_WinstrateF, 0x800, 52, gTrainerFrontPic_PokefanF, 0x800, 52,
gTrainerFrontPic_Youngster, 0x800, 53, gTrainerFrontPic_Youngster, 0x800, 53,
gTrainerFrontPic_ChampionWallace, 0x1000, 54, gTrainerFrontPic_ChampionWallace, 0x1000, 54,
gTrainerFrontPic_Fisherman, 0x800, 55, gTrainerFrontPic_Fisherman, 0x800, 55,
@ -245,8 +245,8 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] =
gTrainerPalette_SchoolKidM, 48, gTrainerPalette_SchoolKidM, 48,
gTrainerPalette_SchoolKidF, 49, gTrainerPalette_SchoolKidF, 49,
gTrainerPalette_SrAndJr, 50, gTrainerPalette_SrAndJr, 50,
gTrainerPalette_WinstrateM, 51, gTrainerPalette_PokefanM, 51,
gTrainerPalette_WinstrateF, 52, gTrainerPalette_PokefanF, 52,
gTrainerPalette_Youngster, 53, gTrainerPalette_Youngster, 53,
gTrainerPalette_ChampionWallace, 54, gTrainerPalette_ChampionWallace, 54,
gTrainerPalette_Fisherman, 55, gTrainerPalette_Fisherman, 55,

34
src/data/trainers.h
View File

@ -4092,7 +4092,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM, .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_WINSTRATE, .trainerClass = TRAINER_CLASS_WINSTRATE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_M, .trainerPic = TRAINER_PIC_POKEFAN_M,
.trainerName = _("VICTOR"), .trainerName = _("VICTOR"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -4106,7 +4106,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM, .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN, .trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_M, .trainerPic = TRAINER_PIC_POKEFAN_M,
.trainerName = _("MIGUEL"), .trainerName = _("MIGUEL"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -4120,7 +4120,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEFAN, .trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_M, .trainerPic = TRAINER_PIC_POKEFAN_M,
.trainerName = _("COLTON"), .trainerName = _("COLTON"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -4134,7 +4134,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM, .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN, .trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_M, .trainerPic = TRAINER_PIC_POKEFAN_M,
.trainerName = _("MIGUEL"), .trainerName = _("MIGUEL"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -4148,7 +4148,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM, .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN, .trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_M, .trainerPic = TRAINER_PIC_POKEFAN_M,
.trainerName = _("MIGUEL"), .trainerName = _("MIGUEL"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -4162,7 +4162,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM, .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN, .trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_M, .trainerPic = TRAINER_PIC_POKEFAN_M,
.trainerName = _("MIGUEL"), .trainerName = _("MIGUEL"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -4176,7 +4176,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM, .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN, .trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_M, .trainerPic = TRAINER_PIC_POKEFAN_M,
.trainerName = _("MIGUEL"), .trainerName = _("MIGUEL"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -4190,7 +4190,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM, .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_WINSTRATE, .trainerClass = TRAINER_CLASS_WINSTRATE,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_F, .trainerPic = TRAINER_PIC_POKEFAN_F,
.trainerName = _("VICTORIA"), .trainerName = _("VICTORIA"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -4204,7 +4204,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM, .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN, .trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_F, .trainerPic = TRAINER_PIC_POKEFAN_F,
.trainerName = _("VANESSA"), .trainerName = _("VANESSA"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -4218,7 +4218,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM, .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN, .trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_F, .trainerPic = TRAINER_PIC_POKEFAN_F,
.trainerName = _("BETHANY"), .trainerName = _("BETHANY"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -4232,7 +4232,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM, .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN, .trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_F, .trainerPic = TRAINER_PIC_POKEFAN_F,
.trainerName = _("ISABEL"), .trainerName = _("ISABEL"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -4246,7 +4246,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM, .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN, .trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_F, .trainerPic = TRAINER_PIC_POKEFAN_F,
.trainerName = _("ISABEL"), .trainerName = _("ISABEL"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -4260,7 +4260,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM, .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN, .trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_F, .trainerPic = TRAINER_PIC_POKEFAN_F,
.trainerName = _("ISABEL"), .trainerName = _("ISABEL"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -4274,7 +4274,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM, .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN, .trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_F, .trainerPic = TRAINER_PIC_POKEFAN_F,
.trainerName = _("ISABEL"), .trainerName = _("ISABEL"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -4288,7 +4288,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM, .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN, .trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_F, .trainerPic = TRAINER_PIC_POKEFAN_F,
.trainerName = _("ISABEL"), .trainerName = _("ISABEL"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -7032,7 +7032,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_POKEFAN, .trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_F, .trainerPic = TRAINER_PIC_POKEFAN_F,
.trainerName = _("ANNIKA"), .trainerName = _("ANNIKA"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
@ -9790,7 +9790,7 @@ const struct Trainer gTrainers[] = {
.partyFlags = F_TRAINER_PARTY_HELD_ITEM, .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
.trainerClass = TRAINER_CLASS_POKEFAN, .trainerClass = TRAINER_CLASS_POKEFAN,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
.trainerPic = TRAINER_PIC_WINSTRATE_M, .trainerPic = TRAINER_PIC_POKEFAN_M,
.trainerName = _("KALEB"), .trainerName = _("KALEB"),
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,