From 587abebb7bd19ea541f91bf3d9d89bf0b0fc1312 Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 18 Dec 2023 10:13:53 -0500 Subject: [PATCH] Hardcoded sAnims_Trainer into struct since every sprite uses it --- src/data/graphics/trainers.h | 188 +++++++++++++++++------------------ 1 file changed, 94 insertions(+), 94 deletions(-) diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 88f1438e9f51..04d4f825db16 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -302,104 +302,104 @@ static const union AnimCmd *const sAnims_Trainer[] ={ .y_offset = 8, \ .frontPic = {gTrainerFrontPic_##file, TRAINER_PIC_SIZE, TRAINER_PIC_##trainerPic},\ .palette = {gTrainerPalette_##file, TRAINER_PIC_##trainerPic}, \ - .animation = sAnims_##anim, \ + .animation = sAnims_Trainer, \ } const struct TrainerSprite gTrainerSprites[] = { - TRAINER_SPRITE(HIKER, Hiker, Trainer), - TRAINER_SPRITE(AQUA_GRUNT_M, AquaGruntM, Trainer), - TRAINER_SPRITE(POKEMON_BREEDER_F, PokemonBreederF, Trainer), - TRAINER_SPRITE(COOLTRAINER_M, CoolTrainerM, Trainer), - TRAINER_SPRITE(BIRD_KEEPER, BirdKeeper, Trainer), - TRAINER_SPRITE(COLLECTOR, Collector, Trainer), - TRAINER_SPRITE(AQUA_GRUNT_F, AquaGruntF, Trainer), - TRAINER_SPRITE(SWIMMER_M, SwimmerM, Trainer), - TRAINER_SPRITE(MAGMA_GRUNT_M, MagmaGruntM, Trainer), - TRAINER_SPRITE(EXPERT_M, ExpertM, Trainer), - TRAINER_SPRITE(AQUA_ADMIN_M, AquaAdminM, Trainer), - TRAINER_SPRITE(BLACK_BELT, BlackBelt, Trainer), - TRAINER_SPRITE(AQUA_ADMIN_F, AquaAdminF, Trainer), - TRAINER_SPRITE(AQUA_LEADER_ARCHIE, AquaLeaderArchie, Trainer), - TRAINER_SPRITE(HEX_MANIAC, HexManiac, Trainer), - TRAINER_SPRITE(AROMA_LADY, AromaLady, Trainer), - TRAINER_SPRITE(RUIN_MANIAC, RuinManiac, Trainer), - TRAINER_SPRITE(INTERVIEWER, Interviewer, Trainer), - TRAINER_SPRITE(TUBER_F, TuberF, Trainer), - TRAINER_SPRITE(TUBER_M, TuberM, Trainer), - TRAINER_SPRITE(COOLTRAINER_F, CoolTrainerF, Trainer), - TRAINER_SPRITE(LADY, Lady, Trainer), - TRAINER_SPRITE(BEAUTY, Beauty, Trainer), - TRAINER_SPRITE(RICH_BOY, RichBoy, Trainer), - TRAINER_SPRITE(EXPERT_F, ExpertF, Trainer), - TRAINER_SPRITE(POKEMANIAC, Pokemaniac, Trainer), - TRAINER_SPRITE(MAGMA_GRUNT_F, MagmaGruntF, Trainer), - TRAINER_SPRITE(GUITARIST, Guitarist, Trainer), - TRAINER_SPRITE(KINDLER, Kindler, Trainer), - TRAINER_SPRITE(CAMPER, Camper, Trainer), - TRAINER_SPRITE(PICNICKER, Picnicker, Trainer), - TRAINER_SPRITE(BUG_MANIAC, BugManiac, Trainer), - TRAINER_SPRITE(POKEMON_BREEDER_M, PokemonBreederM, Trainer), - TRAINER_SPRITE(PSYCHIC_M, PsychicM, Trainer), - TRAINER_SPRITE(PSYCHIC_F, PsychicF, Trainer), - TRAINER_SPRITE(GENTLEMAN, Gentleman, Trainer), - TRAINER_SPRITE(ELITE_FOUR_SIDNEY, EliteFourSidney, Trainer), - TRAINER_SPRITE(ELITE_FOUR_PHOEBE, EliteFourPhoebe, Trainer), - TRAINER_SPRITE(ELITE_FOUR_GLACIA, EliteFourGlacia, Trainer), - TRAINER_SPRITE(ELITE_FOUR_DRAKE, EliteFourDrake, Trainer), - TRAINER_SPRITE(LEADER_ROXANNE, LeaderRoxanne, Trainer), - TRAINER_SPRITE(LEADER_BRAWLY, LeaderBrawly, Trainer), - TRAINER_SPRITE(LEADER_WATTSON, LeaderWattson, Trainer), - TRAINER_SPRITE(LEADER_FLANNERY, LeaderFlannery, Trainer), - TRAINER_SPRITE(LEADER_NORMAN, LeaderNorman, Trainer), - TRAINER_SPRITE(LEADER_WINONA, LeaderWinona, Trainer), - TRAINER_SPRITE(LEADER_TATE_AND_LIZA, LeaderTateAndLiza, Trainer), - TRAINER_SPRITE(LEADER_JUAN, LeaderJuan, Trainer), - TRAINER_SPRITE(SCHOOL_KID_M, SchoolKidM, Trainer), - TRAINER_SPRITE(SCHOOL_KID_F, SchoolKidF, Trainer), - TRAINER_SPRITE(SR_AND_JR, SrAndJr, Trainer), - TRAINER_SPRITE(POKEFAN_M, PokefanM, Trainer), - TRAINER_SPRITE(POKEFAN_F, PokefanF, Trainer), - TRAINER_SPRITE(YOUNGSTER, Youngster, Trainer), - TRAINER_SPRITE(CHAMPION_WALLACE, ChampionWallace, Trainer), - TRAINER_SPRITE(FISHERMAN, Fisherman, Trainer), - TRAINER_SPRITE(CYCLING_TRIATHLETE_M, CyclingTriathleteM, Trainer), - TRAINER_SPRITE(CYCLING_TRIATHLETE_F, CyclingTriathleteF, Trainer), - TRAINER_SPRITE(RUNNING_TRIATHLETE_M, RunningTriathleteM, Trainer), - TRAINER_SPRITE(RUNNING_TRIATHLETE_F, RunningTriathleteF, Trainer), - TRAINER_SPRITE(SWIMMING_TRIATHLETE_M, SwimmingTriathleteM, Trainer), - TRAINER_SPRITE(SWIMMING_TRIATHLETE_F, SwimmingTriathleteF, Trainer), - TRAINER_SPRITE(DRAGON_TAMER, DragonTamer, Trainer), - TRAINER_SPRITE(NINJA_BOY, NinjaBoy, Trainer), - TRAINER_SPRITE(BATTLE_GIRL, BattleGirl, Trainer), - TRAINER_SPRITE(PARASOL_LADY, ParasolLady, Trainer), - TRAINER_SPRITE(SWIMMER_F, SwimmerF, Trainer), - TRAINER_SPRITE(TWINS, Twins, Trainer), - TRAINER_SPRITE(SAILOR, Sailor, Trainer), - TRAINER_SPRITE(MAGMA_ADMIN, MagmaAdmin, Trainer), - TRAINER_SPRITE(WALLY, Wally, Trainer), - TRAINER_SPRITE(BRENDAN, Brendan, Trainer), - TRAINER_SPRITE(MAY, May, Trainer), - TRAINER_SPRITE(BUG_CATCHER, BugCatcher, Trainer), - TRAINER_SPRITE(POKEMON_RANGER_M, PokemonRangerM, Trainer), - TRAINER_SPRITE(POKEMON_RANGER_F, PokemonRangerF, Trainer), - TRAINER_SPRITE(MAGMA_LEADER_MAXIE, MagmaLeaderMaxie, Trainer), - TRAINER_SPRITE(LASS, Lass, Trainer), - TRAINER_SPRITE(YOUNG_COUPLE, YoungCouple, Trainer), - TRAINER_SPRITE(OLD_COUPLE, OldCouple, Trainer), - TRAINER_SPRITE(SIS_AND_BRO, SisAndBro, Trainer), - TRAINER_SPRITE(STEVEN, Steven, Trainer), - TRAINER_SPRITE(SALON_MAIDEN_ANABEL, SalonMaidenAnabel, Trainer), - TRAINER_SPRITE(DOME_ACE_TUCKER, DomeAceTucker, Trainer), - TRAINER_SPRITE(PALACE_MAVEN_SPENSER, PalaceMavenSpenser, Trainer), - TRAINER_SPRITE(ARENA_TYCOON_GRETA, ArenaTycoonGreta, Trainer), - TRAINER_SPRITE(FACTORY_HEAD_NOLAND, FactoryHeadNoland, Trainer), - TRAINER_SPRITE(PIKE_QUEEN_LUCY, PikeQueenLucy, Trainer), - TRAINER_SPRITE(PYRAMID_KING_BRANDON, PyramidKingBrandon, Trainer), - TRAINER_SPRITE(RED, Red, Trainer), - TRAINER_SPRITE(LEAF, Leaf, Trainer), - TRAINER_SPRITE(RS_BRENDAN, RubySapphireBrendan, Trainer), - TRAINER_SPRITE(RS_MAY, RubySapphireMay, Trainer), + TRAINER_SPRITE(HIKER, Hiker), + TRAINER_SPRITE(AQUA_GRUNT_M, AquaGruntM), + TRAINER_SPRITE(POKEMON_BREEDER_F, PokemonBreederF), + TRAINER_SPRITE(COOLTRAINER_M, CoolTrainerM), + TRAINER_SPRITE(BIRD_KEEPER, BirdKeeper), + TRAINER_SPRITE(COLLECTOR, Collector), + TRAINER_SPRITE(AQUA_GRUNT_F, AquaGruntF), + TRAINER_SPRITE(SWIMMER_M, SwimmerM), + TRAINER_SPRITE(MAGMA_GRUNT_M, MagmaGruntM), + TRAINER_SPRITE(EXPERT_M, ExpertM), + TRAINER_SPRITE(AQUA_ADMIN_M, AquaAdminM), + TRAINER_SPRITE(BLACK_BELT, BlackBelt), + TRAINER_SPRITE(AQUA_ADMIN_F, AquaAdminF), + TRAINER_SPRITE(AQUA_LEADER_ARCHIE, AquaLeaderArchie), + TRAINER_SPRITE(HEX_MANIAC, HexManiac), + TRAINER_SPRITE(AROMA_LADY, AromaLady), + TRAINER_SPRITE(RUIN_MANIAC, RuinManiac), + TRAINER_SPRITE(INTERVIEWER, Interviewer), + TRAINER_SPRITE(TUBER_F, TuberF), + TRAINER_SPRITE(TUBER_M, TuberM), + TRAINER_SPRITE(COOLTRAINER_F, CoolTrainerF), + TRAINER_SPRITE(LADY, Lady), + TRAINER_SPRITE(BEAUTY, Beauty), + TRAINER_SPRITE(RICH_BOY, RichBoy), + TRAINER_SPRITE(EXPERT_F, ExpertF), + TRAINER_SPRITE(POKEMANIAC, Pokemaniac), + TRAINER_SPRITE(MAGMA_GRUNT_F, MagmaGruntF), + TRAINER_SPRITE(GUITARIST, Guitarist), + TRAINER_SPRITE(KINDLER, Kindler), + TRAINER_SPRITE(CAMPER, Camper), + TRAINER_SPRITE(PICNICKER, Picnicker), + TRAINER_SPRITE(BUG_MANIAC, BugManiac), + TRAINER_SPRITE(POKEMON_BREEDER_M, PokemonBreederM), + TRAINER_SPRITE(PSYCHIC_M, PsychicM), + TRAINER_SPRITE(PSYCHIC_F, PsychicF), + TRAINER_SPRITE(GENTLEMAN, Gentleman), + TRAINER_SPRITE(ELITE_FOUR_SIDNEY, EliteFourSidney), + TRAINER_SPRITE(ELITE_FOUR_PHOEBE, EliteFourPhoebe), + TRAINER_SPRITE(ELITE_FOUR_GLACIA, EliteFourGlacia), + TRAINER_SPRITE(ELITE_FOUR_DRAKE, EliteFourDrake), + TRAINER_SPRITE(LEADER_ROXANNE, LeaderRoxanne), + TRAINER_SPRITE(LEADER_BRAWLY, LeaderBrawly), + TRAINER_SPRITE(LEADER_WATTSON, LeaderWattson), + TRAINER_SPRITE(LEADER_FLANNERY, LeaderFlannery), + TRAINER_SPRITE(LEADER_NORMAN, LeaderNorman), + TRAINER_SPRITE(LEADER_WINONA, LeaderWinona), + TRAINER_SPRITE(LEADER_TATE_AND_LIZA, LeaderTateAndLiza), + TRAINER_SPRITE(LEADER_JUAN, LeaderJuan), + TRAINER_SPRITE(SCHOOL_KID_M, SchoolKidM), + TRAINER_SPRITE(SCHOOL_KID_F, SchoolKidF), + TRAINER_SPRITE(SR_AND_JR, SrAndJr), + TRAINER_SPRITE(POKEFAN_M, PokefanM), + TRAINER_SPRITE(POKEFAN_F, PokefanF), + TRAINER_SPRITE(YOUNGSTER, Youngster), + TRAINER_SPRITE(CHAMPION_WALLACE, ChampionWallace), + TRAINER_SPRITE(FISHERMAN, Fisherman), + TRAINER_SPRITE(CYCLING_TRIATHLETE_M, CyclingTriathleteM), + TRAINER_SPRITE(CYCLING_TRIATHLETE_F, CyclingTriathleteF), + TRAINER_SPRITE(RUNNING_TRIATHLETE_M, RunningTriathleteM), + TRAINER_SPRITE(RUNNING_TRIATHLETE_F, RunningTriathleteF), + TRAINER_SPRITE(SWIMMING_TRIATHLETE_M, SwimmingTriathleteM), + TRAINER_SPRITE(SWIMMING_TRIATHLETE_F, SwimmingTriathleteF), + TRAINER_SPRITE(DRAGON_TAMER, DragonTamer), + TRAINER_SPRITE(NINJA_BOY, NinjaBoy), + TRAINER_SPRITE(BATTLE_GIRL, BattleGirl), + TRAINER_SPRITE(PARASOL_LADY, ParasolLady), + TRAINER_SPRITE(SWIMMER_F, SwimmerF), + TRAINER_SPRITE(TWINS, Twins), + TRAINER_SPRITE(SAILOR, Sailor), + TRAINER_SPRITE(MAGMA_ADMIN, MagmaAdmin), + TRAINER_SPRITE(WALLY, Wally), + TRAINER_SPRITE(BRENDAN, Brendan), + TRAINER_SPRITE(MAY, May), + TRAINER_SPRITE(BUG_CATCHER, BugCatcher), + TRAINER_SPRITE(POKEMON_RANGER_M, PokemonRangerM), + TRAINER_SPRITE(POKEMON_RANGER_F, PokemonRangerF), + TRAINER_SPRITE(MAGMA_LEADER_MAXIE, MagmaLeaderMaxie), + TRAINER_SPRITE(LASS, Lass), + TRAINER_SPRITE(YOUNG_COUPLE, YoungCouple), + TRAINER_SPRITE(OLD_COUPLE, OldCouple), + TRAINER_SPRITE(SIS_AND_BRO, SisAndBro), + TRAINER_SPRITE(STEVEN, Steven), + TRAINER_SPRITE(SALON_MAIDEN_ANABEL, SalonMaidenAnabel), + TRAINER_SPRITE(DOME_ACE_TUCKER, DomeAceTucker), + TRAINER_SPRITE(PALACE_MAVEN_SPENSER, PalaceMavenSpenser), + TRAINER_SPRITE(ARENA_TYCOON_GRETA, ArenaTycoonGreta), + TRAINER_SPRITE(FACTORY_HEAD_NOLAND, FactoryHeadNoland), + TRAINER_SPRITE(PIKE_QUEEN_LUCY, PikeQueenLucy), + TRAINER_SPRITE(PYRAMID_KING_BRANDON, PyramidKingBrandon), + TRAINER_SPRITE(RED, Red), + TRAINER_SPRITE(LEAF, Leaf), + TRAINER_SPRITE(RS_BRENDAN, RubySapphireBrendan), + TRAINER_SPRITE(RS_MAY, RubySapphireMay), }; static const union AnimCmd sAnimCmd_Hoenn[] =