From db66e2f6c01e877e345637c509070e310321d4f1 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 24 Nov 2023 01:16:38 -0500 Subject: [PATCH] Improved TRAINER_SPRITE/PAL defines --- src/data/graphics/trainers.h | 376 +++++++++++++++++------------------ 1 file changed, 188 insertions(+), 188 deletions(-) diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 5b6e412a260e..92f9622faf77 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -293,8 +293,8 @@ const u32 gTrainerBackPicPalette_Red[] = INCBIN_U32("graphics/trainers/back_pics const u32 gTrainerBackPicPalette_Leaf[] = INCBIN_U32("graphics/trainers/back_pics/leaf.gbapal.lz"); #define TRAINER_SPRITE_SIZE 8 -#define TRAINER_SPRITE(trainerPic, sprite, size) {sprite, size, TRAINER_PIC_##trainerPic} -#define TRAINER_PAL(trainerPic, pal) {pal, TRAINER_PIC_##trainerPic} +#define TRAINER_SPRITE(sprite, size, trainerPic) {gTrainerFrontPic_##sprite, size, TRAINER_PIC_##trainerPic} +#define TRAINER_PAL(pal, trainerPic) {gTrainerPalette_##pal, TRAINER_PIC_##trainerPic} static const union AnimCmd *const sAnims_Trainer[] ={ sAnim_GeneralFrame0, }; @@ -304,744 +304,744 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_HIKER] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(HIKER, gTrainerFrontPic_Hiker, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(HIKER, gTrainerPalette_Hiker), + .frontPic = TRAINER_SPRITE(Hiker, TRAINER_PIC_SIZE, HIKER), + .palette = TRAINER_PAL(Hiker, HIKER), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_GRUNT_M] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(AQUA_GRUNT_M, gTrainerFrontPic_AquaGruntM, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(AQUA_GRUNT_M, gTrainerPalette_AquaGruntM), + .frontPic = TRAINER_SPRITE(AquaGruntM, TRAINER_PIC_SIZE, AQUA_GRUNT_M), + .palette = TRAINER_PAL(AquaGruntM, AQUA_GRUNT_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_BREEDER_F] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(POKEMON_BREEDER_F, gTrainerFrontPic_PokemonBreederF, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(POKEMON_BREEDER_F, gTrainerPalette_PokemonBreederF), + .frontPic = TRAINER_SPRITE(PokemonBreederF, TRAINER_PIC_SIZE, POKEMON_BREEDER_F), + .palette = TRAINER_PAL(PokemonBreederF, POKEMON_BREEDER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_COOLTRAINER_M] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(COOLTRAINER_M, gTrainerFrontPic_CoolTrainerM, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(COOLTRAINER_M, gTrainerPalette_CoolTrainerM), + .frontPic = TRAINER_SPRITE(CoolTrainerM, TRAINER_PIC_SIZE, COOLTRAINER_M), + .palette = TRAINER_PAL(CoolTrainerM, COOLTRAINER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_BIRD_KEEPER] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(BIRD_KEEPER, gTrainerFrontPic_BirdKeeper, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(BIRD_KEEPER, gTrainerPalette_BirdKeeper), + .frontPic = TRAINER_SPRITE(BirdKeeper, TRAINER_PIC_SIZE, BIRD_KEEPER), + .palette = TRAINER_PAL(BirdKeeper, BIRD_KEEPER), .animation = sAnims_Trainer, }, [TRAINER_PIC_COLLECTOR] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(COLLECTOR, gTrainerFrontPic_Collector, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(COLLECTOR, gTrainerPalette_Collector), + .frontPic = TRAINER_SPRITE(Collector, TRAINER_PIC_SIZE, COLLECTOR), + .palette = TRAINER_PAL(Collector, COLLECTOR), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_GRUNT_F] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(AQUA_GRUNT_F, gTrainerFrontPic_AquaGruntF, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(AQUA_GRUNT_F, gTrainerPalette_AquaGruntF), + .frontPic = TRAINER_SPRITE(AquaGruntF, TRAINER_PIC_SIZE, AQUA_GRUNT_F), + .palette = TRAINER_PAL(AquaGruntF, AQUA_GRUNT_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMER_M] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(SWIMMER_M, gTrainerFrontPic_SwimmerM, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(SWIMMER_M, gTrainerPalette_SwimmerM), + .frontPic = TRAINER_SPRITE(SwimmerM, TRAINER_PIC_SIZE, SWIMMER_M), + .palette = TRAINER_PAL(SwimmerM, SWIMMER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_GRUNT_M] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(MAGMA_GRUNT_M, gTrainerFrontPic_MagmaGruntM, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(MAGMA_GRUNT_M, gTrainerPalette_MagmaGruntM), + .frontPic = TRAINER_SPRITE(MagmaGruntM, TRAINER_PIC_SIZE, MAGMA_GRUNT_M), + .palette = TRAINER_PAL(MagmaGruntM, MAGMA_GRUNT_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_EXPERT_M] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(EXPERT_M, gTrainerFrontPic_ExpertM, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(EXPERT_M, gTrainerPalette_ExpertM), + .frontPic = TRAINER_SPRITE(ExpertM, TRAINER_PIC_SIZE, EXPERT_M), + .palette = TRAINER_PAL(ExpertM, EXPERT_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_ADMIN_M] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(AQUA_ADMIN_M, gTrainerFrontPic_AquaAdminM, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(AQUA_ADMIN_M, gTrainerPalette_AquaAdminM), + .frontPic = TRAINER_SPRITE(AquaAdminM, TRAINER_PIC_SIZE, AQUA_ADMIN_M), + .palette = TRAINER_PAL(AquaAdminM, AQUA_ADMIN_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_BLACK_BELT] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(BLACK_BELT, gTrainerFrontPic_BlackBelt, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(BLACK_BELT, gTrainerPalette_BlackBelt), + .frontPic = TRAINER_SPRITE(BlackBelt, TRAINER_PIC_SIZE, BLACK_BELT), + .palette = TRAINER_PAL(BlackBelt, BLACK_BELT), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_ADMIN_F] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(AQUA_ADMIN_F, gTrainerFrontPic_AquaAdminF, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(AQUA_ADMIN_F, gTrainerPalette_AquaAdminF), + .frontPic = TRAINER_SPRITE(AquaAdminF, TRAINER_PIC_SIZE, AQUA_ADMIN_F), + .palette = TRAINER_PAL(AquaAdminF, AQUA_ADMIN_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_LEADER_ARCHIE] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(AQUA_LEADER_ARCHIE, gTrainerFrontPic_AquaLeaderArchie, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(AQUA_LEADER_ARCHIE, gTrainerPalette_AquaLeaderArchie), + .frontPic = TRAINER_SPRITE(AquaLeaderArchie, TRAINER_PIC_SIZE, AQUA_LEADER_ARCHIE), + .palette = TRAINER_PAL(AquaLeaderArchie, AQUA_LEADER_ARCHIE), .animation = sAnims_Trainer, }, [TRAINER_PIC_HEX_MANIAC] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(HEX_MANIAC, gTrainerFrontPic_HexManiac, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(HEX_MANIAC, gTrainerPalette_HexManiac), + .frontPic = TRAINER_SPRITE(HexManiac, TRAINER_PIC_SIZE, HEX_MANIAC), + .palette = TRAINER_PAL(HexManiac, HEX_MANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_AROMA_LADY] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(AROMA_LADY, gTrainerFrontPic_AromaLady, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(AROMA_LADY, gTrainerPalette_AromaLady), + .frontPic = TRAINER_SPRITE(AromaLady, TRAINER_PIC_SIZE, AROMA_LADY), + .palette = TRAINER_PAL(AromaLady, AROMA_LADY), .animation = sAnims_Trainer, }, [TRAINER_PIC_RUIN_MANIAC] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(RUIN_MANIAC, gTrainerFrontPic_RuinManiac, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(RUIN_MANIAC, gTrainerPalette_RuinManiac), + .frontPic = TRAINER_SPRITE(RuinManiac, TRAINER_PIC_SIZE, RUIN_MANIAC), + .palette = TRAINER_PAL(RuinManiac, RUIN_MANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_INTERVIEWER] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(INTERVIEWER, gTrainerFrontPic_Interviewer, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(INTERVIEWER, gTrainerPalette_Interviewer), + .frontPic = TRAINER_SPRITE(Interviewer, TRAINER_PIC_SIZE, INTERVIEWER), + .palette = TRAINER_PAL(Interviewer, INTERVIEWER), .animation = sAnims_Trainer, }, [TRAINER_PIC_TUBER_F] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(TUBER_F, gTrainerFrontPic_TuberF, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(TUBER_F, gTrainerPalette_TuberF), + .frontPic = TRAINER_SPRITE(TuberF, TRAINER_PIC_SIZE, TUBER_F), + .palette = TRAINER_PAL(TuberF, TUBER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_TUBER_M] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(TUBER_M, gTrainerFrontPic_TuberM, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(TUBER_M, gTrainerPalette_TuberM), + .frontPic = TRAINER_SPRITE(TuberM, TRAINER_PIC_SIZE, TUBER_M), + .palette = TRAINER_PAL(TuberM, TUBER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_COOLTRAINER_F] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(COOLTRAINER_F, gTrainerFrontPic_CoolTrainerF, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(COOLTRAINER_F, gTrainerPalette_CoolTrainerF), + .frontPic = TRAINER_SPRITE(CoolTrainerF, TRAINER_PIC_SIZE, COOLTRAINER_F), + .palette = TRAINER_PAL(CoolTrainerF, COOLTRAINER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_LADY] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(LADY, gTrainerFrontPic_Lady, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(LADY, gTrainerPalette_Lady), + .frontPic = TRAINER_SPRITE(Lady, TRAINER_PIC_SIZE, LADY), + .palette = TRAINER_PAL(Lady, LADY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BEAUTY] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(BEAUTY, gTrainerFrontPic_Beauty, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(BEAUTY, gTrainerPalette_Beauty), + .frontPic = TRAINER_SPRITE(Beauty, TRAINER_PIC_SIZE, BEAUTY), + .palette = TRAINER_PAL(Beauty, BEAUTY), .animation = sAnims_Trainer, }, [TRAINER_PIC_RICH_BOY] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(RICH_BOY, gTrainerFrontPic_RichBoy, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(RICH_BOY, gTrainerPalette_RichBoy), + .frontPic = TRAINER_SPRITE(RichBoy, TRAINER_PIC_SIZE, RICH_BOY), + .palette = TRAINER_PAL(RichBoy, RICH_BOY), .animation = sAnims_Trainer, }, [TRAINER_PIC_EXPERT_F] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(EXPERT_F, gTrainerFrontPic_ExpertF, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(EXPERT_F, gTrainerPalette_ExpertF), + .frontPic = TRAINER_SPRITE(ExpertF, TRAINER_PIC_SIZE, EXPERT_F), + .palette = TRAINER_PAL(ExpertF, EXPERT_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMANIAC] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(POKEMANIAC, gTrainerFrontPic_Pokemaniac, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(POKEMANIAC, gTrainerPalette_Pokemaniac), + .frontPic = TRAINER_SPRITE(Pokemaniac, TRAINER_PIC_SIZE, POKEMANIAC), + .palette = TRAINER_PAL(Pokemaniac, POKEMANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_GRUNT_F] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(MAGMA_GRUNT_F, gTrainerFrontPic_MagmaGruntF, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(MAGMA_GRUNT_F, gTrainerPalette_MagmaGruntF), + .frontPic = TRAINER_SPRITE(MagmaGruntF, TRAINER_PIC_SIZE, MAGMA_GRUNT_F), + .palette = TRAINER_PAL(MagmaGruntF, MAGMA_GRUNT_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_GUITARIST] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(GUITARIST, gTrainerFrontPic_Guitarist, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(GUITARIST, gTrainerPalette_Guitarist), + .frontPic = TRAINER_SPRITE(Guitarist, TRAINER_PIC_SIZE, GUITARIST), + .palette = TRAINER_PAL(Guitarist, GUITARIST), .animation = sAnims_Trainer, }, [TRAINER_PIC_KINDLER] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(KINDLER, gTrainerFrontPic_Kindler, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(KINDLER, gTrainerPalette_Kindler), + .frontPic = TRAINER_SPRITE(Kindler, TRAINER_PIC_SIZE, KINDLER), + .palette = TRAINER_PAL(Kindler, KINDLER), .animation = sAnims_Trainer, }, [TRAINER_PIC_CAMPER] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(CAMPER, gTrainerFrontPic_Camper, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(CAMPER, gTrainerPalette_Camper), + .frontPic = TRAINER_SPRITE(Camper, TRAINER_PIC_SIZE, CAMPER), + .palette = TRAINER_PAL(Camper, CAMPER), .animation = sAnims_Trainer, }, [TRAINER_PIC_PICNICKER] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(PICNICKER, gTrainerFrontPic_Picnicker, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(PICNICKER, gTrainerPalette_Picnicker), + .frontPic = TRAINER_SPRITE(Picnicker, TRAINER_PIC_SIZE, PICNICKER), + .palette = TRAINER_PAL(Picnicker, PICNICKER), .animation = sAnims_Trainer, }, [TRAINER_PIC_BUG_MANIAC] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(BUG_MANIAC, gTrainerFrontPic_BugManiac, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(BUG_MANIAC, gTrainerPalette_BugManiac), + .frontPic = TRAINER_SPRITE(BugManiac, TRAINER_PIC_SIZE, BUG_MANIAC), + .palette = TRAINER_PAL(BugManiac, BUG_MANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_BREEDER_M] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(POKEMON_BREEDER_M, gTrainerFrontPic_PokemonBreederM, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(POKEMON_BREEDER_M, gTrainerPalette_PokemonBreederM), + .frontPic = TRAINER_SPRITE(PokemonBreederM, TRAINER_PIC_SIZE, POKEMON_BREEDER_M), + .palette = TRAINER_PAL(PokemonBreederM, POKEMON_BREEDER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_PSYCHIC_M] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(PSYCHIC_M, gTrainerFrontPic_PsychicM, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(PSYCHIC_M, gTrainerPalette_PsychicM), + .frontPic = TRAINER_SPRITE(PsychicM, TRAINER_PIC_SIZE, PSYCHIC_M), + .palette = TRAINER_PAL(PsychicM, PSYCHIC_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_PSYCHIC_F] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(PSYCHIC_F, gTrainerFrontPic_PsychicF, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(PSYCHIC_F, gTrainerPalette_PsychicF), + .frontPic = TRAINER_SPRITE(PsychicF, TRAINER_PIC_SIZE, PSYCHIC_F), + .palette = TRAINER_PAL(PsychicF, PSYCHIC_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_GENTLEMAN] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(GENTLEMAN, gTrainerFrontPic_Gentleman, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(GENTLEMAN, gTrainerPalette_Gentleman), + .frontPic = TRAINER_SPRITE(Gentleman, TRAINER_PIC_SIZE, GENTLEMAN), + .palette = TRAINER_PAL(Gentleman, GENTLEMAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_SIDNEY] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(ELITE_FOUR_SIDNEY, gTrainerFrontPic_EliteFourSidney, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(ELITE_FOUR_SIDNEY, gTrainerPalette_EliteFourSidney), + .frontPic = TRAINER_SPRITE(EliteFourSidney, TRAINER_PIC_SIZE, ELITE_FOUR_SIDNEY), + .palette = TRAINER_PAL(EliteFourSidney, ELITE_FOUR_SIDNEY), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_PHOEBE] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(ELITE_FOUR_PHOEBE, gTrainerFrontPic_EliteFourPhoebe, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(ELITE_FOUR_PHOEBE, gTrainerPalette_EliteFourPhoebe), + .frontPic = TRAINER_SPRITE(EliteFourPhoebe, TRAINER_PIC_SIZE, ELITE_FOUR_PHOEBE), + .palette = TRAINER_PAL(EliteFourPhoebe, ELITE_FOUR_PHOEBE), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_GLACIA] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(ELITE_FOUR_GLACIA, gTrainerFrontPic_EliteFourGlacia, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(ELITE_FOUR_GLACIA, gTrainerPalette_EliteFourGlacia), + .frontPic = TRAINER_SPRITE(EliteFourGlacia, TRAINER_PIC_SIZE, ELITE_FOUR_GLACIA), + .palette = TRAINER_PAL(EliteFourGlacia, ELITE_FOUR_GLACIA), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_DRAKE] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(ELITE_FOUR_DRAKE, gTrainerFrontPic_EliteFourDrake, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(ELITE_FOUR_DRAKE, gTrainerPalette_EliteFourDrake), + .frontPic = TRAINER_SPRITE(EliteFourDrake, TRAINER_PIC_SIZE, ELITE_FOUR_DRAKE), + .palette = TRAINER_PAL(EliteFourDrake, ELITE_FOUR_DRAKE), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_ROXANNE] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(LEADER_ROXANNE, gTrainerFrontPic_LeaderRoxanne, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(LEADER_ROXANNE, gTrainerPalette_LeaderRoxanne), + .frontPic = TRAINER_SPRITE(LeaderRoxanne, TRAINER_PIC_SIZE, LEADER_ROXANNE), + .palette = TRAINER_PAL(LeaderRoxanne, LEADER_ROXANNE), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_BRAWLY] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(LEADER_BRAWLY, gTrainerFrontPic_LeaderBrawly, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(LEADER_BRAWLY, gTrainerPalette_LeaderBrawly), + .frontPic = TRAINER_SPRITE(LeaderBrawly, TRAINER_PIC_SIZE, LEADER_BRAWLY), + .palette = TRAINER_PAL(LeaderBrawly, LEADER_BRAWLY), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_WATTSON] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(LEADER_WATTSON, gTrainerFrontPic_LeaderWattson, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(LEADER_WATTSON, gTrainerPalette_LeaderWattson), + .frontPic = TRAINER_SPRITE(LeaderWattson, TRAINER_PIC_SIZE, LEADER_WATTSON), + .palette = TRAINER_PAL(LeaderWattson, LEADER_WATTSON), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_FLANNERY] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(LEADER_FLANNERY, gTrainerFrontPic_LeaderFlannery, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(LEADER_FLANNERY, gTrainerPalette_LeaderFlannery), + .frontPic = TRAINER_SPRITE(LeaderFlannery, TRAINER_PIC_SIZE, LEADER_FLANNERY), + .palette = TRAINER_PAL(LeaderFlannery, LEADER_FLANNERY), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_NORMAN] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(LEADER_NORMAN, gTrainerFrontPic_LeaderNorman, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(LEADER_NORMAN, gTrainerPalette_LeaderNorman), + .frontPic = TRAINER_SPRITE(LeaderNorman, TRAINER_PIC_SIZE, LEADER_NORMAN), + .palette = TRAINER_PAL(LeaderNorman, LEADER_NORMAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_WINONA] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(LEADER_WINONA, gTrainerFrontPic_LeaderWinona, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(LEADER_WINONA, gTrainerPalette_LeaderWinona), + .frontPic = TRAINER_SPRITE(LeaderWinona, TRAINER_PIC_SIZE, LEADER_WINONA), + .palette = TRAINER_PAL(LeaderWinona, LEADER_WINONA), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_TATE_AND_LIZA] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(LEADER_TATE_AND_LIZA, gTrainerFrontPic_LeaderTateAndLiza, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(LEADER_TATE_AND_LIZA, gTrainerPalette_LeaderTateAndLiza), + .frontPic = TRAINER_SPRITE(LeaderTateAndLiza, TRAINER_PIC_SIZE, LEADER_TATE_AND_LIZA), + .palette = TRAINER_PAL(LeaderTateAndLiza, LEADER_TATE_AND_LIZA), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_JUAN] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(LEADER_JUAN, gTrainerFrontPic_LeaderJuan, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(LEADER_JUAN, gTrainerPalette_LeaderJuan), + .frontPic = TRAINER_SPRITE(LeaderJuan, TRAINER_PIC_SIZE, LEADER_JUAN), + .palette = TRAINER_PAL(LeaderJuan, LEADER_JUAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_SCHOOL_KID_M] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(SCHOOL_KID_M, gTrainerFrontPic_SchoolKidM, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(SCHOOL_KID_M, gTrainerPalette_SchoolKidM), + .frontPic = TRAINER_SPRITE(SchoolKidM, TRAINER_PIC_SIZE, SCHOOL_KID_M), + .palette = TRAINER_PAL(SchoolKidM, SCHOOL_KID_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_SCHOOL_KID_F] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(SCHOOL_KID_F, gTrainerFrontPic_SchoolKidF, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(SCHOOL_KID_F, gTrainerPalette_SchoolKidF), + .frontPic = TRAINER_SPRITE(SchoolKidF, TRAINER_PIC_SIZE, SCHOOL_KID_F), + .palette = TRAINER_PAL(SchoolKidF, SCHOOL_KID_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_SR_AND_JR] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 2}, - .frontPic = TRAINER_SPRITE(SR_AND_JR, gTrainerFrontPic_SrAndJr, TRAINER_PIC_SIZE * 2), - .palette = TRAINER_PAL(SR_AND_JR, gTrainerPalette_SrAndJr), + .frontPic = TRAINER_SPRITE(SrAndJr, TRAINER_PIC_SIZE * 2, SR_AND_JR), + .palette = TRAINER_PAL(SrAndJr, SR_AND_JR), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEFAN_M] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 2}, - .frontPic = TRAINER_SPRITE(POKEFAN_M, gTrainerFrontPic_PokefanM, TRAINER_PIC_SIZE * 2), - .palette = TRAINER_PAL(POKEFAN_M, gTrainerPalette_PokefanM), + .frontPic = TRAINER_SPRITE(PokefanM, TRAINER_PIC_SIZE * 2, POKEFAN_M), + .palette = TRAINER_PAL(PokefanM, POKEFAN_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEFAN_F] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(POKEFAN_F, gTrainerFrontPic_PokefanF, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(POKEFAN_F, gTrainerPalette_PokefanF), + .frontPic = TRAINER_SPRITE(PokefanF, TRAINER_PIC_SIZE, POKEFAN_F), + .palette = TRAINER_PAL(PokefanF, POKEFAN_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_YOUNGSTER] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(YOUNGSTER, gTrainerFrontPic_Youngster, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(YOUNGSTER, gTrainerPalette_Youngster), + .frontPic = TRAINER_SPRITE(Youngster, TRAINER_PIC_SIZE, YOUNGSTER), + .palette = TRAINER_PAL(Youngster, YOUNGSTER), .animation = sAnims_Trainer, }, [TRAINER_PIC_CHAMPION_WALLACE] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 2}, - .frontPic = TRAINER_SPRITE(CHAMPION_WALLACE, gTrainerFrontPic_ChampionWallace, TRAINER_PIC_SIZE * 2), - .palette = TRAINER_PAL(CHAMPION_WALLACE, gTrainerPalette_ChampionWallace), + .frontPic = TRAINER_SPRITE(ChampionWallace, TRAINER_PIC_SIZE * 2, CHAMPION_WALLACE), + .palette = TRAINER_PAL(ChampionWallace, CHAMPION_WALLACE), .animation = sAnims_Trainer, }, [TRAINER_PIC_FISHERMAN] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(FISHERMAN, gTrainerFrontPic_Fisherman, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(FISHERMAN, gTrainerPalette_Fisherman), + .frontPic = TRAINER_SPRITE(Fisherman, TRAINER_PIC_SIZE, FISHERMAN), + .palette = TRAINER_PAL(Fisherman, FISHERMAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_CYCLING_TRIATHLETE_M] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 2}, - .frontPic = TRAINER_SPRITE(CYCLING_TRIATHLETE_M, gTrainerFrontPic_CyclingTriathleteM, TRAINER_PIC_SIZE * 2), - .palette = TRAINER_PAL(CYCLING_TRIATHLETE_M, gTrainerPalette_CyclingTriathleteM), + .frontPic = TRAINER_SPRITE(CyclingTriathleteM, TRAINER_PIC_SIZE * 2, CYCLING_TRIATHLETE_M), + .palette = TRAINER_PAL(CyclingTriathleteM, CYCLING_TRIATHLETE_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_CYCLING_TRIATHLETE_F] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(CYCLING_TRIATHLETE_F, gTrainerFrontPic_CyclingTriathleteF, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(CYCLING_TRIATHLETE_F, gTrainerPalette_CyclingTriathleteF), + .frontPic = TRAINER_SPRITE(CyclingTriathleteF, TRAINER_PIC_SIZE, CYCLING_TRIATHLETE_F), + .palette = TRAINER_PAL(CyclingTriathleteF, CYCLING_TRIATHLETE_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_RUNNING_TRIATHLETE_M] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(RUNNING_TRIATHLETE_M, gTrainerFrontPic_RunningTriathleteM, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(RUNNING_TRIATHLETE_M, gTrainerPalette_RunningTriathleteM), + .frontPic = TRAINER_SPRITE(RunningTriathleteM, TRAINER_PIC_SIZE, RUNNING_TRIATHLETE_M), + .palette = TRAINER_PAL(RunningTriathleteM, RUNNING_TRIATHLETE_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_RUNNING_TRIATHLETE_F] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(RUNNING_TRIATHLETE_F, gTrainerFrontPic_RunningTriathleteF, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(RUNNING_TRIATHLETE_F, gTrainerPalette_RunningTriathleteF), + .frontPic = TRAINER_SPRITE(RunningTriathleteF, TRAINER_PIC_SIZE, RUNNING_TRIATHLETE_F), + .palette = TRAINER_PAL(RunningTriathleteF, RUNNING_TRIATHLETE_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(SWIMMING_TRIATHLETE_M, gTrainerFrontPic_SwimmingTriathleteM, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(SWIMMING_TRIATHLETE_M, gTrainerPalette_SwimmingTriathleteM), + .frontPic = TRAINER_SPRITE(SwimmingTriathleteM, TRAINER_PIC_SIZE, SWIMMING_TRIATHLETE_M), + .palette = TRAINER_PAL(SwimmingTriathleteM, SWIMMING_TRIATHLETE_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(SWIMMING_TRIATHLETE_F, gTrainerFrontPic_SwimmingTriathleteF, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(SWIMMING_TRIATHLETE_F, gTrainerPalette_SwimmingTriathleteF), + .frontPic = TRAINER_SPRITE(SwimmingTriathleteF, TRAINER_PIC_SIZE, SWIMMING_TRIATHLETE_F), + .palette = TRAINER_PAL(SwimmingTriathleteF, SWIMMING_TRIATHLETE_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_DRAGON_TAMER] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(DRAGON_TAMER, gTrainerFrontPic_DragonTamer, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(DRAGON_TAMER, gTrainerPalette_DragonTamer), + .frontPic = TRAINER_SPRITE(DragonTamer, TRAINER_PIC_SIZE, DRAGON_TAMER), + .palette = TRAINER_PAL(DragonTamer, DRAGON_TAMER), .animation = sAnims_Trainer, }, [TRAINER_PIC_NINJA_BOY] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(NINJA_BOY, gTrainerFrontPic_NinjaBoy, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(NINJA_BOY, gTrainerPalette_NinjaBoy), + .frontPic = TRAINER_SPRITE(NinjaBoy, TRAINER_PIC_SIZE, NINJA_BOY), + .palette = TRAINER_PAL(NinjaBoy, NINJA_BOY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BATTLE_GIRL] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 2}, - .frontPic = TRAINER_SPRITE(BATTLE_GIRL, gTrainerFrontPic_BattleGirl, TRAINER_PIC_SIZE * 2), - .palette = TRAINER_PAL(BATTLE_GIRL, gTrainerPalette_BattleGirl), + .frontPic = TRAINER_SPRITE(BattleGirl, TRAINER_PIC_SIZE * 2, BATTLE_GIRL), + .palette = TRAINER_PAL(BattleGirl, BATTLE_GIRL), .animation = sAnims_Trainer, }, [TRAINER_PIC_PARASOL_LADY] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(PARASOL_LADY, gTrainerFrontPic_ParasolLady, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(PARASOL_LADY, gTrainerPalette_ParasolLady), + .frontPic = TRAINER_SPRITE(ParasolLady, TRAINER_PIC_SIZE, PARASOL_LADY), + .palette = TRAINER_PAL(ParasolLady, PARASOL_LADY), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMER_F] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(SWIMMER_F, gTrainerFrontPic_SwimmerF, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(SWIMMER_F, gTrainerPalette_SwimmerF), + .frontPic = TRAINER_SPRITE(SwimmerF, TRAINER_PIC_SIZE, SWIMMER_F), + .palette = TRAINER_PAL(SwimmerF, SWIMMER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_TWINS] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(TWINS, gTrainerFrontPic_Twins, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(TWINS, gTrainerPalette_Twins), + .frontPic = TRAINER_SPRITE(Twins, TRAINER_PIC_SIZE, TWINS), + .palette = TRAINER_PAL(Twins, TWINS), .animation = sAnims_Trainer, }, [TRAINER_PIC_SAILOR] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(SAILOR, gTrainerFrontPic_Sailor, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(SAILOR, gTrainerPalette_Sailor), + .frontPic = TRAINER_SPRITE(Sailor, TRAINER_PIC_SIZE, SAILOR), + .palette = TRAINER_PAL(Sailor, SAILOR), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_ADMIN] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(MAGMA_ADMIN, gTrainerFrontPic_MagmaAdmin, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(MAGMA_ADMIN, gTrainerPalette_MagmaAdmin), + .frontPic = TRAINER_SPRITE(MagmaAdmin, TRAINER_PIC_SIZE, MAGMA_ADMIN), + .palette = TRAINER_PAL(MagmaAdmin, MAGMA_ADMIN), .animation = sAnims_Trainer, }, [TRAINER_PIC_WALLY] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(WALLY, gTrainerFrontPic_Wally, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(WALLY, gTrainerPalette_Wally), + .frontPic = TRAINER_SPRITE(Wally, TRAINER_PIC_SIZE, WALLY), + .palette = TRAINER_PAL(Wally, WALLY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BRENDAN] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(BRENDAN, gTrainerFrontPic_Brendan, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(BRENDAN, gTrainerPalette_Brendan), + .frontPic = TRAINER_SPRITE(Brendan, TRAINER_PIC_SIZE, BRENDAN), + .palette = TRAINER_PAL(Brendan, BRENDAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAY] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(MAY, gTrainerFrontPic_May, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(MAY, gTrainerPalette_May), + .frontPic = TRAINER_SPRITE(May, TRAINER_PIC_SIZE, MAY), + .palette = TRAINER_PAL(May, MAY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BUG_CATCHER] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(BUG_CATCHER, gTrainerFrontPic_BugCatcher, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(BUG_CATCHER, gTrainerPalette_BugCatcher), + .frontPic = TRAINER_SPRITE(BugCatcher, TRAINER_PIC_SIZE, BUG_CATCHER), + .palette = TRAINER_PAL(BugCatcher, BUG_CATCHER), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_RANGER_M] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(POKEMON_RANGER_M, gTrainerFrontPic_PokemonRangerM, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(POKEMON_RANGER_M, gTrainerPalette_PokemonRangerM), + .frontPic = TRAINER_SPRITE(PokemonRangerM, TRAINER_PIC_SIZE, POKEMON_RANGER_M), + .palette = TRAINER_PAL(PokemonRangerM, POKEMON_RANGER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_RANGER_F] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(POKEMON_RANGER_F, gTrainerFrontPic_PokemonRangerF, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(POKEMON_RANGER_F, gTrainerPalette_PokemonRangerF), + .frontPic = TRAINER_SPRITE(PokemonRangerF, TRAINER_PIC_SIZE, POKEMON_RANGER_F), + .palette = TRAINER_PAL(PokemonRangerF, POKEMON_RANGER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_LEADER_MAXIE] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(MAGMA_LEADER_MAXIE, gTrainerFrontPic_MagmaLeaderMaxie, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(MAGMA_LEADER_MAXIE, gTrainerPalette_MagmaLeaderMaxie), + .frontPic = TRAINER_SPRITE(MagmaLeaderMaxie, TRAINER_PIC_SIZE, MAGMA_LEADER_MAXIE), + .palette = TRAINER_PAL(MagmaLeaderMaxie, MAGMA_LEADER_MAXIE), .animation = sAnims_Trainer, }, [TRAINER_PIC_LASS] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(LASS, gTrainerFrontPic_Lass, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(LASS, gTrainerPalette_Lass), + .frontPic = TRAINER_SPRITE(Lass, TRAINER_PIC_SIZE, LASS), + .palette = TRAINER_PAL(Lass, LASS), .animation = sAnims_Trainer, }, [TRAINER_PIC_YOUNG_COUPLE] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(YOUNG_COUPLE, gTrainerFrontPic_YoungCouple, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(YOUNG_COUPLE, gTrainerPalette_YoungCouple), + .frontPic = TRAINER_SPRITE(YoungCouple, TRAINER_PIC_SIZE, YOUNG_COUPLE), + .palette = TRAINER_PAL(YoungCouple, YOUNG_COUPLE), .animation = sAnims_Trainer, }, [TRAINER_PIC_OLD_COUPLE] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(OLD_COUPLE, gTrainerFrontPic_OldCouple, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(OLD_COUPLE, gTrainerPalette_OldCouple), + .frontPic = TRAINER_SPRITE(OldCouple, TRAINER_PIC_SIZE, OLD_COUPLE), + .palette = TRAINER_PAL(OldCouple, OLD_COUPLE), .animation = sAnims_Trainer, }, [TRAINER_PIC_SIS_AND_BRO] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(SIS_AND_BRO, gTrainerFrontPic_SisAndBro, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(SIS_AND_BRO, gTrainerPalette_SisAndBro), + .frontPic = TRAINER_SPRITE(SisAndBro, TRAINER_PIC_SIZE, SIS_AND_BRO), + .palette = TRAINER_PAL(SisAndBro, SIS_AND_BRO), .animation = sAnims_Trainer, }, [TRAINER_PIC_STEVEN] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(STEVEN, gTrainerFrontPic_Steven, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(STEVEN, gTrainerPalette_Steven), + .frontPic = TRAINER_SPRITE(Steven, TRAINER_PIC_SIZE, STEVEN), + .palette = TRAINER_PAL(Steven, STEVEN), .animation = sAnims_Trainer, }, [TRAINER_PIC_SALON_MAIDEN_ANABEL] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(SALON_MAIDEN_ANABEL, gTrainerFrontPic_SalonMaidenAnabel, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(SALON_MAIDEN_ANABEL, gTrainerPalette_SalonMaidenAnabel), + .frontPic = TRAINER_SPRITE(SalonMaidenAnabel, TRAINER_PIC_SIZE, SALON_MAIDEN_ANABEL), + .palette = TRAINER_PAL(SalonMaidenAnabel, SALON_MAIDEN_ANABEL), .animation = sAnims_Trainer, }, [TRAINER_PIC_DOME_ACE_TUCKER] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(DOME_ACE_TUCKER, gTrainerFrontPic_DomeAceTucker, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(DOME_ACE_TUCKER, gTrainerPalette_DomeAceTucker), + .frontPic = TRAINER_SPRITE(DomeAceTucker, TRAINER_PIC_SIZE, DOME_ACE_TUCKER), + .palette = TRAINER_PAL(DomeAceTucker, DOME_ACE_TUCKER), .animation = sAnims_Trainer, }, [TRAINER_PIC_PALACE_MAVEN_SPENSER] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(PALACE_MAVEN_SPENSER, gTrainerFrontPic_PalaceMavenSpenser, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(PALACE_MAVEN_SPENSER, gTrainerPalette_PalaceMavenSpenser), + .frontPic = TRAINER_SPRITE(PalaceMavenSpenser, TRAINER_PIC_SIZE, PALACE_MAVEN_SPENSER), + .palette = TRAINER_PAL(PalaceMavenSpenser, PALACE_MAVEN_SPENSER), .animation = sAnims_Trainer, }, [TRAINER_PIC_ARENA_TYCOON_GRETA] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 2}, - .frontPic = TRAINER_SPRITE(ARENA_TYCOON_GRETA, gTrainerFrontPic_ArenaTycoonGreta, TRAINER_PIC_SIZE * 2), - .palette = TRAINER_PAL(ARENA_TYCOON_GRETA, gTrainerPalette_ArenaTycoonGreta), + .frontPic = TRAINER_SPRITE(ArenaTycoonGreta, TRAINER_PIC_SIZE * 2, ARENA_TYCOON_GRETA), + .palette = TRAINER_PAL(ArenaTycoonGreta, ARENA_TYCOON_GRETA), .animation = sAnims_Trainer, }, [TRAINER_PIC_FACTORY_HEAD_NOLAND] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(FACTORY_HEAD_NOLAND, gTrainerFrontPic_FactoryHeadNoland, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(FACTORY_HEAD_NOLAND, gTrainerPalette_FactoryHeadNoland), + .frontPic = TRAINER_SPRITE(FactoryHeadNoland, TRAINER_PIC_SIZE, FACTORY_HEAD_NOLAND), + .palette = TRAINER_PAL(FactoryHeadNoland, FACTORY_HEAD_NOLAND), .animation = sAnims_Trainer, }, [TRAINER_PIC_PIKE_QUEEN_LUCY] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(PIKE_QUEEN_LUCY, gTrainerFrontPic_PikeQueenLucy, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(PIKE_QUEEN_LUCY, gTrainerPalette_PikeQueenLucy), + .frontPic = TRAINER_SPRITE(PikeQueenLucy, TRAINER_PIC_SIZE, PIKE_QUEEN_LUCY), + .palette = TRAINER_PAL(PikeQueenLucy, PIKE_QUEEN_LUCY), .animation = sAnims_Trainer, }, [TRAINER_PIC_PYRAMID_KING_BRANDON] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(PYRAMID_KING_BRANDON, gTrainerFrontPic_PyramidKingBrandon, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(PYRAMID_KING_BRANDON, gTrainerPalette_PyramidKingBrandon), + .frontPic = TRAINER_SPRITE(PyramidKingBrandon, TRAINER_PIC_SIZE, PYRAMID_KING_BRANDON), + .palette = TRAINER_PAL(PyramidKingBrandon, PYRAMID_KING_BRANDON), .animation = sAnims_Trainer, }, [TRAINER_PIC_RED] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(RED, gTrainerFrontPic_Red, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(RED, gTrainerPalette_Red), + .frontPic = TRAINER_SPRITE(Red, TRAINER_PIC_SIZE, RED), + .palette = TRAINER_PAL(Red, RED), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEAF] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(LEAF, gTrainerFrontPic_Leaf, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(LEAF, gTrainerPalette_Leaf), + .frontPic = TRAINER_SPRITE(Leaf, TRAINER_PIC_SIZE, LEAF), + .palette = TRAINER_PAL(Leaf, LEAF), .animation = sAnims_Trainer, }, [TRAINER_PIC_RS_BRENDAN] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(RS_BRENDAN, gTrainerFrontPic_RubySapphireBrendan, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(RS_BRENDAN, gTrainerPalette_RubySapphireBrendan), + .frontPic = TRAINER_SPRITE(RubySapphireBrendan, TRAINER_PIC_SIZE, RS_BRENDAN), + .palette = TRAINER_PAL(RubySapphireBrendan, RS_BRENDAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_RS_MAY] = { .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(RS_MAY, gTrainerFrontPic_RubySapphireMay, TRAINER_PIC_SIZE), - .palette = TRAINER_PAL(RS_MAY, gTrainerPalette_RubySapphireMay), + .frontPic = TRAINER_SPRITE(RubySapphireMay, TRAINER_PIC_SIZE, RS_MAY), + .palette = TRAINER_PAL(RubySapphireMay, RS_MAY), .animation = sAnims_Trainer, }, };