From 9d37bdcae271768627ecc985d27420353d8b577b Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 23 Nov 2023 23:12:16 -0500 Subject: [PATCH 01/25] Added TrainerSprite struct with coordinates --- include/data.h | 9 +- src/battle_controller_link_opponent.c | 2 +- src/battle_controller_opponent.c | 2 +- src/battle_controller_player.c | 2 +- src/battle_controller_player_partner.c | 4 +- src/battle_controller_recorded_opponent.c | 2 +- src/battle_controller_recorded_player.c | 2 +- src/battle_controllers.c | 2 +- src/data/graphics/trainers.h | 471 +++++++++++++++++++ src/data/trainer_graphics/front_pic_tables.h | 97 ---- 10 files changed, 487 insertions(+), 106 deletions(-) diff --git a/include/data.h b/include/data.h index 8fc4209d3de3..8c0242020d16 100644 --- a/include/data.h +++ b/include/data.h @@ -28,6 +28,13 @@ struct MonCoords u8 y_offset; }; +struct TrainerSprite +{ + //See if y_offset is even needed for Trainer Sprites. + //If not, can remove MonCoords value (NOT THE STRUCT THOUGH) and just add size + const struct MonCoords coordinates; +}; + #define MON_COORDS_SIZE(width, height)(DIV_ROUND_UP(width, 8) << 4 | DIV_ROUND_UP(height, 8)) #define GET_MON_COORDS_WIDTH(size)((size >> 4) * 8) #define GET_MON_COORDS_HEIGHT(size)((size & 0xF) * 8) @@ -93,7 +100,7 @@ extern const union AffineAnimCmd *const gAffineAnims_BattleSpriteContest[]; extern const union AnimCmd sAnim_GeneralFrame0[]; extern const union AnimCmd *const gAnims_MonPic[]; extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[]; -extern const struct MonCoords gTrainerFrontPicCoords[]; +extern const struct TrainerSprite gTrainerSprites[]; extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[]; diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 3a3cb7e8ce33..8d259fca3bd5 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -462,7 +462,7 @@ static void LinkOpponentHandleDrawTrainerPic(u32 battler) } BtlController_HandleDrawTrainerPic(battler, trainerPicId, TRUE, - xPos, 40 + 4 * (8 - gTrainerFrontPicCoords[trainerPicId].size), + xPos, 40 + 4 * (8 - gTrainerSprites[trainerPicId].coordinates.size), -1); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 6b09f0d41fa7..8eb59cff9ee5 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -485,7 +485,7 @@ static void OpponentHandleDrawTrainerPic(u32 battler) } BtlController_HandleDrawTrainerPic(battler, trainerPicId, TRUE, - xPos, 40 + 4 * (8 - gTrainerFrontPicCoords[trainerPicId].size), + xPos, 40 + 4 * (8 - gTrainerSprites[trainerPicId].coordinates.size), -1); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 711eef1d1e93..4309e2a551a8 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1879,7 +1879,7 @@ static void PlayerHandleDrawTrainerPic(u32 battler) if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId < TRAINER_PARTNER(PARTNER_NONE)) { xPos = 90; - yPos = (8 - gTrainerFrontPicCoords[trainerPicId].size) * 4 + 80; + yPos = (8 - gTrainerSprites[trainerPicId].coordinates.size) * 4 + 80; } else { diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 8f989c677d7b..df49023f6af3 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -307,13 +307,13 @@ static void PlayerPartnerHandleDrawTrainerPic(u32 battler) { trainerPicId = gTrainers[gPartnerTrainerId].trainerPic; xPos = 60; - yPos = (8 - gTrainerFrontPicCoords[trainerPicId].size) * 4 + 80; + yPos = (8 - gTrainerSprites[trainerPicId].coordinates.size) * 4 + 80; } else { trainerPicId = GetFrontierTrainerFrontSpriteId(gPartnerTrainerId); xPos = 32; - yPos = (8 - gTrainerFrontPicCoords[trainerPicId].size) * 4 + 80; + yPos = (8 - gTrainerSprites[trainerPicId].coordinates.size) * 4 + 80; } // Use back pic only if the partner Steven or is custom. diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 58ef101ec99a..2d0b244aea8c 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -421,7 +421,7 @@ static void RecordedOpponentHandleDrawTrainerPic(u32 battler) } BtlController_HandleDrawTrainerPic(battler, trainerPicId, TRUE, - xPos, 40 + 4 * (8 - gTrainerFrontPicCoords[trainerPicId].size), + xPos, 40 + 4 * (8 - gTrainerSprites[trainerPicId].coordinates.size), -1); } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 39e869867efc..0f314829256f 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -393,7 +393,7 @@ static void RecordedPlayerHandleDrawTrainerPic(u32 battler) if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) { xPos = 90; - yPos = (8 - gTrainerFrontPicCoords[trainerPicId].size) * 4 + 80; + yPos = (8 - gTrainerSprites[trainerPicId].coordinates.size) * 4 + 80; } else { diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 885e9394bbb0..ca8e41ef4d88 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -2544,7 +2544,7 @@ void BtlController_HandleTrainerSlide(u32 battler, u32 trainerPicId) SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(battler)); gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, 176, - (8 - gTrainerFrontPicCoords[trainerPicId].size) * 4 + 40, + (8 - gTrainerSprites[trainerPicId].coordinates.size) * 4 + 40, 30); gSprites[gBattlerSpriteIds[battler]].oam.affineParam = trainerPicId; gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag); diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index fbdea74729ab..52b3145ec762 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -1,3 +1,474 @@ +#include "constants/trainers.h" +#include "data.h" + +const struct TrainerSprite gTrainerSprites[] = +{ + [TRAINER_PIC_HIKER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_AQUA_GRUNT_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_POKEMON_BREEDER_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_COOLTRAINER_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_BIRD_KEEPER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_COLLECTOR] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_AQUA_GRUNT_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_SWIMMER_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_MAGMA_GRUNT_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_EXPERT_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_AQUA_ADMIN_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_BLACK_BELT] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_AQUA_ADMIN_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_AQUA_LEADER_ARCHIE] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_HEX_MANIAC] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_AROMA_LADY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_RUIN_MANIAC] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_INTERVIEWER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_TUBER_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_TUBER_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_COOLTRAINER_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_LADY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_BEAUTY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_RICH_BOY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_EXPERT_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_POKEMANIAC] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_MAGMA_GRUNT_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_GUITARIST] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_KINDLER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_CAMPER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_PICNICKER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_BUG_MANIAC] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_POKEMON_BREEDER_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_PSYCHIC_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_PSYCHIC_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_GENTLEMAN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_ELITE_FOUR_SIDNEY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_ELITE_FOUR_PHOEBE] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_ELITE_FOUR_GLACIA] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_ELITE_FOUR_DRAKE] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_LEADER_ROXANNE] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_LEADER_BRAWLY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_LEADER_WATTSON] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_LEADER_FLANNERY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_LEADER_NORMAN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_LEADER_WINONA] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_LEADER_TATE_AND_LIZA] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_LEADER_JUAN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_SCHOOL_KID_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_SCHOOL_KID_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_SR_AND_JR] = + { + .coordinates = {.size = 8, .y_offset = 2}, + }, + + [TRAINER_PIC_POKEFAN_M] = + { + .coordinates = {.size = 8, .y_offset = 2}, + }, + + [TRAINER_PIC_POKEFAN_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_YOUNGSTER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_CHAMPION_WALLACE] = + { + .coordinates = {.size = 8, .y_offset = 2}, + }, + + [TRAINER_PIC_FISHERMAN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_CYCLING_TRIATHLETE_M] = + { + .coordinates = {.size = 8, .y_offset = 2}, + }, + + [TRAINER_PIC_CYCLING_TRIATHLETE_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_RUNNING_TRIATHLETE_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_RUNNING_TRIATHLETE_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_DRAGON_TAMER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_NINJA_BOY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_BATTLE_GIRL] = + { + .coordinates = {.size = 8, .y_offset = 2}, + }, + + [TRAINER_PIC_PARASOL_LADY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_SWIMMER_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_TWINS] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_SAILOR] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_MAGMA_ADMIN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_WALLY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_BRENDAN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_MAY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_BUG_CATCHER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_POKEMON_RANGER_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_POKEMON_RANGER_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_MAGMA_LEADER_MAXIE] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_LASS] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_YOUNG_COUPLE] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_OLD_COUPLE] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_SIS_AND_BRO] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_STEVEN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_SALON_MAIDEN_ANABEL] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_DOME_ACE_TUCKER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_PALACE_MAVEN_SPENSER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_ARENA_TYCOON_GRETA] = + { + .coordinates = {.size = 8, .y_offset = 2}, + }, + + [TRAINER_PIC_FACTORY_HEAD_NOLAND] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_PIKE_QUEEN_LUCY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_PYRAMID_KING_BRANDON] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_RED] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_LEAF] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_RS_BRENDAN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, + + [TRAINER_PIC_RS_MAY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + }, +}; + const u32 gTrainerFrontPic_Hiker[] = INCBIN_U32("graphics/trainers/front_pics/hiker.4bpp.lz"); const u32 gTrainerPalette_Hiker[] = INCBIN_U32("graphics/trainers/front_pics/hiker.gbapal.lz"); diff --git a/src/data/trainer_graphics/front_pic_tables.h b/src/data/trainer_graphics/front_pic_tables.h index dd4aa26de0c0..d935123bd458 100644 --- a/src/data/trainer_graphics/front_pic_tables.h +++ b/src/data/trainer_graphics/front_pic_tables.h @@ -1,100 +1,3 @@ -const struct MonCoords gTrainerFrontPicCoords[] = -{ - [TRAINER_PIC_HIKER] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_AQUA_GRUNT_M] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_POKEMON_BREEDER_F] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_COOLTRAINER_M] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_BIRD_KEEPER] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_COLLECTOR] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_AQUA_GRUNT_F] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_SWIMMER_M] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_MAGMA_GRUNT_M] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_EXPERT_M] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_AQUA_ADMIN_M] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_BLACK_BELT] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_AQUA_ADMIN_F] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_AQUA_LEADER_ARCHIE] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_HEX_MANIAC] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_AROMA_LADY] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_RUIN_MANIAC] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_INTERVIEWER] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_TUBER_F] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_TUBER_M] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_COOLTRAINER_F] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_LADY] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_BEAUTY] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_RICH_BOY] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_EXPERT_F] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_POKEMANIAC] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_MAGMA_GRUNT_F] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_GUITARIST] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_KINDLER] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_CAMPER] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_PICNICKER] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_BUG_MANIAC] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_POKEMON_BREEDER_M] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_PSYCHIC_M] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_PSYCHIC_F] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_GENTLEMAN] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_ELITE_FOUR_SIDNEY] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_ELITE_FOUR_PHOEBE] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_ELITE_FOUR_GLACIA] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_ELITE_FOUR_DRAKE] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_LEADER_ROXANNE] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_LEADER_BRAWLY] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_LEADER_WATTSON] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_LEADER_FLANNERY] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_LEADER_NORMAN] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_LEADER_WINONA] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_LEADER_TATE_AND_LIZA] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_LEADER_JUAN] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_SCHOOL_KID_M] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_SCHOOL_KID_F] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_SR_AND_JR] = {.size = 8, .y_offset = 2}, - [TRAINER_PIC_POKEFAN_M] = {.size = 8, .y_offset = 2}, - [TRAINER_PIC_POKEFAN_F] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_YOUNGSTER] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_CHAMPION_WALLACE] = {.size = 8, .y_offset = 2}, - [TRAINER_PIC_FISHERMAN] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_CYCLING_TRIATHLETE_M] = {.size = 8, .y_offset = 2}, - [TRAINER_PIC_CYCLING_TRIATHLETE_F] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_RUNNING_TRIATHLETE_M] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_RUNNING_TRIATHLETE_F] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_DRAGON_TAMER] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_NINJA_BOY] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_BATTLE_GIRL] = {.size = 8, .y_offset = 2}, - [TRAINER_PIC_PARASOL_LADY] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_SWIMMER_F] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_TWINS] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_SAILOR] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_MAGMA_ADMIN] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_WALLY] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_BRENDAN] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_MAY] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_BUG_CATCHER] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_POKEMON_RANGER_M] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_POKEMON_RANGER_F] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_MAGMA_LEADER_MAXIE] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_LASS] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_YOUNG_COUPLE] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_OLD_COUPLE] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_SIS_AND_BRO] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_STEVEN] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_SALON_MAIDEN_ANABEL] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_DOME_ACE_TUCKER] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_PALACE_MAVEN_SPENSER] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_ARENA_TYCOON_GRETA] = {.size = 8, .y_offset = 2}, - [TRAINER_PIC_FACTORY_HEAD_NOLAND] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_PIKE_QUEEN_LUCY] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_PYRAMID_KING_BRANDON] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_RED] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_LEAF] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_RS_BRENDAN] = {.size = 8, .y_offset = 1}, - [TRAINER_PIC_RS_MAY] = {.size = 8, .y_offset = 1}, -}; - #define TRAINER_SPRITE(trainerPic, sprite, size) [TRAINER_PIC_##trainerPic] = {sprite, size, TRAINER_PIC_##trainerPic} const struct CompressedSpriteSheet gTrainerFrontPicTable[] = From 2ca0ae85715021f2f17ccc440c8c005cc1e41bc5 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 23 Nov 2023 23:38:56 -0500 Subject: [PATCH 02/25] Added .frontPic to struct --- include/data.h | 4 +- src/battle_gfx_sfx_util.c | 2 +- src/data/graphics/trainers.h | 1031 ++++++++++-------- src/data/trainer_graphics/front_pic_tables.h | 99 -- src/field_effect.c | 8 +- src/pokenav_match_call_gfx.c | 2 +- src/trainer_pokemon_sprites.c | 2 +- 7 files changed, 572 insertions(+), 576 deletions(-) diff --git a/include/data.h b/include/data.h index 8c0242020d16..3f638208b300 100644 --- a/include/data.h +++ b/include/data.h @@ -32,7 +32,8 @@ struct TrainerSprite { //See if y_offset is even needed for Trainer Sprites. //If not, can remove MonCoords value (NOT THE STRUCT THOUGH) and just add size - const struct MonCoords coordinates; + struct MonCoords coordinates; + struct CompressedSpriteSheet frontPic; }; #define MON_COORDS_SIZE(width, height)(DIV_ROUND_UP(width, 8) << 4 | DIV_ROUND_UP(height, 8)) @@ -101,7 +102,6 @@ extern const union AnimCmd sAnim_GeneralFrame0[]; extern const union AnimCmd *const gAnims_MonPic[]; extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[]; extern const struct TrainerSprite gTrainerSprites[]; -extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[]; extern const struct MonCoords gTrainerBackPicCoords[]; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 4a4b47440bf1..f18d7dea43c8 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -650,7 +650,7 @@ void BattleGfxSfxDummy2(u16 species) void DecompressTrainerFrontPic(u16 frontPicId, u8 battler) { u8 position = GetBattlerPosition(battler); - DecompressPicFromTable(&gTrainerFrontPicTable[frontPicId], + DecompressPicFromTable(&gTrainerSprites[frontPicId].frontPic, gMonSpritesGfxPtr->sprites.ptr[position]); LoadCompressedSpritePalette(&gTrainerFrontPicPaletteTable[frontPicId]); } diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 52b3145ec762..9b456c05b72f 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -1,474 +1,6 @@ #include "constants/trainers.h" #include "data.h" -const struct TrainerSprite gTrainerSprites[] = -{ - [TRAINER_PIC_HIKER] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_AQUA_GRUNT_M] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_POKEMON_BREEDER_F] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_COOLTRAINER_M] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_BIRD_KEEPER] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_COLLECTOR] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_AQUA_GRUNT_F] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_SWIMMER_M] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_MAGMA_GRUNT_M] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_EXPERT_M] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_AQUA_ADMIN_M] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_BLACK_BELT] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_AQUA_ADMIN_F] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_AQUA_LEADER_ARCHIE] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_HEX_MANIAC] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_AROMA_LADY] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_RUIN_MANIAC] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_INTERVIEWER] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_TUBER_F] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_TUBER_M] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_COOLTRAINER_F] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_LADY] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_BEAUTY] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_RICH_BOY] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_EXPERT_F] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_POKEMANIAC] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_MAGMA_GRUNT_F] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_GUITARIST] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_KINDLER] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_CAMPER] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_PICNICKER] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_BUG_MANIAC] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_POKEMON_BREEDER_M] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_PSYCHIC_M] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_PSYCHIC_F] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_GENTLEMAN] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_ELITE_FOUR_SIDNEY] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_ELITE_FOUR_PHOEBE] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_ELITE_FOUR_GLACIA] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_ELITE_FOUR_DRAKE] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_LEADER_ROXANNE] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_LEADER_BRAWLY] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_LEADER_WATTSON] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_LEADER_FLANNERY] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_LEADER_NORMAN] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_LEADER_WINONA] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_LEADER_TATE_AND_LIZA] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_LEADER_JUAN] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_SCHOOL_KID_M] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_SCHOOL_KID_F] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_SR_AND_JR] = - { - .coordinates = {.size = 8, .y_offset = 2}, - }, - - [TRAINER_PIC_POKEFAN_M] = - { - .coordinates = {.size = 8, .y_offset = 2}, - }, - - [TRAINER_PIC_POKEFAN_F] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_YOUNGSTER] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_CHAMPION_WALLACE] = - { - .coordinates = {.size = 8, .y_offset = 2}, - }, - - [TRAINER_PIC_FISHERMAN] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_CYCLING_TRIATHLETE_M] = - { - .coordinates = {.size = 8, .y_offset = 2}, - }, - - [TRAINER_PIC_CYCLING_TRIATHLETE_F] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_RUNNING_TRIATHLETE_M] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_RUNNING_TRIATHLETE_F] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_DRAGON_TAMER] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_NINJA_BOY] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_BATTLE_GIRL] = - { - .coordinates = {.size = 8, .y_offset = 2}, - }, - - [TRAINER_PIC_PARASOL_LADY] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_SWIMMER_F] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_TWINS] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_SAILOR] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_MAGMA_ADMIN] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_WALLY] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_BRENDAN] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_MAY] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_BUG_CATCHER] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_POKEMON_RANGER_M] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_POKEMON_RANGER_F] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_MAGMA_LEADER_MAXIE] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_LASS] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_YOUNG_COUPLE] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_OLD_COUPLE] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_SIS_AND_BRO] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_STEVEN] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_SALON_MAIDEN_ANABEL] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_DOME_ACE_TUCKER] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_PALACE_MAVEN_SPENSER] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_ARENA_TYCOON_GRETA] = - { - .coordinates = {.size = 8, .y_offset = 2}, - }, - - [TRAINER_PIC_FACTORY_HEAD_NOLAND] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_PIKE_QUEEN_LUCY] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_PYRAMID_KING_BRANDON] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_RED] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_LEAF] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_RS_BRENDAN] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, - - [TRAINER_PIC_RS_MAY] = - { - .coordinates = {.size = 8, .y_offset = 1}, - }, -}; - const u32 gTrainerFrontPic_Hiker[] = INCBIN_U32("graphics/trainers/front_pics/hiker.4bpp.lz"); const u32 gTrainerPalette_Hiker[] = INCBIN_U32("graphics/trainers/front_pics/hiker.gbapal.lz"); @@ -759,3 +291,566 @@ const u8 gTrainerBackPic_Steven[] = INCBIN_U8("graphics/trainers/back_pics/steve const u32 gTrainerBackPicPalette_Red[] = INCBIN_U32("graphics/trainers/back_pics/red.gbapal.lz"); const u32 gTrainerBackPicPalette_Leaf[] = INCBIN_U32("graphics/trainers/back_pics/leaf.gbapal.lz"); + +#define TRAINER_SPRITE(trainerPic, sprite, size) {sprite, size, TRAINER_PIC_##trainerPic} + +const struct TrainerSprite gTrainerSprites[] = +{ + [TRAINER_PIC_HIKER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(HIKER, gTrainerFrontPic_Hiker, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_AQUA_GRUNT_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(AQUA_GRUNT_M, gTrainerFrontPic_AquaGruntM, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_POKEMON_BREEDER_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(POKEMON_BREEDER_F, gTrainerFrontPic_PokemonBreederF, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_COOLTRAINER_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(COOLTRAINER_M, gTrainerFrontPic_CoolTrainerM, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_BIRD_KEEPER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(BIRD_KEEPER, gTrainerFrontPic_BirdKeeper, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_COLLECTOR] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(COLLECTOR, gTrainerFrontPic_Collector, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_AQUA_GRUNT_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(AQUA_GRUNT_F, gTrainerFrontPic_AquaGruntF, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_SWIMMER_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(SWIMMER_M, gTrainerFrontPic_SwimmerM, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_MAGMA_GRUNT_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(MAGMA_GRUNT_M, gTrainerFrontPic_MagmaGruntM, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_EXPERT_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(EXPERT_M, gTrainerFrontPic_ExpertM, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_AQUA_ADMIN_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(AQUA_ADMIN_M, gTrainerFrontPic_AquaAdminM, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_BLACK_BELT] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(BLACK_BELT, gTrainerFrontPic_BlackBelt, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_AQUA_ADMIN_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(AQUA_ADMIN_F, gTrainerFrontPic_AquaAdminF, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_AQUA_LEADER_ARCHIE] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(AQUA_LEADER_ARCHIE, gTrainerFrontPic_AquaLeaderArchie, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_HEX_MANIAC] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(HEX_MANIAC, gTrainerFrontPic_HexManiac, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_AROMA_LADY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(AROMA_LADY, gTrainerFrontPic_AromaLady, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_RUIN_MANIAC] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(RUIN_MANIAC, gTrainerFrontPic_RuinManiac, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_INTERVIEWER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(INTERVIEWER, gTrainerFrontPic_Interviewer, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_TUBER_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(TUBER_F, gTrainerFrontPic_TuberF, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_TUBER_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(TUBER_M, gTrainerFrontPic_TuberM, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_COOLTRAINER_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(COOLTRAINER_F, gTrainerFrontPic_CoolTrainerF, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_LADY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(LADY, gTrainerFrontPic_Lady, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_BEAUTY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(BEAUTY, gTrainerFrontPic_Beauty, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_RICH_BOY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(RICH_BOY, gTrainerFrontPic_RichBoy, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_EXPERT_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(EXPERT_F, gTrainerFrontPic_ExpertF, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_POKEMANIAC] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(POKEMANIAC, gTrainerFrontPic_Pokemaniac, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_MAGMA_GRUNT_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(MAGMA_GRUNT_F, gTrainerFrontPic_MagmaGruntF, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_GUITARIST] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(GUITARIST, gTrainerFrontPic_Guitarist, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_KINDLER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(KINDLER, gTrainerFrontPic_Kindler, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_CAMPER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(CAMPER, gTrainerFrontPic_Camper, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_PICNICKER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(PICNICKER, gTrainerFrontPic_Picnicker, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_BUG_MANIAC] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(BUG_MANIAC, gTrainerFrontPic_BugManiac, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_POKEMON_BREEDER_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(POKEMON_BREEDER_M, gTrainerFrontPic_PokemonBreederM, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_PSYCHIC_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(PSYCHIC_M, gTrainerFrontPic_PsychicM, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_PSYCHIC_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(PSYCHIC_F, gTrainerFrontPic_PsychicF, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_GENTLEMAN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(GENTLEMAN, gTrainerFrontPic_Gentleman, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_ELITE_FOUR_SIDNEY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(ELITE_FOUR_SIDNEY, gTrainerFrontPic_EliteFourSidney, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_ELITE_FOUR_PHOEBE] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(ELITE_FOUR_PHOEBE, gTrainerFrontPic_EliteFourPhoebe, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_ELITE_FOUR_GLACIA] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(ELITE_FOUR_GLACIA, gTrainerFrontPic_EliteFourGlacia, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_ELITE_FOUR_DRAKE] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(ELITE_FOUR_DRAKE, gTrainerFrontPic_EliteFourDrake, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_LEADER_ROXANNE] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(LEADER_ROXANNE, gTrainerFrontPic_LeaderRoxanne, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_LEADER_BRAWLY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(LEADER_BRAWLY, gTrainerFrontPic_LeaderBrawly, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_LEADER_WATTSON] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(LEADER_WATTSON, gTrainerFrontPic_LeaderWattson, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_LEADER_FLANNERY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(LEADER_FLANNERY, gTrainerFrontPic_LeaderFlannery, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_LEADER_NORMAN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(LEADER_NORMAN, gTrainerFrontPic_LeaderNorman, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_LEADER_WINONA] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(LEADER_WINONA, gTrainerFrontPic_LeaderWinona, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_LEADER_TATE_AND_LIZA] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(LEADER_TATE_AND_LIZA, gTrainerFrontPic_LeaderTateAndLiza, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_LEADER_JUAN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(LEADER_JUAN, gTrainerFrontPic_LeaderJuan, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_SCHOOL_KID_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(SCHOOL_KID_M, gTrainerFrontPic_SchoolKidM, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_SCHOOL_KID_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(SCHOOL_KID_F, gTrainerFrontPic_SchoolKidF, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_SR_AND_JR] = + { + .coordinates = {.size = 8, .y_offset = 2}, + .frontPic = TRAINER_SPRITE(SR_AND_JR, gTrainerFrontPic_SrAndJr, TRAINER_PIC_SIZE * 2), + }, + + [TRAINER_PIC_POKEFAN_M] = + { + .coordinates = {.size = 8, .y_offset = 2}, + .frontPic = TRAINER_SPRITE(POKEFAN_M, gTrainerFrontPic_PokefanM, TRAINER_PIC_SIZE * 2), + }, + + [TRAINER_PIC_POKEFAN_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(POKEFAN_F, gTrainerFrontPic_PokefanF, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_YOUNGSTER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(YOUNGSTER, gTrainerFrontPic_Youngster, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_CHAMPION_WALLACE] = + { + .coordinates = {.size = 8, .y_offset = 2}, + .frontPic = TRAINER_SPRITE(CHAMPION_WALLACE, gTrainerFrontPic_ChampionWallace, TRAINER_PIC_SIZE * 2), + }, + + [TRAINER_PIC_FISHERMAN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(FISHERMAN, gTrainerFrontPic_Fisherman, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_CYCLING_TRIATHLETE_M] = + { + .coordinates = {.size = 8, .y_offset = 2}, + .frontPic = TRAINER_SPRITE(CYCLING_TRIATHLETE_M, gTrainerFrontPic_CyclingTriathleteM, TRAINER_PIC_SIZE * 2), + }, + + [TRAINER_PIC_CYCLING_TRIATHLETE_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(CYCLING_TRIATHLETE_F, gTrainerFrontPic_CyclingTriathleteF, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_RUNNING_TRIATHLETE_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(RUNNING_TRIATHLETE_M, gTrainerFrontPic_RunningTriathleteM, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_RUNNING_TRIATHLETE_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(RUNNING_TRIATHLETE_F, gTrainerFrontPic_RunningTriathleteF, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(SWIMMING_TRIATHLETE_M, gTrainerFrontPic_SwimmingTriathleteM, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(SWIMMING_TRIATHLETE_F, gTrainerFrontPic_SwimmingTriathleteF, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_DRAGON_TAMER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(DRAGON_TAMER, gTrainerFrontPic_DragonTamer, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_NINJA_BOY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(NINJA_BOY, gTrainerFrontPic_NinjaBoy, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_BATTLE_GIRL] = + { + .coordinates = {.size = 8, .y_offset = 2}, + .frontPic = TRAINER_SPRITE(BATTLE_GIRL, gTrainerFrontPic_BattleGirl, TRAINER_PIC_SIZE * 2), + }, + + [TRAINER_PIC_PARASOL_LADY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(PARASOL_LADY, gTrainerFrontPic_ParasolLady, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_SWIMMER_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(SWIMMER_F, gTrainerFrontPic_SwimmerF, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_TWINS] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(TWINS, gTrainerFrontPic_Twins, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_SAILOR] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(SAILOR, gTrainerFrontPic_Sailor, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_MAGMA_ADMIN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(MAGMA_ADMIN, gTrainerFrontPic_MagmaAdmin, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_WALLY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(WALLY, gTrainerFrontPic_Wally, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_BRENDAN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(BRENDAN, gTrainerFrontPic_Brendan, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_MAY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(MAY, gTrainerFrontPic_May, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_BUG_CATCHER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(BUG_CATCHER, gTrainerFrontPic_BugCatcher, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_POKEMON_RANGER_M] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(POKEMON_RANGER_M, gTrainerFrontPic_PokemonRangerM, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_POKEMON_RANGER_F] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(POKEMON_RANGER_F, gTrainerFrontPic_PokemonRangerF, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_MAGMA_LEADER_MAXIE] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(MAGMA_LEADER_MAXIE, gTrainerFrontPic_MagmaLeaderMaxie, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_LASS] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(LASS, gTrainerFrontPic_Lass, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_YOUNG_COUPLE] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(YOUNG_COUPLE, gTrainerFrontPic_YoungCouple, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_OLD_COUPLE] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(OLD_COUPLE, gTrainerFrontPic_OldCouple, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_SIS_AND_BRO] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(SIS_AND_BRO, gTrainerFrontPic_SisAndBro, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_STEVEN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(STEVEN, gTrainerFrontPic_Steven, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_SALON_MAIDEN_ANABEL] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(SALON_MAIDEN_ANABEL, gTrainerFrontPic_SalonMaidenAnabel, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_DOME_ACE_TUCKER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(DOME_ACE_TUCKER, gTrainerFrontPic_DomeAceTucker, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_PALACE_MAVEN_SPENSER] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(PALACE_MAVEN_SPENSER, gTrainerFrontPic_PalaceMavenSpenser, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_ARENA_TYCOON_GRETA] = + { + .coordinates = {.size = 8, .y_offset = 2}, + .frontPic = TRAINER_SPRITE(ARENA_TYCOON_GRETA, gTrainerFrontPic_ArenaTycoonGreta, TRAINER_PIC_SIZE * 2), + }, + + [TRAINER_PIC_FACTORY_HEAD_NOLAND] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(FACTORY_HEAD_NOLAND, gTrainerFrontPic_FactoryHeadNoland, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_PIKE_QUEEN_LUCY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(PIKE_QUEEN_LUCY, gTrainerFrontPic_PikeQueenLucy, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_PYRAMID_KING_BRANDON] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(PYRAMID_KING_BRANDON, gTrainerFrontPic_PyramidKingBrandon, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_RED] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(RED, gTrainerFrontPic_Red, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_LEAF] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(LEAF, gTrainerFrontPic_Leaf, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_RS_BRENDAN] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(RS_BRENDAN, gTrainerFrontPic_RubySapphireBrendan, TRAINER_PIC_SIZE), + }, + + [TRAINER_PIC_RS_MAY] = + { + .coordinates = {.size = 8, .y_offset = 1}, + .frontPic = TRAINER_SPRITE(RS_MAY, gTrainerFrontPic_RubySapphireMay, TRAINER_PIC_SIZE), + }, +}; diff --git a/src/data/trainer_graphics/front_pic_tables.h b/src/data/trainer_graphics/front_pic_tables.h index d935123bd458..bd64c70f6217 100644 --- a/src/data/trainer_graphics/front_pic_tables.h +++ b/src/data/trainer_graphics/front_pic_tables.h @@ -1,102 +1,3 @@ -#define TRAINER_SPRITE(trainerPic, sprite, size) [TRAINER_PIC_##trainerPic] = {sprite, size, TRAINER_PIC_##trainerPic} - -const struct CompressedSpriteSheet gTrainerFrontPicTable[] = -{ - TRAINER_SPRITE(HIKER, gTrainerFrontPic_Hiker, TRAINER_PIC_SIZE), - TRAINER_SPRITE(AQUA_GRUNT_M, gTrainerFrontPic_AquaGruntM, TRAINER_PIC_SIZE), - TRAINER_SPRITE(POKEMON_BREEDER_F, gTrainerFrontPic_PokemonBreederF, TRAINER_PIC_SIZE), - TRAINER_SPRITE(COOLTRAINER_M, gTrainerFrontPic_CoolTrainerM, TRAINER_PIC_SIZE), - TRAINER_SPRITE(BIRD_KEEPER, gTrainerFrontPic_BirdKeeper, TRAINER_PIC_SIZE), - TRAINER_SPRITE(COLLECTOR, gTrainerFrontPic_Collector, TRAINER_PIC_SIZE), - TRAINER_SPRITE(AQUA_GRUNT_F, gTrainerFrontPic_AquaGruntF, TRAINER_PIC_SIZE), - TRAINER_SPRITE(SWIMMER_M, gTrainerFrontPic_SwimmerM, TRAINER_PIC_SIZE), - TRAINER_SPRITE(MAGMA_GRUNT_M, gTrainerFrontPic_MagmaGruntM, TRAINER_PIC_SIZE), - TRAINER_SPRITE(EXPERT_M, gTrainerFrontPic_ExpertM, TRAINER_PIC_SIZE), - TRAINER_SPRITE(AQUA_ADMIN_M, gTrainerFrontPic_AquaAdminM, TRAINER_PIC_SIZE), - TRAINER_SPRITE(BLACK_BELT, gTrainerFrontPic_BlackBelt, TRAINER_PIC_SIZE), - TRAINER_SPRITE(AQUA_ADMIN_F, gTrainerFrontPic_AquaAdminF, TRAINER_PIC_SIZE), - TRAINER_SPRITE(AQUA_LEADER_ARCHIE, gTrainerFrontPic_AquaLeaderArchie, TRAINER_PIC_SIZE), - TRAINER_SPRITE(HEX_MANIAC, gTrainerFrontPic_HexManiac, TRAINER_PIC_SIZE), - TRAINER_SPRITE(AROMA_LADY, gTrainerFrontPic_AromaLady, TRAINER_PIC_SIZE), - TRAINER_SPRITE(RUIN_MANIAC, gTrainerFrontPic_RuinManiac, TRAINER_PIC_SIZE), - TRAINER_SPRITE(INTERVIEWER, gTrainerFrontPic_Interviewer, TRAINER_PIC_SIZE), - TRAINER_SPRITE(TUBER_F, gTrainerFrontPic_TuberF, TRAINER_PIC_SIZE), - TRAINER_SPRITE(TUBER_M, gTrainerFrontPic_TuberM, TRAINER_PIC_SIZE), - TRAINER_SPRITE(COOLTRAINER_F, gTrainerFrontPic_CoolTrainerF, TRAINER_PIC_SIZE), - TRAINER_SPRITE(LADY, gTrainerFrontPic_Lady, TRAINER_PIC_SIZE), - TRAINER_SPRITE(BEAUTY, gTrainerFrontPic_Beauty, TRAINER_PIC_SIZE), - TRAINER_SPRITE(RICH_BOY, gTrainerFrontPic_RichBoy, TRAINER_PIC_SIZE), - TRAINER_SPRITE(EXPERT_F, gTrainerFrontPic_ExpertF, TRAINER_PIC_SIZE), - TRAINER_SPRITE(POKEMANIAC, gTrainerFrontPic_Pokemaniac, TRAINER_PIC_SIZE), - TRAINER_SPRITE(MAGMA_GRUNT_F, gTrainerFrontPic_MagmaGruntF, TRAINER_PIC_SIZE), - TRAINER_SPRITE(GUITARIST, gTrainerFrontPic_Guitarist, TRAINER_PIC_SIZE), - TRAINER_SPRITE(KINDLER, gTrainerFrontPic_Kindler, TRAINER_PIC_SIZE), - TRAINER_SPRITE(CAMPER, gTrainerFrontPic_Camper, TRAINER_PIC_SIZE), - TRAINER_SPRITE(PICNICKER, gTrainerFrontPic_Picnicker, TRAINER_PIC_SIZE), - TRAINER_SPRITE(BUG_MANIAC, gTrainerFrontPic_BugManiac, TRAINER_PIC_SIZE), - TRAINER_SPRITE(POKEMON_BREEDER_M, gTrainerFrontPic_PokemonBreederM, TRAINER_PIC_SIZE), - TRAINER_SPRITE(PSYCHIC_M, gTrainerFrontPic_PsychicM, TRAINER_PIC_SIZE), - TRAINER_SPRITE(PSYCHIC_F, gTrainerFrontPic_PsychicF, TRAINER_PIC_SIZE), - TRAINER_SPRITE(GENTLEMAN, gTrainerFrontPic_Gentleman, TRAINER_PIC_SIZE), - TRAINER_SPRITE(ELITE_FOUR_SIDNEY, gTrainerFrontPic_EliteFourSidney, TRAINER_PIC_SIZE), - TRAINER_SPRITE(ELITE_FOUR_PHOEBE, gTrainerFrontPic_EliteFourPhoebe, TRAINER_PIC_SIZE), - TRAINER_SPRITE(ELITE_FOUR_GLACIA, gTrainerFrontPic_EliteFourGlacia, TRAINER_PIC_SIZE), - TRAINER_SPRITE(ELITE_FOUR_DRAKE, gTrainerFrontPic_EliteFourDrake, TRAINER_PIC_SIZE), - TRAINER_SPRITE(LEADER_ROXANNE, gTrainerFrontPic_LeaderRoxanne, TRAINER_PIC_SIZE), - TRAINER_SPRITE(LEADER_BRAWLY, gTrainerFrontPic_LeaderBrawly, TRAINER_PIC_SIZE), - TRAINER_SPRITE(LEADER_WATTSON, gTrainerFrontPic_LeaderWattson, TRAINER_PIC_SIZE), - TRAINER_SPRITE(LEADER_FLANNERY, gTrainerFrontPic_LeaderFlannery, TRAINER_PIC_SIZE), - TRAINER_SPRITE(LEADER_NORMAN, gTrainerFrontPic_LeaderNorman, TRAINER_PIC_SIZE), - TRAINER_SPRITE(LEADER_WINONA, gTrainerFrontPic_LeaderWinona, TRAINER_PIC_SIZE), - TRAINER_SPRITE(LEADER_TATE_AND_LIZA, gTrainerFrontPic_LeaderTateAndLiza, TRAINER_PIC_SIZE), - TRAINER_SPRITE(LEADER_JUAN, gTrainerFrontPic_LeaderJuan, TRAINER_PIC_SIZE), - TRAINER_SPRITE(SCHOOL_KID_M, gTrainerFrontPic_SchoolKidM, TRAINER_PIC_SIZE), - TRAINER_SPRITE(SCHOOL_KID_F, gTrainerFrontPic_SchoolKidF, TRAINER_PIC_SIZE), - TRAINER_SPRITE(SR_AND_JR, gTrainerFrontPic_SrAndJr, TRAINER_PIC_SIZE * 2), - TRAINER_SPRITE(POKEFAN_M, gTrainerFrontPic_PokefanM, TRAINER_PIC_SIZE * 2), - TRAINER_SPRITE(POKEFAN_F, gTrainerFrontPic_PokefanF, TRAINER_PIC_SIZE), - TRAINER_SPRITE(YOUNGSTER, gTrainerFrontPic_Youngster, TRAINER_PIC_SIZE), - TRAINER_SPRITE(CHAMPION_WALLACE, gTrainerFrontPic_ChampionWallace, TRAINER_PIC_SIZE * 2), - TRAINER_SPRITE(FISHERMAN, gTrainerFrontPic_Fisherman, TRAINER_PIC_SIZE), - TRAINER_SPRITE(CYCLING_TRIATHLETE_M, gTrainerFrontPic_CyclingTriathleteM, TRAINER_PIC_SIZE * 2), - TRAINER_SPRITE(CYCLING_TRIATHLETE_F, gTrainerFrontPic_CyclingTriathleteF, TRAINER_PIC_SIZE), - TRAINER_SPRITE(RUNNING_TRIATHLETE_M, gTrainerFrontPic_RunningTriathleteM, TRAINER_PIC_SIZE), - TRAINER_SPRITE(RUNNING_TRIATHLETE_F, gTrainerFrontPic_RunningTriathleteF, TRAINER_PIC_SIZE), - TRAINER_SPRITE(SWIMMING_TRIATHLETE_M, gTrainerFrontPic_SwimmingTriathleteM, TRAINER_PIC_SIZE), - TRAINER_SPRITE(SWIMMING_TRIATHLETE_F, gTrainerFrontPic_SwimmingTriathleteF, TRAINER_PIC_SIZE), - TRAINER_SPRITE(DRAGON_TAMER, gTrainerFrontPic_DragonTamer, TRAINER_PIC_SIZE), - TRAINER_SPRITE(NINJA_BOY, gTrainerFrontPic_NinjaBoy, TRAINER_PIC_SIZE), - TRAINER_SPRITE(BATTLE_GIRL, gTrainerFrontPic_BattleGirl, TRAINER_PIC_SIZE * 2), - TRAINER_SPRITE(PARASOL_LADY, gTrainerFrontPic_ParasolLady, TRAINER_PIC_SIZE), - TRAINER_SPRITE(SWIMMER_F, gTrainerFrontPic_SwimmerF, TRAINER_PIC_SIZE), - TRAINER_SPRITE(TWINS, gTrainerFrontPic_Twins, TRAINER_PIC_SIZE), - TRAINER_SPRITE(SAILOR, gTrainerFrontPic_Sailor, TRAINER_PIC_SIZE), - TRAINER_SPRITE(MAGMA_ADMIN, gTrainerFrontPic_MagmaAdmin, TRAINER_PIC_SIZE), - TRAINER_SPRITE(WALLY, gTrainerFrontPic_Wally, TRAINER_PIC_SIZE), - TRAINER_SPRITE(BRENDAN, gTrainerFrontPic_Brendan, TRAINER_PIC_SIZE), - TRAINER_SPRITE(MAY, gTrainerFrontPic_May, TRAINER_PIC_SIZE), - TRAINER_SPRITE(BUG_CATCHER, gTrainerFrontPic_BugCatcher, TRAINER_PIC_SIZE), - TRAINER_SPRITE(POKEMON_RANGER_M, gTrainerFrontPic_PokemonRangerM, TRAINER_PIC_SIZE), - TRAINER_SPRITE(POKEMON_RANGER_F, gTrainerFrontPic_PokemonRangerF, TRAINER_PIC_SIZE), - TRAINER_SPRITE(MAGMA_LEADER_MAXIE, gTrainerFrontPic_MagmaLeaderMaxie, TRAINER_PIC_SIZE), - TRAINER_SPRITE(LASS, gTrainerFrontPic_Lass, TRAINER_PIC_SIZE), - TRAINER_SPRITE(YOUNG_COUPLE, gTrainerFrontPic_YoungCouple, TRAINER_PIC_SIZE), - TRAINER_SPRITE(OLD_COUPLE, gTrainerFrontPic_OldCouple, TRAINER_PIC_SIZE), - TRAINER_SPRITE(SIS_AND_BRO, gTrainerFrontPic_SisAndBro, TRAINER_PIC_SIZE), - TRAINER_SPRITE(STEVEN, gTrainerFrontPic_Steven, TRAINER_PIC_SIZE), - TRAINER_SPRITE(SALON_MAIDEN_ANABEL, gTrainerFrontPic_SalonMaidenAnabel, TRAINER_PIC_SIZE), - TRAINER_SPRITE(DOME_ACE_TUCKER, gTrainerFrontPic_DomeAceTucker, TRAINER_PIC_SIZE), - TRAINER_SPRITE(PALACE_MAVEN_SPENSER, gTrainerFrontPic_PalaceMavenSpenser, TRAINER_PIC_SIZE), - TRAINER_SPRITE(ARENA_TYCOON_GRETA, gTrainerFrontPic_ArenaTycoonGreta, TRAINER_PIC_SIZE * 2), - TRAINER_SPRITE(FACTORY_HEAD_NOLAND, gTrainerFrontPic_FactoryHeadNoland, TRAINER_PIC_SIZE), - TRAINER_SPRITE(PIKE_QUEEN_LUCY, gTrainerFrontPic_PikeQueenLucy, TRAINER_PIC_SIZE), - TRAINER_SPRITE(PYRAMID_KING_BRANDON, gTrainerFrontPic_PyramidKingBrandon, TRAINER_PIC_SIZE), - TRAINER_SPRITE(RED, gTrainerFrontPic_Red, TRAINER_PIC_SIZE), - TRAINER_SPRITE(LEAF, gTrainerFrontPic_Leaf, TRAINER_PIC_SIZE), - TRAINER_SPRITE(RS_BRENDAN, gTrainerFrontPic_RubySapphireBrendan, TRAINER_PIC_SIZE), - TRAINER_SPRITE(RS_MAY, gTrainerFrontPic_RubySapphireMay, TRAINER_PIC_SIZE), -}; - #define TRAINER_PAL(trainerPic, pal) [TRAINER_PIC_##trainerPic] = {pal, TRAINER_PIC_##trainerPic} const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] = diff --git a/src/field_effect.c b/src/field_effect.c index be5b2c8820b8..b9265a56513a 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1,4 +1,5 @@ #include "global.h" +#include "data.h" #include "decompress.h" #include "event_object_movement.h" #include "field_camera.h" @@ -244,7 +245,6 @@ static u8 sActiveList[32]; // External declarations extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; -extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; extern u8 *gFieldEffectScriptPointers[]; extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; @@ -895,8 +895,8 @@ u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buf { struct SpriteTemplate spriteTemplate; LoadCompressedSpritePaletteOverrideBuffer(&gTrainerFrontPicPaletteTable[trainerSpriteID], buffer); - LoadCompressedSpriteSheetOverrideBuffer(&gTrainerFrontPicTable[trainerSpriteID], buffer); - spriteTemplate.tileTag = gTrainerFrontPicTable[trainerSpriteID].tag; + LoadCompressedSpriteSheetOverrideBuffer(&gTrainerSprites[trainerSpriteID].frontPic, buffer); + spriteTemplate.tileTag = gTrainerSprites[trainerSpriteID].frontPic.tag; spriteTemplate.paletteTag = gTrainerFrontPicPaletteTable[trainerSpriteID].tag; spriteTemplate.oam = &sOam_64x64; spriteTemplate.anims = gDummySpriteAnimTable; @@ -908,7 +908,7 @@ u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buf static void UNUSED LoadTrainerGfx_TrainerCard(u8 gender, u16 palOffset, u8 *dest) { - LZDecompressVram(gTrainerFrontPicTable[gender].data, dest); + LZDecompressVram(gTrainerSprites[gender].frontPic.data, dest); LoadCompressedPalette(gTrainerFrontPicPaletteTable[gender].data, palOffset, PLTT_SIZE_4BPP); } diff --git a/src/pokenav_match_call_gfx.c b/src/pokenav_match_call_gfx.c index d28d4a276eba..f590d8f417c8 100755 --- a/src/pokenav_match_call_gfx.c +++ b/src/pokenav_match_call_gfx.c @@ -1247,7 +1247,7 @@ static void LoadCheckPageTrainerPic(struct Pokenav_MatchCallGfx *gfx) int trainerPic = GetMatchCallTrainerPic(PokenavList_GetSelectedIndex()); if (trainerPic >= 0) { - DecompressPicFromTable(&gTrainerFrontPicTable[trainerPic], gfx->trainerPicGfx); + DecompressPicFromTable(&gTrainerSprites[trainerPic].frontPic, gfx->trainerPicGfx); LZ77UnCompWram(gTrainerFrontPicPaletteTable[trainerPic].data, gfx->trainerPicPal); cursor = RequestDma3Copy(gfx->trainerPicGfx, gfx->trainerPicGfxPtr, sizeof(gfx->trainerPicGfx), 1); LoadPalette(gfx->trainerPicPal, gfx->trainerPicPalOffset, sizeof(gfx->trainerPicPal)); diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index 8b7d1bbdea37..34ff270721fa 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -66,7 +66,7 @@ static bool16 DecompressPic(u16 species, u32 personality, bool8 isFrontPic, u8 * else { if (isFrontPic) - DecompressPicFromTable(&gTrainerFrontPicTable[species], dest); + DecompressPicFromTable(&gTrainerSprites[species].frontPic, dest); else DecompressPicFromTable(&gTrainerBackPicTable[species], dest); } From c26e83cab6194b4d694c9d76324ac160c8ea95ec Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 23 Nov 2023 23:50:31 -0500 Subject: [PATCH 03/25] Added .palette to TrainerSprite struct --- include/data.h | 2 +- src/battle_controller_player_partner.c | 4 +- src/battle_controller_recorded_player.c | 2 +- src/battle_controllers.c | 6 +- src/battle_gfx_sfx_util.c | 4 +- src/data.c | 1 - src/data/graphics/trainers.h | 94 +++++++++++++++++++ src/data/trainer_graphics/front_pic_tables.h | 98 -------------------- src/field_effect.c | 7 +- src/pokenav_match_call_gfx.c | 2 +- src/trainer_pokemon_sprites.c | 6 +- 11 files changed, 110 insertions(+), 116 deletions(-) delete mode 100644 src/data/trainer_graphics/front_pic_tables.h diff --git a/include/data.h b/include/data.h index 3f638208b300..26fe91c3b762 100644 --- a/include/data.h +++ b/include/data.h @@ -34,6 +34,7 @@ struct TrainerSprite //If not, can remove MonCoords value (NOT THE STRUCT THOUGH) and just add size struct MonCoords coordinates; struct CompressedSpriteSheet frontPic; + struct CompressedSpritePalette palette; }; #define MON_COORDS_SIZE(width, height)(DIV_ROUND_UP(width, 8) << 4 | DIV_ROUND_UP(height, 8)) @@ -102,7 +103,6 @@ extern const union AnimCmd sAnim_GeneralFrame0[]; extern const union AnimCmd *const gAnims_MonPic[]; extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[]; extern const struct TrainerSprite gTrainerSprites[]; -extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[]; extern const struct MonCoords gTrainerBackPicCoords[]; extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; // functionally unused diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index df49023f6af3..9ca5f3765ab0 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -437,9 +437,9 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(u32 battler) if (gPartnerTrainerId > TRAINER_PARTNER(PARTNER_NONE)) trainerPal = gTrainerBackPicPaletteTable[gPartnerSpriteId].data; else if (IsAiVsAiBattle()) - trainerPal = gTrainerFrontPicPaletteTable[gTrainers[gPartnerTrainerId].trainerPic].data; + trainerPal = gTrainerSprites[gTrainers[gPartnerTrainerId].trainerPic].palette.data; else - trainerPal = gTrainerFrontPicPaletteTable[GetFrontierTrainerFrontSpriteId(gPartnerTrainerId)].data; // 2 vs 2 multi battle in Battle Frontier, load front sprite and pal. + trainerPal = gTrainerSprites[GetFrontierTrainerFrontSpriteId(gPartnerTrainerId)].palette.data; // 2 vs 2 multi battle in Battle Frontier, load front sprite and pal. BtlController_HandleIntroTrainerBallThrow(battler, 0xD6F9, trainerPal, 24, Controller_PlayerPartnerShowIntroHealthbox); } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 0f314829256f..eb082f0c73a3 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -517,7 +517,7 @@ static void RecordedPlayerHandleIntroTrainerBallThrow(u32 battler) else trainerPicId = gSaveBlock2Ptr->playerGender + TRAINER_BACK_PIC_BRENDAN; - trainerPal = gTrainerFrontPicPaletteTable[trainerPicId].data; + trainerPal = gTrainerSprites[trainerPicId].palette.data; BtlController_HandleIntroTrainerBallThrow(battler, 0xD6F9, trainerPal, 24, Intro_TryShinyAnimShowHealthbox); } diff --git a/src/battle_controllers.c b/src/battle_controllers.c index ca8e41ef4d88..930a2d8b14ea 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -2480,7 +2480,7 @@ void BtlController_HandleDrawTrainerPic(u32 battler, u32 trainerPicId, bool32 is yPos, subpriority); - gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag); + gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerSprites[trainerPicId].palette.tag); gSprites[gBattlerSpriteIds[battler]].x2 = -DISPLAY_WIDTH; gSprites[gBattlerSpriteIds[battler]].sSpeedX = 2; gSprites[gBattlerSpriteIds[battler]].oam.affineParam = trainerPicId; @@ -2498,7 +2498,7 @@ void BtlController_HandleDrawTrainerPic(u32 battler, u32 trainerPicId, bool32 is yPos, subpriority); - gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag); + gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerSprites[trainerPicId].palette.tag); gSprites[gBattlerSpriteIds[battler]].oam.affineMode = ST_OAM_AFFINE_OFF; gSprites[gBattlerSpriteIds[battler]].hFlip = 1; gSprites[gBattlerSpriteIds[battler]].y2 = 48; @@ -2547,7 +2547,7 @@ void BtlController_HandleTrainerSlide(u32 battler, u32 trainerPicId) (8 - gTrainerSprites[trainerPicId].coordinates.size) * 4 + 40, 30); gSprites[gBattlerSpriteIds[battler]].oam.affineParam = trainerPicId; - gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag); + gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerSprites[trainerPicId].palette.tag); gSprites[gBattlerSpriteIds[battler]].x2 = 96; gSprites[gBattlerSpriteIds[battler]].x += 32; gSprites[gBattlerSpriteIds[battler]].sSpeedX = -2; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index f18d7dea43c8..02a10543331e 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -652,7 +652,7 @@ void DecompressTrainerFrontPic(u16 frontPicId, u8 battler) u8 position = GetBattlerPosition(battler); DecompressPicFromTable(&gTrainerSprites[frontPicId].frontPic, gMonSpritesGfxPtr->sprites.ptr[position]); - LoadCompressedSpritePalette(&gTrainerFrontPicPaletteTable[frontPicId]); + LoadCompressedSpritePalette(&gTrainerSprites[frontPicId].palette); } void DecompressTrainerBackPic(u16 backPicId, u8 battler) @@ -666,7 +666,7 @@ void DecompressTrainerBackPic(u16 backPicId, u8 battler) void FreeTrainerFrontPicPalette(u16 frontPicId) { - FreeSpritePaletteByTag(gTrainerFrontPicPaletteTable[frontPicId].tag); + FreeSpritePaletteByTag(gTrainerSprites[frontPicId].palette.tag); } // Unused. diff --git a/src/data.c b/src/data.c index 1fda8b787641..afa0235f6838 100644 --- a/src/data.c +++ b/src/data.c @@ -286,7 +286,6 @@ const union AnimCmd *const gAnims_MonPic[MAX_MON_PIC_FRAMES] = }; #include "data/trainer_graphics/front_pic_anims.h" -#include "data/trainer_graphics/front_pic_tables.h" #include "data/trainer_graphics/back_pic_anims.h" #include "data/trainer_graphics/back_pic_tables.h" diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 9b456c05b72f..ab0c0f429004 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -293,6 +293,7 @@ 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(trainerPic, sprite, size) {sprite, size, TRAINER_PIC_##trainerPic} +#define TRAINER_PAL(trainerPic, pal) {pal, TRAINER_PIC_##trainerPic} const struct TrainerSprite gTrainerSprites[] = { @@ -300,557 +301,650 @@ const struct TrainerSprite gTrainerSprites[] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(HIKER, gTrainerFrontPic_Hiker, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(HIKER, gTrainerPalette_Hiker), }, [TRAINER_PIC_AQUA_GRUNT_M] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(AQUA_GRUNT_M, gTrainerFrontPic_AquaGruntM, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(AQUA_GRUNT_M, gTrainerPalette_AquaGruntM), }, [TRAINER_PIC_POKEMON_BREEDER_F] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(POKEMON_BREEDER_F, gTrainerFrontPic_PokemonBreederF, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(POKEMON_BREEDER_F, gTrainerPalette_PokemonBreederF), }, [TRAINER_PIC_COOLTRAINER_M] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(COOLTRAINER_M, gTrainerFrontPic_CoolTrainerM, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(COOLTRAINER_M, gTrainerPalette_CoolTrainerM), }, [TRAINER_PIC_BIRD_KEEPER] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BIRD_KEEPER, gTrainerFrontPic_BirdKeeper, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(BIRD_KEEPER, gTrainerPalette_BirdKeeper), }, [TRAINER_PIC_COLLECTOR] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(COLLECTOR, gTrainerFrontPic_Collector, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(COLLECTOR, gTrainerPalette_Collector), }, [TRAINER_PIC_AQUA_GRUNT_F] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(AQUA_GRUNT_F, gTrainerFrontPic_AquaGruntF, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(AQUA_GRUNT_F, gTrainerPalette_AquaGruntF), }, [TRAINER_PIC_SWIMMER_M] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SWIMMER_M, gTrainerFrontPic_SwimmerM, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(SWIMMER_M, gTrainerPalette_SwimmerM), }, [TRAINER_PIC_MAGMA_GRUNT_M] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(MAGMA_GRUNT_M, gTrainerFrontPic_MagmaGruntM, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(MAGMA_GRUNT_M, gTrainerPalette_MagmaGruntM), }, [TRAINER_PIC_EXPERT_M] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(EXPERT_M, gTrainerFrontPic_ExpertM, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(EXPERT_M, gTrainerPalette_ExpertM), }, [TRAINER_PIC_AQUA_ADMIN_M] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(AQUA_ADMIN_M, gTrainerFrontPic_AquaAdminM, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(AQUA_ADMIN_M, gTrainerPalette_AquaAdminM), }, [TRAINER_PIC_BLACK_BELT] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BLACK_BELT, gTrainerFrontPic_BlackBelt, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(BLACK_BELT, gTrainerPalette_BlackBelt), }, [TRAINER_PIC_AQUA_ADMIN_F] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(AQUA_ADMIN_F, gTrainerFrontPic_AquaAdminF, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(AQUA_ADMIN_F, gTrainerPalette_AquaAdminF), }, [TRAINER_PIC_AQUA_LEADER_ARCHIE] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(AQUA_LEADER_ARCHIE, gTrainerFrontPic_AquaLeaderArchie, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(AQUA_LEADER_ARCHIE, gTrainerPalette_AquaLeaderArchie), }, [TRAINER_PIC_HEX_MANIAC] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(HEX_MANIAC, gTrainerFrontPic_HexManiac, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(HEX_MANIAC, gTrainerPalette_HexManiac), }, [TRAINER_PIC_AROMA_LADY] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(AROMA_LADY, gTrainerFrontPic_AromaLady, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(AROMA_LADY, gTrainerPalette_AromaLady), }, [TRAINER_PIC_RUIN_MANIAC] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RUIN_MANIAC, gTrainerFrontPic_RuinManiac, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(RUIN_MANIAC, gTrainerPalette_RuinManiac), }, [TRAINER_PIC_INTERVIEWER] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(INTERVIEWER, gTrainerFrontPic_Interviewer, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(INTERVIEWER, gTrainerPalette_Interviewer), }, [TRAINER_PIC_TUBER_F] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(TUBER_F, gTrainerFrontPic_TuberF, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(TUBER_F, gTrainerPalette_TuberF), }, [TRAINER_PIC_TUBER_M] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(TUBER_M, gTrainerFrontPic_TuberM, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(TUBER_M, gTrainerPalette_TuberM), }, [TRAINER_PIC_COOLTRAINER_F] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(COOLTRAINER_F, gTrainerFrontPic_CoolTrainerF, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(COOLTRAINER_F, gTrainerPalette_CoolTrainerF), }, [TRAINER_PIC_LADY] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LADY, gTrainerFrontPic_Lady, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(LADY, gTrainerPalette_Lady), }, [TRAINER_PIC_BEAUTY] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BEAUTY, gTrainerFrontPic_Beauty, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(BEAUTY, gTrainerPalette_Beauty), }, [TRAINER_PIC_RICH_BOY] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RICH_BOY, gTrainerFrontPic_RichBoy, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(RICH_BOY, gTrainerPalette_RichBoy), }, [TRAINER_PIC_EXPERT_F] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(EXPERT_F, gTrainerFrontPic_ExpertF, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(EXPERT_F, gTrainerPalette_ExpertF), }, [TRAINER_PIC_POKEMANIAC] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(POKEMANIAC, gTrainerFrontPic_Pokemaniac, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(POKEMANIAC, gTrainerPalette_Pokemaniac), }, [TRAINER_PIC_MAGMA_GRUNT_F] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(MAGMA_GRUNT_F, gTrainerFrontPic_MagmaGruntF, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(MAGMA_GRUNT_F, gTrainerPalette_MagmaGruntF), }, [TRAINER_PIC_GUITARIST] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(GUITARIST, gTrainerFrontPic_Guitarist, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(GUITARIST, gTrainerPalette_Guitarist), }, [TRAINER_PIC_KINDLER] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(KINDLER, gTrainerFrontPic_Kindler, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(KINDLER, gTrainerPalette_Kindler), }, [TRAINER_PIC_CAMPER] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(CAMPER, gTrainerFrontPic_Camper, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(CAMPER, gTrainerPalette_Camper), }, [TRAINER_PIC_PICNICKER] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PICNICKER, gTrainerFrontPic_Picnicker, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(PICNICKER, gTrainerPalette_Picnicker), }, [TRAINER_PIC_BUG_MANIAC] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BUG_MANIAC, gTrainerFrontPic_BugManiac, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(BUG_MANIAC, gTrainerPalette_BugManiac), }, [TRAINER_PIC_POKEMON_BREEDER_M] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(POKEMON_BREEDER_M, gTrainerFrontPic_PokemonBreederM, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(POKEMON_BREEDER_M, gTrainerPalette_PokemonBreederM), }, [TRAINER_PIC_PSYCHIC_M] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PSYCHIC_M, gTrainerFrontPic_PsychicM, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(PSYCHIC_M, gTrainerPalette_PsychicM), }, [TRAINER_PIC_PSYCHIC_F] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PSYCHIC_F, gTrainerFrontPic_PsychicF, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(PSYCHIC_F, gTrainerPalette_PsychicF), }, [TRAINER_PIC_GENTLEMAN] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(GENTLEMAN, gTrainerFrontPic_Gentleman, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(GENTLEMAN, gTrainerPalette_Gentleman), }, [TRAINER_PIC_ELITE_FOUR_SIDNEY] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(ELITE_FOUR_SIDNEY, gTrainerFrontPic_EliteFourSidney, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(ELITE_FOUR_SIDNEY, gTrainerPalette_EliteFourSidney), }, [TRAINER_PIC_ELITE_FOUR_PHOEBE] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(ELITE_FOUR_PHOEBE, gTrainerFrontPic_EliteFourPhoebe, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(ELITE_FOUR_PHOEBE, gTrainerPalette_EliteFourPhoebe), }, [TRAINER_PIC_ELITE_FOUR_GLACIA] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(ELITE_FOUR_GLACIA, gTrainerFrontPic_EliteFourGlacia, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(ELITE_FOUR_GLACIA, gTrainerPalette_EliteFourGlacia), }, [TRAINER_PIC_ELITE_FOUR_DRAKE] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(ELITE_FOUR_DRAKE, gTrainerFrontPic_EliteFourDrake, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(ELITE_FOUR_DRAKE, gTrainerPalette_EliteFourDrake), }, [TRAINER_PIC_LEADER_ROXANNE] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_ROXANNE, gTrainerFrontPic_LeaderRoxanne, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(LEADER_ROXANNE, gTrainerPalette_LeaderRoxanne), }, [TRAINER_PIC_LEADER_BRAWLY] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_BRAWLY, gTrainerFrontPic_LeaderBrawly, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(LEADER_BRAWLY, gTrainerPalette_LeaderBrawly), }, [TRAINER_PIC_LEADER_WATTSON] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_WATTSON, gTrainerFrontPic_LeaderWattson, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(LEADER_WATTSON, gTrainerPalette_LeaderWattson), }, [TRAINER_PIC_LEADER_FLANNERY] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_FLANNERY, gTrainerFrontPic_LeaderFlannery, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(LEADER_FLANNERY, gTrainerPalette_LeaderFlannery), }, [TRAINER_PIC_LEADER_NORMAN] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_NORMAN, gTrainerFrontPic_LeaderNorman, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(LEADER_NORMAN, gTrainerPalette_LeaderNorman), }, [TRAINER_PIC_LEADER_WINONA] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_WINONA, gTrainerFrontPic_LeaderWinona, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(LEADER_WINONA, gTrainerPalette_LeaderWinona), }, [TRAINER_PIC_LEADER_TATE_AND_LIZA] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_TATE_AND_LIZA, gTrainerFrontPic_LeaderTateAndLiza, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(LEADER_TATE_AND_LIZA, gTrainerPalette_LeaderTateAndLiza), }, [TRAINER_PIC_LEADER_JUAN] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_JUAN, gTrainerFrontPic_LeaderJuan, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(LEADER_JUAN, gTrainerPalette_LeaderJuan), }, [TRAINER_PIC_SCHOOL_KID_M] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SCHOOL_KID_M, gTrainerFrontPic_SchoolKidM, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(SCHOOL_KID_M, gTrainerPalette_SchoolKidM), }, [TRAINER_PIC_SCHOOL_KID_F] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SCHOOL_KID_F, gTrainerFrontPic_SchoolKidF, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(SCHOOL_KID_F, gTrainerPalette_SchoolKidF), }, [TRAINER_PIC_SR_AND_JR] = { .coordinates = {.size = 8, .y_offset = 2}, .frontPic = TRAINER_SPRITE(SR_AND_JR, gTrainerFrontPic_SrAndJr, TRAINER_PIC_SIZE * 2), + .palette = TRAINER_PAL(SR_AND_JR, gTrainerPalette_SrAndJr), }, [TRAINER_PIC_POKEFAN_M] = { .coordinates = {.size = 8, .y_offset = 2}, .frontPic = TRAINER_SPRITE(POKEFAN_M, gTrainerFrontPic_PokefanM, TRAINER_PIC_SIZE * 2), + .palette = TRAINER_PAL(POKEFAN_M, gTrainerPalette_PokefanM), }, [TRAINER_PIC_POKEFAN_F] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(POKEFAN_F, gTrainerFrontPic_PokefanF, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(POKEFAN_F, gTrainerPalette_PokefanF), }, [TRAINER_PIC_YOUNGSTER] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(YOUNGSTER, gTrainerFrontPic_Youngster, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(YOUNGSTER, gTrainerPalette_Youngster), }, [TRAINER_PIC_CHAMPION_WALLACE] = { .coordinates = {.size = 8, .y_offset = 2}, .frontPic = TRAINER_SPRITE(CHAMPION_WALLACE, gTrainerFrontPic_ChampionWallace, TRAINER_PIC_SIZE * 2), + .palette = TRAINER_PAL(CHAMPION_WALLACE, gTrainerPalette_ChampionWallace), }, [TRAINER_PIC_FISHERMAN] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(FISHERMAN, gTrainerFrontPic_Fisherman, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(FISHERMAN, gTrainerPalette_Fisherman), }, [TRAINER_PIC_CYCLING_TRIATHLETE_M] = { .coordinates = {.size = 8, .y_offset = 2}, .frontPic = TRAINER_SPRITE(CYCLING_TRIATHLETE_M, gTrainerFrontPic_CyclingTriathleteM, TRAINER_PIC_SIZE * 2), + .palette = TRAINER_PAL(CYCLING_TRIATHLETE_M, gTrainerPalette_CyclingTriathleteM), }, [TRAINER_PIC_CYCLING_TRIATHLETE_F] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(CYCLING_TRIATHLETE_F, gTrainerFrontPic_CyclingTriathleteF, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(CYCLING_TRIATHLETE_F, gTrainerPalette_CyclingTriathleteF), }, [TRAINER_PIC_RUNNING_TRIATHLETE_M] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RUNNING_TRIATHLETE_M, gTrainerFrontPic_RunningTriathleteM, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(RUNNING_TRIATHLETE_M, gTrainerPalette_RunningTriathleteM), }, [TRAINER_PIC_RUNNING_TRIATHLETE_F] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RUNNING_TRIATHLETE_F, gTrainerFrontPic_RunningTriathleteF, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(RUNNING_TRIATHLETE_F, gTrainerPalette_RunningTriathleteF), }, [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SWIMMING_TRIATHLETE_M, gTrainerFrontPic_SwimmingTriathleteM, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(SWIMMING_TRIATHLETE_M, gTrainerPalette_SwimmingTriathleteM), }, [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SWIMMING_TRIATHLETE_F, gTrainerFrontPic_SwimmingTriathleteF, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(SWIMMING_TRIATHLETE_F, gTrainerPalette_SwimmingTriathleteF), }, [TRAINER_PIC_DRAGON_TAMER] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(DRAGON_TAMER, gTrainerFrontPic_DragonTamer, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(DRAGON_TAMER, gTrainerPalette_DragonTamer), }, [TRAINER_PIC_NINJA_BOY] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(NINJA_BOY, gTrainerFrontPic_NinjaBoy, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(NINJA_BOY, gTrainerPalette_NinjaBoy), }, [TRAINER_PIC_BATTLE_GIRL] = { .coordinates = {.size = 8, .y_offset = 2}, .frontPic = TRAINER_SPRITE(BATTLE_GIRL, gTrainerFrontPic_BattleGirl, TRAINER_PIC_SIZE * 2), + .palette = TRAINER_PAL(BATTLE_GIRL, gTrainerPalette_BattleGirl), }, [TRAINER_PIC_PARASOL_LADY] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PARASOL_LADY, gTrainerFrontPic_ParasolLady, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(PARASOL_LADY, gTrainerPalette_ParasolLady), }, [TRAINER_PIC_SWIMMER_F] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SWIMMER_F, gTrainerFrontPic_SwimmerF, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(SWIMMER_F, gTrainerPalette_SwimmerF), }, [TRAINER_PIC_TWINS] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(TWINS, gTrainerFrontPic_Twins, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(TWINS, gTrainerPalette_Twins), }, [TRAINER_PIC_SAILOR] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SAILOR, gTrainerFrontPic_Sailor, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(SAILOR, gTrainerPalette_Sailor), }, [TRAINER_PIC_MAGMA_ADMIN] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(MAGMA_ADMIN, gTrainerFrontPic_MagmaAdmin, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(MAGMA_ADMIN, gTrainerPalette_MagmaAdmin), }, [TRAINER_PIC_WALLY] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(WALLY, gTrainerFrontPic_Wally, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(WALLY, gTrainerPalette_Wally), }, [TRAINER_PIC_BRENDAN] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BRENDAN, gTrainerFrontPic_Brendan, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(BRENDAN, gTrainerPalette_Brendan), }, [TRAINER_PIC_MAY] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(MAY, gTrainerFrontPic_May, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(MAY, gTrainerPalette_May), }, [TRAINER_PIC_BUG_CATCHER] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BUG_CATCHER, gTrainerFrontPic_BugCatcher, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(BUG_CATCHER, gTrainerPalette_BugCatcher), }, [TRAINER_PIC_POKEMON_RANGER_M] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(POKEMON_RANGER_M, gTrainerFrontPic_PokemonRangerM, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(POKEMON_RANGER_M, gTrainerPalette_PokemonRangerM), }, [TRAINER_PIC_POKEMON_RANGER_F] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(POKEMON_RANGER_F, gTrainerFrontPic_PokemonRangerF, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(POKEMON_RANGER_F, gTrainerPalette_PokemonRangerF), }, [TRAINER_PIC_MAGMA_LEADER_MAXIE] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(MAGMA_LEADER_MAXIE, gTrainerFrontPic_MagmaLeaderMaxie, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(MAGMA_LEADER_MAXIE, gTrainerPalette_MagmaLeaderMaxie), }, [TRAINER_PIC_LASS] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LASS, gTrainerFrontPic_Lass, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(LASS, gTrainerPalette_Lass), }, [TRAINER_PIC_YOUNG_COUPLE] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(YOUNG_COUPLE, gTrainerFrontPic_YoungCouple, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(YOUNG_COUPLE, gTrainerPalette_YoungCouple), }, [TRAINER_PIC_OLD_COUPLE] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(OLD_COUPLE, gTrainerFrontPic_OldCouple, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(OLD_COUPLE, gTrainerPalette_OldCouple), }, [TRAINER_PIC_SIS_AND_BRO] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SIS_AND_BRO, gTrainerFrontPic_SisAndBro, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(SIS_AND_BRO, gTrainerPalette_SisAndBro), }, [TRAINER_PIC_STEVEN] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(STEVEN, gTrainerFrontPic_Steven, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(STEVEN, gTrainerPalette_Steven), }, [TRAINER_PIC_SALON_MAIDEN_ANABEL] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SALON_MAIDEN_ANABEL, gTrainerFrontPic_SalonMaidenAnabel, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(SALON_MAIDEN_ANABEL, gTrainerPalette_SalonMaidenAnabel), }, [TRAINER_PIC_DOME_ACE_TUCKER] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(DOME_ACE_TUCKER, gTrainerFrontPic_DomeAceTucker, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(DOME_ACE_TUCKER, gTrainerPalette_DomeAceTucker), }, [TRAINER_PIC_PALACE_MAVEN_SPENSER] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PALACE_MAVEN_SPENSER, gTrainerFrontPic_PalaceMavenSpenser, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(PALACE_MAVEN_SPENSER, gTrainerPalette_PalaceMavenSpenser), }, [TRAINER_PIC_ARENA_TYCOON_GRETA] = { .coordinates = {.size = 8, .y_offset = 2}, .frontPic = TRAINER_SPRITE(ARENA_TYCOON_GRETA, gTrainerFrontPic_ArenaTycoonGreta, TRAINER_PIC_SIZE * 2), + .palette = TRAINER_PAL(ARENA_TYCOON_GRETA, gTrainerPalette_ArenaTycoonGreta), }, [TRAINER_PIC_FACTORY_HEAD_NOLAND] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(FACTORY_HEAD_NOLAND, gTrainerFrontPic_FactoryHeadNoland, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(FACTORY_HEAD_NOLAND, gTrainerPalette_FactoryHeadNoland), }, [TRAINER_PIC_PIKE_QUEEN_LUCY] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PIKE_QUEEN_LUCY, gTrainerFrontPic_PikeQueenLucy, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(PIKE_QUEEN_LUCY, gTrainerPalette_PikeQueenLucy), }, [TRAINER_PIC_PYRAMID_KING_BRANDON] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PYRAMID_KING_BRANDON, gTrainerFrontPic_PyramidKingBrandon, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(PYRAMID_KING_BRANDON, gTrainerPalette_PyramidKingBrandon), }, [TRAINER_PIC_RED] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RED, gTrainerFrontPic_Red, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(RED, gTrainerPalette_Red), }, [TRAINER_PIC_LEAF] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEAF, gTrainerFrontPic_Leaf, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(LEAF, gTrainerPalette_Leaf), }, [TRAINER_PIC_RS_BRENDAN] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RS_BRENDAN, gTrainerFrontPic_RubySapphireBrendan, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(RS_BRENDAN, gTrainerPalette_RubySapphireBrendan), }, [TRAINER_PIC_RS_MAY] = { .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RS_MAY, gTrainerFrontPic_RubySapphireMay, TRAINER_PIC_SIZE), + .palette = TRAINER_PAL(RS_MAY, gTrainerPalette_RubySapphireMay), }, }; diff --git a/src/data/trainer_graphics/front_pic_tables.h b/src/data/trainer_graphics/front_pic_tables.h deleted file mode 100644 index bd64c70f6217..000000000000 --- a/src/data/trainer_graphics/front_pic_tables.h +++ /dev/null @@ -1,98 +0,0 @@ -#define TRAINER_PAL(trainerPic, pal) [TRAINER_PIC_##trainerPic] = {pal, TRAINER_PIC_##trainerPic} - -const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] = -{ - TRAINER_PAL(HIKER, gTrainerPalette_Hiker), - TRAINER_PAL(AQUA_GRUNT_M, gTrainerPalette_AquaGruntM), - TRAINER_PAL(POKEMON_BREEDER_F, gTrainerPalette_PokemonBreederF), - TRAINER_PAL(COOLTRAINER_M, gTrainerPalette_CoolTrainerM), - TRAINER_PAL(BIRD_KEEPER, gTrainerPalette_BirdKeeper), - TRAINER_PAL(COLLECTOR, gTrainerPalette_Collector), - TRAINER_PAL(AQUA_GRUNT_F, gTrainerPalette_AquaGruntF), - TRAINER_PAL(SWIMMER_M, gTrainerPalette_SwimmerM), - TRAINER_PAL(MAGMA_GRUNT_M, gTrainerPalette_MagmaGruntM), - TRAINER_PAL(EXPERT_M, gTrainerPalette_ExpertM), - TRAINER_PAL(AQUA_ADMIN_M, gTrainerPalette_AquaAdminM), - TRAINER_PAL(BLACK_BELT, gTrainerPalette_BlackBelt), - TRAINER_PAL(AQUA_ADMIN_F, gTrainerPalette_AquaAdminF), - TRAINER_PAL(AQUA_LEADER_ARCHIE, gTrainerPalette_AquaLeaderArchie), - TRAINER_PAL(HEX_MANIAC, gTrainerPalette_HexManiac), - TRAINER_PAL(AROMA_LADY, gTrainerPalette_AromaLady), - TRAINER_PAL(RUIN_MANIAC, gTrainerPalette_RuinManiac), - TRAINER_PAL(INTERVIEWER, gTrainerPalette_Interviewer), - TRAINER_PAL(TUBER_F, gTrainerPalette_TuberF), - TRAINER_PAL(TUBER_M, gTrainerPalette_TuberM), - TRAINER_PAL(COOLTRAINER_F, gTrainerPalette_CoolTrainerF), - TRAINER_PAL(LADY, gTrainerPalette_Lady), - TRAINER_PAL(BEAUTY, gTrainerPalette_Beauty), - TRAINER_PAL(RICH_BOY, gTrainerPalette_RichBoy), - TRAINER_PAL(EXPERT_F, gTrainerPalette_ExpertF), - TRAINER_PAL(POKEMANIAC, gTrainerPalette_Pokemaniac), - TRAINER_PAL(MAGMA_GRUNT_F, gTrainerPalette_MagmaGruntF), - TRAINER_PAL(GUITARIST, gTrainerPalette_Guitarist), - TRAINER_PAL(KINDLER, gTrainerPalette_Kindler), - TRAINER_PAL(CAMPER, gTrainerPalette_Camper), - TRAINER_PAL(PICNICKER, gTrainerPalette_Picnicker), - TRAINER_PAL(BUG_MANIAC, gTrainerPalette_BugManiac), - TRAINER_PAL(POKEMON_BREEDER_M, gTrainerPalette_PokemonBreederM), - TRAINER_PAL(PSYCHIC_M, gTrainerPalette_PsychicM), - TRAINER_PAL(PSYCHIC_F, gTrainerPalette_PsychicF), - TRAINER_PAL(GENTLEMAN, gTrainerPalette_Gentleman), - TRAINER_PAL(ELITE_FOUR_SIDNEY, gTrainerPalette_EliteFourSidney), - TRAINER_PAL(ELITE_FOUR_PHOEBE, gTrainerPalette_EliteFourPhoebe), - TRAINER_PAL(ELITE_FOUR_GLACIA, gTrainerPalette_EliteFourGlacia), - TRAINER_PAL(ELITE_FOUR_DRAKE, gTrainerPalette_EliteFourDrake), - TRAINER_PAL(LEADER_ROXANNE, gTrainerPalette_LeaderRoxanne), - TRAINER_PAL(LEADER_BRAWLY, gTrainerPalette_LeaderBrawly), - TRAINER_PAL(LEADER_WATTSON, gTrainerPalette_LeaderWattson), - TRAINER_PAL(LEADER_FLANNERY, gTrainerPalette_LeaderFlannery), - TRAINER_PAL(LEADER_NORMAN, gTrainerPalette_LeaderNorman), - TRAINER_PAL(LEADER_WINONA, gTrainerPalette_LeaderWinona), - TRAINER_PAL(LEADER_TATE_AND_LIZA, gTrainerPalette_LeaderTateAndLiza), - TRAINER_PAL(LEADER_JUAN, gTrainerPalette_LeaderJuan), - TRAINER_PAL(SCHOOL_KID_M, gTrainerPalette_SchoolKidM), - TRAINER_PAL(SCHOOL_KID_F, gTrainerPalette_SchoolKidF), - TRAINER_PAL(SR_AND_JR, gTrainerPalette_SrAndJr), - TRAINER_PAL(POKEFAN_M, gTrainerPalette_PokefanM), - TRAINER_PAL(POKEFAN_F, gTrainerPalette_PokefanF), - TRAINER_PAL(YOUNGSTER, gTrainerPalette_Youngster), - TRAINER_PAL(CHAMPION_WALLACE, gTrainerPalette_ChampionWallace), - TRAINER_PAL(FISHERMAN, gTrainerPalette_Fisherman), - TRAINER_PAL(CYCLING_TRIATHLETE_M, gTrainerPalette_CyclingTriathleteM), - TRAINER_PAL(CYCLING_TRIATHLETE_F, gTrainerPalette_CyclingTriathleteF), - TRAINER_PAL(RUNNING_TRIATHLETE_M, gTrainerPalette_RunningTriathleteM), - TRAINER_PAL(RUNNING_TRIATHLETE_F, gTrainerPalette_RunningTriathleteF), - TRAINER_PAL(SWIMMING_TRIATHLETE_M, gTrainerPalette_SwimmingTriathleteM), - TRAINER_PAL(SWIMMING_TRIATHLETE_F, gTrainerPalette_SwimmingTriathleteF), - TRAINER_PAL(DRAGON_TAMER, gTrainerPalette_DragonTamer), - TRAINER_PAL(NINJA_BOY, gTrainerPalette_NinjaBoy), - TRAINER_PAL(BATTLE_GIRL, gTrainerPalette_BattleGirl), - TRAINER_PAL(PARASOL_LADY, gTrainerPalette_ParasolLady), - TRAINER_PAL(SWIMMER_F, gTrainerPalette_SwimmerF), - TRAINER_PAL(TWINS, gTrainerPalette_Twins), - TRAINER_PAL(SAILOR, gTrainerPalette_Sailor), - TRAINER_PAL(MAGMA_ADMIN, gTrainerPalette_MagmaAdmin), - TRAINER_PAL(WALLY, gTrainerPalette_Wally), - TRAINER_PAL(BRENDAN, gTrainerPalette_Brendan), - TRAINER_PAL(MAY, gTrainerPalette_May), - TRAINER_PAL(BUG_CATCHER, gTrainerPalette_BugCatcher), - TRAINER_PAL(POKEMON_RANGER_M, gTrainerPalette_PokemonRangerM), - TRAINER_PAL(POKEMON_RANGER_F, gTrainerPalette_PokemonRangerF), - TRAINER_PAL(MAGMA_LEADER_MAXIE, gTrainerPalette_MagmaLeaderMaxie), - TRAINER_PAL(LASS, gTrainerPalette_Lass), - TRAINER_PAL(YOUNG_COUPLE, gTrainerPalette_YoungCouple), - TRAINER_PAL(OLD_COUPLE, gTrainerPalette_OldCouple), - TRAINER_PAL(SIS_AND_BRO, gTrainerPalette_SisAndBro), - TRAINER_PAL(STEVEN, gTrainerPalette_Steven), - TRAINER_PAL(SALON_MAIDEN_ANABEL, gTrainerPalette_SalonMaidenAnabel), - TRAINER_PAL(DOME_ACE_TUCKER, gTrainerPalette_DomeAceTucker), - TRAINER_PAL(PALACE_MAVEN_SPENSER, gTrainerPalette_PalaceMavenSpenser), - TRAINER_PAL(ARENA_TYCOON_GRETA, gTrainerPalette_ArenaTycoonGreta), - TRAINER_PAL(FACTORY_HEAD_NOLAND, gTrainerPalette_FactoryHeadNoland), - TRAINER_PAL(PIKE_QUEEN_LUCY, gTrainerPalette_PikeQueenLucy), - TRAINER_PAL(PYRAMID_KING_BRANDON, gTrainerPalette_PyramidKingBrandon), - TRAINER_PAL(RED, gTrainerPalette_Red), - TRAINER_PAL(LEAF, gTrainerPalette_Leaf), - TRAINER_PAL(RS_BRENDAN, gTrainerPalette_RubySapphireBrendan), - TRAINER_PAL(RS_MAY, gTrainerPalette_RubySapphireMay), -}; diff --git a/src/field_effect.c b/src/field_effect.c index b9265a56513a..5d0ba3a50d6e 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -244,7 +244,6 @@ static void UseVsSeeker_CleanUpFieldEffect(struct Task *task); static u8 sActiveList[32]; // External declarations -extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern u8 *gFieldEffectScriptPointers[]; extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; @@ -894,10 +893,10 @@ bool8 FieldEffectActiveListContains(u8 id) u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer) { struct SpriteTemplate spriteTemplate; - LoadCompressedSpritePaletteOverrideBuffer(&gTrainerFrontPicPaletteTable[trainerSpriteID], buffer); + LoadCompressedSpritePaletteOverrideBuffer(&gTrainerSprites[trainerSpriteID].palette, buffer); LoadCompressedSpriteSheetOverrideBuffer(&gTrainerSprites[trainerSpriteID].frontPic, buffer); spriteTemplate.tileTag = gTrainerSprites[trainerSpriteID].frontPic.tag; - spriteTemplate.paletteTag = gTrainerFrontPicPaletteTable[trainerSpriteID].tag; + spriteTemplate.paletteTag = gTrainerSprites[trainerSpriteID].palette.tag; spriteTemplate.oam = &sOam_64x64; spriteTemplate.anims = gDummySpriteAnimTable; spriteTemplate.images = NULL; @@ -909,7 +908,7 @@ u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buf static void UNUSED LoadTrainerGfx_TrainerCard(u8 gender, u16 palOffset, u8 *dest) { LZDecompressVram(gTrainerSprites[gender].frontPic.data, dest); - LoadCompressedPalette(gTrainerFrontPicPaletteTable[gender].data, palOffset, PLTT_SIZE_4BPP); + LoadCompressedPalette(gTrainerSprites[gender].palette.data, palOffset, PLTT_SIZE_4BPP); } u8 AddNewGameBirchObject(s16 x, s16 y, u8 subpriority) diff --git a/src/pokenav_match_call_gfx.c b/src/pokenav_match_call_gfx.c index f590d8f417c8..594b4d83d41c 100755 --- a/src/pokenav_match_call_gfx.c +++ b/src/pokenav_match_call_gfx.c @@ -1248,7 +1248,7 @@ static void LoadCheckPageTrainerPic(struct Pokenav_MatchCallGfx *gfx) if (trainerPic >= 0) { DecompressPicFromTable(&gTrainerSprites[trainerPic].frontPic, gfx->trainerPicGfx); - LZ77UnCompWram(gTrainerFrontPicPaletteTable[trainerPic].data, gfx->trainerPicPal); + LZ77UnCompWram(gTrainerSprites[trainerPic].palette.data, gfx->trainerPicPal); cursor = RequestDma3Copy(gfx->trainerPicGfx, gfx->trainerPicGfxPtr, sizeof(gfx->trainerPicGfx), 1); LoadPalette(gfx->trainerPicPal, gfx->trainerPicPalOffset, sizeof(gfx->trainerPicPal)); gfx->trainerPicSprite->data[0] = 0; diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index 34ff270721fa..d535eb8ee9f6 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -93,12 +93,12 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 if (paletteTag == TAG_NONE) { sCreatingSpriteTemplate.paletteTag = TAG_NONE; - LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, OBJ_PLTT_ID(paletteSlot), PLTT_SIZE_4BPP); + LoadCompressedPalette(gTrainerSprites[species].palette.data, OBJ_PLTT_ID(paletteSlot), PLTT_SIZE_4BPP); } else { sCreatingSpriteTemplate.paletteTag = paletteTag; - LoadCompressedSpritePalette(&gTrainerFrontPicPaletteTable[species]); + LoadCompressedSpritePalette(&gTrainerSprites[species].palette); } } } @@ -108,7 +108,7 @@ static void LoadPicPaletteBySlot(u16 species, u32 otId, u32 personality, u8 pale if (!isTrainer) LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), PLTT_ID(paletteSlot), PLTT_SIZE_4BPP); else - LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, PLTT_ID(paletteSlot), PLTT_SIZE_4BPP); + LoadCompressedPalette(gTrainerSprites[species].palette.data, PLTT_ID(paletteSlot), PLTT_SIZE_4BPP); } static void AssignSpriteAnimsTable(bool8 isTrainer) From 0e5eb532035e5f948ebee323ba90dcb291b3f917 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 24 Nov 2023 00:46:55 -0500 Subject: [PATCH 04/25] Added .animation to the struct --- include/data.h | 2 +- src/data.c | 1 - src/data/graphics/trainers.h | 372 ++++++++++++++++ src/data/trainer_graphics/front_pic_anims.h | 468 -------------------- src/pokemon.c | 4 +- src/trainer_pokemon_sprites.c | 2 +- 6 files changed, 376 insertions(+), 473 deletions(-) delete mode 100644 src/data/trainer_graphics/front_pic_anims.h diff --git a/include/data.h b/include/data.h index 26fe91c3b762..3ba9a11c0e1c 100644 --- a/include/data.h +++ b/include/data.h @@ -35,6 +35,7 @@ struct TrainerSprite struct MonCoords coordinates; struct CompressedSpriteSheet frontPic; struct CompressedSpritePalette palette; + const union AnimCmd *const *const animation; }; #define MON_COORDS_SIZE(width, height)(DIV_ROUND_UP(width, 8) << 4 | DIV_ROUND_UP(height, 8)) @@ -101,7 +102,6 @@ extern const union AffineAnimCmd *const gAffineAnims_BattleSpriteContest[]; extern const union AnimCmd sAnim_GeneralFrame0[]; extern const union AnimCmd *const gAnims_MonPic[]; -extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[]; extern const struct TrainerSprite gTrainerSprites[]; extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[]; extern const struct MonCoords gTrainerBackPicCoords[]; diff --git a/src/data.c b/src/data.c index afa0235f6838..02f973a804d0 100644 --- a/src/data.c +++ b/src/data.c @@ -285,7 +285,6 @@ const union AnimCmd *const gAnims_MonPic[MAX_MON_PIC_FRAMES] = sAnim_MonPic_1, }; -#include "data/trainer_graphics/front_pic_anims.h" #include "data/trainer_graphics/back_pic_anims.h" #include "data/trainer_graphics/back_pic_tables.h" diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index ab0c0f429004..e4c99e3bd862 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -3,282 +3,561 @@ const u32 gTrainerFrontPic_Hiker[] = INCBIN_U32("graphics/trainers/front_pics/hiker.4bpp.lz"); const u32 gTrainerPalette_Hiker[] = INCBIN_U32("graphics/trainers/front_pics/hiker.gbapal.lz"); +static const union AnimCmd *const sAnims_Hiker[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_AquaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_m.4bpp.lz"); const u32 gTrainerPalette_AquaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_m.gbapal.lz"); +static const union AnimCmd *const sAnims_AquaGruntM[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_PokemonBreederF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_f.4bpp.lz"); const u32 gTrainerPalette_PokemonBreederF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_f.gbapal.lz"); +static const union AnimCmd *const sAnims_PokemonBreederF[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_CoolTrainerM[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_m.4bpp.lz"); const u32 gTrainerPalette_CoolTrainerM[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_m.gbapal.lz"); +static const union AnimCmd *const sAnims_CoolTrainerM[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_BirdKeeper[] = INCBIN_U32("graphics/trainers/front_pics/bird_keeper.4bpp.lz"); const u32 gTrainerPalette_BirdKeeper[] = INCBIN_U32("graphics/trainers/front_pics/bird_keeper.gbapal.lz"); +static const union AnimCmd *const sAnims_BirdKeeper[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Collector[] = INCBIN_U32("graphics/trainers/front_pics/collector.4bpp.lz"); const u32 gTrainerPalette_Collector[] = INCBIN_U32("graphics/trainers/front_pics/collector.gbapal.lz"); +static const union AnimCmd *const sAnims_Collector[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_AquaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_f.4bpp.lz"); const u32 gTrainerPalette_AquaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_f.gbapal.lz"); +static const union AnimCmd *const sAnims_AquaGruntF[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_SwimmerM[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_m.4bpp.lz"); const u32 gTrainerPalette_SwimmerM[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_m.gbapal.lz"); +static const union AnimCmd *const sAnims_SwimmerM[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_MagmaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_m.4bpp.lz"); const u32 gTrainerPalette_MagmaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_m.gbapal.lz"); +static const union AnimCmd *const sAnims_MagmaGruntM[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_ExpertM[] = INCBIN_U32("graphics/trainers/front_pics/expert_m.4bpp.lz"); const u32 gTrainerPalette_ExpertM[] = INCBIN_U32("graphics/trainers/front_pics/expert_m.gbapal.lz"); +static const union AnimCmd *const sAnims_ExpertM[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_AquaAdminM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_m.4bpp.lz"); const u32 gTrainerPalette_AquaAdminM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_m.gbapal.lz"); +static const union AnimCmd *const sAnims_AquaAdminM[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_BlackBelt[] = INCBIN_U32("graphics/trainers/front_pics/black_belt.4bpp.lz"); const u32 gTrainerPalette_BlackBelt[] = INCBIN_U32("graphics/trainers/front_pics/black_belt.gbapal.lz"); +static const union AnimCmd *const sAnims_BlackBelt[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_AquaAdminF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_f.4bpp.lz"); const u32 gTrainerPalette_AquaAdminF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_f.gbapal.lz"); +static const union AnimCmd *const sAnims_AquaAdminF[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_AquaLeaderArchie[] = INCBIN_U32("graphics/trainers/front_pics/aqua_leader_archie.4bpp.lz"); const u32 gTrainerPalette_AquaLeaderArchie[] = INCBIN_U32("graphics/trainers/front_pics/aqua_leader_archie.gbapal.lz"); +static const union AnimCmd *const sAnims_AquaLeaderArchie[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_HexManiac[] = INCBIN_U32("graphics/trainers/front_pics/hex_maniac.4bpp.lz"); const u32 gTrainerPalette_HexManiac[] = INCBIN_U32("graphics/trainers/front_pics/hex_maniac.gbapal.lz"); +static const union AnimCmd *const sAnims_HexManiac[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_AromaLady[] = INCBIN_U32("graphics/trainers/front_pics/aroma_lady.4bpp.lz"); const u32 gTrainerPalette_AromaLady[] = INCBIN_U32("graphics/trainers/front_pics/aroma_lady.gbapal.lz"); +static const union AnimCmd *const sAnims_AromaLady[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_RuinManiac[] = INCBIN_U32("graphics/trainers/front_pics/ruin_maniac.4bpp.lz"); const u32 gTrainerPalette_RuinManiac[] = INCBIN_U32("graphics/trainers/front_pics/ruin_maniac.gbapal.lz"); +static const union AnimCmd *const sAnims_RuinManiac[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Interviewer[] = INCBIN_U32("graphics/trainers/front_pics/interviewer.4bpp.lz"); const u32 gTrainerPalette_Interviewer[] = INCBIN_U32("graphics/trainers/front_pics/interviewer.gbapal.lz"); +static const union AnimCmd *const sAnims_Interviewer[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_TuberF[] = INCBIN_U32("graphics/trainers/front_pics/tuber_f.4bpp.lz"); const u32 gTrainerPalette_TuberF[] = INCBIN_U32("graphics/trainers/front_pics/tuber_f.gbapal.lz"); +static const union AnimCmd *const sAnims_TuberF[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_TuberM[] = INCBIN_U32("graphics/trainers/front_pics/tuber_m.4bpp.lz"); const u32 gTrainerPalette_TuberM[] = INCBIN_U32("graphics/trainers/front_pics/tuber_m.gbapal.lz"); +static const union AnimCmd *const sAnims_TuberM[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_CoolTrainerF[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_f.4bpp.lz"); const u32 gTrainerPalette_CoolTrainerF[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_f.gbapal.lz"); +static const union AnimCmd *const sAnims_CoolTrainerF[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Lady[] = INCBIN_U32("graphics/trainers/front_pics/lady.4bpp.lz"); const u32 gTrainerPalette_Lady[] = INCBIN_U32("graphics/trainers/front_pics/lady.gbapal.lz"); +static const union AnimCmd *const sAnims_Lady[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Beauty[] = INCBIN_U32("graphics/trainers/front_pics/beauty.4bpp.lz"); const u32 gTrainerPalette_Beauty[] = INCBIN_U32("graphics/trainers/front_pics/beauty.gbapal.lz"); +static const union AnimCmd *const sAnims_Beauty[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_RichBoy[] = INCBIN_U32("graphics/trainers/front_pics/rich_boy.4bpp.lz"); const u32 gTrainerPalette_RichBoy[] = INCBIN_U32("graphics/trainers/front_pics/rich_boy.gbapal.lz"); +static const union AnimCmd *const sAnims_RichBoy[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_ExpertF[] = INCBIN_U32("graphics/trainers/front_pics/expert_f.4bpp.lz"); const u32 gTrainerPalette_ExpertF[] = INCBIN_U32("graphics/trainers/front_pics/expert_f.gbapal.lz"); +static const union AnimCmd *const sAnims_ExpertF[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Pokemaniac[] = INCBIN_U32("graphics/trainers/front_pics/pokemaniac.4bpp.lz"); const u32 gTrainerPalette_Pokemaniac[] = INCBIN_U32("graphics/trainers/front_pics/pokemaniac.gbapal.lz"); +static const union AnimCmd *const sAnims_Pokemaniac[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_MagmaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_f.4bpp.lz"); const u32 gTrainerPalette_MagmaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_f.gbapal.lz"); +static const union AnimCmd *const sAnims_MagmaGruntF[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Guitarist[] = INCBIN_U32("graphics/trainers/front_pics/guitarist.4bpp.lz"); const u32 gTrainerPalette_Guitarist[] = INCBIN_U32("graphics/trainers/front_pics/guitarist.gbapal.lz"); +static const union AnimCmd *const sAnims_Guitarist[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Kindler[] = INCBIN_U32("graphics/trainers/front_pics/kindler.4bpp.lz"); const u32 gTrainerPalette_Kindler[] = INCBIN_U32("graphics/trainers/front_pics/kindler.gbapal.lz"); +static const union AnimCmd *const sAnims_Kindler[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Camper[] = INCBIN_U32("graphics/trainers/front_pics/camper.4bpp.lz"); const u32 gTrainerPalette_Camper[] = INCBIN_U32("graphics/trainers/front_pics/camper.gbapal.lz"); +static const union AnimCmd *const sAnims_Camper[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Picnicker[] = INCBIN_U32("graphics/trainers/front_pics/picnicker.4bpp.lz"); const u32 gTrainerPalette_Picnicker[] = INCBIN_U32("graphics/trainers/front_pics/picnicker.gbapal.lz"); +static const union AnimCmd *const sAnims_Picnicker[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_BugManiac[] = INCBIN_U32("graphics/trainers/front_pics/bug_maniac.4bpp.lz"); const u32 gTrainerPalette_BugManiac[] = INCBIN_U32("graphics/trainers/front_pics/bug_maniac.gbapal.lz"); +static const union AnimCmd *const sAnims_BugManiac[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_PokemonBreederM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_m.4bpp.lz"); const u32 gTrainerPalette_PokemonBreederM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_m.gbapal.lz"); +static const union AnimCmd *const sAnims_PokemonBreederM[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_PsychicM[] = INCBIN_U32("graphics/trainers/front_pics/psychic_m.4bpp.lz"); const u32 gTrainerPalette_PsychicM[] = INCBIN_U32("graphics/trainers/front_pics/psychic_m.gbapal.lz"); +static const union AnimCmd *const sAnims_PsychicM[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_PsychicF[] = INCBIN_U32("graphics/trainers/front_pics/psychic_f.4bpp.lz"); const u32 gTrainerPalette_PsychicF[] = INCBIN_U32("graphics/trainers/front_pics/psychic_f.gbapal.lz"); +static const union AnimCmd *const sAnims_PsychicF[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Gentleman[] = INCBIN_U32("graphics/trainers/front_pics/gentleman.4bpp.lz"); const u32 gTrainerPalette_Gentleman[] = INCBIN_U32("graphics/trainers/front_pics/gentleman.gbapal.lz"); +static const union AnimCmd *const sAnims_Gentleman[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_EliteFourSidney[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_sidney.4bpp.lz"); const u32 gTrainerPalette_EliteFourSidney[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_sidney.gbapal.lz"); +static const union AnimCmd *const sAnims_EliteFourSidney[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_EliteFourPhoebe[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_phoebe.4bpp.lz"); const u32 gTrainerPalette_EliteFourPhoebe[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_phoebe.gbapal.lz"); +static const union AnimCmd *const sAnims_EliteFourPhoebe[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_EliteFourGlacia[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_glacia.4bpp.lz"); const u32 gTrainerPalette_EliteFourGlacia[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_glacia.gbapal.lz"); +static const union AnimCmd *const sAnims_EliteFourGlacia[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_EliteFourDrake[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_drake.4bpp.lz"); const u32 gTrainerPalette_EliteFourDrake[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_drake.gbapal.lz"); +static const union AnimCmd *const sAnims_EliteFourDrake[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_LeaderRoxanne[] = INCBIN_U32("graphics/trainers/front_pics/leader_roxanne.4bpp.lz"); const u32 gTrainerPalette_LeaderRoxanne[] = INCBIN_U32("graphics/trainers/front_pics/leader_roxanne.gbapal.lz"); +static const union AnimCmd *const sAnims_LeaderRoxanne[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_LeaderBrawly[] = INCBIN_U32("graphics/trainers/front_pics/leader_brawly.4bpp.lz"); const u32 gTrainerPalette_LeaderBrawly[] = INCBIN_U32("graphics/trainers/front_pics/leader_brawly.gbapal.lz"); +static const union AnimCmd *const sAnims_LeaderBrawly[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_LeaderWattson[] = INCBIN_U32("graphics/trainers/front_pics/leader_wattson.4bpp.lz"); const u32 gTrainerPalette_LeaderWattson[] = INCBIN_U32("graphics/trainers/front_pics/leader_wattson.gbapal.lz"); +static const union AnimCmd *const sAnims_LeaderWattson[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_LeaderFlannery[] = INCBIN_U32("graphics/trainers/front_pics/leader_flannery.4bpp.lz"); const u32 gTrainerPalette_LeaderFlannery[] = INCBIN_U32("graphics/trainers/front_pics/leader_flannery.gbapal.lz"); +static const union AnimCmd *const sAnims_LeaderFlannery[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_LeaderNorman[] = INCBIN_U32("graphics/trainers/front_pics/leader_norman.4bpp.lz"); const u32 gTrainerPalette_LeaderNorman[] = INCBIN_U32("graphics/trainers/front_pics/leader_norman.gbapal.lz"); +static const union AnimCmd *const sAnims_LeaderNorman[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_LeaderWinona[] = INCBIN_U32("graphics/trainers/front_pics/leader_winona.4bpp.lz"); const u32 gTrainerPalette_LeaderWinona[] = INCBIN_U32("graphics/trainers/front_pics/leader_winona.gbapal.lz"); +static const union AnimCmd *const sAnims_LeaderWinona[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_LeaderTateAndLiza[] = INCBIN_U32("graphics/trainers/front_pics/leader_tate_and_liza.4bpp.lz"); const u32 gTrainerPalette_LeaderTateAndLiza[] = INCBIN_U32("graphics/trainers/front_pics/leader_tate_and_liza.gbapal.lz"); +static const union AnimCmd *const sAnims_LeaderTateAndLiza[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_LeaderJuan[] = INCBIN_U32("graphics/trainers/front_pics/leader_juan.4bpp.lz"); const u32 gTrainerPalette_LeaderJuan[] = INCBIN_U32("graphics/trainers/front_pics/leader_juan.gbapal.lz"); +static const union AnimCmd *const sAnims_LeaderJuan[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_SchoolKidM[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_m.4bpp.lz"); const u32 gTrainerPalette_SchoolKidM[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_m.gbapal.lz"); +static const union AnimCmd *const sAnims_SchoolKidM[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_SchoolKidF[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_f.4bpp.lz"); const u32 gTrainerPalette_SchoolKidF[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_f.gbapal.lz"); +static const union AnimCmd *const sAnims_SchoolKidF[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_SrAndJr[] = INCBIN_U32("graphics/trainers/front_pics/sr_and_jr.4bpp.lz"); const u32 gTrainerPalette_SrAndJr[] = INCBIN_U32("graphics/trainers/front_pics/sr_and_jr.gbapal.lz"); +static const union AnimCmd *const sAnims_SrAndJr[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_PokefanM[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_m.4bpp.lz"); const u32 gTrainerPalette_PokefanM[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_m.gbapal.lz"); +static const union AnimCmd *const sAnims_PokefanM[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_PokefanF[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_f.4bpp.lz"); const u32 gTrainerPalette_PokefanF[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_f.gbapal.lz"); +static const union AnimCmd *const sAnims_PokefanF[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Youngster[] = INCBIN_U32("graphics/trainers/front_pics/youngster.4bpp.lz"); const u32 gTrainerPalette_Youngster[] = INCBIN_U32("graphics/trainers/front_pics/youngster.gbapal.lz"); +static const union AnimCmd *const sAnims_Youngster[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_ChampionWallace[] = INCBIN_U32("graphics/trainers/front_pics/champion_wallace.4bpp.lz"); const u32 gTrainerPalette_ChampionWallace[] = INCBIN_U32("graphics/trainers/front_pics/champion_wallace.gbapal.lz"); +static const union AnimCmd *const sAnims_ChampionWallace[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Fisherman[] = INCBIN_U32("graphics/trainers/front_pics/fisherman.4bpp.lz"); const u32 gTrainerPalette_Fisherman[] = INCBIN_U32("graphics/trainers/front_pics/fisherman.gbapal.lz"); +static const union AnimCmd *const sAnims_Fisherman[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_CyclingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_m.4bpp.lz"); const u32 gTrainerPalette_CyclingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_m.gbapal.lz"); +static const union AnimCmd *const sAnims_CyclingTriathleteM[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_CyclingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_f.4bpp.lz"); const u32 gTrainerPalette_CyclingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_f.gbapal.lz"); +static const union AnimCmd *const sAnims_CyclingTriathleteF[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_RunningTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_m.4bpp.lz"); const u32 gTrainerPalette_RunningTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_m.gbapal.lz"); +static const union AnimCmd *const sAnims_RunningTriathleteM[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_RunningTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_f.4bpp.lz"); const u32 gTrainerPalette_RunningTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_f.gbapal.lz"); +static const union AnimCmd *const sAnims_RunningTriathleteF[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_SwimmingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_m.4bpp.lz"); const u32 gTrainerPalette_SwimmingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_m.gbapal.lz"); +static const union AnimCmd *const sAnims_SwimmingTriathleteM[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_SwimmingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_f.4bpp.lz"); const u32 gTrainerPalette_SwimmingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_f.gbapal.lz"); +static const union AnimCmd *const sAnims_SwimmingTriathleteF[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_DragonTamer[] = INCBIN_U32("graphics/trainers/front_pics/dragon_tamer.4bpp.lz"); const u32 gTrainerPalette_DragonTamer[] = INCBIN_U32("graphics/trainers/front_pics/dragon_tamer.gbapal.lz"); +static const union AnimCmd *const sAnims_DragonTamer[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_NinjaBoy[] = INCBIN_U32("graphics/trainers/front_pics/ninja_boy.4bpp.lz"); const u32 gTrainerPalette_NinjaBoy[] = INCBIN_U32("graphics/trainers/front_pics/ninja_boy.gbapal.lz"); +static const union AnimCmd *const sAnims_NinjaBoy[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_BattleGirl[] = INCBIN_U32("graphics/trainers/front_pics/battle_girl.4bpp.lz"); const u32 gTrainerPalette_BattleGirl[] = INCBIN_U32("graphics/trainers/front_pics/battle_girl.gbapal.lz"); +static const union AnimCmd *const sAnims_BattleGirl[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_ParasolLady[] = INCBIN_U32("graphics/trainers/front_pics/parasol_lady.4bpp.lz"); const u32 gTrainerPalette_ParasolLady[] = INCBIN_U32("graphics/trainers/front_pics/parasol_lady.gbapal.lz"); +static const union AnimCmd *const sAnims_ParasolLady[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_SwimmerF[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_f.4bpp.lz"); const u32 gTrainerPalette_SwimmerF[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_f.gbapal.lz"); +static const union AnimCmd *const sAnims_SwimmerF[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Twins[] = INCBIN_U32("graphics/trainers/front_pics/twins.4bpp.lz"); const u32 gTrainerPalette_Twins[] = INCBIN_U32("graphics/trainers/front_pics/twins.gbapal.lz"); +static const union AnimCmd *const sAnims_Twins[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Sailor[] = INCBIN_U32("graphics/trainers/front_pics/sailor.4bpp.lz"); const u32 gTrainerPalette_Sailor[] = INCBIN_U32("graphics/trainers/front_pics/sailor.gbapal.lz"); +static const union AnimCmd *const sAnims_Sailor[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_MagmaAdmin[] = INCBIN_U32("graphics/trainers/front_pics/magma_admin.4bpp.lz"); const u32 gTrainerPalette_MagmaAdmin[] = INCBIN_U32("graphics/trainers/front_pics/magma_admin.gbapal.lz"); +static const union AnimCmd *const sAnims_MagmaAdmin[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Wally[] = INCBIN_U32("graphics/trainers/front_pics/wally.4bpp.lz"); const u32 gTrainerPalette_Wally[] = INCBIN_U32("graphics/trainers/palettes/wally.gbapal.lz"); +static const union AnimCmd *const sAnims_Wally[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Brendan[] = INCBIN_U32("graphics/trainers/front_pics/brendan.4bpp.lz"); const u32 gTrainerPalette_Brendan[] = INCBIN_U32("graphics/trainers/palettes/brendan.gbapal.lz"); +static const union AnimCmd *const sAnims_Brendan[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_May[] = INCBIN_U32("graphics/trainers/front_pics/may.4bpp.lz"); const u32 gTrainerPalette_May[] = INCBIN_U32("graphics/trainers/palettes/may.gbapal.lz"); +static const union AnimCmd *const sAnims_May[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_BugCatcher[] = INCBIN_U32("graphics/trainers/front_pics/bug_catcher.4bpp.lz"); const u32 gTrainerPalette_BugCatcher[] = INCBIN_U32("graphics/trainers/front_pics/bug_catcher.gbapal.lz"); +static const union AnimCmd *const sAnims_BugCatcher[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_PokemonRangerM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_m.4bpp.lz"); const u32 gTrainerPalette_PokemonRangerM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_m.gbapal.lz"); +static const union AnimCmd *const sAnims_PokemonRangerM[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_PokemonRangerF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_f.4bpp.lz"); const u32 gTrainerPalette_PokemonRangerF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_f.gbapal.lz"); +static const union AnimCmd *const sAnims_PokemonRangerF[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_MagmaLeaderMaxie[] = INCBIN_U32("graphics/trainers/front_pics/magma_leader_maxie.4bpp.lz"); const u32 gTrainerPalette_MagmaLeaderMaxie[] = INCBIN_U32("graphics/trainers/front_pics/magma_leader_maxie.gbapal.lz"); +static const union AnimCmd *const sAnims_MagmaLeaderMaxie[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Lass[] = INCBIN_U32("graphics/trainers/front_pics/lass.4bpp.lz"); const u32 gTrainerPalette_Lass[] = INCBIN_U32("graphics/trainers/front_pics/lass.gbapal.lz"); +static const union AnimCmd *const sAnims_Lass[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_YoungCouple[] = INCBIN_U32("graphics/trainers/front_pics/young_couple.4bpp.lz"); const u32 gTrainerPalette_YoungCouple[] = INCBIN_U32("graphics/trainers/front_pics/young_couple.gbapal.lz"); +static const union AnimCmd *const sAnims_YoungCouple[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_OldCouple[] = INCBIN_U32("graphics/trainers/front_pics/old_couple.4bpp.lz"); const u32 gTrainerPalette_OldCouple[] = INCBIN_U32("graphics/trainers/front_pics/old_couple.gbapal.lz"); +static const union AnimCmd *const sAnims_OldCouple[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_SisAndBro[] = INCBIN_U32("graphics/trainers/front_pics/sis_and_bro.4bpp.lz"); const u32 gTrainerPalette_SisAndBro[] = INCBIN_U32("graphics/trainers/front_pics/sis_and_bro.gbapal.lz"); +static const union AnimCmd *const sAnims_SisAndBro[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Steven[] = INCBIN_U32("graphics/trainers/front_pics/steven.4bpp.lz"); const u32 gTrainerPalette_Steven[] = INCBIN_U32("graphics/trainers/front_pics/steven.gbapal.lz"); +static const union AnimCmd *const sAnims_Steven[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_SalonMaidenAnabel[] = INCBIN_U32("graphics/trainers/front_pics/salon_maiden_anabel.4bpp.lz"); const u32 gTrainerPalette_SalonMaidenAnabel[] = INCBIN_U32("graphics/trainers/front_pics/salon_maiden_anabel.gbapal.lz"); +static const union AnimCmd *const sAnims_SalonMaidenAnabel[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_DomeAceTucker[] = INCBIN_U32("graphics/trainers/front_pics/dome_ace_tucker.4bpp.lz"); const u32 gTrainerPalette_DomeAceTucker[] = INCBIN_U32("graphics/trainers/front_pics/dome_ace_tucker.gbapal.lz"); +static const union AnimCmd *const sAnims_DomeAceTucker[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_PalaceMavenSpenser[] = INCBIN_U32("graphics/trainers/front_pics/palace_maven_spenser.4bpp.lz"); const u32 gTrainerPalette_PalaceMavenSpenser[] = INCBIN_U32("graphics/trainers/front_pics/palace_maven_spenser.gbapal.lz"); +static const union AnimCmd *const sAnims_PalaceMavenSpenser[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_ArenaTycoonGreta[] = INCBIN_U32("graphics/trainers/front_pics/arena_tycoon_greta.4bpp.lz"); const u32 gTrainerPalette_ArenaTycoonGreta[] = INCBIN_U32("graphics/trainers/front_pics/arena_tycoon_greta.gbapal.lz"); +static const union AnimCmd *const sAnims_ArenaTycoonGreta[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_FactoryHeadNoland[] = INCBIN_U32("graphics/trainers/front_pics/factory_head_noland.4bpp.lz"); const u32 gTrainerPalette_FactoryHeadNoland[] = INCBIN_U32("graphics/trainers/front_pics/factory_head_noland.gbapal.lz"); +static const union AnimCmd *const sAnims_FactoryHeadNoland[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_PikeQueenLucy[] = INCBIN_U32("graphics/trainers/front_pics/pike_queen_lucy.4bpp.lz"); const u32 gTrainerPalette_PikeQueenLucy[] = INCBIN_U32("graphics/trainers/front_pics/pike_queen_lucy.gbapal.lz"); +static const union AnimCmd *const sAnims_PikeQueenLucy[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_PyramidKingBrandon[] = INCBIN_U32("graphics/trainers/front_pics/pyramid_king_brandon.4bpp.lz"); const u32 gTrainerPalette_PyramidKingBrandon[] = INCBIN_U32("graphics/trainers/front_pics/pyramid_king_brandon.gbapal.lz"); +static const union AnimCmd *const sAnims_PyramidKingBrandon[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Red[] = INCBIN_U32("graphics/trainers/front_pics/red.4bpp.lz"); const u32 gTrainerPalette_Red[] = INCBIN_U32("graphics/trainers/front_pics/red.gbapal.lz"); +static const union AnimCmd *const sAnims_Red[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_Leaf[] = INCBIN_U32("graphics/trainers/front_pics/leaf.4bpp.lz"); const u32 gTrainerPalette_Leaf[] = INCBIN_U32("graphics/trainers/front_pics/leaf.gbapal.lz"); +static const union AnimCmd *const sAnims_Leaf[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_RubySapphireBrendan[] = INCBIN_U32("graphics/trainers/front_pics/brendan_rs.4bpp.lz"); const u32 gTrainerPalette_RubySapphireBrendan[] = INCBIN_U32("graphics/trainers/palettes/brendan_rs.gbapal.lz"); +static const union AnimCmd *const sAnims_RubySapphireBrendan[] ={ + sAnim_GeneralFrame0, +}; const u32 gTrainerFrontPic_RubySapphireMay[] = INCBIN_U32("graphics/trainers/front_pics/may_rs.4bpp.lz"); const u32 gTrainerPalette_RubySapphireMay[] = INCBIN_U32("graphics/trainers/palettes/may_rs.gbapal.lz"); +static const union AnimCmd *const sAnims_RubySapphireMay[] ={ + sAnim_GeneralFrame0, +}; const u8 gTrainerBackPic_Brendan[] = INCBIN_U8("graphics/trainers/back_pics/brendan.4bpp"); const u8 gTrainerBackPic_May[] = INCBIN_U8("graphics/trainers/back_pics/may.4bpp"); @@ -302,6 +581,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(HIKER, gTrainerFrontPic_Hiker, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(HIKER, gTrainerPalette_Hiker), + .animation = sAnims_Hiker, }, [TRAINER_PIC_AQUA_GRUNT_M] = @@ -309,6 +589,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(AQUA_GRUNT_M, gTrainerFrontPic_AquaGruntM, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(AQUA_GRUNT_M, gTrainerPalette_AquaGruntM), + .animation = sAnims_AquaGruntM, }, [TRAINER_PIC_POKEMON_BREEDER_F] = @@ -316,6 +597,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(POKEMON_BREEDER_F, gTrainerFrontPic_PokemonBreederF, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(POKEMON_BREEDER_F, gTrainerPalette_PokemonBreederF), + .animation = sAnims_PokemonBreederF, }, [TRAINER_PIC_COOLTRAINER_M] = @@ -323,6 +605,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(COOLTRAINER_M, gTrainerFrontPic_CoolTrainerM, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(COOLTRAINER_M, gTrainerPalette_CoolTrainerM), + .animation = sAnims_CoolTrainerM, }, [TRAINER_PIC_BIRD_KEEPER] = @@ -330,6 +613,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BIRD_KEEPER, gTrainerFrontPic_BirdKeeper, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(BIRD_KEEPER, gTrainerPalette_BirdKeeper), + .animation = sAnims_BirdKeeper, }, [TRAINER_PIC_COLLECTOR] = @@ -337,6 +621,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(COLLECTOR, gTrainerFrontPic_Collector, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(COLLECTOR, gTrainerPalette_Collector), + .animation = sAnims_Collector, }, [TRAINER_PIC_AQUA_GRUNT_F] = @@ -344,6 +629,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(AQUA_GRUNT_F, gTrainerFrontPic_AquaGruntF, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(AQUA_GRUNT_F, gTrainerPalette_AquaGruntF), + .animation = sAnims_AquaGruntF, }, [TRAINER_PIC_SWIMMER_M] = @@ -351,6 +637,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SWIMMER_M, gTrainerFrontPic_SwimmerM, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(SWIMMER_M, gTrainerPalette_SwimmerM), + .animation = sAnims_SwimmerM, }, [TRAINER_PIC_MAGMA_GRUNT_M] = @@ -358,6 +645,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(MAGMA_GRUNT_M, gTrainerFrontPic_MagmaGruntM, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(MAGMA_GRUNT_M, gTrainerPalette_MagmaGruntM), + .animation = sAnims_MagmaGruntM, }, [TRAINER_PIC_EXPERT_M] = @@ -365,6 +653,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(EXPERT_M, gTrainerFrontPic_ExpertM, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(EXPERT_M, gTrainerPalette_ExpertM), + .animation = sAnims_ExpertM, }, [TRAINER_PIC_AQUA_ADMIN_M] = @@ -372,6 +661,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(AQUA_ADMIN_M, gTrainerFrontPic_AquaAdminM, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(AQUA_ADMIN_M, gTrainerPalette_AquaAdminM), + .animation = sAnims_AquaAdminM, }, [TRAINER_PIC_BLACK_BELT] = @@ -379,6 +669,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BLACK_BELT, gTrainerFrontPic_BlackBelt, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(BLACK_BELT, gTrainerPalette_BlackBelt), + .animation = sAnims_BlackBelt, }, [TRAINER_PIC_AQUA_ADMIN_F] = @@ -386,6 +677,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(AQUA_ADMIN_F, gTrainerFrontPic_AquaAdminF, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(AQUA_ADMIN_F, gTrainerPalette_AquaAdminF), + .animation = sAnims_AquaAdminF, }, [TRAINER_PIC_AQUA_LEADER_ARCHIE] = @@ -393,6 +685,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(AQUA_LEADER_ARCHIE, gTrainerFrontPic_AquaLeaderArchie, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(AQUA_LEADER_ARCHIE, gTrainerPalette_AquaLeaderArchie), + .animation = sAnims_AquaLeaderArchie, }, [TRAINER_PIC_HEX_MANIAC] = @@ -400,6 +693,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(HEX_MANIAC, gTrainerFrontPic_HexManiac, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(HEX_MANIAC, gTrainerPalette_HexManiac), + .animation = sAnims_HexManiac, }, [TRAINER_PIC_AROMA_LADY] = @@ -407,6 +701,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(AROMA_LADY, gTrainerFrontPic_AromaLady, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(AROMA_LADY, gTrainerPalette_AromaLady), + .animation = sAnims_AromaLady, }, [TRAINER_PIC_RUIN_MANIAC] = @@ -414,6 +709,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RUIN_MANIAC, gTrainerFrontPic_RuinManiac, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(RUIN_MANIAC, gTrainerPalette_RuinManiac), + .animation = sAnims_RuinManiac, }, [TRAINER_PIC_INTERVIEWER] = @@ -421,6 +717,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(INTERVIEWER, gTrainerFrontPic_Interviewer, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(INTERVIEWER, gTrainerPalette_Interviewer), + .animation = sAnims_Interviewer, }, [TRAINER_PIC_TUBER_F] = @@ -428,6 +725,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(TUBER_F, gTrainerFrontPic_TuberF, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(TUBER_F, gTrainerPalette_TuberF), + .animation = sAnims_TuberF, }, [TRAINER_PIC_TUBER_M] = @@ -435,6 +733,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(TUBER_M, gTrainerFrontPic_TuberM, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(TUBER_M, gTrainerPalette_TuberM), + .animation = sAnims_TuberM, }, [TRAINER_PIC_COOLTRAINER_F] = @@ -442,6 +741,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(COOLTRAINER_F, gTrainerFrontPic_CoolTrainerF, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(COOLTRAINER_F, gTrainerPalette_CoolTrainerF), + .animation = sAnims_CoolTrainerF, }, [TRAINER_PIC_LADY] = @@ -449,6 +749,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LADY, gTrainerFrontPic_Lady, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LADY, gTrainerPalette_Lady), + .animation = sAnims_Lady, }, [TRAINER_PIC_BEAUTY] = @@ -456,6 +757,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BEAUTY, gTrainerFrontPic_Beauty, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(BEAUTY, gTrainerPalette_Beauty), + .animation = sAnims_Beauty, }, [TRAINER_PIC_RICH_BOY] = @@ -463,6 +765,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RICH_BOY, gTrainerFrontPic_RichBoy, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(RICH_BOY, gTrainerPalette_RichBoy), + .animation = sAnims_RichBoy, }, [TRAINER_PIC_EXPERT_F] = @@ -470,6 +773,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(EXPERT_F, gTrainerFrontPic_ExpertF, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(EXPERT_F, gTrainerPalette_ExpertF), + .animation = sAnims_ExpertF, }, [TRAINER_PIC_POKEMANIAC] = @@ -477,6 +781,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(POKEMANIAC, gTrainerFrontPic_Pokemaniac, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(POKEMANIAC, gTrainerPalette_Pokemaniac), + .animation = sAnims_Pokemaniac, }, [TRAINER_PIC_MAGMA_GRUNT_F] = @@ -484,6 +789,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(MAGMA_GRUNT_F, gTrainerFrontPic_MagmaGruntF, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(MAGMA_GRUNT_F, gTrainerPalette_MagmaGruntF), + .animation = sAnims_MagmaGruntF, }, [TRAINER_PIC_GUITARIST] = @@ -491,6 +797,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(GUITARIST, gTrainerFrontPic_Guitarist, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(GUITARIST, gTrainerPalette_Guitarist), + .animation = sAnims_Guitarist, }, [TRAINER_PIC_KINDLER] = @@ -498,6 +805,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(KINDLER, gTrainerFrontPic_Kindler, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(KINDLER, gTrainerPalette_Kindler), + .animation = sAnims_Kindler, }, [TRAINER_PIC_CAMPER] = @@ -505,6 +813,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(CAMPER, gTrainerFrontPic_Camper, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(CAMPER, gTrainerPalette_Camper), + .animation = sAnims_Camper, }, [TRAINER_PIC_PICNICKER] = @@ -512,6 +821,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PICNICKER, gTrainerFrontPic_Picnicker, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(PICNICKER, gTrainerPalette_Picnicker), + .animation = sAnims_Picnicker, }, [TRAINER_PIC_BUG_MANIAC] = @@ -519,6 +829,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BUG_MANIAC, gTrainerFrontPic_BugManiac, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(BUG_MANIAC, gTrainerPalette_BugManiac), + .animation = sAnims_BugManiac, }, [TRAINER_PIC_POKEMON_BREEDER_M] = @@ -526,6 +837,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(POKEMON_BREEDER_M, gTrainerFrontPic_PokemonBreederM, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(POKEMON_BREEDER_M, gTrainerPalette_PokemonBreederM), + .animation = sAnims_PokemonBreederM, }, [TRAINER_PIC_PSYCHIC_M] = @@ -533,6 +845,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PSYCHIC_M, gTrainerFrontPic_PsychicM, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(PSYCHIC_M, gTrainerPalette_PsychicM), + .animation = sAnims_PsychicM, }, [TRAINER_PIC_PSYCHIC_F] = @@ -540,6 +853,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PSYCHIC_F, gTrainerFrontPic_PsychicF, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(PSYCHIC_F, gTrainerPalette_PsychicF), + .animation = sAnims_PsychicF, }, [TRAINER_PIC_GENTLEMAN] = @@ -547,6 +861,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(GENTLEMAN, gTrainerFrontPic_Gentleman, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(GENTLEMAN, gTrainerPalette_Gentleman), + .animation = sAnims_Gentleman, }, [TRAINER_PIC_ELITE_FOUR_SIDNEY] = @@ -554,6 +869,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(ELITE_FOUR_SIDNEY, gTrainerFrontPic_EliteFourSidney, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(ELITE_FOUR_SIDNEY, gTrainerPalette_EliteFourSidney), + .animation = sAnims_EliteFourSidney, }, [TRAINER_PIC_ELITE_FOUR_PHOEBE] = @@ -561,6 +877,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(ELITE_FOUR_PHOEBE, gTrainerFrontPic_EliteFourPhoebe, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(ELITE_FOUR_PHOEBE, gTrainerPalette_EliteFourPhoebe), + .animation = sAnims_EliteFourPhoebe, }, [TRAINER_PIC_ELITE_FOUR_GLACIA] = @@ -568,6 +885,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(ELITE_FOUR_GLACIA, gTrainerFrontPic_EliteFourGlacia, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(ELITE_FOUR_GLACIA, gTrainerPalette_EliteFourGlacia), + .animation = sAnims_EliteFourGlacia, }, [TRAINER_PIC_ELITE_FOUR_DRAKE] = @@ -575,6 +893,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(ELITE_FOUR_DRAKE, gTrainerFrontPic_EliteFourDrake, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(ELITE_FOUR_DRAKE, gTrainerPalette_EliteFourDrake), + .animation = sAnims_EliteFourDrake, }, [TRAINER_PIC_LEADER_ROXANNE] = @@ -582,6 +901,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_ROXANNE, gTrainerFrontPic_LeaderRoxanne, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LEADER_ROXANNE, gTrainerPalette_LeaderRoxanne), + .animation = sAnims_LeaderRoxanne, }, [TRAINER_PIC_LEADER_BRAWLY] = @@ -589,6 +909,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_BRAWLY, gTrainerFrontPic_LeaderBrawly, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LEADER_BRAWLY, gTrainerPalette_LeaderBrawly), + .animation = sAnims_LeaderBrawly, }, [TRAINER_PIC_LEADER_WATTSON] = @@ -596,6 +917,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_WATTSON, gTrainerFrontPic_LeaderWattson, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LEADER_WATTSON, gTrainerPalette_LeaderWattson), + .animation = sAnims_LeaderWattson, }, [TRAINER_PIC_LEADER_FLANNERY] = @@ -603,6 +925,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_FLANNERY, gTrainerFrontPic_LeaderFlannery, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LEADER_FLANNERY, gTrainerPalette_LeaderFlannery), + .animation = sAnims_LeaderFlannery, }, [TRAINER_PIC_LEADER_NORMAN] = @@ -610,6 +933,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_NORMAN, gTrainerFrontPic_LeaderNorman, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LEADER_NORMAN, gTrainerPalette_LeaderNorman), + .animation = sAnims_LeaderNorman, }, [TRAINER_PIC_LEADER_WINONA] = @@ -617,6 +941,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_WINONA, gTrainerFrontPic_LeaderWinona, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LEADER_WINONA, gTrainerPalette_LeaderWinona), + .animation = sAnims_LeaderWinona, }, [TRAINER_PIC_LEADER_TATE_AND_LIZA] = @@ -624,6 +949,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_TATE_AND_LIZA, gTrainerFrontPic_LeaderTateAndLiza, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LEADER_TATE_AND_LIZA, gTrainerPalette_LeaderTateAndLiza), + .animation = sAnims_LeaderTateAndLiza, }, [TRAINER_PIC_LEADER_JUAN] = @@ -631,6 +957,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEADER_JUAN, gTrainerFrontPic_LeaderJuan, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LEADER_JUAN, gTrainerPalette_LeaderJuan), + .animation = sAnims_LeaderJuan, }, [TRAINER_PIC_SCHOOL_KID_M] = @@ -638,6 +965,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SCHOOL_KID_M, gTrainerFrontPic_SchoolKidM, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(SCHOOL_KID_M, gTrainerPalette_SchoolKidM), + .animation = sAnims_SchoolKidM, }, [TRAINER_PIC_SCHOOL_KID_F] = @@ -645,6 +973,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SCHOOL_KID_F, gTrainerFrontPic_SchoolKidF, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(SCHOOL_KID_F, gTrainerPalette_SchoolKidF), + .animation = sAnims_SchoolKidF, }, [TRAINER_PIC_SR_AND_JR] = @@ -652,6 +981,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 2}, .frontPic = TRAINER_SPRITE(SR_AND_JR, gTrainerFrontPic_SrAndJr, TRAINER_PIC_SIZE * 2), .palette = TRAINER_PAL(SR_AND_JR, gTrainerPalette_SrAndJr), + .animation = sAnims_SrAndJr, }, [TRAINER_PIC_POKEFAN_M] = @@ -659,6 +989,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 2}, .frontPic = TRAINER_SPRITE(POKEFAN_M, gTrainerFrontPic_PokefanM, TRAINER_PIC_SIZE * 2), .palette = TRAINER_PAL(POKEFAN_M, gTrainerPalette_PokefanM), + .animation = sAnims_PokefanM, }, [TRAINER_PIC_POKEFAN_F] = @@ -666,6 +997,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(POKEFAN_F, gTrainerFrontPic_PokefanF, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(POKEFAN_F, gTrainerPalette_PokefanF), + .animation = sAnims_PokefanF, }, [TRAINER_PIC_YOUNGSTER] = @@ -673,6 +1005,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(YOUNGSTER, gTrainerFrontPic_Youngster, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(YOUNGSTER, gTrainerPalette_Youngster), + .animation = sAnims_Youngster, }, [TRAINER_PIC_CHAMPION_WALLACE] = @@ -680,6 +1013,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 2}, .frontPic = TRAINER_SPRITE(CHAMPION_WALLACE, gTrainerFrontPic_ChampionWallace, TRAINER_PIC_SIZE * 2), .palette = TRAINER_PAL(CHAMPION_WALLACE, gTrainerPalette_ChampionWallace), + .animation = sAnims_ChampionWallace, }, [TRAINER_PIC_FISHERMAN] = @@ -687,6 +1021,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(FISHERMAN, gTrainerFrontPic_Fisherman, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(FISHERMAN, gTrainerPalette_Fisherman), + .animation = sAnims_Fisherman, }, [TRAINER_PIC_CYCLING_TRIATHLETE_M] = @@ -694,6 +1029,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 2}, .frontPic = TRAINER_SPRITE(CYCLING_TRIATHLETE_M, gTrainerFrontPic_CyclingTriathleteM, TRAINER_PIC_SIZE * 2), .palette = TRAINER_PAL(CYCLING_TRIATHLETE_M, gTrainerPalette_CyclingTriathleteM), + .animation = sAnims_CyclingTriathleteM, }, [TRAINER_PIC_CYCLING_TRIATHLETE_F] = @@ -701,6 +1037,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(CYCLING_TRIATHLETE_F, gTrainerFrontPic_CyclingTriathleteF, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(CYCLING_TRIATHLETE_F, gTrainerPalette_CyclingTriathleteF), + .animation = sAnims_CyclingTriathleteF, }, [TRAINER_PIC_RUNNING_TRIATHLETE_M] = @@ -708,6 +1045,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RUNNING_TRIATHLETE_M, gTrainerFrontPic_RunningTriathleteM, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(RUNNING_TRIATHLETE_M, gTrainerPalette_RunningTriathleteM), + .animation = sAnims_RunningTriathleteM, }, [TRAINER_PIC_RUNNING_TRIATHLETE_F] = @@ -715,6 +1053,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RUNNING_TRIATHLETE_F, gTrainerFrontPic_RunningTriathleteF, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(RUNNING_TRIATHLETE_F, gTrainerPalette_RunningTriathleteF), + .animation = sAnims_RunningTriathleteF, }, [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = @@ -722,6 +1061,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SWIMMING_TRIATHLETE_M, gTrainerFrontPic_SwimmingTriathleteM, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(SWIMMING_TRIATHLETE_M, gTrainerPalette_SwimmingTriathleteM), + .animation = sAnims_SwimmingTriathleteM, }, [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = @@ -729,6 +1069,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SWIMMING_TRIATHLETE_F, gTrainerFrontPic_SwimmingTriathleteF, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(SWIMMING_TRIATHLETE_F, gTrainerPalette_SwimmingTriathleteF), + .animation = sAnims_SwimmingTriathleteF, }, [TRAINER_PIC_DRAGON_TAMER] = @@ -736,6 +1077,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(DRAGON_TAMER, gTrainerFrontPic_DragonTamer, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(DRAGON_TAMER, gTrainerPalette_DragonTamer), + .animation = sAnims_DragonTamer, }, [TRAINER_PIC_NINJA_BOY] = @@ -743,6 +1085,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(NINJA_BOY, gTrainerFrontPic_NinjaBoy, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(NINJA_BOY, gTrainerPalette_NinjaBoy), + .animation = sAnims_NinjaBoy, }, [TRAINER_PIC_BATTLE_GIRL] = @@ -750,6 +1093,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 2}, .frontPic = TRAINER_SPRITE(BATTLE_GIRL, gTrainerFrontPic_BattleGirl, TRAINER_PIC_SIZE * 2), .palette = TRAINER_PAL(BATTLE_GIRL, gTrainerPalette_BattleGirl), + .animation = sAnims_BattleGirl, }, [TRAINER_PIC_PARASOL_LADY] = @@ -757,6 +1101,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PARASOL_LADY, gTrainerFrontPic_ParasolLady, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(PARASOL_LADY, gTrainerPalette_ParasolLady), + .animation = sAnims_ParasolLady, }, [TRAINER_PIC_SWIMMER_F] = @@ -764,6 +1109,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SWIMMER_F, gTrainerFrontPic_SwimmerF, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(SWIMMER_F, gTrainerPalette_SwimmerF), + .animation = sAnims_SwimmerF, }, [TRAINER_PIC_TWINS] = @@ -771,6 +1117,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(TWINS, gTrainerFrontPic_Twins, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(TWINS, gTrainerPalette_Twins), + .animation = sAnims_Twins, }, [TRAINER_PIC_SAILOR] = @@ -778,6 +1125,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SAILOR, gTrainerFrontPic_Sailor, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(SAILOR, gTrainerPalette_Sailor), + .animation = sAnims_Sailor, }, [TRAINER_PIC_MAGMA_ADMIN] = @@ -785,6 +1133,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(MAGMA_ADMIN, gTrainerFrontPic_MagmaAdmin, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(MAGMA_ADMIN, gTrainerPalette_MagmaAdmin), + .animation = sAnims_MagmaAdmin, }, [TRAINER_PIC_WALLY] = @@ -792,6 +1141,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(WALLY, gTrainerFrontPic_Wally, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(WALLY, gTrainerPalette_Wally), + .animation = sAnims_Wally, }, [TRAINER_PIC_BRENDAN] = @@ -799,6 +1149,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BRENDAN, gTrainerFrontPic_Brendan, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(BRENDAN, gTrainerPalette_Brendan), + .animation = sAnims_Brendan, }, [TRAINER_PIC_MAY] = @@ -806,6 +1157,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(MAY, gTrainerFrontPic_May, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(MAY, gTrainerPalette_May), + .animation = sAnims_May, }, [TRAINER_PIC_BUG_CATCHER] = @@ -813,6 +1165,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BUG_CATCHER, gTrainerFrontPic_BugCatcher, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(BUG_CATCHER, gTrainerPalette_BugCatcher), + .animation = sAnims_BugCatcher, }, [TRAINER_PIC_POKEMON_RANGER_M] = @@ -820,6 +1173,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(POKEMON_RANGER_M, gTrainerFrontPic_PokemonRangerM, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(POKEMON_RANGER_M, gTrainerPalette_PokemonRangerM), + .animation = sAnims_PokemonRangerM, }, [TRAINER_PIC_POKEMON_RANGER_F] = @@ -827,6 +1181,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(POKEMON_RANGER_F, gTrainerFrontPic_PokemonRangerF, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(POKEMON_RANGER_F, gTrainerPalette_PokemonRangerF), + .animation = sAnims_PokemonRangerF, }, [TRAINER_PIC_MAGMA_LEADER_MAXIE] = @@ -834,6 +1189,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(MAGMA_LEADER_MAXIE, gTrainerFrontPic_MagmaLeaderMaxie, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(MAGMA_LEADER_MAXIE, gTrainerPalette_MagmaLeaderMaxie), + .animation = sAnims_MagmaLeaderMaxie, }, [TRAINER_PIC_LASS] = @@ -841,6 +1197,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LASS, gTrainerFrontPic_Lass, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LASS, gTrainerPalette_Lass), + .animation = sAnims_Lass, }, [TRAINER_PIC_YOUNG_COUPLE] = @@ -848,6 +1205,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(YOUNG_COUPLE, gTrainerFrontPic_YoungCouple, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(YOUNG_COUPLE, gTrainerPalette_YoungCouple), + .animation = sAnims_YoungCouple, }, [TRAINER_PIC_OLD_COUPLE] = @@ -855,6 +1213,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(OLD_COUPLE, gTrainerFrontPic_OldCouple, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(OLD_COUPLE, gTrainerPalette_OldCouple), + .animation = sAnims_OldCouple, }, [TRAINER_PIC_SIS_AND_BRO] = @@ -862,6 +1221,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SIS_AND_BRO, gTrainerFrontPic_SisAndBro, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(SIS_AND_BRO, gTrainerPalette_SisAndBro), + .animation = sAnims_SisAndBro, }, [TRAINER_PIC_STEVEN] = @@ -869,6 +1229,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(STEVEN, gTrainerFrontPic_Steven, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(STEVEN, gTrainerPalette_Steven), + .animation = sAnims_Steven, }, [TRAINER_PIC_SALON_MAIDEN_ANABEL] = @@ -876,6 +1237,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SALON_MAIDEN_ANABEL, gTrainerFrontPic_SalonMaidenAnabel, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(SALON_MAIDEN_ANABEL, gTrainerPalette_SalonMaidenAnabel), + .animation = sAnims_SalonMaidenAnabel, }, [TRAINER_PIC_DOME_ACE_TUCKER] = @@ -883,6 +1245,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(DOME_ACE_TUCKER, gTrainerFrontPic_DomeAceTucker, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(DOME_ACE_TUCKER, gTrainerPalette_DomeAceTucker), + .animation = sAnims_DomeAceTucker, }, [TRAINER_PIC_PALACE_MAVEN_SPENSER] = @@ -890,6 +1253,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PALACE_MAVEN_SPENSER, gTrainerFrontPic_PalaceMavenSpenser, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(PALACE_MAVEN_SPENSER, gTrainerPalette_PalaceMavenSpenser), + .animation = sAnims_PalaceMavenSpenser, }, [TRAINER_PIC_ARENA_TYCOON_GRETA] = @@ -897,6 +1261,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 2}, .frontPic = TRAINER_SPRITE(ARENA_TYCOON_GRETA, gTrainerFrontPic_ArenaTycoonGreta, TRAINER_PIC_SIZE * 2), .palette = TRAINER_PAL(ARENA_TYCOON_GRETA, gTrainerPalette_ArenaTycoonGreta), + .animation = sAnims_ArenaTycoonGreta, }, [TRAINER_PIC_FACTORY_HEAD_NOLAND] = @@ -904,6 +1269,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(FACTORY_HEAD_NOLAND, gTrainerFrontPic_FactoryHeadNoland, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(FACTORY_HEAD_NOLAND, gTrainerPalette_FactoryHeadNoland), + .animation = sAnims_FactoryHeadNoland, }, [TRAINER_PIC_PIKE_QUEEN_LUCY] = @@ -911,6 +1277,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PIKE_QUEEN_LUCY, gTrainerFrontPic_PikeQueenLucy, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(PIKE_QUEEN_LUCY, gTrainerPalette_PikeQueenLucy), + .animation = sAnims_PikeQueenLucy, }, [TRAINER_PIC_PYRAMID_KING_BRANDON] = @@ -918,6 +1285,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PYRAMID_KING_BRANDON, gTrainerFrontPic_PyramidKingBrandon, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(PYRAMID_KING_BRANDON, gTrainerPalette_PyramidKingBrandon), + .animation = sAnims_PyramidKingBrandon, }, [TRAINER_PIC_RED] = @@ -925,6 +1293,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RED, gTrainerFrontPic_Red, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(RED, gTrainerPalette_Red), + .animation = sAnims_Red, }, [TRAINER_PIC_LEAF] = @@ -932,6 +1301,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEAF, gTrainerFrontPic_Leaf, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LEAF, gTrainerPalette_Leaf), + .animation = sAnims_Leaf, }, [TRAINER_PIC_RS_BRENDAN] = @@ -939,6 +1309,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RS_BRENDAN, gTrainerFrontPic_RubySapphireBrendan, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(RS_BRENDAN, gTrainerPalette_RubySapphireBrendan), + .animation = sAnims_RubySapphireBrendan, }, [TRAINER_PIC_RS_MAY] = @@ -946,5 +1317,6 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = 8, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RS_MAY, gTrainerFrontPic_RubySapphireMay, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(RS_MAY, gTrainerPalette_RubySapphireMay), + .animation = sAnims_RubySapphireMay, }, }; diff --git a/src/data/trainer_graphics/front_pic_anims.h b/src/data/trainer_graphics/front_pic_anims.h deleted file mode 100644 index f01394532aea..000000000000 --- a/src/data/trainer_graphics/front_pic_anims.h +++ /dev/null @@ -1,468 +0,0 @@ -static const union AnimCmd *const sAnims_Hiker[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_AquaGruntM[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_PokemonBreederF[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_CoolTrainerM[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_BirdKeeper[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Collector[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_AquaGruntF[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_SwimmerM[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_MagmaGruntM[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_ExpertM[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_AquaAdminM[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_BlackBelt[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_AquaAdminF[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_AquaLeaderArchie[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_HexManiac[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_AromaLady[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_RuinManiac[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Interviewer[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_TuberF[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_TuberM[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_CoolTrainerF[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Lady[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Beauty[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_RichBoy[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_ExpertF[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Pokemaniac[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_MagmaGruntF[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Guitarist[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Kindler[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Camper[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Picnicker[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_BugManiac[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_PokemonBreederM[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_PsychicM[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_PsychicF[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Gentleman[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_EliteFourSidney[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_EliteFourPhoebe[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_EliteFourGlacia[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_EliteFourDrake[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_LeaderRoxanne[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_LeaderBrawly[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_LeaderWattson[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_LeaderFlannery[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_LeaderNorman[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_LeaderWinona[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_LeaderTateAndLiza[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_LeaderJuan[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_SchoolKidM[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_SchoolKidF[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_SrAndJr[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_PokefanM[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_PokefanF[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Youngster[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_ChampionWallace[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Fisherman[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_CyclingTriathleteM[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_CyclingTriathleteF[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_RunningTriathleteM[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_RunningTriathleteF[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_SwimmingTriathleteM[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_SwimmingTriathleteF[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_DragonTamer[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_NinjaBoy[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_BattleGirl[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_ParasolLady[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_SwimmerF[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Twins[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Sailor[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_MagmaAdmin[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Wally[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Brendan[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_May[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_BugCatcher[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_PokemonRangerM[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_PokemonRangerF[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_MagmaLeaderMaxie[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Lass[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_YoungCouple[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_OldCouple[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_SisAndBro[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Steven[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_SalonMaidenAnabel[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_DomeAceTucker[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_PalaceMavenSpenser[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_ArenaTycoonGreta[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_FactoryHeadNoland[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_PikeQueenLucy[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_PyramidKingBrandon[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Red[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_Leaf[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_RubySapphireBrendan[] ={ - sAnim_GeneralFrame0, -}; - -static const union AnimCmd *const sAnims_RubySapphireMay[] ={ - sAnim_GeneralFrame0, -}; - -const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] = -{ - [TRAINER_PIC_HIKER] = sAnims_Hiker, - [TRAINER_PIC_AQUA_GRUNT_M] = sAnims_AquaGruntM, - [TRAINER_PIC_POKEMON_BREEDER_F] = sAnims_PokemonBreederF, - [TRAINER_PIC_COOLTRAINER_M] = sAnims_CoolTrainerM, - [TRAINER_PIC_BIRD_KEEPER] = sAnims_BirdKeeper, - [TRAINER_PIC_COLLECTOR] = sAnims_Collector, - [TRAINER_PIC_AQUA_GRUNT_F] = sAnims_AquaGruntF, - [TRAINER_PIC_SWIMMER_M] = sAnims_SwimmerM, - [TRAINER_PIC_MAGMA_GRUNT_M] = sAnims_MagmaGruntM, - [TRAINER_PIC_EXPERT_M] = sAnims_ExpertM, - [TRAINER_PIC_AQUA_ADMIN_M] = sAnims_AquaAdminM, - [TRAINER_PIC_BLACK_BELT] = sAnims_BlackBelt, - [TRAINER_PIC_AQUA_ADMIN_F] = sAnims_AquaAdminF, - [TRAINER_PIC_AQUA_LEADER_ARCHIE] = sAnims_AquaLeaderArchie, - [TRAINER_PIC_HEX_MANIAC] = sAnims_HexManiac, - [TRAINER_PIC_AROMA_LADY] = sAnims_AromaLady, - [TRAINER_PIC_RUIN_MANIAC] = sAnims_RuinManiac, - [TRAINER_PIC_INTERVIEWER] = sAnims_Interviewer, - [TRAINER_PIC_TUBER_F] = sAnims_TuberF, - [TRAINER_PIC_TUBER_M] = sAnims_TuberM, - [TRAINER_PIC_COOLTRAINER_F] = sAnims_CoolTrainerF, - [TRAINER_PIC_LADY] = sAnims_Lady, - [TRAINER_PIC_BEAUTY] = sAnims_Beauty, - [TRAINER_PIC_RICH_BOY] = sAnims_RichBoy, - [TRAINER_PIC_EXPERT_F] = sAnims_ExpertF, - [TRAINER_PIC_POKEMANIAC] = sAnims_Pokemaniac, - [TRAINER_PIC_MAGMA_GRUNT_F] = sAnims_MagmaGruntF, - [TRAINER_PIC_GUITARIST] = sAnims_Guitarist, - [TRAINER_PIC_KINDLER] = sAnims_Kindler, - [TRAINER_PIC_CAMPER] = sAnims_Camper, - [TRAINER_PIC_PICNICKER] = sAnims_Picnicker, - [TRAINER_PIC_BUG_MANIAC] = sAnims_BugManiac, - [TRAINER_PIC_POKEMON_BREEDER_M] = sAnims_PokemonBreederM, - [TRAINER_PIC_PSYCHIC_M] = sAnims_PsychicM, - [TRAINER_PIC_PSYCHIC_F] = sAnims_PsychicF, - [TRAINER_PIC_GENTLEMAN] = sAnims_Gentleman, - [TRAINER_PIC_ELITE_FOUR_SIDNEY] = sAnims_EliteFourSidney, - [TRAINER_PIC_ELITE_FOUR_PHOEBE] = sAnims_EliteFourPhoebe, - [TRAINER_PIC_ELITE_FOUR_GLACIA] = sAnims_EliteFourGlacia, - [TRAINER_PIC_ELITE_FOUR_DRAKE] = sAnims_EliteFourDrake, - [TRAINER_PIC_LEADER_ROXANNE] = sAnims_LeaderRoxanne, - [TRAINER_PIC_LEADER_BRAWLY] = sAnims_LeaderBrawly, - [TRAINER_PIC_LEADER_WATTSON] = sAnims_LeaderWattson, - [TRAINER_PIC_LEADER_FLANNERY] = sAnims_LeaderFlannery, - [TRAINER_PIC_LEADER_NORMAN] = sAnims_LeaderNorman, - [TRAINER_PIC_LEADER_WINONA] = sAnims_LeaderWinona, - [TRAINER_PIC_LEADER_TATE_AND_LIZA] = sAnims_LeaderTateAndLiza, - [TRAINER_PIC_LEADER_JUAN] = sAnims_LeaderJuan, - [TRAINER_PIC_SCHOOL_KID_M] = sAnims_SchoolKidM, - [TRAINER_PIC_SCHOOL_KID_F] = sAnims_SchoolKidF, - [TRAINER_PIC_SR_AND_JR] = sAnims_SrAndJr, - [TRAINER_PIC_POKEFAN_M] = sAnims_PokefanM, - [TRAINER_PIC_POKEFAN_F] = sAnims_PokefanF, - [TRAINER_PIC_YOUNGSTER] = sAnims_Youngster, - [TRAINER_PIC_CHAMPION_WALLACE] = sAnims_ChampionWallace, - [TRAINER_PIC_FISHERMAN] = sAnims_Fisherman, - [TRAINER_PIC_CYCLING_TRIATHLETE_M] = sAnims_CyclingTriathleteM, - [TRAINER_PIC_CYCLING_TRIATHLETE_F] = sAnims_CyclingTriathleteF, - [TRAINER_PIC_RUNNING_TRIATHLETE_M] = sAnims_RunningTriathleteM, - [TRAINER_PIC_RUNNING_TRIATHLETE_F] = sAnims_RunningTriathleteF, - [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = sAnims_SwimmingTriathleteM, - [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = sAnims_SwimmingTriathleteF, - [TRAINER_PIC_DRAGON_TAMER] = sAnims_DragonTamer, - [TRAINER_PIC_NINJA_BOY] = sAnims_NinjaBoy, - [TRAINER_PIC_BATTLE_GIRL] = sAnims_BattleGirl, - [TRAINER_PIC_PARASOL_LADY] = sAnims_ParasolLady, - [TRAINER_PIC_SWIMMER_F] = sAnims_SwimmerF, - [TRAINER_PIC_TWINS] = sAnims_Twins, - [TRAINER_PIC_SAILOR] = sAnims_Sailor, - [TRAINER_PIC_MAGMA_ADMIN] = sAnims_MagmaAdmin, - [TRAINER_PIC_WALLY] = sAnims_Wally, - [TRAINER_PIC_BRENDAN] = sAnims_Brendan, - [TRAINER_PIC_MAY] = sAnims_May, - [TRAINER_PIC_BUG_CATCHER] = sAnims_BugCatcher, - [TRAINER_PIC_POKEMON_RANGER_M] = sAnims_PokemonRangerM, - [TRAINER_PIC_POKEMON_RANGER_F] = sAnims_PokemonRangerF, - [TRAINER_PIC_MAGMA_LEADER_MAXIE] = sAnims_MagmaLeaderMaxie, - [TRAINER_PIC_LASS] = sAnims_Lass, - [TRAINER_PIC_YOUNG_COUPLE] = sAnims_YoungCouple, - [TRAINER_PIC_OLD_COUPLE] = sAnims_OldCouple, - [TRAINER_PIC_SIS_AND_BRO] = sAnims_SisAndBro, - [TRAINER_PIC_STEVEN] = sAnims_Steven, - [TRAINER_PIC_SALON_MAIDEN_ANABEL] = sAnims_SalonMaidenAnabel, - [TRAINER_PIC_DOME_ACE_TUCKER] = sAnims_DomeAceTucker, - [TRAINER_PIC_PALACE_MAVEN_SPENSER] = sAnims_PalaceMavenSpenser, - [TRAINER_PIC_ARENA_TYCOON_GRETA] = sAnims_ArenaTycoonGreta, - [TRAINER_PIC_FACTORY_HEAD_NOLAND] = sAnims_FactoryHeadNoland, - [TRAINER_PIC_PIKE_QUEEN_LUCY] = sAnims_PikeQueenLucy, - [TRAINER_PIC_PYRAMID_KING_BRANDON] = sAnims_PyramidKingBrandon, - [TRAINER_PIC_RED] = sAnims_Red, - [TRAINER_PIC_LEAF] = sAnims_Leaf, - [TRAINER_PIC_RS_BRENDAN] = sAnims_RubySapphireBrendan, - [TRAINER_PIC_RS_MAY] = sAnims_RubySapphireMay, -}; diff --git a/src/pokemon.c b/src/pokemon.c index 721a998bef11..d29b376acc83 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1852,7 +1852,7 @@ void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerPicId, u8 battlerPosition gMultiuseSpriteTemplate = gMonSpritesGfxPtr->templates[battlerPosition]; else gMultiuseSpriteTemplate = gBattlerSpriteTemplates[battlerPosition]; - gMultiuseSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[trainerPicId]; + gMultiuseSpriteTemplate.anims = gTrainerSprites[trainerPicId].animation; } } @@ -1864,7 +1864,7 @@ void SetMultiuseSpriteTemplateToTrainerFront(u16 trainerPicId, u8 battlerPositio gMultiuseSpriteTemplate = gBattlerSpriteTemplates[battlerPosition]; gMultiuseSpriteTemplate.paletteTag = trainerPicId; - gMultiuseSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[trainerPicId]; + gMultiuseSpriteTemplate.anims = gTrainerSprites[trainerPicId].animation; } static void EncryptBoxMon(struct BoxPokemon *boxMon) diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index d535eb8ee9f6..8addb07f2b1b 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -116,7 +116,7 @@ static void AssignSpriteAnimsTable(bool8 isTrainer) if (!isTrainer) sCreatingSpriteTemplate.anims = gAnims_MonPic; else - sCreatingSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[0]; + sCreatingSpriteTemplate.anims = gTrainerSprites[0].animation; } static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 isTrainer) From 35428dc4791589320e46606a86aa20d85393a377 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 24 Nov 2023 01:06:40 -0500 Subject: [PATCH 05/25] Added define for sprite size --- include/data.h | 2 +- src/data/graphics/trainers.h | 187 ++++++++++++++++++----------------- 2 files changed, 95 insertions(+), 94 deletions(-) diff --git a/include/data.h b/include/data.h index 3ba9a11c0e1c..e75a30c2e08d 100644 --- a/include/data.h +++ b/include/data.h @@ -30,7 +30,7 @@ struct MonCoords struct TrainerSprite { - //See if y_offset is even needed for Trainer Sprites. + //The y_offset might not even be needed/have any affect for Trainer Sprites. //If not, can remove MonCoords value (NOT THE STRUCT THOUGH) and just add size struct MonCoords coordinates; struct CompressedSpriteSheet frontPic; diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index e4c99e3bd862..5414226b803b 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -571,6 +571,7 @@ const u8 gTrainerBackPic_Steven[] = INCBIN_U8("graphics/trainers/back_pics/steve const u32 gTrainerBackPicPalette_Red[] = INCBIN_U32("graphics/trainers/back_pics/red.gbapal.lz"); 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} @@ -578,7 +579,7 @@ const struct TrainerSprite gTrainerSprites[] = { [TRAINER_PIC_HIKER] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(HIKER, gTrainerFrontPic_Hiker, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(HIKER, gTrainerPalette_Hiker), .animation = sAnims_Hiker, @@ -586,7 +587,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_AQUA_GRUNT_M] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_AquaGruntM, @@ -594,7 +595,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_POKEMON_BREEDER_F] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_PokemonBreederF, @@ -602,7 +603,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_COOLTRAINER_M] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_CoolTrainerM, @@ -610,7 +611,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_BIRD_KEEPER] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_BirdKeeper, @@ -618,7 +619,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_COLLECTOR] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(COLLECTOR, gTrainerFrontPic_Collector, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(COLLECTOR, gTrainerPalette_Collector), .animation = sAnims_Collector, @@ -626,7 +627,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_AQUA_GRUNT_F] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_AquaGruntF, @@ -634,7 +635,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_SWIMMER_M] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_SwimmerM, @@ -642,7 +643,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_MAGMA_GRUNT_M] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_MagmaGruntM, @@ -650,7 +651,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_EXPERT_M] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_ExpertM, @@ -658,7 +659,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_AQUA_ADMIN_M] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_AquaAdminM, @@ -666,7 +667,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_BLACK_BELT] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_BlackBelt, @@ -674,7 +675,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_AQUA_ADMIN_F] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_AquaAdminF, @@ -682,7 +683,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_AQUA_LEADER_ARCHIE] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_AquaLeaderArchie, @@ -690,7 +691,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_HEX_MANIAC] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_HexManiac, @@ -698,7 +699,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_AROMA_LADY] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_AromaLady, @@ -706,7 +707,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_RUIN_MANIAC] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_RuinManiac, @@ -714,7 +715,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_INTERVIEWER] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(INTERVIEWER, gTrainerFrontPic_Interviewer, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(INTERVIEWER, gTrainerPalette_Interviewer), .animation = sAnims_Interviewer, @@ -722,7 +723,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_TUBER_F] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_TuberF, @@ -730,7 +731,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_TUBER_M] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_TuberM, @@ -738,7 +739,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_COOLTRAINER_F] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_CoolTrainerF, @@ -746,7 +747,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_LADY] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LADY, gTrainerFrontPic_Lady, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LADY, gTrainerPalette_Lady), .animation = sAnims_Lady, @@ -754,7 +755,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_BEAUTY] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BEAUTY, gTrainerFrontPic_Beauty, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(BEAUTY, gTrainerPalette_Beauty), .animation = sAnims_Beauty, @@ -762,7 +763,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_RICH_BOY] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_RichBoy, @@ -770,7 +771,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_EXPERT_F] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_ExpertF, @@ -778,7 +779,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_POKEMANIAC] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(POKEMANIAC, gTrainerFrontPic_Pokemaniac, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(POKEMANIAC, gTrainerPalette_Pokemaniac), .animation = sAnims_Pokemaniac, @@ -786,7 +787,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_MAGMA_GRUNT_F] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_MagmaGruntF, @@ -794,7 +795,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_GUITARIST] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(GUITARIST, gTrainerFrontPic_Guitarist, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(GUITARIST, gTrainerPalette_Guitarist), .animation = sAnims_Guitarist, @@ -802,7 +803,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_KINDLER] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(KINDLER, gTrainerFrontPic_Kindler, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(KINDLER, gTrainerPalette_Kindler), .animation = sAnims_Kindler, @@ -810,7 +811,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_CAMPER] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(CAMPER, gTrainerFrontPic_Camper, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(CAMPER, gTrainerPalette_Camper), .animation = sAnims_Camper, @@ -818,7 +819,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_PICNICKER] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PICNICKER, gTrainerFrontPic_Picnicker, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(PICNICKER, gTrainerPalette_Picnicker), .animation = sAnims_Picnicker, @@ -826,7 +827,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_BUG_MANIAC] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_BugManiac, @@ -834,7 +835,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_POKEMON_BREEDER_M] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_PokemonBreederM, @@ -842,7 +843,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_PSYCHIC_M] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_PsychicM, @@ -850,7 +851,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_PSYCHIC_F] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_PsychicF, @@ -858,7 +859,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_GENTLEMAN] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(GENTLEMAN, gTrainerFrontPic_Gentleman, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(GENTLEMAN, gTrainerPalette_Gentleman), .animation = sAnims_Gentleman, @@ -866,7 +867,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_ELITE_FOUR_SIDNEY] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_EliteFourSidney, @@ -874,7 +875,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_ELITE_FOUR_PHOEBE] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_EliteFourPhoebe, @@ -882,7 +883,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_ELITE_FOUR_GLACIA] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_EliteFourGlacia, @@ -890,7 +891,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_ELITE_FOUR_DRAKE] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_EliteFourDrake, @@ -898,7 +899,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_LEADER_ROXANNE] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_LeaderRoxanne, @@ -906,7 +907,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_LEADER_BRAWLY] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_LeaderBrawly, @@ -914,7 +915,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_LEADER_WATTSON] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_LeaderWattson, @@ -922,7 +923,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_LEADER_FLANNERY] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_LeaderFlannery, @@ -930,7 +931,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_LEADER_NORMAN] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_LeaderNorman, @@ -938,7 +939,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_LEADER_WINONA] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_LeaderWinona, @@ -946,7 +947,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_LEADER_TATE_AND_LIZA] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_LeaderTateAndLiza, @@ -954,7 +955,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_LEADER_JUAN] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_LeaderJuan, @@ -962,7 +963,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_SCHOOL_KID_M] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_SchoolKidM, @@ -970,7 +971,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_SCHOOL_KID_F] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_SchoolKidF, @@ -978,7 +979,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_SR_AND_JR] = { - .coordinates = {.size = 8, .y_offset = 2}, + .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), .animation = sAnims_SrAndJr, @@ -986,7 +987,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_POKEFAN_M] = { - .coordinates = {.size = 8, .y_offset = 2}, + .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), .animation = sAnims_PokefanM, @@ -994,7 +995,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_POKEFAN_F] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_PokefanF, @@ -1002,7 +1003,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_YOUNGSTER] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(YOUNGSTER, gTrainerFrontPic_Youngster, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(YOUNGSTER, gTrainerPalette_Youngster), .animation = sAnims_Youngster, @@ -1010,7 +1011,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_CHAMPION_WALLACE] = { - .coordinates = {.size = 8, .y_offset = 2}, + .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), .animation = sAnims_ChampionWallace, @@ -1018,7 +1019,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_FISHERMAN] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(FISHERMAN, gTrainerFrontPic_Fisherman, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(FISHERMAN, gTrainerPalette_Fisherman), .animation = sAnims_Fisherman, @@ -1026,7 +1027,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_CYCLING_TRIATHLETE_M] = { - .coordinates = {.size = 8, .y_offset = 2}, + .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), .animation = sAnims_CyclingTriathleteM, @@ -1034,7 +1035,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_CYCLING_TRIATHLETE_F] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_CyclingTriathleteF, @@ -1042,7 +1043,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_RUNNING_TRIATHLETE_M] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_RunningTriathleteM, @@ -1050,7 +1051,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_RUNNING_TRIATHLETE_F] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_RunningTriathleteF, @@ -1058,7 +1059,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_SwimmingTriathleteM, @@ -1066,7 +1067,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_SwimmingTriathleteF, @@ -1074,7 +1075,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_DRAGON_TAMER] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_DragonTamer, @@ -1082,7 +1083,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_NINJA_BOY] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_NinjaBoy, @@ -1090,7 +1091,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_BATTLE_GIRL] = { - .coordinates = {.size = 8, .y_offset = 2}, + .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), .animation = sAnims_BattleGirl, @@ -1098,7 +1099,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_PARASOL_LADY] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_ParasolLady, @@ -1106,7 +1107,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_SWIMMER_F] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_SwimmerF, @@ -1114,7 +1115,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_TWINS] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(TWINS, gTrainerFrontPic_Twins, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(TWINS, gTrainerPalette_Twins), .animation = sAnims_Twins, @@ -1122,7 +1123,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_SAILOR] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SAILOR, gTrainerFrontPic_Sailor, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(SAILOR, gTrainerPalette_Sailor), .animation = sAnims_Sailor, @@ -1130,7 +1131,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_MAGMA_ADMIN] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_MagmaAdmin, @@ -1138,7 +1139,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_WALLY] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(WALLY, gTrainerFrontPic_Wally, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(WALLY, gTrainerPalette_Wally), .animation = sAnims_Wally, @@ -1146,7 +1147,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_BRENDAN] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BRENDAN, gTrainerFrontPic_Brendan, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(BRENDAN, gTrainerPalette_Brendan), .animation = sAnims_Brendan, @@ -1154,7 +1155,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_MAY] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(MAY, gTrainerFrontPic_May, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(MAY, gTrainerPalette_May), .animation = sAnims_May, @@ -1162,7 +1163,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_BUG_CATCHER] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_BugCatcher, @@ -1170,7 +1171,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_POKEMON_RANGER_M] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_PokemonRangerM, @@ -1178,7 +1179,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_POKEMON_RANGER_F] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_PokemonRangerF, @@ -1186,7 +1187,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_MAGMA_LEADER_MAXIE] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_MagmaLeaderMaxie, @@ -1194,7 +1195,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_LASS] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LASS, gTrainerFrontPic_Lass, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LASS, gTrainerPalette_Lass), .animation = sAnims_Lass, @@ -1202,7 +1203,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_YOUNG_COUPLE] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_YoungCouple, @@ -1210,7 +1211,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_OLD_COUPLE] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_OldCouple, @@ -1218,7 +1219,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_SIS_AND_BRO] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_SisAndBro, @@ -1226,7 +1227,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_STEVEN] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(STEVEN, gTrainerFrontPic_Steven, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(STEVEN, gTrainerPalette_Steven), .animation = sAnims_Steven, @@ -1234,7 +1235,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_SALON_MAIDEN_ANABEL] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_SalonMaidenAnabel, @@ -1242,7 +1243,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_DOME_ACE_TUCKER] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_DomeAceTucker, @@ -1250,7 +1251,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_PALACE_MAVEN_SPENSER] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_PalaceMavenSpenser, @@ -1258,7 +1259,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_ARENA_TYCOON_GRETA] = { - .coordinates = {.size = 8, .y_offset = 2}, + .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), .animation = sAnims_ArenaTycoonGreta, @@ -1266,7 +1267,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_FACTORY_HEAD_NOLAND] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_FactoryHeadNoland, @@ -1274,7 +1275,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_PIKE_QUEEN_LUCY] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_PikeQueenLucy, @@ -1282,7 +1283,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_PYRAMID_KING_BRANDON] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_PyramidKingBrandon, @@ -1290,7 +1291,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_RED] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RED, gTrainerFrontPic_Red, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(RED, gTrainerPalette_Red), .animation = sAnims_Red, @@ -1298,7 +1299,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_LEAF] = { - .coordinates = {.size = 8, .y_offset = 1}, + .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEAF, gTrainerFrontPic_Leaf, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LEAF, gTrainerPalette_Leaf), .animation = sAnims_Leaf, @@ -1306,7 +1307,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_RS_BRENDAN] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_RubySapphireBrendan, @@ -1314,7 +1315,7 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_RS_MAY] = { - .coordinates = {.size = 8, .y_offset = 1}, + .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), .animation = sAnims_RubySapphireMay, From d1f56329bca9d30157d6fc727612e08e61ee0502 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 24 Nov 2023 01:11:01 -0500 Subject: [PATCH 06/25] Condensed animations since they were all the same --- src/data/graphics/trainers.h | 468 +++++++---------------------------- 1 file changed, 96 insertions(+), 372 deletions(-) diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 5414226b803b..5b6e412a260e 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -3,561 +3,282 @@ const u32 gTrainerFrontPic_Hiker[] = INCBIN_U32("graphics/trainers/front_pics/hiker.4bpp.lz"); const u32 gTrainerPalette_Hiker[] = INCBIN_U32("graphics/trainers/front_pics/hiker.gbapal.lz"); -static const union AnimCmd *const sAnims_Hiker[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_AquaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_m.4bpp.lz"); const u32 gTrainerPalette_AquaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_m.gbapal.lz"); -static const union AnimCmd *const sAnims_AquaGruntM[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_PokemonBreederF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_f.4bpp.lz"); const u32 gTrainerPalette_PokemonBreederF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_f.gbapal.lz"); -static const union AnimCmd *const sAnims_PokemonBreederF[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_CoolTrainerM[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_m.4bpp.lz"); const u32 gTrainerPalette_CoolTrainerM[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_m.gbapal.lz"); -static const union AnimCmd *const sAnims_CoolTrainerM[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_BirdKeeper[] = INCBIN_U32("graphics/trainers/front_pics/bird_keeper.4bpp.lz"); const u32 gTrainerPalette_BirdKeeper[] = INCBIN_U32("graphics/trainers/front_pics/bird_keeper.gbapal.lz"); -static const union AnimCmd *const sAnims_BirdKeeper[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Collector[] = INCBIN_U32("graphics/trainers/front_pics/collector.4bpp.lz"); const u32 gTrainerPalette_Collector[] = INCBIN_U32("graphics/trainers/front_pics/collector.gbapal.lz"); -static const union AnimCmd *const sAnims_Collector[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_AquaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_f.4bpp.lz"); const u32 gTrainerPalette_AquaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_f.gbapal.lz"); -static const union AnimCmd *const sAnims_AquaGruntF[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_SwimmerM[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_m.4bpp.lz"); const u32 gTrainerPalette_SwimmerM[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_m.gbapal.lz"); -static const union AnimCmd *const sAnims_SwimmerM[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_MagmaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_m.4bpp.lz"); const u32 gTrainerPalette_MagmaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_m.gbapal.lz"); -static const union AnimCmd *const sAnims_MagmaGruntM[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_ExpertM[] = INCBIN_U32("graphics/trainers/front_pics/expert_m.4bpp.lz"); const u32 gTrainerPalette_ExpertM[] = INCBIN_U32("graphics/trainers/front_pics/expert_m.gbapal.lz"); -static const union AnimCmd *const sAnims_ExpertM[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_AquaAdminM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_m.4bpp.lz"); const u32 gTrainerPalette_AquaAdminM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_m.gbapal.lz"); -static const union AnimCmd *const sAnims_AquaAdminM[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_BlackBelt[] = INCBIN_U32("graphics/trainers/front_pics/black_belt.4bpp.lz"); const u32 gTrainerPalette_BlackBelt[] = INCBIN_U32("graphics/trainers/front_pics/black_belt.gbapal.lz"); -static const union AnimCmd *const sAnims_BlackBelt[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_AquaAdminF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_f.4bpp.lz"); const u32 gTrainerPalette_AquaAdminF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_f.gbapal.lz"); -static const union AnimCmd *const sAnims_AquaAdminF[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_AquaLeaderArchie[] = INCBIN_U32("graphics/trainers/front_pics/aqua_leader_archie.4bpp.lz"); const u32 gTrainerPalette_AquaLeaderArchie[] = INCBIN_U32("graphics/trainers/front_pics/aqua_leader_archie.gbapal.lz"); -static const union AnimCmd *const sAnims_AquaLeaderArchie[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_HexManiac[] = INCBIN_U32("graphics/trainers/front_pics/hex_maniac.4bpp.lz"); const u32 gTrainerPalette_HexManiac[] = INCBIN_U32("graphics/trainers/front_pics/hex_maniac.gbapal.lz"); -static const union AnimCmd *const sAnims_HexManiac[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_AromaLady[] = INCBIN_U32("graphics/trainers/front_pics/aroma_lady.4bpp.lz"); const u32 gTrainerPalette_AromaLady[] = INCBIN_U32("graphics/trainers/front_pics/aroma_lady.gbapal.lz"); -static const union AnimCmd *const sAnims_AromaLady[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_RuinManiac[] = INCBIN_U32("graphics/trainers/front_pics/ruin_maniac.4bpp.lz"); const u32 gTrainerPalette_RuinManiac[] = INCBIN_U32("graphics/trainers/front_pics/ruin_maniac.gbapal.lz"); -static const union AnimCmd *const sAnims_RuinManiac[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Interviewer[] = INCBIN_U32("graphics/trainers/front_pics/interviewer.4bpp.lz"); const u32 gTrainerPalette_Interviewer[] = INCBIN_U32("graphics/trainers/front_pics/interviewer.gbapal.lz"); -static const union AnimCmd *const sAnims_Interviewer[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_TuberF[] = INCBIN_U32("graphics/trainers/front_pics/tuber_f.4bpp.lz"); const u32 gTrainerPalette_TuberF[] = INCBIN_U32("graphics/trainers/front_pics/tuber_f.gbapal.lz"); -static const union AnimCmd *const sAnims_TuberF[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_TuberM[] = INCBIN_U32("graphics/trainers/front_pics/tuber_m.4bpp.lz"); const u32 gTrainerPalette_TuberM[] = INCBIN_U32("graphics/trainers/front_pics/tuber_m.gbapal.lz"); -static const union AnimCmd *const sAnims_TuberM[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_CoolTrainerF[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_f.4bpp.lz"); const u32 gTrainerPalette_CoolTrainerF[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_f.gbapal.lz"); -static const union AnimCmd *const sAnims_CoolTrainerF[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Lady[] = INCBIN_U32("graphics/trainers/front_pics/lady.4bpp.lz"); const u32 gTrainerPalette_Lady[] = INCBIN_U32("graphics/trainers/front_pics/lady.gbapal.lz"); -static const union AnimCmd *const sAnims_Lady[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Beauty[] = INCBIN_U32("graphics/trainers/front_pics/beauty.4bpp.lz"); const u32 gTrainerPalette_Beauty[] = INCBIN_U32("graphics/trainers/front_pics/beauty.gbapal.lz"); -static const union AnimCmd *const sAnims_Beauty[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_RichBoy[] = INCBIN_U32("graphics/trainers/front_pics/rich_boy.4bpp.lz"); const u32 gTrainerPalette_RichBoy[] = INCBIN_U32("graphics/trainers/front_pics/rich_boy.gbapal.lz"); -static const union AnimCmd *const sAnims_RichBoy[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_ExpertF[] = INCBIN_U32("graphics/trainers/front_pics/expert_f.4bpp.lz"); const u32 gTrainerPalette_ExpertF[] = INCBIN_U32("graphics/trainers/front_pics/expert_f.gbapal.lz"); -static const union AnimCmd *const sAnims_ExpertF[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Pokemaniac[] = INCBIN_U32("graphics/trainers/front_pics/pokemaniac.4bpp.lz"); const u32 gTrainerPalette_Pokemaniac[] = INCBIN_U32("graphics/trainers/front_pics/pokemaniac.gbapal.lz"); -static const union AnimCmd *const sAnims_Pokemaniac[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_MagmaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_f.4bpp.lz"); const u32 gTrainerPalette_MagmaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_f.gbapal.lz"); -static const union AnimCmd *const sAnims_MagmaGruntF[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Guitarist[] = INCBIN_U32("graphics/trainers/front_pics/guitarist.4bpp.lz"); const u32 gTrainerPalette_Guitarist[] = INCBIN_U32("graphics/trainers/front_pics/guitarist.gbapal.lz"); -static const union AnimCmd *const sAnims_Guitarist[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Kindler[] = INCBIN_U32("graphics/trainers/front_pics/kindler.4bpp.lz"); const u32 gTrainerPalette_Kindler[] = INCBIN_U32("graphics/trainers/front_pics/kindler.gbapal.lz"); -static const union AnimCmd *const sAnims_Kindler[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Camper[] = INCBIN_U32("graphics/trainers/front_pics/camper.4bpp.lz"); const u32 gTrainerPalette_Camper[] = INCBIN_U32("graphics/trainers/front_pics/camper.gbapal.lz"); -static const union AnimCmd *const sAnims_Camper[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Picnicker[] = INCBIN_U32("graphics/trainers/front_pics/picnicker.4bpp.lz"); const u32 gTrainerPalette_Picnicker[] = INCBIN_U32("graphics/trainers/front_pics/picnicker.gbapal.lz"); -static const union AnimCmd *const sAnims_Picnicker[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_BugManiac[] = INCBIN_U32("graphics/trainers/front_pics/bug_maniac.4bpp.lz"); const u32 gTrainerPalette_BugManiac[] = INCBIN_U32("graphics/trainers/front_pics/bug_maniac.gbapal.lz"); -static const union AnimCmd *const sAnims_BugManiac[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_PokemonBreederM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_m.4bpp.lz"); const u32 gTrainerPalette_PokemonBreederM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_m.gbapal.lz"); -static const union AnimCmd *const sAnims_PokemonBreederM[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_PsychicM[] = INCBIN_U32("graphics/trainers/front_pics/psychic_m.4bpp.lz"); const u32 gTrainerPalette_PsychicM[] = INCBIN_U32("graphics/trainers/front_pics/psychic_m.gbapal.lz"); -static const union AnimCmd *const sAnims_PsychicM[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_PsychicF[] = INCBIN_U32("graphics/trainers/front_pics/psychic_f.4bpp.lz"); const u32 gTrainerPalette_PsychicF[] = INCBIN_U32("graphics/trainers/front_pics/psychic_f.gbapal.lz"); -static const union AnimCmd *const sAnims_PsychicF[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Gentleman[] = INCBIN_U32("graphics/trainers/front_pics/gentleman.4bpp.lz"); const u32 gTrainerPalette_Gentleman[] = INCBIN_U32("graphics/trainers/front_pics/gentleman.gbapal.lz"); -static const union AnimCmd *const sAnims_Gentleman[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_EliteFourSidney[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_sidney.4bpp.lz"); const u32 gTrainerPalette_EliteFourSidney[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_sidney.gbapal.lz"); -static const union AnimCmd *const sAnims_EliteFourSidney[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_EliteFourPhoebe[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_phoebe.4bpp.lz"); const u32 gTrainerPalette_EliteFourPhoebe[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_phoebe.gbapal.lz"); -static const union AnimCmd *const sAnims_EliteFourPhoebe[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_EliteFourGlacia[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_glacia.4bpp.lz"); const u32 gTrainerPalette_EliteFourGlacia[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_glacia.gbapal.lz"); -static const union AnimCmd *const sAnims_EliteFourGlacia[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_EliteFourDrake[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_drake.4bpp.lz"); const u32 gTrainerPalette_EliteFourDrake[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_drake.gbapal.lz"); -static const union AnimCmd *const sAnims_EliteFourDrake[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_LeaderRoxanne[] = INCBIN_U32("graphics/trainers/front_pics/leader_roxanne.4bpp.lz"); const u32 gTrainerPalette_LeaderRoxanne[] = INCBIN_U32("graphics/trainers/front_pics/leader_roxanne.gbapal.lz"); -static const union AnimCmd *const sAnims_LeaderRoxanne[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_LeaderBrawly[] = INCBIN_U32("graphics/trainers/front_pics/leader_brawly.4bpp.lz"); const u32 gTrainerPalette_LeaderBrawly[] = INCBIN_U32("graphics/trainers/front_pics/leader_brawly.gbapal.lz"); -static const union AnimCmd *const sAnims_LeaderBrawly[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_LeaderWattson[] = INCBIN_U32("graphics/trainers/front_pics/leader_wattson.4bpp.lz"); const u32 gTrainerPalette_LeaderWattson[] = INCBIN_U32("graphics/trainers/front_pics/leader_wattson.gbapal.lz"); -static const union AnimCmd *const sAnims_LeaderWattson[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_LeaderFlannery[] = INCBIN_U32("graphics/trainers/front_pics/leader_flannery.4bpp.lz"); const u32 gTrainerPalette_LeaderFlannery[] = INCBIN_U32("graphics/trainers/front_pics/leader_flannery.gbapal.lz"); -static const union AnimCmd *const sAnims_LeaderFlannery[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_LeaderNorman[] = INCBIN_U32("graphics/trainers/front_pics/leader_norman.4bpp.lz"); const u32 gTrainerPalette_LeaderNorman[] = INCBIN_U32("graphics/trainers/front_pics/leader_norman.gbapal.lz"); -static const union AnimCmd *const sAnims_LeaderNorman[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_LeaderWinona[] = INCBIN_U32("graphics/trainers/front_pics/leader_winona.4bpp.lz"); const u32 gTrainerPalette_LeaderWinona[] = INCBIN_U32("graphics/trainers/front_pics/leader_winona.gbapal.lz"); -static const union AnimCmd *const sAnims_LeaderWinona[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_LeaderTateAndLiza[] = INCBIN_U32("graphics/trainers/front_pics/leader_tate_and_liza.4bpp.lz"); const u32 gTrainerPalette_LeaderTateAndLiza[] = INCBIN_U32("graphics/trainers/front_pics/leader_tate_and_liza.gbapal.lz"); -static const union AnimCmd *const sAnims_LeaderTateAndLiza[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_LeaderJuan[] = INCBIN_U32("graphics/trainers/front_pics/leader_juan.4bpp.lz"); const u32 gTrainerPalette_LeaderJuan[] = INCBIN_U32("graphics/trainers/front_pics/leader_juan.gbapal.lz"); -static const union AnimCmd *const sAnims_LeaderJuan[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_SchoolKidM[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_m.4bpp.lz"); const u32 gTrainerPalette_SchoolKidM[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_m.gbapal.lz"); -static const union AnimCmd *const sAnims_SchoolKidM[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_SchoolKidF[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_f.4bpp.lz"); const u32 gTrainerPalette_SchoolKidF[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_f.gbapal.lz"); -static const union AnimCmd *const sAnims_SchoolKidF[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_SrAndJr[] = INCBIN_U32("graphics/trainers/front_pics/sr_and_jr.4bpp.lz"); const u32 gTrainerPalette_SrAndJr[] = INCBIN_U32("graphics/trainers/front_pics/sr_and_jr.gbapal.lz"); -static const union AnimCmd *const sAnims_SrAndJr[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_PokefanM[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_m.4bpp.lz"); const u32 gTrainerPalette_PokefanM[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_m.gbapal.lz"); -static const union AnimCmd *const sAnims_PokefanM[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_PokefanF[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_f.4bpp.lz"); const u32 gTrainerPalette_PokefanF[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_f.gbapal.lz"); -static const union AnimCmd *const sAnims_PokefanF[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Youngster[] = INCBIN_U32("graphics/trainers/front_pics/youngster.4bpp.lz"); const u32 gTrainerPalette_Youngster[] = INCBIN_U32("graphics/trainers/front_pics/youngster.gbapal.lz"); -static const union AnimCmd *const sAnims_Youngster[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_ChampionWallace[] = INCBIN_U32("graphics/trainers/front_pics/champion_wallace.4bpp.lz"); const u32 gTrainerPalette_ChampionWallace[] = INCBIN_U32("graphics/trainers/front_pics/champion_wallace.gbapal.lz"); -static const union AnimCmd *const sAnims_ChampionWallace[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Fisherman[] = INCBIN_U32("graphics/trainers/front_pics/fisherman.4bpp.lz"); const u32 gTrainerPalette_Fisherman[] = INCBIN_U32("graphics/trainers/front_pics/fisherman.gbapal.lz"); -static const union AnimCmd *const sAnims_Fisherman[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_CyclingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_m.4bpp.lz"); const u32 gTrainerPalette_CyclingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_m.gbapal.lz"); -static const union AnimCmd *const sAnims_CyclingTriathleteM[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_CyclingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_f.4bpp.lz"); const u32 gTrainerPalette_CyclingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_f.gbapal.lz"); -static const union AnimCmd *const sAnims_CyclingTriathleteF[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_RunningTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_m.4bpp.lz"); const u32 gTrainerPalette_RunningTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_m.gbapal.lz"); -static const union AnimCmd *const sAnims_RunningTriathleteM[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_RunningTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_f.4bpp.lz"); const u32 gTrainerPalette_RunningTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_f.gbapal.lz"); -static const union AnimCmd *const sAnims_RunningTriathleteF[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_SwimmingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_m.4bpp.lz"); const u32 gTrainerPalette_SwimmingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_m.gbapal.lz"); -static const union AnimCmd *const sAnims_SwimmingTriathleteM[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_SwimmingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_f.4bpp.lz"); const u32 gTrainerPalette_SwimmingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_f.gbapal.lz"); -static const union AnimCmd *const sAnims_SwimmingTriathleteF[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_DragonTamer[] = INCBIN_U32("graphics/trainers/front_pics/dragon_tamer.4bpp.lz"); const u32 gTrainerPalette_DragonTamer[] = INCBIN_U32("graphics/trainers/front_pics/dragon_tamer.gbapal.lz"); -static const union AnimCmd *const sAnims_DragonTamer[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_NinjaBoy[] = INCBIN_U32("graphics/trainers/front_pics/ninja_boy.4bpp.lz"); const u32 gTrainerPalette_NinjaBoy[] = INCBIN_U32("graphics/trainers/front_pics/ninja_boy.gbapal.lz"); -static const union AnimCmd *const sAnims_NinjaBoy[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_BattleGirl[] = INCBIN_U32("graphics/trainers/front_pics/battle_girl.4bpp.lz"); const u32 gTrainerPalette_BattleGirl[] = INCBIN_U32("graphics/trainers/front_pics/battle_girl.gbapal.lz"); -static const union AnimCmd *const sAnims_BattleGirl[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_ParasolLady[] = INCBIN_U32("graphics/trainers/front_pics/parasol_lady.4bpp.lz"); const u32 gTrainerPalette_ParasolLady[] = INCBIN_U32("graphics/trainers/front_pics/parasol_lady.gbapal.lz"); -static const union AnimCmd *const sAnims_ParasolLady[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_SwimmerF[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_f.4bpp.lz"); const u32 gTrainerPalette_SwimmerF[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_f.gbapal.lz"); -static const union AnimCmd *const sAnims_SwimmerF[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Twins[] = INCBIN_U32("graphics/trainers/front_pics/twins.4bpp.lz"); const u32 gTrainerPalette_Twins[] = INCBIN_U32("graphics/trainers/front_pics/twins.gbapal.lz"); -static const union AnimCmd *const sAnims_Twins[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Sailor[] = INCBIN_U32("graphics/trainers/front_pics/sailor.4bpp.lz"); const u32 gTrainerPalette_Sailor[] = INCBIN_U32("graphics/trainers/front_pics/sailor.gbapal.lz"); -static const union AnimCmd *const sAnims_Sailor[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_MagmaAdmin[] = INCBIN_U32("graphics/trainers/front_pics/magma_admin.4bpp.lz"); const u32 gTrainerPalette_MagmaAdmin[] = INCBIN_U32("graphics/trainers/front_pics/magma_admin.gbapal.lz"); -static const union AnimCmd *const sAnims_MagmaAdmin[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Wally[] = INCBIN_U32("graphics/trainers/front_pics/wally.4bpp.lz"); const u32 gTrainerPalette_Wally[] = INCBIN_U32("graphics/trainers/palettes/wally.gbapal.lz"); -static const union AnimCmd *const sAnims_Wally[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Brendan[] = INCBIN_U32("graphics/trainers/front_pics/brendan.4bpp.lz"); const u32 gTrainerPalette_Brendan[] = INCBIN_U32("graphics/trainers/palettes/brendan.gbapal.lz"); -static const union AnimCmd *const sAnims_Brendan[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_May[] = INCBIN_U32("graphics/trainers/front_pics/may.4bpp.lz"); const u32 gTrainerPalette_May[] = INCBIN_U32("graphics/trainers/palettes/may.gbapal.lz"); -static const union AnimCmd *const sAnims_May[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_BugCatcher[] = INCBIN_U32("graphics/trainers/front_pics/bug_catcher.4bpp.lz"); const u32 gTrainerPalette_BugCatcher[] = INCBIN_U32("graphics/trainers/front_pics/bug_catcher.gbapal.lz"); -static const union AnimCmd *const sAnims_BugCatcher[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_PokemonRangerM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_m.4bpp.lz"); const u32 gTrainerPalette_PokemonRangerM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_m.gbapal.lz"); -static const union AnimCmd *const sAnims_PokemonRangerM[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_PokemonRangerF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_f.4bpp.lz"); const u32 gTrainerPalette_PokemonRangerF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_f.gbapal.lz"); -static const union AnimCmd *const sAnims_PokemonRangerF[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_MagmaLeaderMaxie[] = INCBIN_U32("graphics/trainers/front_pics/magma_leader_maxie.4bpp.lz"); const u32 gTrainerPalette_MagmaLeaderMaxie[] = INCBIN_U32("graphics/trainers/front_pics/magma_leader_maxie.gbapal.lz"); -static const union AnimCmd *const sAnims_MagmaLeaderMaxie[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Lass[] = INCBIN_U32("graphics/trainers/front_pics/lass.4bpp.lz"); const u32 gTrainerPalette_Lass[] = INCBIN_U32("graphics/trainers/front_pics/lass.gbapal.lz"); -static const union AnimCmd *const sAnims_Lass[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_YoungCouple[] = INCBIN_U32("graphics/trainers/front_pics/young_couple.4bpp.lz"); const u32 gTrainerPalette_YoungCouple[] = INCBIN_U32("graphics/trainers/front_pics/young_couple.gbapal.lz"); -static const union AnimCmd *const sAnims_YoungCouple[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_OldCouple[] = INCBIN_U32("graphics/trainers/front_pics/old_couple.4bpp.lz"); const u32 gTrainerPalette_OldCouple[] = INCBIN_U32("graphics/trainers/front_pics/old_couple.gbapal.lz"); -static const union AnimCmd *const sAnims_OldCouple[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_SisAndBro[] = INCBIN_U32("graphics/trainers/front_pics/sis_and_bro.4bpp.lz"); const u32 gTrainerPalette_SisAndBro[] = INCBIN_U32("graphics/trainers/front_pics/sis_and_bro.gbapal.lz"); -static const union AnimCmd *const sAnims_SisAndBro[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Steven[] = INCBIN_U32("graphics/trainers/front_pics/steven.4bpp.lz"); const u32 gTrainerPalette_Steven[] = INCBIN_U32("graphics/trainers/front_pics/steven.gbapal.lz"); -static const union AnimCmd *const sAnims_Steven[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_SalonMaidenAnabel[] = INCBIN_U32("graphics/trainers/front_pics/salon_maiden_anabel.4bpp.lz"); const u32 gTrainerPalette_SalonMaidenAnabel[] = INCBIN_U32("graphics/trainers/front_pics/salon_maiden_anabel.gbapal.lz"); -static const union AnimCmd *const sAnims_SalonMaidenAnabel[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_DomeAceTucker[] = INCBIN_U32("graphics/trainers/front_pics/dome_ace_tucker.4bpp.lz"); const u32 gTrainerPalette_DomeAceTucker[] = INCBIN_U32("graphics/trainers/front_pics/dome_ace_tucker.gbapal.lz"); -static const union AnimCmd *const sAnims_DomeAceTucker[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_PalaceMavenSpenser[] = INCBIN_U32("graphics/trainers/front_pics/palace_maven_spenser.4bpp.lz"); const u32 gTrainerPalette_PalaceMavenSpenser[] = INCBIN_U32("graphics/trainers/front_pics/palace_maven_spenser.gbapal.lz"); -static const union AnimCmd *const sAnims_PalaceMavenSpenser[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_ArenaTycoonGreta[] = INCBIN_U32("graphics/trainers/front_pics/arena_tycoon_greta.4bpp.lz"); const u32 gTrainerPalette_ArenaTycoonGreta[] = INCBIN_U32("graphics/trainers/front_pics/arena_tycoon_greta.gbapal.lz"); -static const union AnimCmd *const sAnims_ArenaTycoonGreta[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_FactoryHeadNoland[] = INCBIN_U32("graphics/trainers/front_pics/factory_head_noland.4bpp.lz"); const u32 gTrainerPalette_FactoryHeadNoland[] = INCBIN_U32("graphics/trainers/front_pics/factory_head_noland.gbapal.lz"); -static const union AnimCmd *const sAnims_FactoryHeadNoland[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_PikeQueenLucy[] = INCBIN_U32("graphics/trainers/front_pics/pike_queen_lucy.4bpp.lz"); const u32 gTrainerPalette_PikeQueenLucy[] = INCBIN_U32("graphics/trainers/front_pics/pike_queen_lucy.gbapal.lz"); -static const union AnimCmd *const sAnims_PikeQueenLucy[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_PyramidKingBrandon[] = INCBIN_U32("graphics/trainers/front_pics/pyramid_king_brandon.4bpp.lz"); const u32 gTrainerPalette_PyramidKingBrandon[] = INCBIN_U32("graphics/trainers/front_pics/pyramid_king_brandon.gbapal.lz"); -static const union AnimCmd *const sAnims_PyramidKingBrandon[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Red[] = INCBIN_U32("graphics/trainers/front_pics/red.4bpp.lz"); const u32 gTrainerPalette_Red[] = INCBIN_U32("graphics/trainers/front_pics/red.gbapal.lz"); -static const union AnimCmd *const sAnims_Red[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_Leaf[] = INCBIN_U32("graphics/trainers/front_pics/leaf.4bpp.lz"); const u32 gTrainerPalette_Leaf[] = INCBIN_U32("graphics/trainers/front_pics/leaf.gbapal.lz"); -static const union AnimCmd *const sAnims_Leaf[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_RubySapphireBrendan[] = INCBIN_U32("graphics/trainers/front_pics/brendan_rs.4bpp.lz"); const u32 gTrainerPalette_RubySapphireBrendan[] = INCBIN_U32("graphics/trainers/palettes/brendan_rs.gbapal.lz"); -static const union AnimCmd *const sAnims_RubySapphireBrendan[] ={ - sAnim_GeneralFrame0, -}; const u32 gTrainerFrontPic_RubySapphireMay[] = INCBIN_U32("graphics/trainers/front_pics/may_rs.4bpp.lz"); const u32 gTrainerPalette_RubySapphireMay[] = INCBIN_U32("graphics/trainers/palettes/may_rs.gbapal.lz"); -static const union AnimCmd *const sAnims_RubySapphireMay[] ={ - sAnim_GeneralFrame0, -}; const u8 gTrainerBackPic_Brendan[] = INCBIN_U8("graphics/trainers/back_pics/brendan.4bpp"); const u8 gTrainerBackPic_May[] = INCBIN_U8("graphics/trainers/back_pics/may.4bpp"); @@ -574,6 +295,9 @@ const u32 gTrainerBackPicPalette_Leaf[] = INCBIN_U32("graphics/trainers/back_pic #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} +static const union AnimCmd *const sAnims_Trainer[] ={ + sAnim_GeneralFrame0, +}; const struct TrainerSprite gTrainerSprites[] = { @@ -582,7 +306,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(HIKER, gTrainerFrontPic_Hiker, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(HIKER, gTrainerPalette_Hiker), - .animation = sAnims_Hiker, + .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_GRUNT_M] = @@ -590,7 +314,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_AquaGruntM, + .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_BREEDER_F] = @@ -598,7 +322,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_PokemonBreederF, + .animation = sAnims_Trainer, }, [TRAINER_PIC_COOLTRAINER_M] = @@ -606,7 +330,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_CoolTrainerM, + .animation = sAnims_Trainer, }, [TRAINER_PIC_BIRD_KEEPER] = @@ -614,7 +338,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_BirdKeeper, + .animation = sAnims_Trainer, }, [TRAINER_PIC_COLLECTOR] = @@ -622,7 +346,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(COLLECTOR, gTrainerFrontPic_Collector, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(COLLECTOR, gTrainerPalette_Collector), - .animation = sAnims_Collector, + .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_GRUNT_F] = @@ -630,7 +354,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_AquaGruntF, + .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMER_M] = @@ -638,7 +362,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_SwimmerM, + .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_GRUNT_M] = @@ -646,7 +370,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_MagmaGruntM, + .animation = sAnims_Trainer, }, [TRAINER_PIC_EXPERT_M] = @@ -654,7 +378,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_ExpertM, + .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_ADMIN_M] = @@ -662,7 +386,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_AquaAdminM, + .animation = sAnims_Trainer, }, [TRAINER_PIC_BLACK_BELT] = @@ -670,7 +394,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_BlackBelt, + .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_ADMIN_F] = @@ -678,7 +402,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_AquaAdminF, + .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_LEADER_ARCHIE] = @@ -686,7 +410,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_AquaLeaderArchie, + .animation = sAnims_Trainer, }, [TRAINER_PIC_HEX_MANIAC] = @@ -694,7 +418,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_HexManiac, + .animation = sAnims_Trainer, }, [TRAINER_PIC_AROMA_LADY] = @@ -702,7 +426,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_AromaLady, + .animation = sAnims_Trainer, }, [TRAINER_PIC_RUIN_MANIAC] = @@ -710,7 +434,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_RuinManiac, + .animation = sAnims_Trainer, }, [TRAINER_PIC_INTERVIEWER] = @@ -718,7 +442,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(INTERVIEWER, gTrainerFrontPic_Interviewer, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(INTERVIEWER, gTrainerPalette_Interviewer), - .animation = sAnims_Interviewer, + .animation = sAnims_Trainer, }, [TRAINER_PIC_TUBER_F] = @@ -726,7 +450,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_TuberF, + .animation = sAnims_Trainer, }, [TRAINER_PIC_TUBER_M] = @@ -734,7 +458,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_TuberM, + .animation = sAnims_Trainer, }, [TRAINER_PIC_COOLTRAINER_F] = @@ -742,7 +466,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_CoolTrainerF, + .animation = sAnims_Trainer, }, [TRAINER_PIC_LADY] = @@ -750,7 +474,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LADY, gTrainerFrontPic_Lady, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LADY, gTrainerPalette_Lady), - .animation = sAnims_Lady, + .animation = sAnims_Trainer, }, [TRAINER_PIC_BEAUTY] = @@ -758,7 +482,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BEAUTY, gTrainerFrontPic_Beauty, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(BEAUTY, gTrainerPalette_Beauty), - .animation = sAnims_Beauty, + .animation = sAnims_Trainer, }, [TRAINER_PIC_RICH_BOY] = @@ -766,7 +490,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_RichBoy, + .animation = sAnims_Trainer, }, [TRAINER_PIC_EXPERT_F] = @@ -774,7 +498,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_ExpertF, + .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMANIAC] = @@ -782,7 +506,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(POKEMANIAC, gTrainerFrontPic_Pokemaniac, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(POKEMANIAC, gTrainerPalette_Pokemaniac), - .animation = sAnims_Pokemaniac, + .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_GRUNT_F] = @@ -790,7 +514,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_MagmaGruntF, + .animation = sAnims_Trainer, }, [TRAINER_PIC_GUITARIST] = @@ -798,7 +522,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(GUITARIST, gTrainerFrontPic_Guitarist, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(GUITARIST, gTrainerPalette_Guitarist), - .animation = sAnims_Guitarist, + .animation = sAnims_Trainer, }, [TRAINER_PIC_KINDLER] = @@ -806,7 +530,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(KINDLER, gTrainerFrontPic_Kindler, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(KINDLER, gTrainerPalette_Kindler), - .animation = sAnims_Kindler, + .animation = sAnims_Trainer, }, [TRAINER_PIC_CAMPER] = @@ -814,7 +538,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(CAMPER, gTrainerFrontPic_Camper, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(CAMPER, gTrainerPalette_Camper), - .animation = sAnims_Camper, + .animation = sAnims_Trainer, }, [TRAINER_PIC_PICNICKER] = @@ -822,7 +546,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(PICNICKER, gTrainerFrontPic_Picnicker, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(PICNICKER, gTrainerPalette_Picnicker), - .animation = sAnims_Picnicker, + .animation = sAnims_Trainer, }, [TRAINER_PIC_BUG_MANIAC] = @@ -830,7 +554,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_BugManiac, + .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_BREEDER_M] = @@ -838,7 +562,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_PokemonBreederM, + .animation = sAnims_Trainer, }, [TRAINER_PIC_PSYCHIC_M] = @@ -846,7 +570,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_PsychicM, + .animation = sAnims_Trainer, }, [TRAINER_PIC_PSYCHIC_F] = @@ -854,7 +578,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_PsychicF, + .animation = sAnims_Trainer, }, [TRAINER_PIC_GENTLEMAN] = @@ -862,7 +586,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(GENTLEMAN, gTrainerFrontPic_Gentleman, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(GENTLEMAN, gTrainerPalette_Gentleman), - .animation = sAnims_Gentleman, + .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_SIDNEY] = @@ -870,7 +594,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_EliteFourSidney, + .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_PHOEBE] = @@ -878,7 +602,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_EliteFourPhoebe, + .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_GLACIA] = @@ -886,7 +610,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_EliteFourGlacia, + .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_DRAKE] = @@ -894,7 +618,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_EliteFourDrake, + .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_ROXANNE] = @@ -902,7 +626,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_LeaderRoxanne, + .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_BRAWLY] = @@ -910,7 +634,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_LeaderBrawly, + .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_WATTSON] = @@ -918,7 +642,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_LeaderWattson, + .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_FLANNERY] = @@ -926,7 +650,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_LeaderFlannery, + .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_NORMAN] = @@ -934,7 +658,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_LeaderNorman, + .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_WINONA] = @@ -942,7 +666,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_LeaderWinona, + .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_TATE_AND_LIZA] = @@ -950,7 +674,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_LeaderTateAndLiza, + .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_JUAN] = @@ -958,7 +682,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_LeaderJuan, + .animation = sAnims_Trainer, }, [TRAINER_PIC_SCHOOL_KID_M] = @@ -966,7 +690,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_SchoolKidM, + .animation = sAnims_Trainer, }, [TRAINER_PIC_SCHOOL_KID_F] = @@ -974,7 +698,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_SchoolKidF, + .animation = sAnims_Trainer, }, [TRAINER_PIC_SR_AND_JR] = @@ -982,7 +706,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_SrAndJr, + .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEFAN_M] = @@ -990,7 +714,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_PokefanM, + .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEFAN_F] = @@ -998,7 +722,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_PokefanF, + .animation = sAnims_Trainer, }, [TRAINER_PIC_YOUNGSTER] = @@ -1006,7 +730,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(YOUNGSTER, gTrainerFrontPic_Youngster, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(YOUNGSTER, gTrainerPalette_Youngster), - .animation = sAnims_Youngster, + .animation = sAnims_Trainer, }, [TRAINER_PIC_CHAMPION_WALLACE] = @@ -1014,7 +738,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_ChampionWallace, + .animation = sAnims_Trainer, }, [TRAINER_PIC_FISHERMAN] = @@ -1022,7 +746,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(FISHERMAN, gTrainerFrontPic_Fisherman, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(FISHERMAN, gTrainerPalette_Fisherman), - .animation = sAnims_Fisherman, + .animation = sAnims_Trainer, }, [TRAINER_PIC_CYCLING_TRIATHLETE_M] = @@ -1030,7 +754,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_CyclingTriathleteM, + .animation = sAnims_Trainer, }, [TRAINER_PIC_CYCLING_TRIATHLETE_F] = @@ -1038,7 +762,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_CyclingTriathleteF, + .animation = sAnims_Trainer, }, [TRAINER_PIC_RUNNING_TRIATHLETE_M] = @@ -1046,7 +770,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_RunningTriathleteM, + .animation = sAnims_Trainer, }, [TRAINER_PIC_RUNNING_TRIATHLETE_F] = @@ -1054,7 +778,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_RunningTriathleteF, + .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = @@ -1062,7 +786,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_SwimmingTriathleteM, + .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = @@ -1070,7 +794,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_SwimmingTriathleteF, + .animation = sAnims_Trainer, }, [TRAINER_PIC_DRAGON_TAMER] = @@ -1078,7 +802,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_DragonTamer, + .animation = sAnims_Trainer, }, [TRAINER_PIC_NINJA_BOY] = @@ -1086,7 +810,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_NinjaBoy, + .animation = sAnims_Trainer, }, [TRAINER_PIC_BATTLE_GIRL] = @@ -1094,7 +818,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_BattleGirl, + .animation = sAnims_Trainer, }, [TRAINER_PIC_PARASOL_LADY] = @@ -1102,7 +826,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_ParasolLady, + .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMER_F] = @@ -1110,7 +834,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_SwimmerF, + .animation = sAnims_Trainer, }, [TRAINER_PIC_TWINS] = @@ -1118,7 +842,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(TWINS, gTrainerFrontPic_Twins, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(TWINS, gTrainerPalette_Twins), - .animation = sAnims_Twins, + .animation = sAnims_Trainer, }, [TRAINER_PIC_SAILOR] = @@ -1126,7 +850,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(SAILOR, gTrainerFrontPic_Sailor, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(SAILOR, gTrainerPalette_Sailor), - .animation = sAnims_Sailor, + .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_ADMIN] = @@ -1134,7 +858,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_MagmaAdmin, + .animation = sAnims_Trainer, }, [TRAINER_PIC_WALLY] = @@ -1142,7 +866,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(WALLY, gTrainerFrontPic_Wally, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(WALLY, gTrainerPalette_Wally), - .animation = sAnims_Wally, + .animation = sAnims_Trainer, }, [TRAINER_PIC_BRENDAN] = @@ -1150,7 +874,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(BRENDAN, gTrainerFrontPic_Brendan, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(BRENDAN, gTrainerPalette_Brendan), - .animation = sAnims_Brendan, + .animation = sAnims_Trainer, }, [TRAINER_PIC_MAY] = @@ -1158,7 +882,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(MAY, gTrainerFrontPic_May, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(MAY, gTrainerPalette_May), - .animation = sAnims_May, + .animation = sAnims_Trainer, }, [TRAINER_PIC_BUG_CATCHER] = @@ -1166,7 +890,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_BugCatcher, + .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_RANGER_M] = @@ -1174,7 +898,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_PokemonRangerM, + .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_RANGER_F] = @@ -1182,7 +906,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_PokemonRangerF, + .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_LEADER_MAXIE] = @@ -1190,7 +914,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_MagmaLeaderMaxie, + .animation = sAnims_Trainer, }, [TRAINER_PIC_LASS] = @@ -1198,7 +922,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LASS, gTrainerFrontPic_Lass, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LASS, gTrainerPalette_Lass), - .animation = sAnims_Lass, + .animation = sAnims_Trainer, }, [TRAINER_PIC_YOUNG_COUPLE] = @@ -1206,7 +930,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_YoungCouple, + .animation = sAnims_Trainer, }, [TRAINER_PIC_OLD_COUPLE] = @@ -1214,7 +938,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_OldCouple, + .animation = sAnims_Trainer, }, [TRAINER_PIC_SIS_AND_BRO] = @@ -1222,7 +946,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_SisAndBro, + .animation = sAnims_Trainer, }, [TRAINER_PIC_STEVEN] = @@ -1230,7 +954,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(STEVEN, gTrainerFrontPic_Steven, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(STEVEN, gTrainerPalette_Steven), - .animation = sAnims_Steven, + .animation = sAnims_Trainer, }, [TRAINER_PIC_SALON_MAIDEN_ANABEL] = @@ -1238,7 +962,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_SalonMaidenAnabel, + .animation = sAnims_Trainer, }, [TRAINER_PIC_DOME_ACE_TUCKER] = @@ -1246,7 +970,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_DomeAceTucker, + .animation = sAnims_Trainer, }, [TRAINER_PIC_PALACE_MAVEN_SPENSER] = @@ -1254,7 +978,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_PalaceMavenSpenser, + .animation = sAnims_Trainer, }, [TRAINER_PIC_ARENA_TYCOON_GRETA] = @@ -1262,7 +986,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_ArenaTycoonGreta, + .animation = sAnims_Trainer, }, [TRAINER_PIC_FACTORY_HEAD_NOLAND] = @@ -1270,7 +994,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_FactoryHeadNoland, + .animation = sAnims_Trainer, }, [TRAINER_PIC_PIKE_QUEEN_LUCY] = @@ -1278,7 +1002,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_PikeQueenLucy, + .animation = sAnims_Trainer, }, [TRAINER_PIC_PYRAMID_KING_BRANDON] = @@ -1286,7 +1010,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_PyramidKingBrandon, + .animation = sAnims_Trainer, }, [TRAINER_PIC_RED] = @@ -1294,7 +1018,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(RED, gTrainerFrontPic_Red, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(RED, gTrainerPalette_Red), - .animation = sAnims_Red, + .animation = sAnims_Trainer, }, [TRAINER_PIC_LEAF] = @@ -1302,7 +1026,7 @@ const struct TrainerSprite gTrainerSprites[] = .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, .frontPic = TRAINER_SPRITE(LEAF, gTrainerFrontPic_Leaf, TRAINER_PIC_SIZE), .palette = TRAINER_PAL(LEAF, gTrainerPalette_Leaf), - .animation = sAnims_Leaf, + .animation = sAnims_Trainer, }, [TRAINER_PIC_RS_BRENDAN] = @@ -1310,7 +1034,7 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_RubySapphireBrendan, + .animation = sAnims_Trainer, }, [TRAINER_PIC_RS_MAY] = @@ -1318,6 +1042,6 @@ const struct TrainerSprite gTrainerSprites[] = .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), - .animation = sAnims_RubySapphireMay, + .animation = sAnims_Trainer, }, }; From eebf31bf89ed7eb6758138858d1ac6fb340affcd Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 24 Nov 2023 01:16:38 -0500 Subject: [PATCH 07/25] 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, }, }; From 80440e270ad726d7490bb3b809c2012eef12618c Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 24 Nov 2023 13:24:35 -0500 Subject: [PATCH 08/25] Simplified seemingly unused .y_offset and TRAINER_PIC_SIZE values --- include/data.h | 6 +- src/battle_controller_link_opponent.c | 2 +- src/battle_controller_opponent.c | 2 +- src/battle_controller_player.c | 2 +- src/battle_controller_player_partner.c | 4 +- src/battle_controller_recorded_opponent.c | 2 +- src/battle_controller_recorded_player.c | 2 +- src/battle_controllers.c | 2 +- src/data/graphics/trainers.h | 374 +++++++++++----------- 9 files changed, 198 insertions(+), 198 deletions(-) diff --git a/include/data.h b/include/data.h index e75a30c2e08d..de3b89906899 100644 --- a/include/data.h +++ b/include/data.h @@ -30,9 +30,9 @@ struct MonCoords struct TrainerSprite { - //The y_offset might not even be needed/have any affect for Trainer Sprites. - //If not, can remove MonCoords value (NOT THE STRUCT THOUGH) and just add size - struct MonCoords coordinates; + // This would use a bitfield, but some function + // uses it as a u8 and casting won't match. + u8 size; // u8 width:4, height:4; struct CompressedSpriteSheet frontPic; struct CompressedSpritePalette palette; const union AnimCmd *const *const animation; diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 8d259fca3bd5..b58d1666cd71 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -462,7 +462,7 @@ static void LinkOpponentHandleDrawTrainerPic(u32 battler) } BtlController_HandleDrawTrainerPic(battler, trainerPicId, TRUE, - xPos, 40 + 4 * (8 - gTrainerSprites[trainerPicId].coordinates.size), + xPos, 40 + 4 * (8 - gTrainerSprites[trainerPicId].size), -1); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 8eb59cff9ee5..3e5954254cf2 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -485,7 +485,7 @@ static void OpponentHandleDrawTrainerPic(u32 battler) } BtlController_HandleDrawTrainerPic(battler, trainerPicId, TRUE, - xPos, 40 + 4 * (8 - gTrainerSprites[trainerPicId].coordinates.size), + xPos, 40 + 4 * (8 - gTrainerSprites[trainerPicId].size), -1); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 4309e2a551a8..4f407459c0d5 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1879,7 +1879,7 @@ static void PlayerHandleDrawTrainerPic(u32 battler) if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId < TRAINER_PARTNER(PARTNER_NONE)) { xPos = 90; - yPos = (8 - gTrainerSprites[trainerPicId].coordinates.size) * 4 + 80; + yPos = (8 - gTrainerSprites[trainerPicId].size) * 4 + 80; } else { diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 9ca5f3765ab0..0af8f8651d65 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -307,13 +307,13 @@ static void PlayerPartnerHandleDrawTrainerPic(u32 battler) { trainerPicId = gTrainers[gPartnerTrainerId].trainerPic; xPos = 60; - yPos = (8 - gTrainerSprites[trainerPicId].coordinates.size) * 4 + 80; + yPos = (8 - gTrainerSprites[trainerPicId].size) * 4 + 80; } else { trainerPicId = GetFrontierTrainerFrontSpriteId(gPartnerTrainerId); xPos = 32; - yPos = (8 - gTrainerSprites[trainerPicId].coordinates.size) * 4 + 80; + yPos = (8 - gTrainerSprites[trainerPicId].size) * 4 + 80; } // Use back pic only if the partner Steven or is custom. diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 2d0b244aea8c..9bd7dbb65c2a 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -421,7 +421,7 @@ static void RecordedOpponentHandleDrawTrainerPic(u32 battler) } BtlController_HandleDrawTrainerPic(battler, trainerPicId, TRUE, - xPos, 40 + 4 * (8 - gTrainerSprites[trainerPicId].coordinates.size), + xPos, 40 + 4 * (8 - gTrainerSprites[trainerPicId].size), -1); } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index eb082f0c73a3..fe241c3c1c44 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -393,7 +393,7 @@ static void RecordedPlayerHandleDrawTrainerPic(u32 battler) if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) { xPos = 90; - yPos = (8 - gTrainerSprites[trainerPicId].coordinates.size) * 4 + 80; + yPos = (8 - gTrainerSprites[trainerPicId].size) * 4 + 80; } else { diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 930a2d8b14ea..77cb8b82b59b 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -2544,7 +2544,7 @@ void BtlController_HandleTrainerSlide(u32 battler, u32 trainerPicId) SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(battler)); gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, 176, - (8 - gTrainerSprites[trainerPicId].coordinates.size) * 4 + 40, + (8 - gTrainerSprites[trainerPicId].size) * 4 + 40, 30); gSprites[gBattlerSpriteIds[battler]].oam.affineParam = trainerPicId; gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerSprites[trainerPicId].palette.tag); diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 92f9622faf77..f57f081dcef9 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -293,7 +293,7 @@ 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(sprite, size, trainerPic) {gTrainerFrontPic_##sprite, size, TRAINER_PIC_##trainerPic} +#define TRAINER_SPRITE(sprite, trainerPic) {gTrainerFrontPic_##sprite, TRAINER_PIC_SIZE, TRAINER_PIC_##trainerPic} #define TRAINER_PAL(pal, trainerPic) {gTrainerPalette_##pal, TRAINER_PIC_##trainerPic} static const union AnimCmd *const sAnims_Trainer[] ={ sAnim_GeneralFrame0, @@ -303,744 +303,744 @@ const struct TrainerSprite gTrainerSprites[] = { [TRAINER_PIC_HIKER] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(Hiker, TRAINER_PIC_SIZE, HIKER), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Hiker, 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(AquaGruntM, TRAINER_PIC_SIZE, AQUA_GRUNT_M), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(AquaGruntM, 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(PokemonBreederF, TRAINER_PIC_SIZE, POKEMON_BREEDER_F), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(PokemonBreederF, 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(CoolTrainerM, TRAINER_PIC_SIZE, COOLTRAINER_M), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(CoolTrainerM, 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(BirdKeeper, TRAINER_PIC_SIZE, BIRD_KEEPER), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(BirdKeeper, 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, TRAINER_PIC_SIZE, COLLECTOR), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Collector, 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(AquaGruntF, TRAINER_PIC_SIZE, AQUA_GRUNT_F), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(AquaGruntF, 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(SwimmerM, TRAINER_PIC_SIZE, SWIMMER_M), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(SwimmerM, 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(MagmaGruntM, TRAINER_PIC_SIZE, MAGMA_GRUNT_M), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(MagmaGruntM, 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(ExpertM, TRAINER_PIC_SIZE, EXPERT_M), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(ExpertM, 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(AquaAdminM, TRAINER_PIC_SIZE, AQUA_ADMIN_M), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(AquaAdminM, 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(BlackBelt, TRAINER_PIC_SIZE, BLACK_BELT), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(BlackBelt, 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(AquaAdminF, TRAINER_PIC_SIZE, AQUA_ADMIN_F), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(AquaAdminF, 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(AquaLeaderArchie, TRAINER_PIC_SIZE, AQUA_LEADER_ARCHIE), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(AquaLeaderArchie, 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(HexManiac, TRAINER_PIC_SIZE, HEX_MANIAC), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(HexManiac, 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(AromaLady, TRAINER_PIC_SIZE, AROMA_LADY), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(AromaLady, 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(RuinManiac, TRAINER_PIC_SIZE, RUIN_MANIAC), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(RuinManiac, 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, TRAINER_PIC_SIZE, INTERVIEWER), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Interviewer, INTERVIEWER), .palette = TRAINER_PAL(Interviewer, INTERVIEWER), .animation = sAnims_Trainer, }, [TRAINER_PIC_TUBER_F] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(TuberF, TRAINER_PIC_SIZE, TUBER_F), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(TuberF, 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(TuberM, TRAINER_PIC_SIZE, TUBER_M), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(TuberM, 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(CoolTrainerF, TRAINER_PIC_SIZE, COOLTRAINER_F), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(CoolTrainerF, 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, TRAINER_PIC_SIZE, LADY), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Lady, LADY), .palette = TRAINER_PAL(Lady, LADY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BEAUTY] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(Beauty, TRAINER_PIC_SIZE, BEAUTY), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Beauty, BEAUTY), .palette = TRAINER_PAL(Beauty, BEAUTY), .animation = sAnims_Trainer, }, [TRAINER_PIC_RICH_BOY] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(RichBoy, TRAINER_PIC_SIZE, RICH_BOY), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(RichBoy, 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(ExpertF, TRAINER_PIC_SIZE, EXPERT_F), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(ExpertF, 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, TRAINER_PIC_SIZE, POKEMANIAC), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Pokemaniac, 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(MagmaGruntF, TRAINER_PIC_SIZE, MAGMA_GRUNT_F), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(MagmaGruntF, 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, TRAINER_PIC_SIZE, GUITARIST), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Guitarist, GUITARIST), .palette = TRAINER_PAL(Guitarist, GUITARIST), .animation = sAnims_Trainer, }, [TRAINER_PIC_KINDLER] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(Kindler, TRAINER_PIC_SIZE, KINDLER), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Kindler, KINDLER), .palette = TRAINER_PAL(Kindler, KINDLER), .animation = sAnims_Trainer, }, [TRAINER_PIC_CAMPER] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(Camper, TRAINER_PIC_SIZE, CAMPER), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Camper, CAMPER), .palette = TRAINER_PAL(Camper, CAMPER), .animation = sAnims_Trainer, }, [TRAINER_PIC_PICNICKER] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(Picnicker, TRAINER_PIC_SIZE, PICNICKER), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Picnicker, PICNICKER), .palette = TRAINER_PAL(Picnicker, PICNICKER), .animation = sAnims_Trainer, }, [TRAINER_PIC_BUG_MANIAC] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(BugManiac, TRAINER_PIC_SIZE, BUG_MANIAC), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(BugManiac, 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(PokemonBreederM, TRAINER_PIC_SIZE, POKEMON_BREEDER_M), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(PokemonBreederM, 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(PsychicM, TRAINER_PIC_SIZE, PSYCHIC_M), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(PsychicM, 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(PsychicF, TRAINER_PIC_SIZE, PSYCHIC_F), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(PsychicF, 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, TRAINER_PIC_SIZE, GENTLEMAN), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Gentleman, 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(EliteFourSidney, TRAINER_PIC_SIZE, ELITE_FOUR_SIDNEY), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(EliteFourSidney, 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(EliteFourPhoebe, TRAINER_PIC_SIZE, ELITE_FOUR_PHOEBE), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(EliteFourPhoebe, 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(EliteFourGlacia, TRAINER_PIC_SIZE, ELITE_FOUR_GLACIA), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(EliteFourGlacia, 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(EliteFourDrake, TRAINER_PIC_SIZE, ELITE_FOUR_DRAKE), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(EliteFourDrake, 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(LeaderRoxanne, TRAINER_PIC_SIZE, LEADER_ROXANNE), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(LeaderRoxanne, 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(LeaderBrawly, TRAINER_PIC_SIZE, LEADER_BRAWLY), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(LeaderBrawly, 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(LeaderWattson, TRAINER_PIC_SIZE, LEADER_WATTSON), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(LeaderWattson, 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(LeaderFlannery, TRAINER_PIC_SIZE, LEADER_FLANNERY), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(LeaderFlannery, 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(LeaderNorman, TRAINER_PIC_SIZE, LEADER_NORMAN), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(LeaderNorman, 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(LeaderWinona, TRAINER_PIC_SIZE, LEADER_WINONA), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(LeaderWinona, 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(LeaderTateAndLiza, TRAINER_PIC_SIZE, LEADER_TATE_AND_LIZA), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(LeaderTateAndLiza, 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(LeaderJuan, TRAINER_PIC_SIZE, LEADER_JUAN), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(LeaderJuan, 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(SchoolKidM, TRAINER_PIC_SIZE, SCHOOL_KID_M), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(SchoolKidM, 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(SchoolKidF, TRAINER_PIC_SIZE, SCHOOL_KID_F), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(SchoolKidF, 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(SrAndJr, TRAINER_PIC_SIZE * 2, SR_AND_JR), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(SrAndJr, 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(PokefanM, TRAINER_PIC_SIZE * 2, POKEFAN_M), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(PokefanM, 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(PokefanF, TRAINER_PIC_SIZE, POKEFAN_F), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(PokefanF, 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, TRAINER_PIC_SIZE, YOUNGSTER), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Youngster, YOUNGSTER), .palette = TRAINER_PAL(Youngster, YOUNGSTER), .animation = sAnims_Trainer, }, [TRAINER_PIC_CHAMPION_WALLACE] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 2}, - .frontPic = TRAINER_SPRITE(ChampionWallace, TRAINER_PIC_SIZE * 2, CHAMPION_WALLACE), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(ChampionWallace, 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, TRAINER_PIC_SIZE, FISHERMAN), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Fisherman, 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(CyclingTriathleteM, TRAINER_PIC_SIZE * 2, CYCLING_TRIATHLETE_M), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(CyclingTriathleteM, 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(CyclingTriathleteF, TRAINER_PIC_SIZE, CYCLING_TRIATHLETE_F), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(CyclingTriathleteF, 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(RunningTriathleteM, TRAINER_PIC_SIZE, RUNNING_TRIATHLETE_M), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(RunningTriathleteM, 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(RunningTriathleteF, TRAINER_PIC_SIZE, RUNNING_TRIATHLETE_F), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(RunningTriathleteF, 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(SwimmingTriathleteM, TRAINER_PIC_SIZE, SWIMMING_TRIATHLETE_M), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(SwimmingTriathleteM, 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(SwimmingTriathleteF, TRAINER_PIC_SIZE, SWIMMING_TRIATHLETE_F), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(SwimmingTriathleteF, 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(DragonTamer, TRAINER_PIC_SIZE, DRAGON_TAMER), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(DragonTamer, 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(NinjaBoy, TRAINER_PIC_SIZE, NINJA_BOY), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(NinjaBoy, 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(BattleGirl, TRAINER_PIC_SIZE * 2, BATTLE_GIRL), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(BattleGirl, 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(ParasolLady, TRAINER_PIC_SIZE, PARASOL_LADY), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(ParasolLady, 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(SwimmerF, TRAINER_PIC_SIZE, SWIMMER_F), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(SwimmerF, 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, TRAINER_PIC_SIZE, TWINS), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Twins, TWINS), .palette = TRAINER_PAL(Twins, TWINS), .animation = sAnims_Trainer, }, [TRAINER_PIC_SAILOR] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(Sailor, TRAINER_PIC_SIZE, SAILOR), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Sailor, SAILOR), .palette = TRAINER_PAL(Sailor, SAILOR), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_ADMIN] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(MagmaAdmin, TRAINER_PIC_SIZE, MAGMA_ADMIN), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(MagmaAdmin, 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, TRAINER_PIC_SIZE, WALLY), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Wally, WALLY), .palette = TRAINER_PAL(Wally, WALLY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BRENDAN] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(Brendan, TRAINER_PIC_SIZE, BRENDAN), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Brendan, BRENDAN), .palette = TRAINER_PAL(Brendan, BRENDAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAY] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(May, TRAINER_PIC_SIZE, MAY), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(May, MAY), .palette = TRAINER_PAL(May, MAY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BUG_CATCHER] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(BugCatcher, TRAINER_PIC_SIZE, BUG_CATCHER), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(BugCatcher, 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(PokemonRangerM, TRAINER_PIC_SIZE, POKEMON_RANGER_M), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(PokemonRangerM, 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(PokemonRangerF, TRAINER_PIC_SIZE, POKEMON_RANGER_F), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(PokemonRangerF, 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(MagmaLeaderMaxie, TRAINER_PIC_SIZE, MAGMA_LEADER_MAXIE), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(MagmaLeaderMaxie, 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, TRAINER_PIC_SIZE, LASS), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Lass, LASS), .palette = TRAINER_PAL(Lass, LASS), .animation = sAnims_Trainer, }, [TRAINER_PIC_YOUNG_COUPLE] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(YoungCouple, TRAINER_PIC_SIZE, YOUNG_COUPLE), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(YoungCouple, 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(OldCouple, TRAINER_PIC_SIZE, OLD_COUPLE), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(OldCouple, 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(SisAndBro, TRAINER_PIC_SIZE, SIS_AND_BRO), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(SisAndBro, 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, TRAINER_PIC_SIZE, STEVEN), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Steven, 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(SalonMaidenAnabel, TRAINER_PIC_SIZE, SALON_MAIDEN_ANABEL), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(SalonMaidenAnabel, 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(DomeAceTucker, TRAINER_PIC_SIZE, DOME_ACE_TUCKER), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(DomeAceTucker, 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(PalaceMavenSpenser, TRAINER_PIC_SIZE, PALACE_MAVEN_SPENSER), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(PalaceMavenSpenser, 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(ArenaTycoonGreta, TRAINER_PIC_SIZE * 2, ARENA_TYCOON_GRETA), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(ArenaTycoonGreta, 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(FactoryHeadNoland, TRAINER_PIC_SIZE, FACTORY_HEAD_NOLAND), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(FactoryHeadNoland, 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(PikeQueenLucy, TRAINER_PIC_SIZE, PIKE_QUEEN_LUCY), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(PikeQueenLucy, 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(PyramidKingBrandon, TRAINER_PIC_SIZE, PYRAMID_KING_BRANDON), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(PyramidKingBrandon, 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, TRAINER_PIC_SIZE, RED), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Red, RED), .palette = TRAINER_PAL(Red, RED), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEAF] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(Leaf, TRAINER_PIC_SIZE, LEAF), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(Leaf, LEAF), .palette = TRAINER_PAL(Leaf, LEAF), .animation = sAnims_Trainer, }, [TRAINER_PIC_RS_BRENDAN] = { - .coordinates = {.size = TRAINER_SPRITE_SIZE, .y_offset = 1}, - .frontPic = TRAINER_SPRITE(RubySapphireBrendan, TRAINER_PIC_SIZE, RS_BRENDAN), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(RubySapphireBrendan, 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(RubySapphireMay, TRAINER_PIC_SIZE, RS_MAY), + .size = TRAINER_SPRITE_SIZE, + .frontPic = TRAINER_SPRITE(RubySapphireMay, RS_MAY), .palette = TRAINER_PAL(RubySapphireMay, RS_MAY), .animation = sAnims_Trainer, }, From fb983108ff7e03e80cc343a50afa5986e6403142 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 24 Nov 2023 14:06:46 -0500 Subject: [PATCH 09/25] Condensed TRAINER_SPRITE and TRAINER_PAL into TRAINER_PIC --- src/data/graphics/trainers.h | 286 ++++++++++++----------------------- 1 file changed, 98 insertions(+), 188 deletions(-) diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index f57f081dcef9..0ace1d368156 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -292,9 +292,12 @@ const u8 gTrainerBackPic_Steven[] = INCBIN_U8("graphics/trainers/back_pics/steve const u32 gTrainerBackPicPalette_Red[] = INCBIN_U32("graphics/trainers/back_pics/red.gbapal.lz"); const u32 gTrainerBackPicPalette_Leaf[] = INCBIN_U32("graphics/trainers/back_pics/leaf.gbapal.lz"); +//If there's no reason for the size to ever change, it can be moved into TRAINER_PIC #define TRAINER_SPRITE_SIZE 8 -#define TRAINER_SPRITE(sprite, trainerPic) {gTrainerFrontPic_##sprite, TRAINER_PIC_SIZE, TRAINER_PIC_##trainerPic} -#define TRAINER_PAL(pal, trainerPic) {gTrainerPalette_##pal, TRAINER_PIC_##trainerPic} +#define TRAINER_PIC(file, trainerPic) \ + .frontPic = {gTrainerFrontPic_##file, TRAINER_PIC_SIZE, TRAINER_PIC_##trainerPic},\ + .palette = {gTrainerPalette_##file, TRAINER_PIC_##trainerPic} + static const union AnimCmd *const sAnims_Trainer[] ={ sAnim_GeneralFrame0, }; @@ -304,744 +307,651 @@ const struct TrainerSprite gTrainerSprites[] = [TRAINER_PIC_HIKER] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Hiker, HIKER), - .palette = TRAINER_PAL(Hiker, HIKER), + TRAINER_PIC(Hiker, HIKER), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_GRUNT_M] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(AquaGruntM, AQUA_GRUNT_M), - .palette = TRAINER_PAL(AquaGruntM, AQUA_GRUNT_M), + TRAINER_PIC(AquaGruntM, AQUA_GRUNT_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_BREEDER_F] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(PokemonBreederF, POKEMON_BREEDER_F), - .palette = TRAINER_PAL(PokemonBreederF, POKEMON_BREEDER_F), + TRAINER_PIC(PokemonBreederF, POKEMON_BREEDER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_COOLTRAINER_M] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(CoolTrainerM, COOLTRAINER_M), - .palette = TRAINER_PAL(CoolTrainerM, COOLTRAINER_M), + TRAINER_PIC(CoolTrainerM, COOLTRAINER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_BIRD_KEEPER] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(BirdKeeper, BIRD_KEEPER), - .palette = TRAINER_PAL(BirdKeeper, BIRD_KEEPER), + TRAINER_PIC(BirdKeeper, BIRD_KEEPER), .animation = sAnims_Trainer, }, [TRAINER_PIC_COLLECTOR] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Collector, COLLECTOR), - .palette = TRAINER_PAL(Collector, COLLECTOR), + TRAINER_PIC(Collector, COLLECTOR), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_GRUNT_F] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(AquaGruntF, AQUA_GRUNT_F), - .palette = TRAINER_PAL(AquaGruntF, AQUA_GRUNT_F), + TRAINER_PIC(AquaGruntF, AQUA_GRUNT_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMER_M] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(SwimmerM, SWIMMER_M), - .palette = TRAINER_PAL(SwimmerM, SWIMMER_M), + TRAINER_PIC(SwimmerM, SWIMMER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_GRUNT_M] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(MagmaGruntM, MAGMA_GRUNT_M), - .palette = TRAINER_PAL(MagmaGruntM, MAGMA_GRUNT_M), + TRAINER_PIC(MagmaGruntM, MAGMA_GRUNT_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_EXPERT_M] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(ExpertM, EXPERT_M), - .palette = TRAINER_PAL(ExpertM, EXPERT_M), + TRAINER_PIC(ExpertM, EXPERT_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_ADMIN_M] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(AquaAdminM, AQUA_ADMIN_M), - .palette = TRAINER_PAL(AquaAdminM, AQUA_ADMIN_M), + TRAINER_PIC(AquaAdminM, AQUA_ADMIN_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_BLACK_BELT] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(BlackBelt, BLACK_BELT), - .palette = TRAINER_PAL(BlackBelt, BLACK_BELT), + TRAINER_PIC(BlackBelt, BLACK_BELT), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_ADMIN_F] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(AquaAdminF, AQUA_ADMIN_F), - .palette = TRAINER_PAL(AquaAdminF, AQUA_ADMIN_F), + TRAINER_PIC(AquaAdminF, AQUA_ADMIN_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_LEADER_ARCHIE] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(AquaLeaderArchie, AQUA_LEADER_ARCHIE), - .palette = TRAINER_PAL(AquaLeaderArchie, AQUA_LEADER_ARCHIE), + TRAINER_PIC(AquaLeaderArchie, AQUA_LEADER_ARCHIE), .animation = sAnims_Trainer, }, [TRAINER_PIC_HEX_MANIAC] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(HexManiac, HEX_MANIAC), - .palette = TRAINER_PAL(HexManiac, HEX_MANIAC), + TRAINER_PIC(HexManiac, HEX_MANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_AROMA_LADY] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(AromaLady, AROMA_LADY), - .palette = TRAINER_PAL(AromaLady, AROMA_LADY), + TRAINER_PIC(AromaLady, AROMA_LADY), .animation = sAnims_Trainer, }, [TRAINER_PIC_RUIN_MANIAC] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(RuinManiac, RUIN_MANIAC), - .palette = TRAINER_PAL(RuinManiac, RUIN_MANIAC), + TRAINER_PIC(RuinManiac, RUIN_MANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_INTERVIEWER] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Interviewer, INTERVIEWER), - .palette = TRAINER_PAL(Interviewer, INTERVIEWER), + TRAINER_PIC(Interviewer, INTERVIEWER), .animation = sAnims_Trainer, }, [TRAINER_PIC_TUBER_F] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(TuberF, TUBER_F), - .palette = TRAINER_PAL(TuberF, TUBER_F), + TRAINER_PIC(TuberF, TUBER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_TUBER_M] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(TuberM, TUBER_M), - .palette = TRAINER_PAL(TuberM, TUBER_M), + TRAINER_PIC(TuberM, TUBER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_COOLTRAINER_F] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(CoolTrainerF, COOLTRAINER_F), - .palette = TRAINER_PAL(CoolTrainerF, COOLTRAINER_F), + TRAINER_PIC(CoolTrainerF, COOLTRAINER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_LADY] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Lady, LADY), - .palette = TRAINER_PAL(Lady, LADY), + TRAINER_PIC(Lady, LADY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BEAUTY] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Beauty, BEAUTY), - .palette = TRAINER_PAL(Beauty, BEAUTY), + TRAINER_PIC(Beauty, BEAUTY), .animation = sAnims_Trainer, }, [TRAINER_PIC_RICH_BOY] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(RichBoy, RICH_BOY), - .palette = TRAINER_PAL(RichBoy, RICH_BOY), + TRAINER_PIC(RichBoy, RICH_BOY), .animation = sAnims_Trainer, }, [TRAINER_PIC_EXPERT_F] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(ExpertF, EXPERT_F), - .palette = TRAINER_PAL(ExpertF, EXPERT_F), + TRAINER_PIC(ExpertF, EXPERT_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMANIAC] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Pokemaniac, POKEMANIAC), - .palette = TRAINER_PAL(Pokemaniac, POKEMANIAC), + TRAINER_PIC(Pokemaniac, POKEMANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_GRUNT_F] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(MagmaGruntF, MAGMA_GRUNT_F), - .palette = TRAINER_PAL(MagmaGruntF, MAGMA_GRUNT_F), + TRAINER_PIC(MagmaGruntF, MAGMA_GRUNT_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_GUITARIST] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Guitarist, GUITARIST), - .palette = TRAINER_PAL(Guitarist, GUITARIST), + TRAINER_PIC(Guitarist, GUITARIST), .animation = sAnims_Trainer, }, [TRAINER_PIC_KINDLER] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Kindler, KINDLER), - .palette = TRAINER_PAL(Kindler, KINDLER), + TRAINER_PIC(Kindler, KINDLER), .animation = sAnims_Trainer, }, [TRAINER_PIC_CAMPER] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Camper, CAMPER), - .palette = TRAINER_PAL(Camper, CAMPER), + TRAINER_PIC(Camper, CAMPER), .animation = sAnims_Trainer, }, [TRAINER_PIC_PICNICKER] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Picnicker, PICNICKER), - .palette = TRAINER_PAL(Picnicker, PICNICKER), + TRAINER_PIC(Picnicker, PICNICKER), .animation = sAnims_Trainer, }, [TRAINER_PIC_BUG_MANIAC] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(BugManiac, BUG_MANIAC), - .palette = TRAINER_PAL(BugManiac, BUG_MANIAC), + TRAINER_PIC(BugManiac, BUG_MANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_BREEDER_M] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(PokemonBreederM, POKEMON_BREEDER_M), - .palette = TRAINER_PAL(PokemonBreederM, POKEMON_BREEDER_M), + TRAINER_PIC(PokemonBreederM, POKEMON_BREEDER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_PSYCHIC_M] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(PsychicM, PSYCHIC_M), - .palette = TRAINER_PAL(PsychicM, PSYCHIC_M), + TRAINER_PIC(PsychicM, PSYCHIC_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_PSYCHIC_F] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(PsychicF, PSYCHIC_F), - .palette = TRAINER_PAL(PsychicF, PSYCHIC_F), + TRAINER_PIC(PsychicF, PSYCHIC_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_GENTLEMAN] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Gentleman, GENTLEMAN), - .palette = TRAINER_PAL(Gentleman, GENTLEMAN), + TRAINER_PIC(Gentleman, GENTLEMAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_SIDNEY] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(EliteFourSidney, ELITE_FOUR_SIDNEY), - .palette = TRAINER_PAL(EliteFourSidney, ELITE_FOUR_SIDNEY), + TRAINER_PIC(EliteFourSidney, ELITE_FOUR_SIDNEY), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_PHOEBE] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(EliteFourPhoebe, ELITE_FOUR_PHOEBE), - .palette = TRAINER_PAL(EliteFourPhoebe, ELITE_FOUR_PHOEBE), + TRAINER_PIC(EliteFourPhoebe, ELITE_FOUR_PHOEBE), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_GLACIA] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(EliteFourGlacia, ELITE_FOUR_GLACIA), - .palette = TRAINER_PAL(EliteFourGlacia, ELITE_FOUR_GLACIA), + TRAINER_PIC(EliteFourGlacia, ELITE_FOUR_GLACIA), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_DRAKE] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(EliteFourDrake, ELITE_FOUR_DRAKE), - .palette = TRAINER_PAL(EliteFourDrake, ELITE_FOUR_DRAKE), + TRAINER_PIC(EliteFourDrake, ELITE_FOUR_DRAKE), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_ROXANNE] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(LeaderRoxanne, LEADER_ROXANNE), - .palette = TRAINER_PAL(LeaderRoxanne, LEADER_ROXANNE), + TRAINER_PIC(LeaderRoxanne, LEADER_ROXANNE), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_BRAWLY] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(LeaderBrawly, LEADER_BRAWLY), - .palette = TRAINER_PAL(LeaderBrawly, LEADER_BRAWLY), + TRAINER_PIC(LeaderBrawly, LEADER_BRAWLY), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_WATTSON] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(LeaderWattson, LEADER_WATTSON), - .palette = TRAINER_PAL(LeaderWattson, LEADER_WATTSON), + TRAINER_PIC(LeaderWattson, LEADER_WATTSON), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_FLANNERY] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(LeaderFlannery, LEADER_FLANNERY), - .palette = TRAINER_PAL(LeaderFlannery, LEADER_FLANNERY), + TRAINER_PIC(LeaderFlannery, LEADER_FLANNERY), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_NORMAN] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(LeaderNorman, LEADER_NORMAN), - .palette = TRAINER_PAL(LeaderNorman, LEADER_NORMAN), + TRAINER_PIC(LeaderNorman, LEADER_NORMAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_WINONA] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(LeaderWinona, LEADER_WINONA), - .palette = TRAINER_PAL(LeaderWinona, LEADER_WINONA), + TRAINER_PIC(LeaderWinona, LEADER_WINONA), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_TATE_AND_LIZA] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(LeaderTateAndLiza, LEADER_TATE_AND_LIZA), - .palette = TRAINER_PAL(LeaderTateAndLiza, LEADER_TATE_AND_LIZA), + TRAINER_PIC(LeaderTateAndLiza, LEADER_TATE_AND_LIZA), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_JUAN] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(LeaderJuan, LEADER_JUAN), - .palette = TRAINER_PAL(LeaderJuan, LEADER_JUAN), + TRAINER_PIC(LeaderJuan, LEADER_JUAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_SCHOOL_KID_M] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(SchoolKidM, SCHOOL_KID_M), - .palette = TRAINER_PAL(SchoolKidM, SCHOOL_KID_M), + TRAINER_PIC(SchoolKidM, SCHOOL_KID_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_SCHOOL_KID_F] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(SchoolKidF, SCHOOL_KID_F), - .palette = TRAINER_PAL(SchoolKidF, SCHOOL_KID_F), + TRAINER_PIC(SchoolKidF, SCHOOL_KID_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_SR_AND_JR] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(SrAndJr, SR_AND_JR), - .palette = TRAINER_PAL(SrAndJr, SR_AND_JR), + TRAINER_PIC(SrAndJr, SR_AND_JR), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEFAN_M] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(PokefanM, POKEFAN_M), - .palette = TRAINER_PAL(PokefanM, POKEFAN_M), + TRAINER_PIC(PokefanM, POKEFAN_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEFAN_F] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(PokefanF, POKEFAN_F), - .palette = TRAINER_PAL(PokefanF, POKEFAN_F), + TRAINER_PIC(PokefanF, POKEFAN_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_YOUNGSTER] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Youngster, YOUNGSTER), - .palette = TRAINER_PAL(Youngster, YOUNGSTER), + TRAINER_PIC(Youngster, YOUNGSTER), .animation = sAnims_Trainer, }, [TRAINER_PIC_CHAMPION_WALLACE] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(ChampionWallace, CHAMPION_WALLACE), - .palette = TRAINER_PAL(ChampionWallace, CHAMPION_WALLACE), + TRAINER_PIC(ChampionWallace, CHAMPION_WALLACE), .animation = sAnims_Trainer, }, [TRAINER_PIC_FISHERMAN] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Fisherman, FISHERMAN), - .palette = TRAINER_PAL(Fisherman, FISHERMAN), + TRAINER_PIC(Fisherman, FISHERMAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_CYCLING_TRIATHLETE_M] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(CyclingTriathleteM, CYCLING_TRIATHLETE_M), - .palette = TRAINER_PAL(CyclingTriathleteM, CYCLING_TRIATHLETE_M), + TRAINER_PIC(CyclingTriathleteM, CYCLING_TRIATHLETE_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_CYCLING_TRIATHLETE_F] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(CyclingTriathleteF, CYCLING_TRIATHLETE_F), - .palette = TRAINER_PAL(CyclingTriathleteF, CYCLING_TRIATHLETE_F), + TRAINER_PIC(CyclingTriathleteF, CYCLING_TRIATHLETE_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_RUNNING_TRIATHLETE_M] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(RunningTriathleteM, RUNNING_TRIATHLETE_M), - .palette = TRAINER_PAL(RunningTriathleteM, RUNNING_TRIATHLETE_M), + TRAINER_PIC(RunningTriathleteM, RUNNING_TRIATHLETE_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_RUNNING_TRIATHLETE_F] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(RunningTriathleteF, RUNNING_TRIATHLETE_F), - .palette = TRAINER_PAL(RunningTriathleteF, RUNNING_TRIATHLETE_F), + TRAINER_PIC(RunningTriathleteF, RUNNING_TRIATHLETE_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(SwimmingTriathleteM, SWIMMING_TRIATHLETE_M), - .palette = TRAINER_PAL(SwimmingTriathleteM, SWIMMING_TRIATHLETE_M), + TRAINER_PIC(SwimmingTriathleteM, SWIMMING_TRIATHLETE_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(SwimmingTriathleteF, SWIMMING_TRIATHLETE_F), - .palette = TRAINER_PAL(SwimmingTriathleteF, SWIMMING_TRIATHLETE_F), + TRAINER_PIC(SwimmingTriathleteF, SWIMMING_TRIATHLETE_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_DRAGON_TAMER] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(DragonTamer, DRAGON_TAMER), - .palette = TRAINER_PAL(DragonTamer, DRAGON_TAMER), + TRAINER_PIC(DragonTamer, DRAGON_TAMER), .animation = sAnims_Trainer, }, [TRAINER_PIC_NINJA_BOY] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(NinjaBoy, NINJA_BOY), - .palette = TRAINER_PAL(NinjaBoy, NINJA_BOY), + TRAINER_PIC(NinjaBoy, NINJA_BOY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BATTLE_GIRL] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(BattleGirl, BATTLE_GIRL), - .palette = TRAINER_PAL(BattleGirl, BATTLE_GIRL), + TRAINER_PIC(BattleGirl, BATTLE_GIRL), .animation = sAnims_Trainer, }, [TRAINER_PIC_PARASOL_LADY] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(ParasolLady, PARASOL_LADY), - .palette = TRAINER_PAL(ParasolLady, PARASOL_LADY), + TRAINER_PIC(ParasolLady, PARASOL_LADY), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMER_F] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(SwimmerF, SWIMMER_F), - .palette = TRAINER_PAL(SwimmerF, SWIMMER_F), + TRAINER_PIC(SwimmerF, SWIMMER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_TWINS] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Twins, TWINS), - .palette = TRAINER_PAL(Twins, TWINS), + TRAINER_PIC(Twins, TWINS), .animation = sAnims_Trainer, }, [TRAINER_PIC_SAILOR] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Sailor, SAILOR), - .palette = TRAINER_PAL(Sailor, SAILOR), + TRAINER_PIC(Sailor, SAILOR), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_ADMIN] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(MagmaAdmin, MAGMA_ADMIN), - .palette = TRAINER_PAL(MagmaAdmin, MAGMA_ADMIN), + TRAINER_PIC(MagmaAdmin, MAGMA_ADMIN), .animation = sAnims_Trainer, }, [TRAINER_PIC_WALLY] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Wally, WALLY), - .palette = TRAINER_PAL(Wally, WALLY), + TRAINER_PIC(Wally, WALLY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BRENDAN] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Brendan, BRENDAN), - .palette = TRAINER_PAL(Brendan, BRENDAN), + TRAINER_PIC(Brendan, BRENDAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAY] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(May, MAY), - .palette = TRAINER_PAL(May, MAY), + TRAINER_PIC(May, MAY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BUG_CATCHER] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(BugCatcher, BUG_CATCHER), - .palette = TRAINER_PAL(BugCatcher, BUG_CATCHER), + TRAINER_PIC(BugCatcher, BUG_CATCHER), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_RANGER_M] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(PokemonRangerM, POKEMON_RANGER_M), - .palette = TRAINER_PAL(PokemonRangerM, POKEMON_RANGER_M), + TRAINER_PIC(PokemonRangerM, POKEMON_RANGER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_RANGER_F] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(PokemonRangerF, POKEMON_RANGER_F), - .palette = TRAINER_PAL(PokemonRangerF, POKEMON_RANGER_F), + TRAINER_PIC(PokemonRangerF, POKEMON_RANGER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_LEADER_MAXIE] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(MagmaLeaderMaxie, MAGMA_LEADER_MAXIE), - .palette = TRAINER_PAL(MagmaLeaderMaxie, MAGMA_LEADER_MAXIE), + TRAINER_PIC(MagmaLeaderMaxie, MAGMA_LEADER_MAXIE), .animation = sAnims_Trainer, }, [TRAINER_PIC_LASS] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Lass, LASS), - .palette = TRAINER_PAL(Lass, LASS), + TRAINER_PIC(Lass, LASS), .animation = sAnims_Trainer, }, [TRAINER_PIC_YOUNG_COUPLE] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(YoungCouple, YOUNG_COUPLE), - .palette = TRAINER_PAL(YoungCouple, YOUNG_COUPLE), + TRAINER_PIC(YoungCouple, YOUNG_COUPLE), .animation = sAnims_Trainer, }, [TRAINER_PIC_OLD_COUPLE] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(OldCouple, OLD_COUPLE), - .palette = TRAINER_PAL(OldCouple, OLD_COUPLE), + TRAINER_PIC(OldCouple, OLD_COUPLE), .animation = sAnims_Trainer, }, [TRAINER_PIC_SIS_AND_BRO] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(SisAndBro, SIS_AND_BRO), - .palette = TRAINER_PAL(SisAndBro, SIS_AND_BRO), + TRAINER_PIC(SisAndBro, SIS_AND_BRO), .animation = sAnims_Trainer, }, [TRAINER_PIC_STEVEN] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Steven, STEVEN), - .palette = TRAINER_PAL(Steven, STEVEN), + TRAINER_PIC(Steven, STEVEN), .animation = sAnims_Trainer, }, [TRAINER_PIC_SALON_MAIDEN_ANABEL] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(SalonMaidenAnabel, SALON_MAIDEN_ANABEL), - .palette = TRAINER_PAL(SalonMaidenAnabel, SALON_MAIDEN_ANABEL), + TRAINER_PIC(SalonMaidenAnabel, SALON_MAIDEN_ANABEL), .animation = sAnims_Trainer, }, [TRAINER_PIC_DOME_ACE_TUCKER] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(DomeAceTucker, DOME_ACE_TUCKER), - .palette = TRAINER_PAL(DomeAceTucker, DOME_ACE_TUCKER), + TRAINER_PIC(DomeAceTucker, DOME_ACE_TUCKER), .animation = sAnims_Trainer, }, [TRAINER_PIC_PALACE_MAVEN_SPENSER] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(PalaceMavenSpenser, PALACE_MAVEN_SPENSER), - .palette = TRAINER_PAL(PalaceMavenSpenser, PALACE_MAVEN_SPENSER), + TRAINER_PIC(PalaceMavenSpenser, PALACE_MAVEN_SPENSER), .animation = sAnims_Trainer, }, [TRAINER_PIC_ARENA_TYCOON_GRETA] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(ArenaTycoonGreta, ARENA_TYCOON_GRETA), - .palette = TRAINER_PAL(ArenaTycoonGreta, ARENA_TYCOON_GRETA), + TRAINER_PIC(ArenaTycoonGreta, ARENA_TYCOON_GRETA), .animation = sAnims_Trainer, }, [TRAINER_PIC_FACTORY_HEAD_NOLAND] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(FactoryHeadNoland, FACTORY_HEAD_NOLAND), - .palette = TRAINER_PAL(FactoryHeadNoland, FACTORY_HEAD_NOLAND), + TRAINER_PIC(FactoryHeadNoland, FACTORY_HEAD_NOLAND), .animation = sAnims_Trainer, }, [TRAINER_PIC_PIKE_QUEEN_LUCY] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(PikeQueenLucy, PIKE_QUEEN_LUCY), - .palette = TRAINER_PAL(PikeQueenLucy, PIKE_QUEEN_LUCY), + TRAINER_PIC(PikeQueenLucy, PIKE_QUEEN_LUCY), .animation = sAnims_Trainer, }, [TRAINER_PIC_PYRAMID_KING_BRANDON] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(PyramidKingBrandon, PYRAMID_KING_BRANDON), - .palette = TRAINER_PAL(PyramidKingBrandon, PYRAMID_KING_BRANDON), + TRAINER_PIC(PyramidKingBrandon, PYRAMID_KING_BRANDON), .animation = sAnims_Trainer, }, [TRAINER_PIC_RED] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Red, RED), - .palette = TRAINER_PAL(Red, RED), + TRAINER_PIC(Red, RED), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEAF] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(Leaf, LEAF), - .palette = TRAINER_PAL(Leaf, LEAF), + TRAINER_PIC(Leaf, LEAF), .animation = sAnims_Trainer, }, [TRAINER_PIC_RS_BRENDAN] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(RubySapphireBrendan, RS_BRENDAN), - .palette = TRAINER_PAL(RubySapphireBrendan, RS_BRENDAN), + TRAINER_PIC(RubySapphireBrendan, RS_BRENDAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_RS_MAY] = { .size = TRAINER_SPRITE_SIZE, - .frontPic = TRAINER_SPRITE(RubySapphireMay, RS_MAY), - .palette = TRAINER_PAL(RubySapphireMay, RS_MAY), + TRAINER_PIC(RubySapphireMay, RS_MAY), .animation = sAnims_Trainer, }, }; From a0543eec6f384d8e83143f18b60c84c24ce08cc3 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 24 Nov 2023 14:13:25 -0500 Subject: [PATCH 10/25] Renamed .size to .y_offset since that what it appears to actually be --- include/data.h | 4 +- src/battle_controller_link_opponent.c | 2 +- src/battle_controller_opponent.c | 2 +- src/battle_controller_player.c | 2 +- src/battle_controller_player_partner.c | 4 +- src/battle_controller_recorded_opponent.c | 2 +- src/battle_controller_recorded_player.c | 2 +- src/battle_controllers.c | 2 +- src/data/graphics/trainers.h | 192 +++++++++++----------- 9 files changed, 106 insertions(+), 106 deletions(-) diff --git a/include/data.h b/include/data.h index de3b89906899..64d1090bd8c4 100644 --- a/include/data.h +++ b/include/data.h @@ -30,9 +30,7 @@ struct MonCoords struct TrainerSprite { - // This would use a bitfield, but some function - // uses it as a u8 and casting won't match. - u8 size; // u8 width:4, height:4; + u8 y_offset; struct CompressedSpriteSheet frontPic; struct CompressedSpritePalette palette; const union AnimCmd *const *const animation; diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index b58d1666cd71..b89c2263f3f0 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -462,7 +462,7 @@ static void LinkOpponentHandleDrawTrainerPic(u32 battler) } BtlController_HandleDrawTrainerPic(battler, trainerPicId, TRUE, - xPos, 40 + 4 * (8 - gTrainerSprites[trainerPicId].size), + xPos, 40 + 4 * (8 - gTrainerSprites[trainerPicId].y_offset), -1); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 3e5954254cf2..649240ce34da 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -485,7 +485,7 @@ static void OpponentHandleDrawTrainerPic(u32 battler) } BtlController_HandleDrawTrainerPic(battler, trainerPicId, TRUE, - xPos, 40 + 4 * (8 - gTrainerSprites[trainerPicId].size), + xPos, 40 + 4 * (8 - gTrainerSprites[trainerPicId].y_offset), -1); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 4f407459c0d5..cc701b1b12a1 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1879,7 +1879,7 @@ static void PlayerHandleDrawTrainerPic(u32 battler) if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId < TRAINER_PARTNER(PARTNER_NONE)) { xPos = 90; - yPos = (8 - gTrainerSprites[trainerPicId].size) * 4 + 80; + yPos = (8 - gTrainerSprites[trainerPicId].y_offset) * 4 + 80; } else { diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 0af8f8651d65..9bdfbefbc668 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -307,13 +307,13 @@ static void PlayerPartnerHandleDrawTrainerPic(u32 battler) { trainerPicId = gTrainers[gPartnerTrainerId].trainerPic; xPos = 60; - yPos = (8 - gTrainerSprites[trainerPicId].size) * 4 + 80; + yPos = (8 - gTrainerSprites[trainerPicId].y_offset) * 4 + 80; } else { trainerPicId = GetFrontierTrainerFrontSpriteId(gPartnerTrainerId); xPos = 32; - yPos = (8 - gTrainerSprites[trainerPicId].size) * 4 + 80; + yPos = (8 - gTrainerSprites[trainerPicId].y_offset) * 4 + 80; } // Use back pic only if the partner Steven or is custom. diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 9bd7dbb65c2a..36caa14c1433 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -421,7 +421,7 @@ static void RecordedOpponentHandleDrawTrainerPic(u32 battler) } BtlController_HandleDrawTrainerPic(battler, trainerPicId, TRUE, - xPos, 40 + 4 * (8 - gTrainerSprites[trainerPicId].size), + xPos, 40 + 4 * (8 - gTrainerSprites[trainerPicId].y_offset), -1); } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index fe241c3c1c44..f020f0e09657 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -393,7 +393,7 @@ static void RecordedPlayerHandleDrawTrainerPic(u32 battler) if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) { xPos = 90; - yPos = (8 - gTrainerSprites[trainerPicId].size) * 4 + 80; + yPos = (8 - gTrainerSprites[trainerPicId].y_offset) * 4 + 80; } else { diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 77cb8b82b59b..1822e984b6cc 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -2544,7 +2544,7 @@ void BtlController_HandleTrainerSlide(u32 battler, u32 trainerPicId) SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(battler)); gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, 176, - (8 - gTrainerSprites[trainerPicId].size) * 4 + 40, + (8 - gTrainerSprites[trainerPicId].y_offset) * 4 + 40, 30); gSprites[gBattlerSpriteIds[battler]].oam.affineParam = trainerPicId; gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerSprites[trainerPicId].palette.tag); diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 0ace1d368156..29ff55cf1c39 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -292,12 +292,14 @@ const u8 gTrainerBackPic_Steven[] = INCBIN_U8("graphics/trainers/back_pics/steve const u32 gTrainerBackPicPalette_Red[] = INCBIN_U32("graphics/trainers/back_pics/red.gbapal.lz"); const u32 gTrainerBackPicPalette_Leaf[] = INCBIN_U32("graphics/trainers/back_pics/leaf.gbapal.lz"); -//If there's no reason for the size to ever change, it can be moved into TRAINER_PIC -#define TRAINER_SPRITE_SIZE 8 +//If there's no reason for the value to ever change, it can be moved into TRAINER_PIC +#define TRAINER_SPRITE_Y_OFFSET 8 #define TRAINER_PIC(file, trainerPic) \ .frontPic = {gTrainerFrontPic_##file, TRAINER_PIC_SIZE, TRAINER_PIC_##trainerPic},\ .palette = {gTrainerPalette_##file, TRAINER_PIC_##trainerPic} +//If there's no reason for the value to ever change, it can be moved into TRAINER_PIC +//However, some people may want to incorporate sprites with more than one frame so it might be best to stay outside static const union AnimCmd *const sAnims_Trainer[] ={ sAnim_GeneralFrame0, }; @@ -306,651 +308,651 @@ const struct TrainerSprite gTrainerSprites[] = { [TRAINER_PIC_HIKER] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Hiker, HIKER), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_GRUNT_M] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(AquaGruntM, AQUA_GRUNT_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_BREEDER_F] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PokemonBreederF, POKEMON_BREEDER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_COOLTRAINER_M] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(CoolTrainerM, COOLTRAINER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_BIRD_KEEPER] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(BirdKeeper, BIRD_KEEPER), .animation = sAnims_Trainer, }, [TRAINER_PIC_COLLECTOR] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Collector, COLLECTOR), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_GRUNT_F] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(AquaGruntF, AQUA_GRUNT_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMER_M] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SwimmerM, SWIMMER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_GRUNT_M] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(MagmaGruntM, MAGMA_GRUNT_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_EXPERT_M] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(ExpertM, EXPERT_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_ADMIN_M] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(AquaAdminM, AQUA_ADMIN_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_BLACK_BELT] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(BlackBelt, BLACK_BELT), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_ADMIN_F] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(AquaAdminF, AQUA_ADMIN_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_LEADER_ARCHIE] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(AquaLeaderArchie, AQUA_LEADER_ARCHIE), .animation = sAnims_Trainer, }, [TRAINER_PIC_HEX_MANIAC] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(HexManiac, HEX_MANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_AROMA_LADY] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(AromaLady, AROMA_LADY), .animation = sAnims_Trainer, }, [TRAINER_PIC_RUIN_MANIAC] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(RuinManiac, RUIN_MANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_INTERVIEWER] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Interviewer, INTERVIEWER), .animation = sAnims_Trainer, }, [TRAINER_PIC_TUBER_F] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(TuberF, TUBER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_TUBER_M] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(TuberM, TUBER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_COOLTRAINER_F] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(CoolTrainerF, COOLTRAINER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_LADY] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Lady, LADY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BEAUTY] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Beauty, BEAUTY), .animation = sAnims_Trainer, }, [TRAINER_PIC_RICH_BOY] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(RichBoy, RICH_BOY), .animation = sAnims_Trainer, }, [TRAINER_PIC_EXPERT_F] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(ExpertF, EXPERT_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMANIAC] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Pokemaniac, POKEMANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_GRUNT_F] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(MagmaGruntF, MAGMA_GRUNT_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_GUITARIST] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Guitarist, GUITARIST), .animation = sAnims_Trainer, }, [TRAINER_PIC_KINDLER] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Kindler, KINDLER), .animation = sAnims_Trainer, }, [TRAINER_PIC_CAMPER] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Camper, CAMPER), .animation = sAnims_Trainer, }, [TRAINER_PIC_PICNICKER] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Picnicker, PICNICKER), .animation = sAnims_Trainer, }, [TRAINER_PIC_BUG_MANIAC] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(BugManiac, BUG_MANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_BREEDER_M] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PokemonBreederM, POKEMON_BREEDER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_PSYCHIC_M] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PsychicM, PSYCHIC_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_PSYCHIC_F] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PsychicF, PSYCHIC_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_GENTLEMAN] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Gentleman, GENTLEMAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_SIDNEY] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(EliteFourSidney, ELITE_FOUR_SIDNEY), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_PHOEBE] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(EliteFourPhoebe, ELITE_FOUR_PHOEBE), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_GLACIA] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(EliteFourGlacia, ELITE_FOUR_GLACIA), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_DRAKE] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(EliteFourDrake, ELITE_FOUR_DRAKE), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_ROXANNE] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderRoxanne, LEADER_ROXANNE), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_BRAWLY] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderBrawly, LEADER_BRAWLY), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_WATTSON] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderWattson, LEADER_WATTSON), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_FLANNERY] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderFlannery, LEADER_FLANNERY), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_NORMAN] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderNorman, LEADER_NORMAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_WINONA] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderWinona, LEADER_WINONA), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_TATE_AND_LIZA] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderTateAndLiza, LEADER_TATE_AND_LIZA), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_JUAN] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderJuan, LEADER_JUAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_SCHOOL_KID_M] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SchoolKidM, SCHOOL_KID_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_SCHOOL_KID_F] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SchoolKidF, SCHOOL_KID_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_SR_AND_JR] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SrAndJr, SR_AND_JR), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEFAN_M] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PokefanM, POKEFAN_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEFAN_F] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PokefanF, POKEFAN_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_YOUNGSTER] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Youngster, YOUNGSTER), .animation = sAnims_Trainer, }, [TRAINER_PIC_CHAMPION_WALLACE] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(ChampionWallace, CHAMPION_WALLACE), .animation = sAnims_Trainer, }, [TRAINER_PIC_FISHERMAN] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Fisherman, FISHERMAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_CYCLING_TRIATHLETE_M] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(CyclingTriathleteM, CYCLING_TRIATHLETE_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_CYCLING_TRIATHLETE_F] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(CyclingTriathleteF, CYCLING_TRIATHLETE_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_RUNNING_TRIATHLETE_M] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(RunningTriathleteM, RUNNING_TRIATHLETE_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_RUNNING_TRIATHLETE_F] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(RunningTriathleteF, RUNNING_TRIATHLETE_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SwimmingTriathleteM, SWIMMING_TRIATHLETE_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SwimmingTriathleteF, SWIMMING_TRIATHLETE_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_DRAGON_TAMER] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(DragonTamer, DRAGON_TAMER), .animation = sAnims_Trainer, }, [TRAINER_PIC_NINJA_BOY] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(NinjaBoy, NINJA_BOY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BATTLE_GIRL] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(BattleGirl, BATTLE_GIRL), .animation = sAnims_Trainer, }, [TRAINER_PIC_PARASOL_LADY] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(ParasolLady, PARASOL_LADY), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMER_F] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SwimmerF, SWIMMER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_TWINS] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Twins, TWINS), .animation = sAnims_Trainer, }, [TRAINER_PIC_SAILOR] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Sailor, SAILOR), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_ADMIN] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(MagmaAdmin, MAGMA_ADMIN), .animation = sAnims_Trainer, }, [TRAINER_PIC_WALLY] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Wally, WALLY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BRENDAN] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Brendan, BRENDAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAY] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(May, MAY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BUG_CATCHER] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(BugCatcher, BUG_CATCHER), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_RANGER_M] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PokemonRangerM, POKEMON_RANGER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_RANGER_F] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PokemonRangerF, POKEMON_RANGER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_LEADER_MAXIE] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(MagmaLeaderMaxie, MAGMA_LEADER_MAXIE), .animation = sAnims_Trainer, }, [TRAINER_PIC_LASS] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Lass, LASS), .animation = sAnims_Trainer, }, [TRAINER_PIC_YOUNG_COUPLE] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(YoungCouple, YOUNG_COUPLE), .animation = sAnims_Trainer, }, [TRAINER_PIC_OLD_COUPLE] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(OldCouple, OLD_COUPLE), .animation = sAnims_Trainer, }, [TRAINER_PIC_SIS_AND_BRO] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SisAndBro, SIS_AND_BRO), .animation = sAnims_Trainer, }, [TRAINER_PIC_STEVEN] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Steven, STEVEN), .animation = sAnims_Trainer, }, [TRAINER_PIC_SALON_MAIDEN_ANABEL] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SalonMaidenAnabel, SALON_MAIDEN_ANABEL), .animation = sAnims_Trainer, }, [TRAINER_PIC_DOME_ACE_TUCKER] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(DomeAceTucker, DOME_ACE_TUCKER), .animation = sAnims_Trainer, }, [TRAINER_PIC_PALACE_MAVEN_SPENSER] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PalaceMavenSpenser, PALACE_MAVEN_SPENSER), .animation = sAnims_Trainer, }, [TRAINER_PIC_ARENA_TYCOON_GRETA] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(ArenaTycoonGreta, ARENA_TYCOON_GRETA), .animation = sAnims_Trainer, }, [TRAINER_PIC_FACTORY_HEAD_NOLAND] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(FactoryHeadNoland, FACTORY_HEAD_NOLAND), .animation = sAnims_Trainer, }, [TRAINER_PIC_PIKE_QUEEN_LUCY] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PikeQueenLucy, PIKE_QUEEN_LUCY), .animation = sAnims_Trainer, }, [TRAINER_PIC_PYRAMID_KING_BRANDON] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PyramidKingBrandon, PYRAMID_KING_BRANDON), .animation = sAnims_Trainer, }, [TRAINER_PIC_RED] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Red, RED), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEAF] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Leaf, LEAF), .animation = sAnims_Trainer, }, [TRAINER_PIC_RS_BRENDAN] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(RubySapphireBrendan, RS_BRENDAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_RS_MAY] = { - .size = TRAINER_SPRITE_SIZE, + .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(RubySapphireMay, RS_MAY), .animation = sAnims_Trainer, }, From 052ee2e1956c6235898c358d9ea798b12fa41040 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 24 Nov 2023 14:16:47 -0500 Subject: [PATCH 11/25] Moved y_offset into TRAINER_PIC --- src/data/graphics/trainers.h | 98 +----------------------------------- 1 file changed, 2 insertions(+), 96 deletions(-) diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 29ff55cf1c39..27f1e5a00e9d 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -292,9 +292,8 @@ const u8 gTrainerBackPic_Steven[] = INCBIN_U8("graphics/trainers/back_pics/steve const u32 gTrainerBackPicPalette_Red[] = INCBIN_U32("graphics/trainers/back_pics/red.gbapal.lz"); const u32 gTrainerBackPicPalette_Leaf[] = INCBIN_U32("graphics/trainers/back_pics/leaf.gbapal.lz"); -//If there's no reason for the value to ever change, it can be moved into TRAINER_PIC -#define TRAINER_SPRITE_Y_OFFSET 8 -#define TRAINER_PIC(file, trainerPic) \ +#define TRAINER_PIC(file, trainerPic) \ + .y_offset = 8, \ .frontPic = {gTrainerFrontPic_##file, TRAINER_PIC_SIZE, TRAINER_PIC_##trainerPic},\ .palette = {gTrainerPalette_##file, TRAINER_PIC_##trainerPic} @@ -308,651 +307,558 @@ const struct TrainerSprite gTrainerSprites[] = { [TRAINER_PIC_HIKER] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Hiker, HIKER), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_GRUNT_M] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(AquaGruntM, AQUA_GRUNT_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_BREEDER_F] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PokemonBreederF, POKEMON_BREEDER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_COOLTRAINER_M] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(CoolTrainerM, COOLTRAINER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_BIRD_KEEPER] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(BirdKeeper, BIRD_KEEPER), .animation = sAnims_Trainer, }, [TRAINER_PIC_COLLECTOR] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Collector, COLLECTOR), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_GRUNT_F] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(AquaGruntF, AQUA_GRUNT_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMER_M] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SwimmerM, SWIMMER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_GRUNT_M] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(MagmaGruntM, MAGMA_GRUNT_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_EXPERT_M] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(ExpertM, EXPERT_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_ADMIN_M] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(AquaAdminM, AQUA_ADMIN_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_BLACK_BELT] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(BlackBelt, BLACK_BELT), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_ADMIN_F] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(AquaAdminF, AQUA_ADMIN_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_AQUA_LEADER_ARCHIE] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(AquaLeaderArchie, AQUA_LEADER_ARCHIE), .animation = sAnims_Trainer, }, [TRAINER_PIC_HEX_MANIAC] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(HexManiac, HEX_MANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_AROMA_LADY] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(AromaLady, AROMA_LADY), .animation = sAnims_Trainer, }, [TRAINER_PIC_RUIN_MANIAC] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(RuinManiac, RUIN_MANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_INTERVIEWER] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Interviewer, INTERVIEWER), .animation = sAnims_Trainer, }, [TRAINER_PIC_TUBER_F] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(TuberF, TUBER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_TUBER_M] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(TuberM, TUBER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_COOLTRAINER_F] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(CoolTrainerF, COOLTRAINER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_LADY] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Lady, LADY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BEAUTY] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Beauty, BEAUTY), .animation = sAnims_Trainer, }, [TRAINER_PIC_RICH_BOY] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(RichBoy, RICH_BOY), .animation = sAnims_Trainer, }, [TRAINER_PIC_EXPERT_F] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(ExpertF, EXPERT_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMANIAC] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Pokemaniac, POKEMANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_GRUNT_F] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(MagmaGruntF, MAGMA_GRUNT_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_GUITARIST] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Guitarist, GUITARIST), .animation = sAnims_Trainer, }, [TRAINER_PIC_KINDLER] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Kindler, KINDLER), .animation = sAnims_Trainer, }, [TRAINER_PIC_CAMPER] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Camper, CAMPER), .animation = sAnims_Trainer, }, [TRAINER_PIC_PICNICKER] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Picnicker, PICNICKER), .animation = sAnims_Trainer, }, [TRAINER_PIC_BUG_MANIAC] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(BugManiac, BUG_MANIAC), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_BREEDER_M] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PokemonBreederM, POKEMON_BREEDER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_PSYCHIC_M] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PsychicM, PSYCHIC_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_PSYCHIC_F] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PsychicF, PSYCHIC_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_GENTLEMAN] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Gentleman, GENTLEMAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_SIDNEY] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(EliteFourSidney, ELITE_FOUR_SIDNEY), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_PHOEBE] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(EliteFourPhoebe, ELITE_FOUR_PHOEBE), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_GLACIA] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(EliteFourGlacia, ELITE_FOUR_GLACIA), .animation = sAnims_Trainer, }, [TRAINER_PIC_ELITE_FOUR_DRAKE] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(EliteFourDrake, ELITE_FOUR_DRAKE), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_ROXANNE] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderRoxanne, LEADER_ROXANNE), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_BRAWLY] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderBrawly, LEADER_BRAWLY), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_WATTSON] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderWattson, LEADER_WATTSON), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_FLANNERY] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderFlannery, LEADER_FLANNERY), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_NORMAN] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderNorman, LEADER_NORMAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_WINONA] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderWinona, LEADER_WINONA), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_TATE_AND_LIZA] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderTateAndLiza, LEADER_TATE_AND_LIZA), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEADER_JUAN] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(LeaderJuan, LEADER_JUAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_SCHOOL_KID_M] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SchoolKidM, SCHOOL_KID_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_SCHOOL_KID_F] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SchoolKidF, SCHOOL_KID_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_SR_AND_JR] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SrAndJr, SR_AND_JR), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEFAN_M] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PokefanM, POKEFAN_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEFAN_F] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PokefanF, POKEFAN_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_YOUNGSTER] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Youngster, YOUNGSTER), .animation = sAnims_Trainer, }, [TRAINER_PIC_CHAMPION_WALLACE] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(ChampionWallace, CHAMPION_WALLACE), .animation = sAnims_Trainer, }, [TRAINER_PIC_FISHERMAN] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Fisherman, FISHERMAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_CYCLING_TRIATHLETE_M] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(CyclingTriathleteM, CYCLING_TRIATHLETE_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_CYCLING_TRIATHLETE_F] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(CyclingTriathleteF, CYCLING_TRIATHLETE_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_RUNNING_TRIATHLETE_M] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(RunningTriathleteM, RUNNING_TRIATHLETE_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_RUNNING_TRIATHLETE_F] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(RunningTriathleteF, RUNNING_TRIATHLETE_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SwimmingTriathleteM, SWIMMING_TRIATHLETE_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SwimmingTriathleteF, SWIMMING_TRIATHLETE_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_DRAGON_TAMER] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(DragonTamer, DRAGON_TAMER), .animation = sAnims_Trainer, }, [TRAINER_PIC_NINJA_BOY] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(NinjaBoy, NINJA_BOY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BATTLE_GIRL] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(BattleGirl, BATTLE_GIRL), .animation = sAnims_Trainer, }, [TRAINER_PIC_PARASOL_LADY] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(ParasolLady, PARASOL_LADY), .animation = sAnims_Trainer, }, [TRAINER_PIC_SWIMMER_F] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SwimmerF, SWIMMER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_TWINS] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Twins, TWINS), .animation = sAnims_Trainer, }, [TRAINER_PIC_SAILOR] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Sailor, SAILOR), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_ADMIN] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(MagmaAdmin, MAGMA_ADMIN), .animation = sAnims_Trainer, }, [TRAINER_PIC_WALLY] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Wally, WALLY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BRENDAN] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Brendan, BRENDAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAY] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(May, MAY), .animation = sAnims_Trainer, }, [TRAINER_PIC_BUG_CATCHER] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(BugCatcher, BUG_CATCHER), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_RANGER_M] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PokemonRangerM, POKEMON_RANGER_M), .animation = sAnims_Trainer, }, [TRAINER_PIC_POKEMON_RANGER_F] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PokemonRangerF, POKEMON_RANGER_F), .animation = sAnims_Trainer, }, [TRAINER_PIC_MAGMA_LEADER_MAXIE] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(MagmaLeaderMaxie, MAGMA_LEADER_MAXIE), .animation = sAnims_Trainer, }, [TRAINER_PIC_LASS] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Lass, LASS), .animation = sAnims_Trainer, }, [TRAINER_PIC_YOUNG_COUPLE] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(YoungCouple, YOUNG_COUPLE), .animation = sAnims_Trainer, }, [TRAINER_PIC_OLD_COUPLE] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(OldCouple, OLD_COUPLE), .animation = sAnims_Trainer, }, [TRAINER_PIC_SIS_AND_BRO] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SisAndBro, SIS_AND_BRO), .animation = sAnims_Trainer, }, [TRAINER_PIC_STEVEN] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Steven, STEVEN), .animation = sAnims_Trainer, }, [TRAINER_PIC_SALON_MAIDEN_ANABEL] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(SalonMaidenAnabel, SALON_MAIDEN_ANABEL), .animation = sAnims_Trainer, }, [TRAINER_PIC_DOME_ACE_TUCKER] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(DomeAceTucker, DOME_ACE_TUCKER), .animation = sAnims_Trainer, }, [TRAINER_PIC_PALACE_MAVEN_SPENSER] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PalaceMavenSpenser, PALACE_MAVEN_SPENSER), .animation = sAnims_Trainer, }, [TRAINER_PIC_ARENA_TYCOON_GRETA] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(ArenaTycoonGreta, ARENA_TYCOON_GRETA), .animation = sAnims_Trainer, }, [TRAINER_PIC_FACTORY_HEAD_NOLAND] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(FactoryHeadNoland, FACTORY_HEAD_NOLAND), .animation = sAnims_Trainer, }, [TRAINER_PIC_PIKE_QUEEN_LUCY] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PikeQueenLucy, PIKE_QUEEN_LUCY), .animation = sAnims_Trainer, }, [TRAINER_PIC_PYRAMID_KING_BRANDON] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(PyramidKingBrandon, PYRAMID_KING_BRANDON), .animation = sAnims_Trainer, }, [TRAINER_PIC_RED] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Red, RED), .animation = sAnims_Trainer, }, [TRAINER_PIC_LEAF] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(Leaf, LEAF), .animation = sAnims_Trainer, }, [TRAINER_PIC_RS_BRENDAN] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(RubySapphireBrendan, RS_BRENDAN), .animation = sAnims_Trainer, }, [TRAINER_PIC_RS_MAY] = { - .y_offset = TRAINER_SPRITE_Y_OFFSET, TRAINER_PIC(RubySapphireMay, RS_MAY), .animation = sAnims_Trainer, }, From 1a03fcc5e866233b60fefef222ee8d06d1a7d0ef Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 24 Nov 2023 14:20:09 -0500 Subject: [PATCH 12/25] Moved animation inside of TRAINER_PIC --- src/data/graphics/trainers.h | 292 ++++++++++++----------------------- 1 file changed, 99 insertions(+), 193 deletions(-) diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 27f1e5a00e9d..910c4e2e620b 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -292,574 +292,480 @@ const u8 gTrainerBackPic_Steven[] = INCBIN_U8("graphics/trainers/back_pics/steve const u32 gTrainerBackPicPalette_Red[] = INCBIN_U32("graphics/trainers/back_pics/red.gbapal.lz"); const u32 gTrainerBackPicPalette_Leaf[] = INCBIN_U32("graphics/trainers/back_pics/leaf.gbapal.lz"); -#define TRAINER_PIC(file, trainerPic) \ - .y_offset = 8, \ - .frontPic = {gTrainerFrontPic_##file, TRAINER_PIC_SIZE, TRAINER_PIC_##trainerPic},\ - .palette = {gTrainerPalette_##file, TRAINER_PIC_##trainerPic} - -//If there's no reason for the value to ever change, it can be moved into TRAINER_PIC -//However, some people may want to incorporate sprites with more than one frame so it might be best to stay outside static const union AnimCmd *const sAnims_Trainer[] ={ sAnim_GeneralFrame0, }; +#define TRAINER_PIC(file, trainerPic, anims) \ + .y_offset = 8, \ + .frontPic = {gTrainerFrontPic_##file, TRAINER_PIC_SIZE, TRAINER_PIC_##trainerPic},\ + .palette = {gTrainerPalette_##file, TRAINER_PIC_##trainerPic}, \ + .animation = sAnims_##anims + const struct TrainerSprite gTrainerSprites[] = { [TRAINER_PIC_HIKER] = { - TRAINER_PIC(Hiker, HIKER), - .animation = sAnims_Trainer, + TRAINER_PIC(Hiker, HIKER, Trainer), }, [TRAINER_PIC_AQUA_GRUNT_M] = { - TRAINER_PIC(AquaGruntM, AQUA_GRUNT_M), - .animation = sAnims_Trainer, + TRAINER_PIC(AquaGruntM, AQUA_GRUNT_M, Trainer), }, [TRAINER_PIC_POKEMON_BREEDER_F] = { - TRAINER_PIC(PokemonBreederF, POKEMON_BREEDER_F), - .animation = sAnims_Trainer, + TRAINER_PIC(PokemonBreederF, POKEMON_BREEDER_F, Trainer), }, [TRAINER_PIC_COOLTRAINER_M] = { - TRAINER_PIC(CoolTrainerM, COOLTRAINER_M), - .animation = sAnims_Trainer, + TRAINER_PIC(CoolTrainerM, COOLTRAINER_M, Trainer), }, [TRAINER_PIC_BIRD_KEEPER] = { - TRAINER_PIC(BirdKeeper, BIRD_KEEPER), - .animation = sAnims_Trainer, + TRAINER_PIC(BirdKeeper, BIRD_KEEPER, Trainer), }, [TRAINER_PIC_COLLECTOR] = { - TRAINER_PIC(Collector, COLLECTOR), - .animation = sAnims_Trainer, + TRAINER_PIC(Collector, COLLECTOR, Trainer), }, [TRAINER_PIC_AQUA_GRUNT_F] = { - TRAINER_PIC(AquaGruntF, AQUA_GRUNT_F), - .animation = sAnims_Trainer, + TRAINER_PIC(AquaGruntF, AQUA_GRUNT_F, Trainer), }, [TRAINER_PIC_SWIMMER_M] = { - TRAINER_PIC(SwimmerM, SWIMMER_M), - .animation = sAnims_Trainer, + TRAINER_PIC(SwimmerM, SWIMMER_M, Trainer), }, [TRAINER_PIC_MAGMA_GRUNT_M] = { - TRAINER_PIC(MagmaGruntM, MAGMA_GRUNT_M), - .animation = sAnims_Trainer, + TRAINER_PIC(MagmaGruntM, MAGMA_GRUNT_M, Trainer), }, [TRAINER_PIC_EXPERT_M] = { - TRAINER_PIC(ExpertM, EXPERT_M), - .animation = sAnims_Trainer, + TRAINER_PIC(ExpertM, EXPERT_M, Trainer), }, [TRAINER_PIC_AQUA_ADMIN_M] = { - TRAINER_PIC(AquaAdminM, AQUA_ADMIN_M), - .animation = sAnims_Trainer, + TRAINER_PIC(AquaAdminM, AQUA_ADMIN_M, Trainer), }, [TRAINER_PIC_BLACK_BELT] = { - TRAINER_PIC(BlackBelt, BLACK_BELT), - .animation = sAnims_Trainer, + TRAINER_PIC(BlackBelt, BLACK_BELT, Trainer), }, [TRAINER_PIC_AQUA_ADMIN_F] = { - TRAINER_PIC(AquaAdminF, AQUA_ADMIN_F), - .animation = sAnims_Trainer, + TRAINER_PIC(AquaAdminF, AQUA_ADMIN_F, Trainer), }, [TRAINER_PIC_AQUA_LEADER_ARCHIE] = { - TRAINER_PIC(AquaLeaderArchie, AQUA_LEADER_ARCHIE), - .animation = sAnims_Trainer, + TRAINER_PIC(AquaLeaderArchie, AQUA_LEADER_ARCHIE, Trainer), }, [TRAINER_PIC_HEX_MANIAC] = { - TRAINER_PIC(HexManiac, HEX_MANIAC), - .animation = sAnims_Trainer, + TRAINER_PIC(HexManiac, HEX_MANIAC, Trainer), }, [TRAINER_PIC_AROMA_LADY] = { - TRAINER_PIC(AromaLady, AROMA_LADY), - .animation = sAnims_Trainer, + TRAINER_PIC(AromaLady, AROMA_LADY, Trainer), }, [TRAINER_PIC_RUIN_MANIAC] = { - TRAINER_PIC(RuinManiac, RUIN_MANIAC), - .animation = sAnims_Trainer, + TRAINER_PIC(RuinManiac, RUIN_MANIAC, Trainer), }, [TRAINER_PIC_INTERVIEWER] = { - TRAINER_PIC(Interviewer, INTERVIEWER), - .animation = sAnims_Trainer, + TRAINER_PIC(Interviewer, INTERVIEWER, Trainer), }, [TRAINER_PIC_TUBER_F] = { - TRAINER_PIC(TuberF, TUBER_F), - .animation = sAnims_Trainer, + TRAINER_PIC(TuberF, TUBER_F, Trainer), }, [TRAINER_PIC_TUBER_M] = { - TRAINER_PIC(TuberM, TUBER_M), - .animation = sAnims_Trainer, + TRAINER_PIC(TuberM, TUBER_M, Trainer), }, [TRAINER_PIC_COOLTRAINER_F] = { - TRAINER_PIC(CoolTrainerF, COOLTRAINER_F), - .animation = sAnims_Trainer, + TRAINER_PIC(CoolTrainerF, COOLTRAINER_F, Trainer), }, [TRAINER_PIC_LADY] = { - TRAINER_PIC(Lady, LADY), - .animation = sAnims_Trainer, + TRAINER_PIC(Lady, LADY, Trainer), }, [TRAINER_PIC_BEAUTY] = { - TRAINER_PIC(Beauty, BEAUTY), - .animation = sAnims_Trainer, + TRAINER_PIC(Beauty, BEAUTY, Trainer), }, [TRAINER_PIC_RICH_BOY] = { - TRAINER_PIC(RichBoy, RICH_BOY), - .animation = sAnims_Trainer, + TRAINER_PIC(RichBoy, RICH_BOY, Trainer), }, [TRAINER_PIC_EXPERT_F] = { - TRAINER_PIC(ExpertF, EXPERT_F), - .animation = sAnims_Trainer, + TRAINER_PIC(ExpertF, EXPERT_F, Trainer), }, [TRAINER_PIC_POKEMANIAC] = { - TRAINER_PIC(Pokemaniac, POKEMANIAC), - .animation = sAnims_Trainer, + TRAINER_PIC(Pokemaniac, POKEMANIAC, Trainer), }, [TRAINER_PIC_MAGMA_GRUNT_F] = { - TRAINER_PIC(MagmaGruntF, MAGMA_GRUNT_F), - .animation = sAnims_Trainer, + TRAINER_PIC(MagmaGruntF, MAGMA_GRUNT_F, Trainer), }, [TRAINER_PIC_GUITARIST] = { - TRAINER_PIC(Guitarist, GUITARIST), - .animation = sAnims_Trainer, + TRAINER_PIC(Guitarist, GUITARIST, Trainer), }, [TRAINER_PIC_KINDLER] = { - TRAINER_PIC(Kindler, KINDLER), - .animation = sAnims_Trainer, + TRAINER_PIC(Kindler, KINDLER, Trainer), }, [TRAINER_PIC_CAMPER] = { - TRAINER_PIC(Camper, CAMPER), - .animation = sAnims_Trainer, + TRAINER_PIC(Camper, CAMPER, Trainer), }, [TRAINER_PIC_PICNICKER] = { - TRAINER_PIC(Picnicker, PICNICKER), - .animation = sAnims_Trainer, + TRAINER_PIC(Picnicker, PICNICKER, Trainer), }, [TRAINER_PIC_BUG_MANIAC] = { - TRAINER_PIC(BugManiac, BUG_MANIAC), - .animation = sAnims_Trainer, + TRAINER_PIC(BugManiac, BUG_MANIAC, Trainer), }, [TRAINER_PIC_POKEMON_BREEDER_M] = { - TRAINER_PIC(PokemonBreederM, POKEMON_BREEDER_M), - .animation = sAnims_Trainer, + TRAINER_PIC(PokemonBreederM, POKEMON_BREEDER_M, Trainer), }, [TRAINER_PIC_PSYCHIC_M] = { - TRAINER_PIC(PsychicM, PSYCHIC_M), - .animation = sAnims_Trainer, + TRAINER_PIC(PsychicM, PSYCHIC_M, Trainer), }, [TRAINER_PIC_PSYCHIC_F] = { - TRAINER_PIC(PsychicF, PSYCHIC_F), - .animation = sAnims_Trainer, + TRAINER_PIC(PsychicF, PSYCHIC_F, Trainer), }, [TRAINER_PIC_GENTLEMAN] = { - TRAINER_PIC(Gentleman, GENTLEMAN), - .animation = sAnims_Trainer, + TRAINER_PIC(Gentleman, GENTLEMAN, Trainer), }, [TRAINER_PIC_ELITE_FOUR_SIDNEY] = { - TRAINER_PIC(EliteFourSidney, ELITE_FOUR_SIDNEY), - .animation = sAnims_Trainer, + TRAINER_PIC(EliteFourSidney, ELITE_FOUR_SIDNEY, Trainer), }, [TRAINER_PIC_ELITE_FOUR_PHOEBE] = { - TRAINER_PIC(EliteFourPhoebe, ELITE_FOUR_PHOEBE), - .animation = sAnims_Trainer, + TRAINER_PIC(EliteFourPhoebe, ELITE_FOUR_PHOEBE, Trainer), }, [TRAINER_PIC_ELITE_FOUR_GLACIA] = { - TRAINER_PIC(EliteFourGlacia, ELITE_FOUR_GLACIA), - .animation = sAnims_Trainer, + TRAINER_PIC(EliteFourGlacia, ELITE_FOUR_GLACIA, Trainer), }, [TRAINER_PIC_ELITE_FOUR_DRAKE] = { - TRAINER_PIC(EliteFourDrake, ELITE_FOUR_DRAKE), - .animation = sAnims_Trainer, + TRAINER_PIC(EliteFourDrake, ELITE_FOUR_DRAKE, Trainer), }, [TRAINER_PIC_LEADER_ROXANNE] = { - TRAINER_PIC(LeaderRoxanne, LEADER_ROXANNE), - .animation = sAnims_Trainer, + TRAINER_PIC(LeaderRoxanne, LEADER_ROXANNE, Trainer), }, [TRAINER_PIC_LEADER_BRAWLY] = { - TRAINER_PIC(LeaderBrawly, LEADER_BRAWLY), - .animation = sAnims_Trainer, + TRAINER_PIC(LeaderBrawly, LEADER_BRAWLY, Trainer), }, [TRAINER_PIC_LEADER_WATTSON] = { - TRAINER_PIC(LeaderWattson, LEADER_WATTSON), - .animation = sAnims_Trainer, + TRAINER_PIC(LeaderWattson, LEADER_WATTSON, Trainer), }, [TRAINER_PIC_LEADER_FLANNERY] = { - TRAINER_PIC(LeaderFlannery, LEADER_FLANNERY), - .animation = sAnims_Trainer, + TRAINER_PIC(LeaderFlannery, LEADER_FLANNERY, Trainer), }, [TRAINER_PIC_LEADER_NORMAN] = { - TRAINER_PIC(LeaderNorman, LEADER_NORMAN), - .animation = sAnims_Trainer, + TRAINER_PIC(LeaderNorman, LEADER_NORMAN, Trainer), }, [TRAINER_PIC_LEADER_WINONA] = { - TRAINER_PIC(LeaderWinona, LEADER_WINONA), - .animation = sAnims_Trainer, + TRAINER_PIC(LeaderWinona, LEADER_WINONA, Trainer), }, [TRAINER_PIC_LEADER_TATE_AND_LIZA] = { - TRAINER_PIC(LeaderTateAndLiza, LEADER_TATE_AND_LIZA), - .animation = sAnims_Trainer, + TRAINER_PIC(LeaderTateAndLiza, LEADER_TATE_AND_LIZA, Trainer), }, [TRAINER_PIC_LEADER_JUAN] = { - TRAINER_PIC(LeaderJuan, LEADER_JUAN), - .animation = sAnims_Trainer, + TRAINER_PIC(LeaderJuan, LEADER_JUAN, Trainer), }, [TRAINER_PIC_SCHOOL_KID_M] = { - TRAINER_PIC(SchoolKidM, SCHOOL_KID_M), - .animation = sAnims_Trainer, + TRAINER_PIC(SchoolKidM, SCHOOL_KID_M, Trainer), }, [TRAINER_PIC_SCHOOL_KID_F] = { - TRAINER_PIC(SchoolKidF, SCHOOL_KID_F), - .animation = sAnims_Trainer, + TRAINER_PIC(SchoolKidF, SCHOOL_KID_F, Trainer), }, [TRAINER_PIC_SR_AND_JR] = { - TRAINER_PIC(SrAndJr, SR_AND_JR), - .animation = sAnims_Trainer, + TRAINER_PIC(SrAndJr, SR_AND_JR, Trainer), }, [TRAINER_PIC_POKEFAN_M] = { - TRAINER_PIC(PokefanM, POKEFAN_M), - .animation = sAnims_Trainer, + TRAINER_PIC(PokefanM, POKEFAN_M, Trainer), }, [TRAINER_PIC_POKEFAN_F] = { - TRAINER_PIC(PokefanF, POKEFAN_F), - .animation = sAnims_Trainer, + TRAINER_PIC(PokefanF, POKEFAN_F, Trainer), }, [TRAINER_PIC_YOUNGSTER] = { - TRAINER_PIC(Youngster, YOUNGSTER), - .animation = sAnims_Trainer, + TRAINER_PIC(Youngster, YOUNGSTER, Trainer), }, [TRAINER_PIC_CHAMPION_WALLACE] = { - TRAINER_PIC(ChampionWallace, CHAMPION_WALLACE), - .animation = sAnims_Trainer, + TRAINER_PIC(ChampionWallace, CHAMPION_WALLACE, Trainer), }, [TRAINER_PIC_FISHERMAN] = { - TRAINER_PIC(Fisherman, FISHERMAN), - .animation = sAnims_Trainer, + TRAINER_PIC(Fisherman, FISHERMAN, Trainer), }, [TRAINER_PIC_CYCLING_TRIATHLETE_M] = { - TRAINER_PIC(CyclingTriathleteM, CYCLING_TRIATHLETE_M), - .animation = sAnims_Trainer, + TRAINER_PIC(CyclingTriathleteM, CYCLING_TRIATHLETE_M, Trainer), }, [TRAINER_PIC_CYCLING_TRIATHLETE_F] = { - TRAINER_PIC(CyclingTriathleteF, CYCLING_TRIATHLETE_F), - .animation = sAnims_Trainer, + TRAINER_PIC(CyclingTriathleteF, CYCLING_TRIATHLETE_F, Trainer), }, [TRAINER_PIC_RUNNING_TRIATHLETE_M] = { - TRAINER_PIC(RunningTriathleteM, RUNNING_TRIATHLETE_M), - .animation = sAnims_Trainer, + TRAINER_PIC(RunningTriathleteM, RUNNING_TRIATHLETE_M, Trainer), }, [TRAINER_PIC_RUNNING_TRIATHLETE_F] = { - TRAINER_PIC(RunningTriathleteF, RUNNING_TRIATHLETE_F), - .animation = sAnims_Trainer, + TRAINER_PIC(RunningTriathleteF, RUNNING_TRIATHLETE_F, Trainer), }, [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = { - TRAINER_PIC(SwimmingTriathleteM, SWIMMING_TRIATHLETE_M), - .animation = sAnims_Trainer, + TRAINER_PIC(SwimmingTriathleteM, SWIMMING_TRIATHLETE_M, Trainer), }, [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = { - TRAINER_PIC(SwimmingTriathleteF, SWIMMING_TRIATHLETE_F), - .animation = sAnims_Trainer, + TRAINER_PIC(SwimmingTriathleteF, SWIMMING_TRIATHLETE_F, Trainer), }, [TRAINER_PIC_DRAGON_TAMER] = { - TRAINER_PIC(DragonTamer, DRAGON_TAMER), - .animation = sAnims_Trainer, + TRAINER_PIC(DragonTamer, DRAGON_TAMER, Trainer), }, [TRAINER_PIC_NINJA_BOY] = { - TRAINER_PIC(NinjaBoy, NINJA_BOY), - .animation = sAnims_Trainer, + TRAINER_PIC(NinjaBoy, NINJA_BOY, Trainer), }, [TRAINER_PIC_BATTLE_GIRL] = { - TRAINER_PIC(BattleGirl, BATTLE_GIRL), - .animation = sAnims_Trainer, + TRAINER_PIC(BattleGirl, BATTLE_GIRL, Trainer), }, [TRAINER_PIC_PARASOL_LADY] = { - TRAINER_PIC(ParasolLady, PARASOL_LADY), - .animation = sAnims_Trainer, + TRAINER_PIC(ParasolLady, PARASOL_LADY, Trainer), }, [TRAINER_PIC_SWIMMER_F] = { - TRAINER_PIC(SwimmerF, SWIMMER_F), - .animation = sAnims_Trainer, + TRAINER_PIC(SwimmerF, SWIMMER_F, Trainer), }, [TRAINER_PIC_TWINS] = { - TRAINER_PIC(Twins, TWINS), - .animation = sAnims_Trainer, + TRAINER_PIC(Twins, TWINS, Trainer), }, [TRAINER_PIC_SAILOR] = { - TRAINER_PIC(Sailor, SAILOR), - .animation = sAnims_Trainer, + TRAINER_PIC(Sailor, SAILOR, Trainer), }, [TRAINER_PIC_MAGMA_ADMIN] = { - TRAINER_PIC(MagmaAdmin, MAGMA_ADMIN), - .animation = sAnims_Trainer, + TRAINER_PIC(MagmaAdmin, MAGMA_ADMIN, Trainer), }, [TRAINER_PIC_WALLY] = { - TRAINER_PIC(Wally, WALLY), - .animation = sAnims_Trainer, + TRAINER_PIC(Wally, WALLY, Trainer), }, [TRAINER_PIC_BRENDAN] = { - TRAINER_PIC(Brendan, BRENDAN), - .animation = sAnims_Trainer, + TRAINER_PIC(Brendan, BRENDAN, Trainer), }, [TRAINER_PIC_MAY] = { - TRAINER_PIC(May, MAY), - .animation = sAnims_Trainer, + TRAINER_PIC(May, MAY, Trainer), }, [TRAINER_PIC_BUG_CATCHER] = { - TRAINER_PIC(BugCatcher, BUG_CATCHER), - .animation = sAnims_Trainer, + TRAINER_PIC(BugCatcher, BUG_CATCHER, Trainer), }, [TRAINER_PIC_POKEMON_RANGER_M] = { - TRAINER_PIC(PokemonRangerM, POKEMON_RANGER_M), - .animation = sAnims_Trainer, + TRAINER_PIC(PokemonRangerM, POKEMON_RANGER_M, Trainer), }, [TRAINER_PIC_POKEMON_RANGER_F] = { - TRAINER_PIC(PokemonRangerF, POKEMON_RANGER_F), - .animation = sAnims_Trainer, + TRAINER_PIC(PokemonRangerF, POKEMON_RANGER_F, Trainer), }, [TRAINER_PIC_MAGMA_LEADER_MAXIE] = { - TRAINER_PIC(MagmaLeaderMaxie, MAGMA_LEADER_MAXIE), - .animation = sAnims_Trainer, + TRAINER_PIC(MagmaLeaderMaxie, MAGMA_LEADER_MAXIE, Trainer), }, [TRAINER_PIC_LASS] = { - TRAINER_PIC(Lass, LASS), - .animation = sAnims_Trainer, + TRAINER_PIC(Lass, LASS, Trainer), }, [TRAINER_PIC_YOUNG_COUPLE] = { - TRAINER_PIC(YoungCouple, YOUNG_COUPLE), - .animation = sAnims_Trainer, + TRAINER_PIC(YoungCouple, YOUNG_COUPLE, Trainer), }, [TRAINER_PIC_OLD_COUPLE] = { - TRAINER_PIC(OldCouple, OLD_COUPLE), - .animation = sAnims_Trainer, + TRAINER_PIC(OldCouple, OLD_COUPLE, Trainer), }, [TRAINER_PIC_SIS_AND_BRO] = { - TRAINER_PIC(SisAndBro, SIS_AND_BRO), - .animation = sAnims_Trainer, + TRAINER_PIC(SisAndBro, SIS_AND_BRO, Trainer), }, [TRAINER_PIC_STEVEN] = { - TRAINER_PIC(Steven, STEVEN), - .animation = sAnims_Trainer, + TRAINER_PIC(Steven, STEVEN, Trainer), }, [TRAINER_PIC_SALON_MAIDEN_ANABEL] = { - TRAINER_PIC(SalonMaidenAnabel, SALON_MAIDEN_ANABEL), - .animation = sAnims_Trainer, + TRAINER_PIC(SalonMaidenAnabel, SALON_MAIDEN_ANABEL, Trainer), }, [TRAINER_PIC_DOME_ACE_TUCKER] = { - TRAINER_PIC(DomeAceTucker, DOME_ACE_TUCKER), - .animation = sAnims_Trainer, + TRAINER_PIC(DomeAceTucker, DOME_ACE_TUCKER, Trainer), }, [TRAINER_PIC_PALACE_MAVEN_SPENSER] = { - TRAINER_PIC(PalaceMavenSpenser, PALACE_MAVEN_SPENSER), - .animation = sAnims_Trainer, + TRAINER_PIC(PalaceMavenSpenser, PALACE_MAVEN_SPENSER, Trainer), }, [TRAINER_PIC_ARENA_TYCOON_GRETA] = { - TRAINER_PIC(ArenaTycoonGreta, ARENA_TYCOON_GRETA), - .animation = sAnims_Trainer, + TRAINER_PIC(ArenaTycoonGreta, ARENA_TYCOON_GRETA, Trainer), }, [TRAINER_PIC_FACTORY_HEAD_NOLAND] = { - TRAINER_PIC(FactoryHeadNoland, FACTORY_HEAD_NOLAND), - .animation = sAnims_Trainer, + TRAINER_PIC(FactoryHeadNoland, FACTORY_HEAD_NOLAND, Trainer), }, [TRAINER_PIC_PIKE_QUEEN_LUCY] = { - TRAINER_PIC(PikeQueenLucy, PIKE_QUEEN_LUCY), - .animation = sAnims_Trainer, + TRAINER_PIC(PikeQueenLucy, PIKE_QUEEN_LUCY, Trainer), }, [TRAINER_PIC_PYRAMID_KING_BRANDON] = { - TRAINER_PIC(PyramidKingBrandon, PYRAMID_KING_BRANDON), - .animation = sAnims_Trainer, + TRAINER_PIC(PyramidKingBrandon, PYRAMID_KING_BRANDON, Trainer), }, [TRAINER_PIC_RED] = { - TRAINER_PIC(Red, RED), - .animation = sAnims_Trainer, + TRAINER_PIC(Red, RED, Trainer), }, [TRAINER_PIC_LEAF] = { - TRAINER_PIC(Leaf, LEAF), - .animation = sAnims_Trainer, + TRAINER_PIC(Leaf, LEAF, Trainer), }, [TRAINER_PIC_RS_BRENDAN] = { - TRAINER_PIC(RubySapphireBrendan, RS_BRENDAN), - .animation = sAnims_Trainer, + TRAINER_PIC(RubySapphireBrendan, RS_BRENDAN, Trainer), }, [TRAINER_PIC_RS_MAY] = { - TRAINER_PIC(RubySapphireMay, RS_MAY), - .animation = sAnims_Trainer, + TRAINER_PIC(RubySapphireMay, RS_MAY, Trainer), }, }; From 0a8cc5e64436823a7a77126be3287fcfeb1777ca Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 25 Nov 2023 18:22:03 -0500 Subject: [PATCH 13/25] Added array number to preproc --- src/data/graphics/trainers.h | 564 ++++++----------------------------- 1 file changed, 98 insertions(+), 466 deletions(-) diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 910c4e2e620b..11b28f438d85 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -296,476 +296,108 @@ static const union AnimCmd *const sAnims_Trainer[] ={ sAnim_GeneralFrame0, }; -#define TRAINER_PIC(file, trainerPic, anims) \ +#define TRAINER_PIC(trainerPic, file, anims) \ + [TRAINER_PIC_##trainerPic] = \ + { \ .y_offset = 8, \ .frontPic = {gTrainerFrontPic_##file, TRAINER_PIC_SIZE, TRAINER_PIC_##trainerPic},\ .palette = {gTrainerPalette_##file, TRAINER_PIC_##trainerPic}, \ - .animation = sAnims_##anims + .animation = sAnims_##anims, \ + } const struct TrainerSprite gTrainerSprites[] = { - [TRAINER_PIC_HIKER] = - { - TRAINER_PIC(Hiker, HIKER, Trainer), - }, - - [TRAINER_PIC_AQUA_GRUNT_M] = - { - TRAINER_PIC(AquaGruntM, AQUA_GRUNT_M, Trainer), - }, - - [TRAINER_PIC_POKEMON_BREEDER_F] = - { - TRAINER_PIC(PokemonBreederF, POKEMON_BREEDER_F, Trainer), - }, - - [TRAINER_PIC_COOLTRAINER_M] = - { - TRAINER_PIC(CoolTrainerM, COOLTRAINER_M, Trainer), - }, - - [TRAINER_PIC_BIRD_KEEPER] = - { - TRAINER_PIC(BirdKeeper, BIRD_KEEPER, Trainer), - }, - - [TRAINER_PIC_COLLECTOR] = - { - TRAINER_PIC(Collector, COLLECTOR, Trainer), - }, - - [TRAINER_PIC_AQUA_GRUNT_F] = - { - TRAINER_PIC(AquaGruntF, AQUA_GRUNT_F, Trainer), - }, - - [TRAINER_PIC_SWIMMER_M] = - { - TRAINER_PIC(SwimmerM, SWIMMER_M, Trainer), - }, - - [TRAINER_PIC_MAGMA_GRUNT_M] = - { - TRAINER_PIC(MagmaGruntM, MAGMA_GRUNT_M, Trainer), - }, - - [TRAINER_PIC_EXPERT_M] = - { - TRAINER_PIC(ExpertM, EXPERT_M, Trainer), - }, - - [TRAINER_PIC_AQUA_ADMIN_M] = - { - TRAINER_PIC(AquaAdminM, AQUA_ADMIN_M, Trainer), - }, - - [TRAINER_PIC_BLACK_BELT] = - { - TRAINER_PIC(BlackBelt, BLACK_BELT, Trainer), - }, - - [TRAINER_PIC_AQUA_ADMIN_F] = - { - TRAINER_PIC(AquaAdminF, AQUA_ADMIN_F, Trainer), - }, - - [TRAINER_PIC_AQUA_LEADER_ARCHIE] = - { - TRAINER_PIC(AquaLeaderArchie, AQUA_LEADER_ARCHIE, Trainer), - }, - - [TRAINER_PIC_HEX_MANIAC] = - { - TRAINER_PIC(HexManiac, HEX_MANIAC, Trainer), - }, - - [TRAINER_PIC_AROMA_LADY] = - { - TRAINER_PIC(AromaLady, AROMA_LADY, Trainer), - }, - - [TRAINER_PIC_RUIN_MANIAC] = - { - TRAINER_PIC(RuinManiac, RUIN_MANIAC, Trainer), - }, - - [TRAINER_PIC_INTERVIEWER] = - { - TRAINER_PIC(Interviewer, INTERVIEWER, Trainer), - }, - - [TRAINER_PIC_TUBER_F] = - { - TRAINER_PIC(TuberF, TUBER_F, Trainer), - }, - - [TRAINER_PIC_TUBER_M] = - { - TRAINER_PIC(TuberM, TUBER_M, Trainer), - }, - - [TRAINER_PIC_COOLTRAINER_F] = - { - TRAINER_PIC(CoolTrainerF, COOLTRAINER_F, Trainer), - }, - - [TRAINER_PIC_LADY] = - { - TRAINER_PIC(Lady, LADY, Trainer), - }, - - [TRAINER_PIC_BEAUTY] = - { - TRAINER_PIC(Beauty, BEAUTY, Trainer), - }, - - [TRAINER_PIC_RICH_BOY] = - { - TRAINER_PIC(RichBoy, RICH_BOY, Trainer), - }, - - [TRAINER_PIC_EXPERT_F] = - { - TRAINER_PIC(ExpertF, EXPERT_F, Trainer), - }, - - [TRAINER_PIC_POKEMANIAC] = - { - TRAINER_PIC(Pokemaniac, POKEMANIAC, Trainer), - }, - - [TRAINER_PIC_MAGMA_GRUNT_F] = - { - TRAINER_PIC(MagmaGruntF, MAGMA_GRUNT_F, Trainer), - }, - - [TRAINER_PIC_GUITARIST] = - { - TRAINER_PIC(Guitarist, GUITARIST, Trainer), - }, - - [TRAINER_PIC_KINDLER] = - { - TRAINER_PIC(Kindler, KINDLER, Trainer), - }, - - [TRAINER_PIC_CAMPER] = - { - TRAINER_PIC(Camper, CAMPER, Trainer), - }, - - [TRAINER_PIC_PICNICKER] = - { - TRAINER_PIC(Picnicker, PICNICKER, Trainer), - }, - - [TRAINER_PIC_BUG_MANIAC] = - { - TRAINER_PIC(BugManiac, BUG_MANIAC, Trainer), - }, - - [TRAINER_PIC_POKEMON_BREEDER_M] = - { - TRAINER_PIC(PokemonBreederM, POKEMON_BREEDER_M, Trainer), - }, - - [TRAINER_PIC_PSYCHIC_M] = - { - TRAINER_PIC(PsychicM, PSYCHIC_M, Trainer), - }, - - [TRAINER_PIC_PSYCHIC_F] = - { - TRAINER_PIC(PsychicF, PSYCHIC_F, Trainer), - }, - - [TRAINER_PIC_GENTLEMAN] = - { - TRAINER_PIC(Gentleman, GENTLEMAN, Trainer), - }, - - [TRAINER_PIC_ELITE_FOUR_SIDNEY] = - { - TRAINER_PIC(EliteFourSidney, ELITE_FOUR_SIDNEY, Trainer), - }, - - [TRAINER_PIC_ELITE_FOUR_PHOEBE] = - { - TRAINER_PIC(EliteFourPhoebe, ELITE_FOUR_PHOEBE, Trainer), - }, - - [TRAINER_PIC_ELITE_FOUR_GLACIA] = - { - TRAINER_PIC(EliteFourGlacia, ELITE_FOUR_GLACIA, Trainer), - }, - - [TRAINER_PIC_ELITE_FOUR_DRAKE] = - { - TRAINER_PIC(EliteFourDrake, ELITE_FOUR_DRAKE, Trainer), - }, - - [TRAINER_PIC_LEADER_ROXANNE] = - { - TRAINER_PIC(LeaderRoxanne, LEADER_ROXANNE, Trainer), - }, - - [TRAINER_PIC_LEADER_BRAWLY] = - { - TRAINER_PIC(LeaderBrawly, LEADER_BRAWLY, Trainer), - }, - - [TRAINER_PIC_LEADER_WATTSON] = - { - TRAINER_PIC(LeaderWattson, LEADER_WATTSON, Trainer), - }, - - [TRAINER_PIC_LEADER_FLANNERY] = - { - TRAINER_PIC(LeaderFlannery, LEADER_FLANNERY, Trainer), - }, - - [TRAINER_PIC_LEADER_NORMAN] = - { - TRAINER_PIC(LeaderNorman, LEADER_NORMAN, Trainer), - }, - - [TRAINER_PIC_LEADER_WINONA] = - { - TRAINER_PIC(LeaderWinona, LEADER_WINONA, Trainer), - }, - - [TRAINER_PIC_LEADER_TATE_AND_LIZA] = - { - TRAINER_PIC(LeaderTateAndLiza, LEADER_TATE_AND_LIZA, Trainer), - }, - - [TRAINER_PIC_LEADER_JUAN] = - { - TRAINER_PIC(LeaderJuan, LEADER_JUAN, Trainer), - }, - - [TRAINER_PIC_SCHOOL_KID_M] = - { - TRAINER_PIC(SchoolKidM, SCHOOL_KID_M, Trainer), - }, - - [TRAINER_PIC_SCHOOL_KID_F] = - { - TRAINER_PIC(SchoolKidF, SCHOOL_KID_F, Trainer), - }, - - [TRAINER_PIC_SR_AND_JR] = - { - TRAINER_PIC(SrAndJr, SR_AND_JR, Trainer), - }, - - [TRAINER_PIC_POKEFAN_M] = - { - TRAINER_PIC(PokefanM, POKEFAN_M, Trainer), - }, - - [TRAINER_PIC_POKEFAN_F] = - { - TRAINER_PIC(PokefanF, POKEFAN_F, Trainer), - }, - - [TRAINER_PIC_YOUNGSTER] = - { - TRAINER_PIC(Youngster, YOUNGSTER, Trainer), - }, - - [TRAINER_PIC_CHAMPION_WALLACE] = - { - TRAINER_PIC(ChampionWallace, CHAMPION_WALLACE, Trainer), - }, - - [TRAINER_PIC_FISHERMAN] = - { - TRAINER_PIC(Fisherman, FISHERMAN, Trainer), - }, - - [TRAINER_PIC_CYCLING_TRIATHLETE_M] = - { - TRAINER_PIC(CyclingTriathleteM, CYCLING_TRIATHLETE_M, Trainer), - }, - - [TRAINER_PIC_CYCLING_TRIATHLETE_F] = - { - TRAINER_PIC(CyclingTriathleteF, CYCLING_TRIATHLETE_F, Trainer), - }, - - [TRAINER_PIC_RUNNING_TRIATHLETE_M] = - { - TRAINER_PIC(RunningTriathleteM, RUNNING_TRIATHLETE_M, Trainer), - }, - - [TRAINER_PIC_RUNNING_TRIATHLETE_F] = - { - TRAINER_PIC(RunningTriathleteF, RUNNING_TRIATHLETE_F, Trainer), - }, - - [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = - { - TRAINER_PIC(SwimmingTriathleteM, SWIMMING_TRIATHLETE_M, Trainer), - }, - - [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = - { - TRAINER_PIC(SwimmingTriathleteF, SWIMMING_TRIATHLETE_F, Trainer), - }, - - [TRAINER_PIC_DRAGON_TAMER] = - { - TRAINER_PIC(DragonTamer, DRAGON_TAMER, Trainer), - }, - - [TRAINER_PIC_NINJA_BOY] = - { - TRAINER_PIC(NinjaBoy, NINJA_BOY, Trainer), - }, - - [TRAINER_PIC_BATTLE_GIRL] = - { - TRAINER_PIC(BattleGirl, BATTLE_GIRL, Trainer), - }, - - [TRAINER_PIC_PARASOL_LADY] = - { - TRAINER_PIC(ParasolLady, PARASOL_LADY, Trainer), - }, - - [TRAINER_PIC_SWIMMER_F] = - { - TRAINER_PIC(SwimmerF, SWIMMER_F, Trainer), - }, - - [TRAINER_PIC_TWINS] = - { - TRAINER_PIC(Twins, TWINS, Trainer), - }, - - [TRAINER_PIC_SAILOR] = - { - TRAINER_PIC(Sailor, SAILOR, Trainer), - }, - - [TRAINER_PIC_MAGMA_ADMIN] = - { - TRAINER_PIC(MagmaAdmin, MAGMA_ADMIN, Trainer), - }, - - [TRAINER_PIC_WALLY] = - { - TRAINER_PIC(Wally, WALLY, Trainer), - }, - - [TRAINER_PIC_BRENDAN] = - { - TRAINER_PIC(Brendan, BRENDAN, Trainer), - }, - - [TRAINER_PIC_MAY] = - { - TRAINER_PIC(May, MAY, Trainer), - }, - - [TRAINER_PIC_BUG_CATCHER] = - { - TRAINER_PIC(BugCatcher, BUG_CATCHER, Trainer), - }, - - [TRAINER_PIC_POKEMON_RANGER_M] = - { - TRAINER_PIC(PokemonRangerM, POKEMON_RANGER_M, Trainer), - }, - - [TRAINER_PIC_POKEMON_RANGER_F] = - { - TRAINER_PIC(PokemonRangerF, POKEMON_RANGER_F, Trainer), - }, - - [TRAINER_PIC_MAGMA_LEADER_MAXIE] = - { - TRAINER_PIC(MagmaLeaderMaxie, MAGMA_LEADER_MAXIE, Trainer), - }, - - [TRAINER_PIC_LASS] = - { - TRAINER_PIC(Lass, LASS, Trainer), - }, - - [TRAINER_PIC_YOUNG_COUPLE] = - { - TRAINER_PIC(YoungCouple, YOUNG_COUPLE, Trainer), - }, - - [TRAINER_PIC_OLD_COUPLE] = - { - TRAINER_PIC(OldCouple, OLD_COUPLE, Trainer), - }, - - [TRAINER_PIC_SIS_AND_BRO] = - { - TRAINER_PIC(SisAndBro, SIS_AND_BRO, Trainer), - }, - - [TRAINER_PIC_STEVEN] = - { - TRAINER_PIC(Steven, STEVEN, Trainer), - }, - - [TRAINER_PIC_SALON_MAIDEN_ANABEL] = - { - TRAINER_PIC(SalonMaidenAnabel, SALON_MAIDEN_ANABEL, Trainer), - }, - - [TRAINER_PIC_DOME_ACE_TUCKER] = - { - TRAINER_PIC(DomeAceTucker, DOME_ACE_TUCKER, Trainer), - }, - - [TRAINER_PIC_PALACE_MAVEN_SPENSER] = - { - TRAINER_PIC(PalaceMavenSpenser, PALACE_MAVEN_SPENSER, Trainer), - }, - - [TRAINER_PIC_ARENA_TYCOON_GRETA] = - { - TRAINER_PIC(ArenaTycoonGreta, ARENA_TYCOON_GRETA, Trainer), - }, - - [TRAINER_PIC_FACTORY_HEAD_NOLAND] = - { - TRAINER_PIC(FactoryHeadNoland, FACTORY_HEAD_NOLAND, Trainer), - }, - - [TRAINER_PIC_PIKE_QUEEN_LUCY] = - { - TRAINER_PIC(PikeQueenLucy, PIKE_QUEEN_LUCY, Trainer), - }, - - [TRAINER_PIC_PYRAMID_KING_BRANDON] = - { - TRAINER_PIC(PyramidKingBrandon, PYRAMID_KING_BRANDON, Trainer), - }, - - [TRAINER_PIC_RED] = - { - TRAINER_PIC(Red, RED, Trainer), - }, - - [TRAINER_PIC_LEAF] = - { - TRAINER_PIC(Leaf, LEAF, Trainer), - }, - - [TRAINER_PIC_RS_BRENDAN] = - { - TRAINER_PIC(RubySapphireBrendan, RS_BRENDAN, Trainer), - }, - - [TRAINER_PIC_RS_MAY] = - { - TRAINER_PIC(RubySapphireMay, RS_MAY, Trainer), - }, + TRAINER_PIC(HIKER, Hiker, Trainer), + TRAINER_PIC(AQUA_GRUNT_M, AquaGruntM, Trainer), + TRAINER_PIC(POKEMON_BREEDER_F, PokemonBreederF, Trainer), + TRAINER_PIC(COOLTRAINER_M, CoolTrainerM, Trainer), + TRAINER_PIC(BIRD_KEEPER, BirdKeeper, Trainer), + TRAINER_PIC(COLLECTOR, Collector, Trainer), + TRAINER_PIC(AQUA_GRUNT_F, AquaGruntF, Trainer), + TRAINER_PIC(SWIMMER_M, SwimmerM, Trainer), + TRAINER_PIC(MAGMA_GRUNT_M, MagmaGruntM, Trainer), + TRAINER_PIC(EXPERT_M, ExpertM, Trainer), + TRAINER_PIC(AQUA_ADMIN_M, AquaAdminM, Trainer), + TRAINER_PIC(BLACK_BELT, BlackBelt, Trainer), + TRAINER_PIC(AQUA_ADMIN_F, AquaAdminF, Trainer), + TRAINER_PIC(AQUA_LEADER_ARCHIE, AquaLeaderArchie, Trainer), + TRAINER_PIC(HEX_MANIAC, HexManiac, Trainer), + TRAINER_PIC(AROMA_LADY, AromaLady, Trainer), + TRAINER_PIC(RUIN_MANIAC, RuinManiac, Trainer), + TRAINER_PIC(INTERVIEWER, Interviewer, Trainer), + TRAINER_PIC(TUBER_F, TuberF, Trainer), + TRAINER_PIC(TUBER_M, TuberM, Trainer), + TRAINER_PIC(COOLTRAINER_F, CoolTrainerF, Trainer), + TRAINER_PIC(LADY, Lady, Trainer), + TRAINER_PIC(BEAUTY, Beauty, Trainer), + TRAINER_PIC(RICH_BOY, RichBoy, Trainer), + TRAINER_PIC(EXPERT_F, ExpertF, Trainer), + TRAINER_PIC(POKEMANIAC, Pokemaniac, Trainer), + TRAINER_PIC(MAGMA_GRUNT_F, MagmaGruntF, Trainer), + TRAINER_PIC(GUITARIST, Guitarist, Trainer), + TRAINER_PIC(KINDLER, Kindler, Trainer), + TRAINER_PIC(CAMPER, Camper, Trainer), + TRAINER_PIC(PICNICKER, Picnicker, Trainer), + TRAINER_PIC(BUG_MANIAC, BugManiac, Trainer), + TRAINER_PIC(POKEMON_BREEDER_M, PokemonBreederM, Trainer), + TRAINER_PIC(PSYCHIC_M, PsychicM, Trainer), + TRAINER_PIC(PSYCHIC_F, PsychicF, Trainer), + TRAINER_PIC(GENTLEMAN, Gentleman, Trainer), + TRAINER_PIC(ELITE_FOUR_SIDNEY, EliteFourSidney, Trainer), + TRAINER_PIC(ELITE_FOUR_PHOEBE, EliteFourPhoebe, Trainer), + TRAINER_PIC(ELITE_FOUR_GLACIA, EliteFourGlacia, Trainer), + TRAINER_PIC(ELITE_FOUR_DRAKE, EliteFourDrake, Trainer), + TRAINER_PIC(LEADER_ROXANNE, LeaderRoxanne, Trainer), + TRAINER_PIC(LEADER_BRAWLY, LeaderBrawly, Trainer), + TRAINER_PIC(LEADER_WATTSON, LeaderWattson, Trainer), + TRAINER_PIC(LEADER_FLANNERY, LeaderFlannery, Trainer), + TRAINER_PIC(LEADER_NORMAN, LeaderNorman, Trainer), + TRAINER_PIC(LEADER_WINONA, LeaderWinona, Trainer), + TRAINER_PIC(LEADER_TATE_AND_LIZA, LeaderTateAndLiza, Trainer), + TRAINER_PIC(LEADER_JUAN, LeaderJuan, Trainer), + TRAINER_PIC(SCHOOL_KID_M, SchoolKidM, Trainer), + TRAINER_PIC(SCHOOL_KID_F, SchoolKidF, Trainer), + TRAINER_PIC(SR_AND_JR, SrAndJr, Trainer), + TRAINER_PIC(POKEFAN_M, PokefanM, Trainer), + TRAINER_PIC(POKEFAN_F, PokefanF, Trainer), + TRAINER_PIC(YOUNGSTER, Youngster, Trainer), + TRAINER_PIC(CHAMPION_WALLACE, ChampionWallace, Trainer), + TRAINER_PIC(FISHERMAN, Fisherman, Trainer), + TRAINER_PIC(CYCLING_TRIATHLETE_M, CyclingTriathleteM, Trainer), + TRAINER_PIC(CYCLING_TRIATHLETE_F, CyclingTriathleteF, Trainer), + TRAINER_PIC(RUNNING_TRIATHLETE_M, RunningTriathleteM, Trainer), + TRAINER_PIC(RUNNING_TRIATHLETE_F, RunningTriathleteF, Trainer), + TRAINER_PIC(SWIMMING_TRIATHLETE_M, SwimmingTriathleteM, Trainer), + TRAINER_PIC(SWIMMING_TRIATHLETE_F, SwimmingTriathleteF, Trainer), + TRAINER_PIC(DRAGON_TAMER, DragonTamer, Trainer), + TRAINER_PIC(NINJA_BOY, NinjaBoy, Trainer), + TRAINER_PIC(BATTLE_GIRL, BattleGirl, Trainer), + TRAINER_PIC(PARASOL_LADY, ParasolLady, Trainer), + TRAINER_PIC(SWIMMER_F, SwimmerF, Trainer), + TRAINER_PIC(TWINS, Twins, Trainer), + TRAINER_PIC(SAILOR, Sailor, Trainer), + TRAINER_PIC(MAGMA_ADMIN, MagmaAdmin, Trainer), + TRAINER_PIC(WALLY, Wally, Trainer), + TRAINER_PIC(BRENDAN, Brendan, Trainer), + TRAINER_PIC(MAY, May, Trainer), + TRAINER_PIC(BUG_CATCHER, BugCatcher, Trainer), + TRAINER_PIC(POKEMON_RANGER_M, PokemonRangerM, Trainer), + TRAINER_PIC(POKEMON_RANGER_F, PokemonRangerF, Trainer), + TRAINER_PIC(MAGMA_LEADER_MAXIE, MagmaLeaderMaxie, Trainer), + TRAINER_PIC(LASS, Lass, Trainer), + TRAINER_PIC(YOUNG_COUPLE, YoungCouple, Trainer), + TRAINER_PIC(OLD_COUPLE, OldCouple, Trainer), + TRAINER_PIC(SIS_AND_BRO, SisAndBro, Trainer), + TRAINER_PIC(STEVEN, Steven, Trainer), + TRAINER_PIC(SALON_MAIDEN_ANABEL, SalonMaidenAnabel, Trainer), + TRAINER_PIC(DOME_ACE_TUCKER, DomeAceTucker, Trainer), + TRAINER_PIC(PALACE_MAVEN_SPENSER, PalaceMavenSpenser, Trainer), + TRAINER_PIC(ARENA_TYCOON_GRETA, ArenaTycoonGreta, Trainer), + TRAINER_PIC(FACTORY_HEAD_NOLAND, FactoryHeadNoland, Trainer), + TRAINER_PIC(PIKE_QUEEN_LUCY, PikeQueenLucy, Trainer), + TRAINER_PIC(PYRAMID_KING_BRANDON, PyramidKingBrandon, Trainer), + TRAINER_PIC(RED, Red, Trainer), + TRAINER_PIC(LEAF, Leaf, Trainer), + TRAINER_PIC(RS_BRENDAN, RubySapphireBrendan, Trainer), + TRAINER_PIC(RS_MAY, RubySapphireMay, Trainer), }; From af34d2c3bf74277e76888643a2223b0868650327 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 26 Nov 2023 16:56:37 -0500 Subject: [PATCH 14/25] Removed trailing spaces --- src/data/graphics/trainers.h | 184 +++++++++++++++++------------------ 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 11b28f438d85..3cbeb181e0ec 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -307,97 +307,97 @@ static const union AnimCmd *const sAnims_Trainer[] ={ const struct TrainerSprite gTrainerSprites[] = { - TRAINER_PIC(HIKER, Hiker, Trainer), - TRAINER_PIC(AQUA_GRUNT_M, AquaGruntM, Trainer), - TRAINER_PIC(POKEMON_BREEDER_F, PokemonBreederF, Trainer), - TRAINER_PIC(COOLTRAINER_M, CoolTrainerM, Trainer), - TRAINER_PIC(BIRD_KEEPER, BirdKeeper, Trainer), - TRAINER_PIC(COLLECTOR, Collector, Trainer), - TRAINER_PIC(AQUA_GRUNT_F, AquaGruntF, Trainer), - TRAINER_PIC(SWIMMER_M, SwimmerM, Trainer), - TRAINER_PIC(MAGMA_GRUNT_M, MagmaGruntM, Trainer), - TRAINER_PIC(EXPERT_M, ExpertM, Trainer), - TRAINER_PIC(AQUA_ADMIN_M, AquaAdminM, Trainer), - TRAINER_PIC(BLACK_BELT, BlackBelt, Trainer), - TRAINER_PIC(AQUA_ADMIN_F, AquaAdminF, Trainer), - TRAINER_PIC(AQUA_LEADER_ARCHIE, AquaLeaderArchie, Trainer), - TRAINER_PIC(HEX_MANIAC, HexManiac, Trainer), - TRAINER_PIC(AROMA_LADY, AromaLady, Trainer), - TRAINER_PIC(RUIN_MANIAC, RuinManiac, Trainer), - TRAINER_PIC(INTERVIEWER, Interviewer, Trainer), - TRAINER_PIC(TUBER_F, TuberF, Trainer), - TRAINER_PIC(TUBER_M, TuberM, Trainer), - TRAINER_PIC(COOLTRAINER_F, CoolTrainerF, Trainer), - TRAINER_PIC(LADY, Lady, Trainer), - TRAINER_PIC(BEAUTY, Beauty, Trainer), - TRAINER_PIC(RICH_BOY, RichBoy, Trainer), - TRAINER_PIC(EXPERT_F, ExpertF, Trainer), - TRAINER_PIC(POKEMANIAC, Pokemaniac, Trainer), - TRAINER_PIC(MAGMA_GRUNT_F, MagmaGruntF, Trainer), - TRAINER_PIC(GUITARIST, Guitarist, Trainer), - TRAINER_PIC(KINDLER, Kindler, Trainer), - TRAINER_PIC(CAMPER, Camper, Trainer), - TRAINER_PIC(PICNICKER, Picnicker, Trainer), - TRAINER_PIC(BUG_MANIAC, BugManiac, Trainer), - TRAINER_PIC(POKEMON_BREEDER_M, PokemonBreederM, Trainer), - TRAINER_PIC(PSYCHIC_M, PsychicM, Trainer), - TRAINER_PIC(PSYCHIC_F, PsychicF, Trainer), - TRAINER_PIC(GENTLEMAN, Gentleman, Trainer), - TRAINER_PIC(ELITE_FOUR_SIDNEY, EliteFourSidney, Trainer), - TRAINER_PIC(ELITE_FOUR_PHOEBE, EliteFourPhoebe, Trainer), - TRAINER_PIC(ELITE_FOUR_GLACIA, EliteFourGlacia, Trainer), - TRAINER_PIC(ELITE_FOUR_DRAKE, EliteFourDrake, Trainer), - TRAINER_PIC(LEADER_ROXANNE, LeaderRoxanne, Trainer), - TRAINER_PIC(LEADER_BRAWLY, LeaderBrawly, Trainer), - TRAINER_PIC(LEADER_WATTSON, LeaderWattson, Trainer), - TRAINER_PIC(LEADER_FLANNERY, LeaderFlannery, Trainer), - TRAINER_PIC(LEADER_NORMAN, LeaderNorman, Trainer), - TRAINER_PIC(LEADER_WINONA, LeaderWinona, Trainer), - TRAINER_PIC(LEADER_TATE_AND_LIZA, LeaderTateAndLiza, Trainer), - TRAINER_PIC(LEADER_JUAN, LeaderJuan, Trainer), - TRAINER_PIC(SCHOOL_KID_M, SchoolKidM, Trainer), - TRAINER_PIC(SCHOOL_KID_F, SchoolKidF, Trainer), - TRAINER_PIC(SR_AND_JR, SrAndJr, Trainer), - TRAINER_PIC(POKEFAN_M, PokefanM, Trainer), - TRAINER_PIC(POKEFAN_F, PokefanF, Trainer), - TRAINER_PIC(YOUNGSTER, Youngster, Trainer), - TRAINER_PIC(CHAMPION_WALLACE, ChampionWallace, Trainer), - TRAINER_PIC(FISHERMAN, Fisherman, Trainer), - TRAINER_PIC(CYCLING_TRIATHLETE_M, CyclingTriathleteM, Trainer), - TRAINER_PIC(CYCLING_TRIATHLETE_F, CyclingTriathleteF, Trainer), - TRAINER_PIC(RUNNING_TRIATHLETE_M, RunningTriathleteM, Trainer), - TRAINER_PIC(RUNNING_TRIATHLETE_F, RunningTriathleteF, Trainer), - TRAINER_PIC(SWIMMING_TRIATHLETE_M, SwimmingTriathleteM, Trainer), - TRAINER_PIC(SWIMMING_TRIATHLETE_F, SwimmingTriathleteF, Trainer), - TRAINER_PIC(DRAGON_TAMER, DragonTamer, Trainer), - TRAINER_PIC(NINJA_BOY, NinjaBoy, Trainer), - TRAINER_PIC(BATTLE_GIRL, BattleGirl, Trainer), - TRAINER_PIC(PARASOL_LADY, ParasolLady, Trainer), - TRAINER_PIC(SWIMMER_F, SwimmerF, Trainer), - TRAINER_PIC(TWINS, Twins, Trainer), - TRAINER_PIC(SAILOR, Sailor, Trainer), - TRAINER_PIC(MAGMA_ADMIN, MagmaAdmin, Trainer), - TRAINER_PIC(WALLY, Wally, Trainer), - TRAINER_PIC(BRENDAN, Brendan, Trainer), - TRAINER_PIC(MAY, May, Trainer), - TRAINER_PIC(BUG_CATCHER, BugCatcher, Trainer), - TRAINER_PIC(POKEMON_RANGER_M, PokemonRangerM, Trainer), - TRAINER_PIC(POKEMON_RANGER_F, PokemonRangerF, Trainer), - TRAINER_PIC(MAGMA_LEADER_MAXIE, MagmaLeaderMaxie, Trainer), - TRAINER_PIC(LASS, Lass, Trainer), - TRAINER_PIC(YOUNG_COUPLE, YoungCouple, Trainer), - TRAINER_PIC(OLD_COUPLE, OldCouple, Trainer), - TRAINER_PIC(SIS_AND_BRO, SisAndBro, Trainer), - TRAINER_PIC(STEVEN, Steven, Trainer), - TRAINER_PIC(SALON_MAIDEN_ANABEL, SalonMaidenAnabel, Trainer), - TRAINER_PIC(DOME_ACE_TUCKER, DomeAceTucker, Trainer), - TRAINER_PIC(PALACE_MAVEN_SPENSER, PalaceMavenSpenser, Trainer), - TRAINER_PIC(ARENA_TYCOON_GRETA, ArenaTycoonGreta, Trainer), - TRAINER_PIC(FACTORY_HEAD_NOLAND, FactoryHeadNoland, Trainer), - TRAINER_PIC(PIKE_QUEEN_LUCY, PikeQueenLucy, Trainer), - TRAINER_PIC(PYRAMID_KING_BRANDON, PyramidKingBrandon, Trainer), - TRAINER_PIC(RED, Red, Trainer), - TRAINER_PIC(LEAF, Leaf, Trainer), - TRAINER_PIC(RS_BRENDAN, RubySapphireBrendan, Trainer), + TRAINER_PIC(HIKER, Hiker, Trainer), + TRAINER_PIC(AQUA_GRUNT_M, AquaGruntM, Trainer), + TRAINER_PIC(POKEMON_BREEDER_F, PokemonBreederF, Trainer), + TRAINER_PIC(COOLTRAINER_M, CoolTrainerM, Trainer), + TRAINER_PIC(BIRD_KEEPER, BirdKeeper, Trainer), + TRAINER_PIC(COLLECTOR, Collector, Trainer), + TRAINER_PIC(AQUA_GRUNT_F, AquaGruntF, Trainer), + TRAINER_PIC(SWIMMER_M, SwimmerM, Trainer), + TRAINER_PIC(MAGMA_GRUNT_M, MagmaGruntM, Trainer), + TRAINER_PIC(EXPERT_M, ExpertM, Trainer), + TRAINER_PIC(AQUA_ADMIN_M, AquaAdminM, Trainer), + TRAINER_PIC(BLACK_BELT, BlackBelt, Trainer), + TRAINER_PIC(AQUA_ADMIN_F, AquaAdminF, Trainer), + TRAINER_PIC(AQUA_LEADER_ARCHIE, AquaLeaderArchie, Trainer), + TRAINER_PIC(HEX_MANIAC, HexManiac, Trainer), + TRAINER_PIC(AROMA_LADY, AromaLady, Trainer), + TRAINER_PIC(RUIN_MANIAC, RuinManiac, Trainer), + TRAINER_PIC(INTERVIEWER, Interviewer, Trainer), + TRAINER_PIC(TUBER_F, TuberF, Trainer), + TRAINER_PIC(TUBER_M, TuberM, Trainer), + TRAINER_PIC(COOLTRAINER_F, CoolTrainerF, Trainer), + TRAINER_PIC(LADY, Lady, Trainer), + TRAINER_PIC(BEAUTY, Beauty, Trainer), + TRAINER_PIC(RICH_BOY, RichBoy, Trainer), + TRAINER_PIC(EXPERT_F, ExpertF, Trainer), + TRAINER_PIC(POKEMANIAC, Pokemaniac, Trainer), + TRAINER_PIC(MAGMA_GRUNT_F, MagmaGruntF, Trainer), + TRAINER_PIC(GUITARIST, Guitarist, Trainer), + TRAINER_PIC(KINDLER, Kindler, Trainer), + TRAINER_PIC(CAMPER, Camper, Trainer), + TRAINER_PIC(PICNICKER, Picnicker, Trainer), + TRAINER_PIC(BUG_MANIAC, BugManiac, Trainer), + TRAINER_PIC(POKEMON_BREEDER_M, PokemonBreederM, Trainer), + TRAINER_PIC(PSYCHIC_M, PsychicM, Trainer), + TRAINER_PIC(PSYCHIC_F, PsychicF, Trainer), + TRAINER_PIC(GENTLEMAN, Gentleman, Trainer), + TRAINER_PIC(ELITE_FOUR_SIDNEY, EliteFourSidney, Trainer), + TRAINER_PIC(ELITE_FOUR_PHOEBE, EliteFourPhoebe, Trainer), + TRAINER_PIC(ELITE_FOUR_GLACIA, EliteFourGlacia, Trainer), + TRAINER_PIC(ELITE_FOUR_DRAKE, EliteFourDrake, Trainer), + TRAINER_PIC(LEADER_ROXANNE, LeaderRoxanne, Trainer), + TRAINER_PIC(LEADER_BRAWLY, LeaderBrawly, Trainer), + TRAINER_PIC(LEADER_WATTSON, LeaderWattson, Trainer), + TRAINER_PIC(LEADER_FLANNERY, LeaderFlannery, Trainer), + TRAINER_PIC(LEADER_NORMAN, LeaderNorman, Trainer), + TRAINER_PIC(LEADER_WINONA, LeaderWinona, Trainer), + TRAINER_PIC(LEADER_TATE_AND_LIZA, LeaderTateAndLiza, Trainer), + TRAINER_PIC(LEADER_JUAN, LeaderJuan, Trainer), + TRAINER_PIC(SCHOOL_KID_M, SchoolKidM, Trainer), + TRAINER_PIC(SCHOOL_KID_F, SchoolKidF, Trainer), + TRAINER_PIC(SR_AND_JR, SrAndJr, Trainer), + TRAINER_PIC(POKEFAN_M, PokefanM, Trainer), + TRAINER_PIC(POKEFAN_F, PokefanF, Trainer), + TRAINER_PIC(YOUNGSTER, Youngster, Trainer), + TRAINER_PIC(CHAMPION_WALLACE, ChampionWallace, Trainer), + TRAINER_PIC(FISHERMAN, Fisherman, Trainer), + TRAINER_PIC(CYCLING_TRIATHLETE_M, CyclingTriathleteM, Trainer), + TRAINER_PIC(CYCLING_TRIATHLETE_F, CyclingTriathleteF, Trainer), + TRAINER_PIC(RUNNING_TRIATHLETE_M, RunningTriathleteM, Trainer), + TRAINER_PIC(RUNNING_TRIATHLETE_F, RunningTriathleteF, Trainer), + TRAINER_PIC(SWIMMING_TRIATHLETE_M, SwimmingTriathleteM, Trainer), + TRAINER_PIC(SWIMMING_TRIATHLETE_F, SwimmingTriathleteF, Trainer), + TRAINER_PIC(DRAGON_TAMER, DragonTamer, Trainer), + TRAINER_PIC(NINJA_BOY, NinjaBoy, Trainer), + TRAINER_PIC(BATTLE_GIRL, BattleGirl, Trainer), + TRAINER_PIC(PARASOL_LADY, ParasolLady, Trainer), + TRAINER_PIC(SWIMMER_F, SwimmerF, Trainer), + TRAINER_PIC(TWINS, Twins, Trainer), + TRAINER_PIC(SAILOR, Sailor, Trainer), + TRAINER_PIC(MAGMA_ADMIN, MagmaAdmin, Trainer), + TRAINER_PIC(WALLY, Wally, Trainer), + TRAINER_PIC(BRENDAN, Brendan, Trainer), + TRAINER_PIC(MAY, May, Trainer), + TRAINER_PIC(BUG_CATCHER, BugCatcher, Trainer), + TRAINER_PIC(POKEMON_RANGER_M, PokemonRangerM, Trainer), + TRAINER_PIC(POKEMON_RANGER_F, PokemonRangerF, Trainer), + TRAINER_PIC(MAGMA_LEADER_MAXIE, MagmaLeaderMaxie, Trainer), + TRAINER_PIC(LASS, Lass, Trainer), + TRAINER_PIC(YOUNG_COUPLE, YoungCouple, Trainer), + TRAINER_PIC(OLD_COUPLE, OldCouple, Trainer), + TRAINER_PIC(SIS_AND_BRO, SisAndBro, Trainer), + TRAINER_PIC(STEVEN, Steven, Trainer), + TRAINER_PIC(SALON_MAIDEN_ANABEL, SalonMaidenAnabel, Trainer), + TRAINER_PIC(DOME_ACE_TUCKER, DomeAceTucker, Trainer), + TRAINER_PIC(PALACE_MAVEN_SPENSER, PalaceMavenSpenser, Trainer), + TRAINER_PIC(ARENA_TYCOON_GRETA, ArenaTycoonGreta, Trainer), + TRAINER_PIC(FACTORY_HEAD_NOLAND, FactoryHeadNoland, Trainer), + TRAINER_PIC(PIKE_QUEEN_LUCY, PikeQueenLucy, Trainer), + TRAINER_PIC(PYRAMID_KING_BRANDON, PyramidKingBrandon, Trainer), + TRAINER_PIC(RED, Red, Trainer), + TRAINER_PIC(LEAF, Leaf, Trainer), + TRAINER_PIC(RS_BRENDAN, RubySapphireBrendan, Trainer), TRAINER_PIC(RS_MAY, RubySapphireMay, Trainer), }; From 71c2399371cd3af358311f7c33a008d7dd981505 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 26 Nov 2023 17:21:27 -0500 Subject: [PATCH 15/25] Added sprite/palette files to preproc --- include/graphics.h | 181 ------------- src/data/graphics/trainers.h | 487 ++++++++--------------------------- 2 files changed, 110 insertions(+), 558 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index 94a8e322f2dd..982b752de555 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -66,191 +66,10 @@ extern const u32 gOpenPokeballGfx[]; extern const u16 gMonIconPalettes[][16]; // trainer sprites -extern const u32 gTrainerFrontPic_Hiker[]; -extern const u32 gTrainerFrontPic_AquaGruntM[]; -extern const u32 gTrainerFrontPic_PokemonBreederF[]; -extern const u32 gTrainerFrontPic_CoolTrainerM[]; -extern const u32 gTrainerFrontPic_BirdKeeper[]; -extern const u32 gTrainerFrontPic_Collector[]; -extern const u32 gTrainerFrontPic_AquaGruntF[]; -extern const u32 gTrainerFrontPic_SwimmerM[]; -extern const u32 gTrainerFrontPic_MagmaGruntM[]; -extern const u32 gTrainerFrontPic_ExpertM[]; -extern const u32 gTrainerFrontPic_AquaAdminM[]; -extern const u32 gTrainerFrontPic_BlackBelt[]; -extern const u32 gTrainerFrontPic_AquaAdminF[]; -extern const u32 gTrainerFrontPic_AquaLeaderArchie[]; -extern const u32 gTrainerFrontPic_HexManiac[]; -extern const u32 gTrainerFrontPic_AromaLady[]; -extern const u32 gTrainerFrontPic_RuinManiac[]; -extern const u32 gTrainerFrontPic_Interviewer[]; -extern const u32 gTrainerFrontPic_TuberF[]; -extern const u32 gTrainerFrontPic_TuberM[]; -extern const u32 gTrainerFrontPic_CoolTrainerF[]; -extern const u32 gTrainerFrontPic_Lady[]; -extern const u32 gTrainerFrontPic_Beauty[]; -extern const u32 gTrainerFrontPic_RichBoy[]; -extern const u32 gTrainerFrontPic_ExpertF[]; -extern const u32 gTrainerFrontPic_Pokemaniac[]; -extern const u32 gTrainerFrontPic_MagmaGruntF[]; -extern const u32 gTrainerFrontPic_Guitarist[]; -extern const u32 gTrainerFrontPic_Kindler[]; -extern const u32 gTrainerFrontPic_Camper[]; -extern const u32 gTrainerFrontPic_Picnicker[]; -extern const u32 gTrainerFrontPic_BugManiac[]; -extern const u32 gTrainerFrontPic_PokemonBreederM[]; -extern const u32 gTrainerFrontPic_PsychicM[]; -extern const u32 gTrainerFrontPic_PsychicF[]; -extern const u32 gTrainerFrontPic_Gentleman[]; -extern const u32 gTrainerFrontPic_EliteFourSidney[]; -extern const u32 gTrainerFrontPic_EliteFourPhoebe[]; -extern const u32 gTrainerFrontPic_EliteFourGlacia[]; -extern const u32 gTrainerFrontPic_EliteFourDrake[]; -extern const u32 gTrainerFrontPic_LeaderRoxanne[]; -extern const u32 gTrainerFrontPic_LeaderBrawly[]; -extern const u32 gTrainerFrontPic_LeaderWattson[]; -extern const u32 gTrainerFrontPic_LeaderFlannery[]; -extern const u32 gTrainerFrontPic_LeaderNorman[]; -extern const u32 gTrainerFrontPic_LeaderWinona[]; -extern const u32 gTrainerFrontPic_LeaderTateAndLiza[]; -extern const u32 gTrainerFrontPic_LeaderJuan[]; -extern const u32 gTrainerFrontPic_SchoolKidM[]; -extern const u32 gTrainerFrontPic_SchoolKidF[]; -extern const u32 gTrainerFrontPic_SrAndJr[]; -extern const u32 gTrainerFrontPic_PokefanM[]; -extern const u32 gTrainerFrontPic_PokefanF[]; -extern const u32 gTrainerFrontPic_Youngster[]; -extern const u32 gTrainerFrontPic_ChampionWallace[]; -extern const u32 gTrainerFrontPic_Fisherman[]; -extern const u32 gTrainerFrontPic_CyclingTriathleteM[]; -extern const u32 gTrainerFrontPic_CyclingTriathleteF[]; -extern const u32 gTrainerFrontPic_RunningTriathleteM[]; -extern const u32 gTrainerFrontPic_RunningTriathleteF[]; -extern const u32 gTrainerFrontPic_SwimmingTriathleteM[]; -extern const u32 gTrainerFrontPic_SwimmingTriathleteF[]; -extern const u32 gTrainerFrontPic_DragonTamer[]; -extern const u32 gTrainerFrontPic_NinjaBoy[]; -extern const u32 gTrainerFrontPic_BattleGirl[]; -extern const u32 gTrainerFrontPic_ParasolLady[]; -extern const u32 gTrainerFrontPic_SwimmerF[]; -extern const u32 gTrainerFrontPic_Twins[]; -extern const u32 gTrainerFrontPic_Sailor[]; -extern const u32 gTrainerFrontPic_MagmaAdmin[]; -extern const u32 gTrainerFrontPic_Wally[]; -extern const u32 gTrainerFrontPic_Brendan[]; -extern const u32 gTrainerFrontPic_May[]; -extern const u32 gTrainerFrontPic_BugCatcher[]; -extern const u32 gTrainerFrontPic_PokemonRangerM[]; -extern const u32 gTrainerFrontPic_PokemonRangerF[]; -extern const u32 gTrainerFrontPic_MagmaLeaderMaxie[]; -extern const u32 gTrainerFrontPic_Lass[]; -extern const u32 gTrainerFrontPic_YoungCouple[]; -extern const u32 gTrainerFrontPic_OldCouple[]; -extern const u32 gTrainerFrontPic_SisAndBro[]; -extern const u32 gTrainerFrontPic_Steven[]; -extern const u32 gTrainerFrontPic_SalonMaidenAnabel[]; -extern const u32 gTrainerFrontPic_DomeAceTucker[]; -extern const u32 gTrainerFrontPic_PalaceMavenSpenser[]; -extern const u32 gTrainerFrontPic_ArenaTycoonGreta[]; -extern const u32 gTrainerFrontPic_FactoryHeadNoland[]; -extern const u32 gTrainerFrontPic_PikeQueenLucy[]; -extern const u32 gTrainerFrontPic_PyramidKingBrandon[]; -extern const u32 gTrainerFrontPic_Red[]; -extern const u32 gTrainerFrontPic_Leaf[]; -extern const u32 gTrainerFrontPic_RubySapphireBrendan[]; -extern const u32 gTrainerFrontPic_RubySapphireMay[]; - -extern const u32 gTrainerPalette_Hiker[]; -extern const u32 gTrainerPalette_AquaGruntM[]; -extern const u32 gTrainerPalette_PokemonBreederF[]; -extern const u32 gTrainerPalette_CoolTrainerM[]; -extern const u32 gTrainerPalette_BirdKeeper[]; -extern const u32 gTrainerPalette_Collector[]; -extern const u32 gTrainerPalette_AquaGruntF[]; -extern const u32 gTrainerPalette_SwimmerM[]; -extern const u32 gTrainerPalette_MagmaGruntM[]; -extern const u32 gTrainerPalette_ExpertM[]; -extern const u32 gTrainerPalette_AquaAdminM[]; -extern const u32 gTrainerPalette_BlackBelt[]; -extern const u32 gTrainerPalette_AquaAdminF[]; -extern const u32 gTrainerPalette_AquaLeaderArchie[]; -extern const u32 gTrainerPalette_HexManiac[]; -extern const u32 gTrainerPalette_AromaLady[]; -extern const u32 gTrainerPalette_RuinManiac[]; -extern const u32 gTrainerPalette_Interviewer[]; -extern const u32 gTrainerPalette_TuberF[]; -extern const u32 gTrainerPalette_TuberM[]; -extern const u32 gTrainerPalette_CoolTrainerF[]; -extern const u32 gTrainerPalette_Lady[]; -extern const u32 gTrainerPalette_Beauty[]; -extern const u32 gTrainerPalette_RichBoy[]; -extern const u32 gTrainerPalette_ExpertF[]; -extern const u32 gTrainerPalette_Pokemaniac[]; -extern const u32 gTrainerPalette_MagmaGruntF[]; -extern const u32 gTrainerPalette_Guitarist[]; -extern const u32 gTrainerPalette_Kindler[]; -extern const u32 gTrainerPalette_Camper[]; -extern const u32 gTrainerPalette_Picnicker[]; -extern const u32 gTrainerPalette_BugManiac[]; -extern const u32 gTrainerPalette_PokemonBreederM[]; -extern const u32 gTrainerPalette_PsychicM[]; -extern const u32 gTrainerPalette_PsychicF[]; -extern const u32 gTrainerPalette_Gentleman[]; -extern const u32 gTrainerPalette_EliteFourSidney[]; -extern const u32 gTrainerPalette_EliteFourPhoebe[]; -extern const u32 gTrainerPalette_EliteFourGlacia[]; -extern const u32 gTrainerPalette_EliteFourDrake[]; -extern const u32 gTrainerPalette_LeaderRoxanne[]; -extern const u32 gTrainerPalette_LeaderBrawly[]; -extern const u32 gTrainerPalette_LeaderWattson[]; -extern const u32 gTrainerPalette_LeaderFlannery[]; -extern const u32 gTrainerPalette_LeaderNorman[]; -extern const u32 gTrainerPalette_LeaderWinona[]; -extern const u32 gTrainerPalette_LeaderTateAndLiza[]; -extern const u32 gTrainerPalette_LeaderJuan[]; -extern const u32 gTrainerPalette_SchoolKidM[]; -extern const u32 gTrainerPalette_SchoolKidF[]; -extern const u32 gTrainerPalette_SrAndJr[]; -extern const u32 gTrainerPalette_PokefanM[]; -extern const u32 gTrainerPalette_PokefanF[]; -extern const u32 gTrainerPalette_Youngster[]; -extern const u32 gTrainerPalette_ChampionWallace[]; -extern const u32 gTrainerPalette_Fisherman[]; -extern const u32 gTrainerPalette_CyclingTriathleteM[]; -extern const u32 gTrainerPalette_CyclingTriathleteF[]; -extern const u32 gTrainerPalette_RunningTriathleteM[]; -extern const u32 gTrainerPalette_RunningTriathleteF[]; -extern const u32 gTrainerPalette_SwimmingTriathleteM[]; -extern const u32 gTrainerPalette_SwimmingTriathleteF[]; -extern const u32 gTrainerPalette_DragonTamer[]; -extern const u32 gTrainerPalette_NinjaBoy[]; -extern const u32 gTrainerPalette_BattleGirl[]; -extern const u32 gTrainerPalette_ParasolLady[]; -extern const u32 gTrainerPalette_SwimmerF[]; -extern const u32 gTrainerPalette_Twins[]; -extern const u32 gTrainerPalette_Sailor[]; -extern const u32 gTrainerPalette_MagmaAdmin[]; extern const u32 gTrainerPalette_Wally[]; extern const u32 gTrainerPalette_Brendan[]; extern const u32 gTrainerPalette_May[]; -extern const u32 gTrainerPalette_BugCatcher[]; -extern const u32 gTrainerPalette_PokemonRangerM[]; -extern const u32 gTrainerPalette_PokemonRangerF[]; -extern const u32 gTrainerPalette_MagmaLeaderMaxie[]; -extern const u32 gTrainerPalette_Lass[]; -extern const u32 gTrainerPalette_YoungCouple[]; -extern const u32 gTrainerPalette_OldCouple[]; -extern const u32 gTrainerPalette_SisAndBro[]; extern const u32 gTrainerPalette_Steven[]; -extern const u32 gTrainerPalette_SalonMaidenAnabel[]; -extern const u32 gTrainerPalette_DomeAceTucker[]; -extern const u32 gTrainerPalette_PalaceMavenSpenser[]; -extern const u32 gTrainerPalette_ArenaTycoonGreta[]; -extern const u32 gTrainerPalette_FactoryHeadNoland[]; -extern const u32 gTrainerPalette_PikeQueenLucy[]; -extern const u32 gTrainerPalette_PyramidKingBrandon[]; -extern const u32 gTrainerPalette_Red[]; -extern const u32 gTrainerPalette_Leaf[]; extern const u32 gTrainerPalette_RubySapphireBrendan[]; extern const u32 gTrainerPalette_RubySapphireMay[]; diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 3cbeb181e0ec..f9b71d66cec5 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -1,403 +1,136 @@ #include "constants/trainers.h" #include "data.h" -const u32 gTrainerFrontPic_Hiker[] = INCBIN_U32("graphics/trainers/front_pics/hiker.4bpp.lz"); -const u32 gTrainerPalette_Hiker[] = INCBIN_U32("graphics/trainers/front_pics/hiker.gbapal.lz"); - -const u32 gTrainerFrontPic_AquaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_m.4bpp.lz"); -const u32 gTrainerPalette_AquaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_m.gbapal.lz"); - -const u32 gTrainerFrontPic_PokemonBreederF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_f.4bpp.lz"); -const u32 gTrainerPalette_PokemonBreederF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_f.gbapal.lz"); - -const u32 gTrainerFrontPic_CoolTrainerM[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_m.4bpp.lz"); -const u32 gTrainerPalette_CoolTrainerM[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_m.gbapal.lz"); - -const u32 gTrainerFrontPic_BirdKeeper[] = INCBIN_U32("graphics/trainers/front_pics/bird_keeper.4bpp.lz"); -const u32 gTrainerPalette_BirdKeeper[] = INCBIN_U32("graphics/trainers/front_pics/bird_keeper.gbapal.lz"); - -const u32 gTrainerFrontPic_Collector[] = INCBIN_U32("graphics/trainers/front_pics/collector.4bpp.lz"); -const u32 gTrainerPalette_Collector[] = INCBIN_U32("graphics/trainers/front_pics/collector.gbapal.lz"); - -const u32 gTrainerFrontPic_AquaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_f.4bpp.lz"); -const u32 gTrainerPalette_AquaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_f.gbapal.lz"); - -const u32 gTrainerFrontPic_SwimmerM[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_m.4bpp.lz"); -const u32 gTrainerPalette_SwimmerM[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_m.gbapal.lz"); - -const u32 gTrainerFrontPic_MagmaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_m.4bpp.lz"); -const u32 gTrainerPalette_MagmaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_m.gbapal.lz"); - -const u32 gTrainerFrontPic_ExpertM[] = INCBIN_U32("graphics/trainers/front_pics/expert_m.4bpp.lz"); -const u32 gTrainerPalette_ExpertM[] = INCBIN_U32("graphics/trainers/front_pics/expert_m.gbapal.lz"); - -const u32 gTrainerFrontPic_AquaAdminM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_m.4bpp.lz"); -const u32 gTrainerPalette_AquaAdminM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_m.gbapal.lz"); - -const u32 gTrainerFrontPic_BlackBelt[] = INCBIN_U32("graphics/trainers/front_pics/black_belt.4bpp.lz"); -const u32 gTrainerPalette_BlackBelt[] = INCBIN_U32("graphics/trainers/front_pics/black_belt.gbapal.lz"); - -const u32 gTrainerFrontPic_AquaAdminF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_f.4bpp.lz"); -const u32 gTrainerPalette_AquaAdminF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_f.gbapal.lz"); - -const u32 gTrainerFrontPic_AquaLeaderArchie[] = INCBIN_U32("graphics/trainers/front_pics/aqua_leader_archie.4bpp.lz"); -const u32 gTrainerPalette_AquaLeaderArchie[] = INCBIN_U32("graphics/trainers/front_pics/aqua_leader_archie.gbapal.lz"); - -const u32 gTrainerFrontPic_HexManiac[] = INCBIN_U32("graphics/trainers/front_pics/hex_maniac.4bpp.lz"); -const u32 gTrainerPalette_HexManiac[] = INCBIN_U32("graphics/trainers/front_pics/hex_maniac.gbapal.lz"); - -const u32 gTrainerFrontPic_AromaLady[] = INCBIN_U32("graphics/trainers/front_pics/aroma_lady.4bpp.lz"); -const u32 gTrainerPalette_AromaLady[] = INCBIN_U32("graphics/trainers/front_pics/aroma_lady.gbapal.lz"); - -const u32 gTrainerFrontPic_RuinManiac[] = INCBIN_U32("graphics/trainers/front_pics/ruin_maniac.4bpp.lz"); -const u32 gTrainerPalette_RuinManiac[] = INCBIN_U32("graphics/trainers/front_pics/ruin_maniac.gbapal.lz"); - -const u32 gTrainerFrontPic_Interviewer[] = INCBIN_U32("graphics/trainers/front_pics/interviewer.4bpp.lz"); -const u32 gTrainerPalette_Interviewer[] = INCBIN_U32("graphics/trainers/front_pics/interviewer.gbapal.lz"); - -const u32 gTrainerFrontPic_TuberF[] = INCBIN_U32("graphics/trainers/front_pics/tuber_f.4bpp.lz"); -const u32 gTrainerPalette_TuberF[] = INCBIN_U32("graphics/trainers/front_pics/tuber_f.gbapal.lz"); - -const u32 gTrainerFrontPic_TuberM[] = INCBIN_U32("graphics/trainers/front_pics/tuber_m.4bpp.lz"); -const u32 gTrainerPalette_TuberM[] = INCBIN_U32("graphics/trainers/front_pics/tuber_m.gbapal.lz"); - -const u32 gTrainerFrontPic_CoolTrainerF[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_f.4bpp.lz"); -const u32 gTrainerPalette_CoolTrainerF[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_f.gbapal.lz"); - -const u32 gTrainerFrontPic_Lady[] = INCBIN_U32("graphics/trainers/front_pics/lady.4bpp.lz"); -const u32 gTrainerPalette_Lady[] = INCBIN_U32("graphics/trainers/front_pics/lady.gbapal.lz"); - -const u32 gTrainerFrontPic_Beauty[] = INCBIN_U32("graphics/trainers/front_pics/beauty.4bpp.lz"); -const u32 gTrainerPalette_Beauty[] = INCBIN_U32("graphics/trainers/front_pics/beauty.gbapal.lz"); - -const u32 gTrainerFrontPic_RichBoy[] = INCBIN_U32("graphics/trainers/front_pics/rich_boy.4bpp.lz"); -const u32 gTrainerPalette_RichBoy[] = INCBIN_U32("graphics/trainers/front_pics/rich_boy.gbapal.lz"); - -const u32 gTrainerFrontPic_ExpertF[] = INCBIN_U32("graphics/trainers/front_pics/expert_f.4bpp.lz"); -const u32 gTrainerPalette_ExpertF[] = INCBIN_U32("graphics/trainers/front_pics/expert_f.gbapal.lz"); - -const u32 gTrainerFrontPic_Pokemaniac[] = INCBIN_U32("graphics/trainers/front_pics/pokemaniac.4bpp.lz"); -const u32 gTrainerPalette_Pokemaniac[] = INCBIN_U32("graphics/trainers/front_pics/pokemaniac.gbapal.lz"); - -const u32 gTrainerFrontPic_MagmaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_f.4bpp.lz"); -const u32 gTrainerPalette_MagmaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_f.gbapal.lz"); - -const u32 gTrainerFrontPic_Guitarist[] = INCBIN_U32("graphics/trainers/front_pics/guitarist.4bpp.lz"); -const u32 gTrainerPalette_Guitarist[] = INCBIN_U32("graphics/trainers/front_pics/guitarist.gbapal.lz"); - -const u32 gTrainerFrontPic_Kindler[] = INCBIN_U32("graphics/trainers/front_pics/kindler.4bpp.lz"); -const u32 gTrainerPalette_Kindler[] = INCBIN_U32("graphics/trainers/front_pics/kindler.gbapal.lz"); - -const u32 gTrainerFrontPic_Camper[] = INCBIN_U32("graphics/trainers/front_pics/camper.4bpp.lz"); -const u32 gTrainerPalette_Camper[] = INCBIN_U32("graphics/trainers/front_pics/camper.gbapal.lz"); - -const u32 gTrainerFrontPic_Picnicker[] = INCBIN_U32("graphics/trainers/front_pics/picnicker.4bpp.lz"); -const u32 gTrainerPalette_Picnicker[] = INCBIN_U32("graphics/trainers/front_pics/picnicker.gbapal.lz"); - -const u32 gTrainerFrontPic_BugManiac[] = INCBIN_U32("graphics/trainers/front_pics/bug_maniac.4bpp.lz"); -const u32 gTrainerPalette_BugManiac[] = INCBIN_U32("graphics/trainers/front_pics/bug_maniac.gbapal.lz"); - -const u32 gTrainerFrontPic_PokemonBreederM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_m.4bpp.lz"); -const u32 gTrainerPalette_PokemonBreederM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_m.gbapal.lz"); - -const u32 gTrainerFrontPic_PsychicM[] = INCBIN_U32("graphics/trainers/front_pics/psychic_m.4bpp.lz"); -const u32 gTrainerPalette_PsychicM[] = INCBIN_U32("graphics/trainers/front_pics/psychic_m.gbapal.lz"); - -const u32 gTrainerFrontPic_PsychicF[] = INCBIN_U32("graphics/trainers/front_pics/psychic_f.4bpp.lz"); -const u32 gTrainerPalette_PsychicF[] = INCBIN_U32("graphics/trainers/front_pics/psychic_f.gbapal.lz"); - -const u32 gTrainerFrontPic_Gentleman[] = INCBIN_U32("graphics/trainers/front_pics/gentleman.4bpp.lz"); -const u32 gTrainerPalette_Gentleman[] = INCBIN_U32("graphics/trainers/front_pics/gentleman.gbapal.lz"); - -const u32 gTrainerFrontPic_EliteFourSidney[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_sidney.4bpp.lz"); -const u32 gTrainerPalette_EliteFourSidney[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_sidney.gbapal.lz"); - -const u32 gTrainerFrontPic_EliteFourPhoebe[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_phoebe.4bpp.lz"); -const u32 gTrainerPalette_EliteFourPhoebe[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_phoebe.gbapal.lz"); - -const u32 gTrainerFrontPic_EliteFourGlacia[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_glacia.4bpp.lz"); -const u32 gTrainerPalette_EliteFourGlacia[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_glacia.gbapal.lz"); - -const u32 gTrainerFrontPic_EliteFourDrake[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_drake.4bpp.lz"); -const u32 gTrainerPalette_EliteFourDrake[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_drake.gbapal.lz"); - -const u32 gTrainerFrontPic_LeaderRoxanne[] = INCBIN_U32("graphics/trainers/front_pics/leader_roxanne.4bpp.lz"); -const u32 gTrainerPalette_LeaderRoxanne[] = INCBIN_U32("graphics/trainers/front_pics/leader_roxanne.gbapal.lz"); - -const u32 gTrainerFrontPic_LeaderBrawly[] = INCBIN_U32("graphics/trainers/front_pics/leader_brawly.4bpp.lz"); -const u32 gTrainerPalette_LeaderBrawly[] = INCBIN_U32("graphics/trainers/front_pics/leader_brawly.gbapal.lz"); - -const u32 gTrainerFrontPic_LeaderWattson[] = INCBIN_U32("graphics/trainers/front_pics/leader_wattson.4bpp.lz"); -const u32 gTrainerPalette_LeaderWattson[] = INCBIN_U32("graphics/trainers/front_pics/leader_wattson.gbapal.lz"); - -const u32 gTrainerFrontPic_LeaderFlannery[] = INCBIN_U32("graphics/trainers/front_pics/leader_flannery.4bpp.lz"); -const u32 gTrainerPalette_LeaderFlannery[] = INCBIN_U32("graphics/trainers/front_pics/leader_flannery.gbapal.lz"); - -const u32 gTrainerFrontPic_LeaderNorman[] = INCBIN_U32("graphics/trainers/front_pics/leader_norman.4bpp.lz"); -const u32 gTrainerPalette_LeaderNorman[] = INCBIN_U32("graphics/trainers/front_pics/leader_norman.gbapal.lz"); - -const u32 gTrainerFrontPic_LeaderWinona[] = INCBIN_U32("graphics/trainers/front_pics/leader_winona.4bpp.lz"); -const u32 gTrainerPalette_LeaderWinona[] = INCBIN_U32("graphics/trainers/front_pics/leader_winona.gbapal.lz"); - -const u32 gTrainerFrontPic_LeaderTateAndLiza[] = INCBIN_U32("graphics/trainers/front_pics/leader_tate_and_liza.4bpp.lz"); -const u32 gTrainerPalette_LeaderTateAndLiza[] = INCBIN_U32("graphics/trainers/front_pics/leader_tate_and_liza.gbapal.lz"); - -const u32 gTrainerFrontPic_LeaderJuan[] = INCBIN_U32("graphics/trainers/front_pics/leader_juan.4bpp.lz"); -const u32 gTrainerPalette_LeaderJuan[] = INCBIN_U32("graphics/trainers/front_pics/leader_juan.gbapal.lz"); - -const u32 gTrainerFrontPic_SchoolKidM[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_m.4bpp.lz"); -const u32 gTrainerPalette_SchoolKidM[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_m.gbapal.lz"); - -const u32 gTrainerFrontPic_SchoolKidF[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_f.4bpp.lz"); -const u32 gTrainerPalette_SchoolKidF[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_f.gbapal.lz"); - -const u32 gTrainerFrontPic_SrAndJr[] = INCBIN_U32("graphics/trainers/front_pics/sr_and_jr.4bpp.lz"); -const u32 gTrainerPalette_SrAndJr[] = INCBIN_U32("graphics/trainers/front_pics/sr_and_jr.gbapal.lz"); - -const u32 gTrainerFrontPic_PokefanM[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_m.4bpp.lz"); -const u32 gTrainerPalette_PokefanM[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_m.gbapal.lz"); - -const u32 gTrainerFrontPic_PokefanF[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_f.4bpp.lz"); -const u32 gTrainerPalette_PokefanF[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_f.gbapal.lz"); - -const u32 gTrainerFrontPic_Youngster[] = INCBIN_U32("graphics/trainers/front_pics/youngster.4bpp.lz"); -const u32 gTrainerPalette_Youngster[] = INCBIN_U32("graphics/trainers/front_pics/youngster.gbapal.lz"); - -const u32 gTrainerFrontPic_ChampionWallace[] = INCBIN_U32("graphics/trainers/front_pics/champion_wallace.4bpp.lz"); -const u32 gTrainerPalette_ChampionWallace[] = INCBIN_U32("graphics/trainers/front_pics/champion_wallace.gbapal.lz"); - -const u32 gTrainerFrontPic_Fisherman[] = INCBIN_U32("graphics/trainers/front_pics/fisherman.4bpp.lz"); -const u32 gTrainerPalette_Fisherman[] = INCBIN_U32("graphics/trainers/front_pics/fisherman.gbapal.lz"); - -const u32 gTrainerFrontPic_CyclingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_m.4bpp.lz"); -const u32 gTrainerPalette_CyclingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_m.gbapal.lz"); - -const u32 gTrainerFrontPic_CyclingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_f.4bpp.lz"); -const u32 gTrainerPalette_CyclingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_f.gbapal.lz"); - -const u32 gTrainerFrontPic_RunningTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_m.4bpp.lz"); -const u32 gTrainerPalette_RunningTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_m.gbapal.lz"); - -const u32 gTrainerFrontPic_RunningTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_f.4bpp.lz"); -const u32 gTrainerPalette_RunningTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_f.gbapal.lz"); - -const u32 gTrainerFrontPic_SwimmingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_m.4bpp.lz"); -const u32 gTrainerPalette_SwimmingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_m.gbapal.lz"); - -const u32 gTrainerFrontPic_SwimmingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_f.4bpp.lz"); -const u32 gTrainerPalette_SwimmingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_f.gbapal.lz"); - -const u32 gTrainerFrontPic_DragonTamer[] = INCBIN_U32("graphics/trainers/front_pics/dragon_tamer.4bpp.lz"); -const u32 gTrainerPalette_DragonTamer[] = INCBIN_U32("graphics/trainers/front_pics/dragon_tamer.gbapal.lz"); - -const u32 gTrainerFrontPic_NinjaBoy[] = INCBIN_U32("graphics/trainers/front_pics/ninja_boy.4bpp.lz"); -const u32 gTrainerPalette_NinjaBoy[] = INCBIN_U32("graphics/trainers/front_pics/ninja_boy.gbapal.lz"); - -const u32 gTrainerFrontPic_BattleGirl[] = INCBIN_U32("graphics/trainers/front_pics/battle_girl.4bpp.lz"); -const u32 gTrainerPalette_BattleGirl[] = INCBIN_U32("graphics/trainers/front_pics/battle_girl.gbapal.lz"); - -const u32 gTrainerFrontPic_ParasolLady[] = INCBIN_U32("graphics/trainers/front_pics/parasol_lady.4bpp.lz"); -const u32 gTrainerPalette_ParasolLady[] = INCBIN_U32("graphics/trainers/front_pics/parasol_lady.gbapal.lz"); - -const u32 gTrainerFrontPic_SwimmerF[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_f.4bpp.lz"); -const u32 gTrainerPalette_SwimmerF[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_f.gbapal.lz"); - -const u32 gTrainerFrontPic_Twins[] = INCBIN_U32("graphics/trainers/front_pics/twins.4bpp.lz"); -const u32 gTrainerPalette_Twins[] = INCBIN_U32("graphics/trainers/front_pics/twins.gbapal.lz"); - -const u32 gTrainerFrontPic_Sailor[] = INCBIN_U32("graphics/trainers/front_pics/sailor.4bpp.lz"); -const u32 gTrainerPalette_Sailor[] = INCBIN_U32("graphics/trainers/front_pics/sailor.gbapal.lz"); - -const u32 gTrainerFrontPic_MagmaAdmin[] = INCBIN_U32("graphics/trainers/front_pics/magma_admin.4bpp.lz"); -const u32 gTrainerPalette_MagmaAdmin[] = INCBIN_U32("graphics/trainers/front_pics/magma_admin.gbapal.lz"); - -const u32 gTrainerFrontPic_Wally[] = INCBIN_U32("graphics/trainers/front_pics/wally.4bpp.lz"); -const u32 gTrainerPalette_Wally[] = INCBIN_U32("graphics/trainers/palettes/wally.gbapal.lz"); - -const u32 gTrainerFrontPic_Brendan[] = INCBIN_U32("graphics/trainers/front_pics/brendan.4bpp.lz"); +const u8 gTrainerBackPic_Brendan[] = INCBIN_U8("graphics/trainers/back_pics/brendan.4bpp"); const u32 gTrainerPalette_Brendan[] = INCBIN_U32("graphics/trainers/palettes/brendan.gbapal.lz"); -const u32 gTrainerFrontPic_May[] = INCBIN_U32("graphics/trainers/front_pics/may.4bpp.lz"); +const u8 gTrainerBackPic_May[] = INCBIN_U8("graphics/trainers/back_pics/may.4bpp"); const u32 gTrainerPalette_May[] = INCBIN_U32("graphics/trainers/palettes/may.gbapal.lz"); -const u32 gTrainerFrontPic_BugCatcher[] = INCBIN_U32("graphics/trainers/front_pics/bug_catcher.4bpp.lz"); -const u32 gTrainerPalette_BugCatcher[] = INCBIN_U32("graphics/trainers/front_pics/bug_catcher.gbapal.lz"); - -const u32 gTrainerFrontPic_PokemonRangerM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_m.4bpp.lz"); -const u32 gTrainerPalette_PokemonRangerM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_m.gbapal.lz"); - -const u32 gTrainerFrontPic_PokemonRangerF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_f.4bpp.lz"); -const u32 gTrainerPalette_PokemonRangerF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_f.gbapal.lz"); - -const u32 gTrainerFrontPic_MagmaLeaderMaxie[] = INCBIN_U32("graphics/trainers/front_pics/magma_leader_maxie.4bpp.lz"); -const u32 gTrainerPalette_MagmaLeaderMaxie[] = INCBIN_U32("graphics/trainers/front_pics/magma_leader_maxie.gbapal.lz"); - -const u32 gTrainerFrontPic_Lass[] = INCBIN_U32("graphics/trainers/front_pics/lass.4bpp.lz"); -const u32 gTrainerPalette_Lass[] = INCBIN_U32("graphics/trainers/front_pics/lass.gbapal.lz"); - -const u32 gTrainerFrontPic_YoungCouple[] = INCBIN_U32("graphics/trainers/front_pics/young_couple.4bpp.lz"); -const u32 gTrainerPalette_YoungCouple[] = INCBIN_U32("graphics/trainers/front_pics/young_couple.gbapal.lz"); - -const u32 gTrainerFrontPic_OldCouple[] = INCBIN_U32("graphics/trainers/front_pics/old_couple.4bpp.lz"); -const u32 gTrainerPalette_OldCouple[] = INCBIN_U32("graphics/trainers/front_pics/old_couple.gbapal.lz"); - -const u32 gTrainerFrontPic_SisAndBro[] = INCBIN_U32("graphics/trainers/front_pics/sis_and_bro.4bpp.lz"); -const u32 gTrainerPalette_SisAndBro[] = INCBIN_U32("graphics/trainers/front_pics/sis_and_bro.gbapal.lz"); - -const u32 gTrainerFrontPic_Steven[] = INCBIN_U32("graphics/trainers/front_pics/steven.4bpp.lz"); -const u32 gTrainerPalette_Steven[] = INCBIN_U32("graphics/trainers/front_pics/steven.gbapal.lz"); - -const u32 gTrainerFrontPic_SalonMaidenAnabel[] = INCBIN_U32("graphics/trainers/front_pics/salon_maiden_anabel.4bpp.lz"); -const u32 gTrainerPalette_SalonMaidenAnabel[] = INCBIN_U32("graphics/trainers/front_pics/salon_maiden_anabel.gbapal.lz"); - -const u32 gTrainerFrontPic_DomeAceTucker[] = INCBIN_U32("graphics/trainers/front_pics/dome_ace_tucker.4bpp.lz"); -const u32 gTrainerPalette_DomeAceTucker[] = INCBIN_U32("graphics/trainers/front_pics/dome_ace_tucker.gbapal.lz"); - -const u32 gTrainerFrontPic_PalaceMavenSpenser[] = INCBIN_U32("graphics/trainers/front_pics/palace_maven_spenser.4bpp.lz"); -const u32 gTrainerPalette_PalaceMavenSpenser[] = INCBIN_U32("graphics/trainers/front_pics/palace_maven_spenser.gbapal.lz"); - -const u32 gTrainerFrontPic_ArenaTycoonGreta[] = INCBIN_U32("graphics/trainers/front_pics/arena_tycoon_greta.4bpp.lz"); -const u32 gTrainerPalette_ArenaTycoonGreta[] = INCBIN_U32("graphics/trainers/front_pics/arena_tycoon_greta.gbapal.lz"); - -const u32 gTrainerFrontPic_FactoryHeadNoland[] = INCBIN_U32("graphics/trainers/front_pics/factory_head_noland.4bpp.lz"); -const u32 gTrainerPalette_FactoryHeadNoland[] = INCBIN_U32("graphics/trainers/front_pics/factory_head_noland.gbapal.lz"); - -const u32 gTrainerFrontPic_PikeQueenLucy[] = INCBIN_U32("graphics/trainers/front_pics/pike_queen_lucy.4bpp.lz"); -const u32 gTrainerPalette_PikeQueenLucy[] = INCBIN_U32("graphics/trainers/front_pics/pike_queen_lucy.gbapal.lz"); - -const u32 gTrainerFrontPic_PyramidKingBrandon[] = INCBIN_U32("graphics/trainers/front_pics/pyramid_king_brandon.4bpp.lz"); -const u32 gTrainerPalette_PyramidKingBrandon[] = INCBIN_U32("graphics/trainers/front_pics/pyramid_king_brandon.gbapal.lz"); - -const u32 gTrainerFrontPic_Red[] = INCBIN_U32("graphics/trainers/front_pics/red.4bpp.lz"); -const u32 gTrainerPalette_Red[] = INCBIN_U32("graphics/trainers/front_pics/red.gbapal.lz"); - -const u32 gTrainerFrontPic_Leaf[] = INCBIN_U32("graphics/trainers/front_pics/leaf.4bpp.lz"); -const u32 gTrainerPalette_Leaf[] = INCBIN_U32("graphics/trainers/front_pics/leaf.gbapal.lz"); - -const u32 gTrainerFrontPic_RubySapphireBrendan[] = INCBIN_U32("graphics/trainers/front_pics/brendan_rs.4bpp.lz"); +const u8 gTrainerBackPic_RubySapphireBrendan[] = INCBIN_U8("graphics/trainers/back_pics/brendan_rs.4bpp"); const u32 gTrainerPalette_RubySapphireBrendan[] = INCBIN_U32("graphics/trainers/palettes/brendan_rs.gbapal.lz"); -const u32 gTrainerFrontPic_RubySapphireMay[] = INCBIN_U32("graphics/trainers/front_pics/may_rs.4bpp.lz"); +const u8 gTrainerBackPic_RubySapphireMay[] = INCBIN_U8("graphics/trainers/back_pics/may_rs.4bpp"); const u32 gTrainerPalette_RubySapphireMay[] = INCBIN_U32("graphics/trainers/palettes/may_rs.gbapal.lz"); -const u8 gTrainerBackPic_Brendan[] = INCBIN_U8("graphics/trainers/back_pics/brendan.4bpp"); -const u8 gTrainerBackPic_May[] = INCBIN_U8("graphics/trainers/back_pics/may.4bpp"); -const u8 gTrainerBackPic_Red[] = INCBIN_U8("graphics/trainers/back_pics/red.4bpp"); -const u8 gTrainerBackPic_Leaf[] = INCBIN_U8("graphics/trainers/back_pics/leaf.4bpp"); -const u8 gTrainerBackPic_RubySapphireBrendan[] = INCBIN_U8("graphics/trainers/back_pics/brendan_rs.4bpp"); -const u8 gTrainerBackPic_RubySapphireMay[] = INCBIN_U8("graphics/trainers/back_pics/may_rs.4bpp"); const u8 gTrainerBackPic_Wally[] = INCBIN_U8("graphics/trainers/back_pics/wally.4bpp"); +const u32 gTrainerPalette_Wally[] = INCBIN_U32("graphics/trainers/palettes/wally.gbapal.lz"); + const u8 gTrainerBackPic_Steven[] = INCBIN_U8("graphics/trainers/back_pics/steven.4bpp"); +const u32 gTrainerPalette_Steven[] = INCBIN_U32("graphics/trainers/front_pics/steven.gbapal.lz"); +const u8 gTrainerBackPic_Red[] = INCBIN_U8("graphics/trainers/back_pics/red.4bpp"); const u32 gTrainerBackPicPalette_Red[] = INCBIN_U32("graphics/trainers/back_pics/red.gbapal.lz"); + +const u8 gTrainerBackPic_Leaf[] = INCBIN_U8("graphics/trainers/back_pics/leaf.4bpp"); const u32 gTrainerBackPicPalette_Leaf[] = INCBIN_U32("graphics/trainers/back_pics/leaf.gbapal.lz"); static const union AnimCmd *const sAnims_Trainer[] ={ sAnim_GeneralFrame0, }; -#define TRAINER_PIC(trainerPic, file, anims) \ - [TRAINER_PIC_##trainerPic] = \ - { \ - .y_offset = 8, \ - .frontPic = {gTrainerFrontPic_##file, TRAINER_PIC_SIZE, TRAINER_PIC_##trainerPic},\ - .palette = {gTrainerPalette_##file, TRAINER_PIC_##trainerPic}, \ - .animation = sAnims_##anims, \ +#define TRAINER_PIC(trainerPic, spriteFile, paletteFile, anims) \ + [TRAINER_PIC_##trainerPic] = \ + { \ + .y_offset = 8, \ + .frontPic = {(const u32[]) INCBIN_##spriteFile, TRAINER_PIC_SIZE, TRAINER_PIC_##trainerPic}, \ + .palette = {(const u32[]) INCBIN_##paletteFile, TRAINER_PIC_##trainerPic}, \ + .animation = sAnims_##anims, \ } const struct TrainerSprite gTrainerSprites[] = { - TRAINER_PIC(HIKER, Hiker, Trainer), - TRAINER_PIC(AQUA_GRUNT_M, AquaGruntM, Trainer), - TRAINER_PIC(POKEMON_BREEDER_F, PokemonBreederF, Trainer), - TRAINER_PIC(COOLTRAINER_M, CoolTrainerM, Trainer), - TRAINER_PIC(BIRD_KEEPER, BirdKeeper, Trainer), - TRAINER_PIC(COLLECTOR, Collector, Trainer), - TRAINER_PIC(AQUA_GRUNT_F, AquaGruntF, Trainer), - TRAINER_PIC(SWIMMER_M, SwimmerM, Trainer), - TRAINER_PIC(MAGMA_GRUNT_M, MagmaGruntM, Trainer), - TRAINER_PIC(EXPERT_M, ExpertM, Trainer), - TRAINER_PIC(AQUA_ADMIN_M, AquaAdminM, Trainer), - TRAINER_PIC(BLACK_BELT, BlackBelt, Trainer), - TRAINER_PIC(AQUA_ADMIN_F, AquaAdminF, Trainer), - TRAINER_PIC(AQUA_LEADER_ARCHIE, AquaLeaderArchie, Trainer), - TRAINER_PIC(HEX_MANIAC, HexManiac, Trainer), - TRAINER_PIC(AROMA_LADY, AromaLady, Trainer), - TRAINER_PIC(RUIN_MANIAC, RuinManiac, Trainer), - TRAINER_PIC(INTERVIEWER, Interviewer, Trainer), - TRAINER_PIC(TUBER_F, TuberF, Trainer), - TRAINER_PIC(TUBER_M, TuberM, Trainer), - TRAINER_PIC(COOLTRAINER_F, CoolTrainerF, Trainer), - TRAINER_PIC(LADY, Lady, Trainer), - TRAINER_PIC(BEAUTY, Beauty, Trainer), - TRAINER_PIC(RICH_BOY, RichBoy, Trainer), - TRAINER_PIC(EXPERT_F, ExpertF, Trainer), - TRAINER_PIC(POKEMANIAC, Pokemaniac, Trainer), - TRAINER_PIC(MAGMA_GRUNT_F, MagmaGruntF, Trainer), - TRAINER_PIC(GUITARIST, Guitarist, Trainer), - TRAINER_PIC(KINDLER, Kindler, Trainer), - TRAINER_PIC(CAMPER, Camper, Trainer), - TRAINER_PIC(PICNICKER, Picnicker, Trainer), - TRAINER_PIC(BUG_MANIAC, BugManiac, Trainer), - TRAINER_PIC(POKEMON_BREEDER_M, PokemonBreederM, Trainer), - TRAINER_PIC(PSYCHIC_M, PsychicM, Trainer), - TRAINER_PIC(PSYCHIC_F, PsychicF, Trainer), - TRAINER_PIC(GENTLEMAN, Gentleman, Trainer), - TRAINER_PIC(ELITE_FOUR_SIDNEY, EliteFourSidney, Trainer), - TRAINER_PIC(ELITE_FOUR_PHOEBE, EliteFourPhoebe, Trainer), - TRAINER_PIC(ELITE_FOUR_GLACIA, EliteFourGlacia, Trainer), - TRAINER_PIC(ELITE_FOUR_DRAKE, EliteFourDrake, Trainer), - TRAINER_PIC(LEADER_ROXANNE, LeaderRoxanne, Trainer), - TRAINER_PIC(LEADER_BRAWLY, LeaderBrawly, Trainer), - TRAINER_PIC(LEADER_WATTSON, LeaderWattson, Trainer), - TRAINER_PIC(LEADER_FLANNERY, LeaderFlannery, Trainer), - TRAINER_PIC(LEADER_NORMAN, LeaderNorman, Trainer), - TRAINER_PIC(LEADER_WINONA, LeaderWinona, Trainer), - TRAINER_PIC(LEADER_TATE_AND_LIZA, LeaderTateAndLiza, Trainer), - TRAINER_PIC(LEADER_JUAN, LeaderJuan, Trainer), - TRAINER_PIC(SCHOOL_KID_M, SchoolKidM, Trainer), - TRAINER_PIC(SCHOOL_KID_F, SchoolKidF, Trainer), - TRAINER_PIC(SR_AND_JR, SrAndJr, Trainer), - TRAINER_PIC(POKEFAN_M, PokefanM, Trainer), - TRAINER_PIC(POKEFAN_F, PokefanF, Trainer), - TRAINER_PIC(YOUNGSTER, Youngster, Trainer), - TRAINER_PIC(CHAMPION_WALLACE, ChampionWallace, Trainer), - TRAINER_PIC(FISHERMAN, Fisherman, Trainer), - TRAINER_PIC(CYCLING_TRIATHLETE_M, CyclingTriathleteM, Trainer), - TRAINER_PIC(CYCLING_TRIATHLETE_F, CyclingTriathleteF, Trainer), - TRAINER_PIC(RUNNING_TRIATHLETE_M, RunningTriathleteM, Trainer), - TRAINER_PIC(RUNNING_TRIATHLETE_F, RunningTriathleteF, Trainer), - TRAINER_PIC(SWIMMING_TRIATHLETE_M, SwimmingTriathleteM, Trainer), - TRAINER_PIC(SWIMMING_TRIATHLETE_F, SwimmingTriathleteF, Trainer), - TRAINER_PIC(DRAGON_TAMER, DragonTamer, Trainer), - TRAINER_PIC(NINJA_BOY, NinjaBoy, Trainer), - TRAINER_PIC(BATTLE_GIRL, BattleGirl, Trainer), - TRAINER_PIC(PARASOL_LADY, ParasolLady, Trainer), - TRAINER_PIC(SWIMMER_F, SwimmerF, Trainer), - TRAINER_PIC(TWINS, Twins, Trainer), - TRAINER_PIC(SAILOR, Sailor, Trainer), - TRAINER_PIC(MAGMA_ADMIN, MagmaAdmin, Trainer), - TRAINER_PIC(WALLY, Wally, Trainer), - TRAINER_PIC(BRENDAN, Brendan, Trainer), - TRAINER_PIC(MAY, May, Trainer), - TRAINER_PIC(BUG_CATCHER, BugCatcher, Trainer), - TRAINER_PIC(POKEMON_RANGER_M, PokemonRangerM, Trainer), - TRAINER_PIC(POKEMON_RANGER_F, PokemonRangerF, Trainer), - TRAINER_PIC(MAGMA_LEADER_MAXIE, MagmaLeaderMaxie, Trainer), - TRAINER_PIC(LASS, Lass, Trainer), - TRAINER_PIC(YOUNG_COUPLE, YoungCouple, Trainer), - TRAINER_PIC(OLD_COUPLE, OldCouple, Trainer), - TRAINER_PIC(SIS_AND_BRO, SisAndBro, Trainer), - TRAINER_PIC(STEVEN, Steven, Trainer), - TRAINER_PIC(SALON_MAIDEN_ANABEL, SalonMaidenAnabel, Trainer), - TRAINER_PIC(DOME_ACE_TUCKER, DomeAceTucker, Trainer), - TRAINER_PIC(PALACE_MAVEN_SPENSER, PalaceMavenSpenser, Trainer), - TRAINER_PIC(ARENA_TYCOON_GRETA, ArenaTycoonGreta, Trainer), - TRAINER_PIC(FACTORY_HEAD_NOLAND, FactoryHeadNoland, Trainer), - TRAINER_PIC(PIKE_QUEEN_LUCY, PikeQueenLucy, Trainer), - TRAINER_PIC(PYRAMID_KING_BRANDON, PyramidKingBrandon, Trainer), - TRAINER_PIC(RED, Red, Trainer), - TRAINER_PIC(LEAF, Leaf, Trainer), - TRAINER_PIC(RS_BRENDAN, RubySapphireBrendan, Trainer), - TRAINER_PIC(RS_MAY, RubySapphireMay, Trainer), + TRAINER_PIC(HIKER, U32("graphics/trainers/front_pics/hiker.4bpp.lz"), U32("graphics/trainers/front_pics/hiker.gbapal.lz"), Trainer), + TRAINER_PIC(AQUA_GRUNT_M, U32("graphics/trainers/front_pics/aqua_grunt_m.4bpp.lz"), U32("graphics/trainers/front_pics/aqua_grunt_m.gbapal.lz"), Trainer), + TRAINER_PIC(POKEMON_BREEDER_F, U32("graphics/trainers/front_pics/pokemon_breeder_f.4bpp.lz"), U32("graphics/trainers/front_pics/pokemon_breeder_f.gbapal.lz"), Trainer), + TRAINER_PIC(COOLTRAINER_M, U32("graphics/trainers/front_pics/cooltrainer_m.4bpp.lz"), U32("graphics/trainers/front_pics/cooltrainer_m.gbapal.lz"), Trainer), + TRAINER_PIC(BIRD_KEEPER, U32("graphics/trainers/front_pics/bird_keeper.4bpp.lz"), U32("graphics/trainers/front_pics/bird_keeper.gbapal.lz"), Trainer), + TRAINER_PIC(COLLECTOR, U32("graphics/trainers/front_pics/collector.4bpp.lz"), U32("graphics/trainers/front_pics/collector.gbapal.lz"), Trainer), + TRAINER_PIC(AQUA_GRUNT_F, U32("graphics/trainers/front_pics/aqua_grunt_f.4bpp.lz"), U32("graphics/trainers/front_pics/aqua_grunt_f.gbapal.lz"), Trainer), + TRAINER_PIC(SWIMMER_M, U32("graphics/trainers/front_pics/swimmer_m.4bpp.lz"), U32("graphics/trainers/front_pics/swimmer_m.gbapal.lz"), Trainer), + TRAINER_PIC(MAGMA_GRUNT_M, U32("graphics/trainers/front_pics/magma_grunt_m.4bpp.lz"), U32("graphics/trainers/front_pics/magma_grunt_m.gbapal.lz"), Trainer), + TRAINER_PIC(EXPERT_M, U32("graphics/trainers/front_pics/expert_m.4bpp.lz"), U32("graphics/trainers/front_pics/expert_m.gbapal.lz"), Trainer), + TRAINER_PIC(AQUA_ADMIN_M, U32("graphics/trainers/front_pics/aqua_admin_m.4bpp.lz"), U32("graphics/trainers/front_pics/aqua_admin_m.gbapal.lz"), Trainer), + TRAINER_PIC(BLACK_BELT, U32("graphics/trainers/front_pics/black_belt.4bpp.lz"), U32("graphics/trainers/front_pics/black_belt.gbapal.lz"), Trainer), + TRAINER_PIC(AQUA_ADMIN_F, U32("graphics/trainers/front_pics/aqua_admin_f.4bpp.lz"), U32("graphics/trainers/front_pics/aqua_admin_f.gbapal.lz"), Trainer), + TRAINER_PIC(AQUA_LEADER_ARCHIE, U32("graphics/trainers/front_pics/aqua_leader_archie.4bpp.lz"), U32("graphics/trainers/front_pics/aqua_leader_archie.gbapal.lz"), Trainer), + TRAINER_PIC(HEX_MANIAC, U32("graphics/trainers/front_pics/hex_maniac.4bpp.lz"), U32("graphics/trainers/front_pics/hex_maniac.gbapal.lz"), Trainer), + TRAINER_PIC(AROMA_LADY, U32("graphics/trainers/front_pics/aroma_lady.4bpp.lz"), U32("graphics/trainers/front_pics/aroma_lady.gbapal.lz"), Trainer), + TRAINER_PIC(RUIN_MANIAC, U32("graphics/trainers/front_pics/ruin_maniac.4bpp.lz"), U32("graphics/trainers/front_pics/ruin_maniac.gbapal.lz"), Trainer), + TRAINER_PIC(INTERVIEWER, U32("graphics/trainers/front_pics/interviewer.4bpp.lz"), U32("graphics/trainers/front_pics/interviewer.gbapal.lz"), Trainer), + TRAINER_PIC(TUBER_F, U32("graphics/trainers/front_pics/tuber_f.4bpp.lz"), U32("graphics/trainers/front_pics/tuber_f.gbapal.lz"), Trainer), + TRAINER_PIC(TUBER_M, U32("graphics/trainers/front_pics/tuber_m.4bpp.lz"), U32("graphics/trainers/front_pics/tuber_m.gbapal.lz"), Trainer), + TRAINER_PIC(COOLTRAINER_F, U32("graphics/trainers/front_pics/cooltrainer_f.4bpp.lz"), U32("graphics/trainers/front_pics/cooltrainer_f.gbapal.lz"), Trainer), + TRAINER_PIC(LADY, U32("graphics/trainers/front_pics/lady.4bpp.lz"), U32("graphics/trainers/front_pics/lady.gbapal.lz"), Trainer), + TRAINER_PIC(BEAUTY, U32("graphics/trainers/front_pics/beauty.4bpp.lz"), U32("graphics/trainers/front_pics/beauty.gbapal.lz"), Trainer), + TRAINER_PIC(RICH_BOY, U32("graphics/trainers/front_pics/rich_boy.4bpp.lz"), U32("graphics/trainers/front_pics/rich_boy.gbapal.lz"), Trainer), + TRAINER_PIC(EXPERT_F, U32("graphics/trainers/front_pics/expert_f.4bpp.lz"), U32("graphics/trainers/front_pics/expert_f.gbapal.lz"), Trainer), + TRAINER_PIC(POKEMANIAC, U32("graphics/trainers/front_pics/pokemaniac.4bpp.lz"), U32("graphics/trainers/front_pics/pokemaniac.gbapal.lz"), Trainer), + TRAINER_PIC(MAGMA_GRUNT_F, U32("graphics/trainers/front_pics/magma_grunt_f.4bpp.lz"), U32("graphics/trainers/front_pics/magma_grunt_f.gbapal.lz"), Trainer), + TRAINER_PIC(GUITARIST, U32("graphics/trainers/front_pics/guitarist.4bpp.lz"), U32("graphics/trainers/front_pics/guitarist.gbapal.lz"), Trainer), + TRAINER_PIC(KINDLER, U32("graphics/trainers/front_pics/kindler.4bpp.lz"), U32("graphics/trainers/front_pics/kindler.gbapal.lz"), Trainer), + TRAINER_PIC(CAMPER, U32("graphics/trainers/front_pics/camper.4bpp.lz"), U32("graphics/trainers/front_pics/camper.gbapal.lz"), Trainer), + TRAINER_PIC(PICNICKER, U32("graphics/trainers/front_pics/picnicker.4bpp.lz"), U32("graphics/trainers/front_pics/picnicker.gbapal.lz"), Trainer), + TRAINER_PIC(BUG_MANIAC, U32("graphics/trainers/front_pics/bug_maniac.4bpp.lz"), U32("graphics/trainers/front_pics/bug_maniac.gbapal.lz"), Trainer), + TRAINER_PIC(POKEMON_BREEDER_M, U32("graphics/trainers/front_pics/pokemon_breeder_m.4bpp.lz"), U32("graphics/trainers/front_pics/pokemon_breeder_m.gbapal.lz"), Trainer), + TRAINER_PIC(PSYCHIC_M, U32("graphics/trainers/front_pics/psychic_m.4bpp.lz"), U32("graphics/trainers/front_pics/psychic_m.gbapal.lz"), Trainer), + TRAINER_PIC(PSYCHIC_F, U32("graphics/trainers/front_pics/psychic_f.4bpp.lz"), U32("graphics/trainers/front_pics/psychic_f.gbapal.lz"), Trainer), + TRAINER_PIC(GENTLEMAN, U32("graphics/trainers/front_pics/gentleman.4bpp.lz"), U32("graphics/trainers/front_pics/gentleman.gbapal.lz"), Trainer), + TRAINER_PIC(ELITE_FOUR_SIDNEY, U32("graphics/trainers/front_pics/elite_four_sidney.4bpp.lz"), U32("graphics/trainers/front_pics/elite_four_sidney.gbapal.lz"), Trainer), + TRAINER_PIC(ELITE_FOUR_PHOEBE, U32("graphics/trainers/front_pics/elite_four_phoebe.4bpp.lz"), U32("graphics/trainers/front_pics/elite_four_phoebe.gbapal.lz"), Trainer), + TRAINER_PIC(ELITE_FOUR_GLACIA, U32("graphics/trainers/front_pics/elite_four_glacia.4bpp.lz"), U32("graphics/trainers/front_pics/elite_four_glacia.gbapal.lz"), Trainer), + TRAINER_PIC(ELITE_FOUR_DRAKE, U32("graphics/trainers/front_pics/elite_four_drake.4bpp.lz"), U32("graphics/trainers/front_pics/elite_four_drake.gbapal.lz"), Trainer), + TRAINER_PIC(LEADER_ROXANNE, U32("graphics/trainers/front_pics/leader_roxanne.4bpp.lz"), U32("graphics/trainers/front_pics/leader_roxanne.gbapal.lz"), Trainer), + TRAINER_PIC(LEADER_BRAWLY, U32("graphics/trainers/front_pics/leader_brawly.4bpp.lz"), U32("graphics/trainers/front_pics/leader_brawly.gbapal.lz"), Trainer), + TRAINER_PIC(LEADER_WATTSON, U32("graphics/trainers/front_pics/leader_wattson.4bpp.lz"), U32("graphics/trainers/front_pics/leader_wattson.gbapal.lz"), Trainer), + TRAINER_PIC(LEADER_FLANNERY, U32("graphics/trainers/front_pics/leader_flannery.4bpp.lz"), U32("graphics/trainers/front_pics/leader_flannery.gbapal.lz"), Trainer), + TRAINER_PIC(LEADER_NORMAN, U32("graphics/trainers/front_pics/leader_norman.4bpp.lz"), U32("graphics/trainers/front_pics/leader_norman.gbapal.lz"), Trainer), + TRAINER_PIC(LEADER_WINONA, U32("graphics/trainers/front_pics/leader_winona.4bpp.lz"), U32("graphics/trainers/front_pics/leader_winona.gbapal.lz"), Trainer), + TRAINER_PIC(LEADER_TATE_AND_LIZA, U32("graphics/trainers/front_pics/leader_tate_and_liza.4bpp.lz"), U32("graphics/trainers/front_pics/leader_tate_and_liza.gbapal.lz"), Trainer), + TRAINER_PIC(LEADER_JUAN, U32("graphics/trainers/front_pics/leader_juan.4bpp.lz"), U32("graphics/trainers/front_pics/leader_juan.gbapal.lz"), Trainer), + TRAINER_PIC(SCHOOL_KID_M, U32("graphics/trainers/front_pics/school_kid_m.4bpp.lz"), U32("graphics/trainers/front_pics/school_kid_m.gbapal.lz"), Trainer), + TRAINER_PIC(SCHOOL_KID_F, U32("graphics/trainers/front_pics/school_kid_f.4bpp.lz"), U32("graphics/trainers/front_pics/school_kid_f.gbapal.lz"), Trainer), + TRAINER_PIC(SR_AND_JR, U32("graphics/trainers/front_pics/sr_and_jr.4bpp.lz"), U32("graphics/trainers/front_pics/sr_and_jr.gbapal.lz"), Trainer), + TRAINER_PIC(POKEFAN_M, U32("graphics/trainers/front_pics/pokefan_m.4bpp.lz"), U32("graphics/trainers/front_pics/pokefan_m.gbapal.lz"), Trainer), + TRAINER_PIC(POKEFAN_F, U32("graphics/trainers/front_pics/pokefan_f.4bpp.lz"), U32("graphics/trainers/front_pics/pokefan_f.gbapal.lz"), Trainer), + TRAINER_PIC(YOUNGSTER, U32("graphics/trainers/front_pics/youngster.4bpp.lz"), U32("graphics/trainers/front_pics/youngster.gbapal.lz"), Trainer), + TRAINER_PIC(CHAMPION_WALLACE, U32("graphics/trainers/front_pics/champion_wallace.4bpp.lz"), U32("graphics/trainers/front_pics/champion_wallace.gbapal.lz"), Trainer), + TRAINER_PIC(FISHERMAN, U32("graphics/trainers/front_pics/fisherman.4bpp.lz"), U32("graphics/trainers/front_pics/fisherman.gbapal.lz"), Trainer), + TRAINER_PIC(CYCLING_TRIATHLETE_M, U32("graphics/trainers/front_pics/cycling_triathlete_m.4bpp.lz"), U32("graphics/trainers/front_pics/cycling_triathlete_m.gbapal.lz"), Trainer), + TRAINER_PIC(CYCLING_TRIATHLETE_F, U32("graphics/trainers/front_pics/cycling_triathlete_f.4bpp.lz"), U32("graphics/trainers/front_pics/cycling_triathlete_f.gbapal.lz"), Trainer), + TRAINER_PIC(RUNNING_TRIATHLETE_M, U32("graphics/trainers/front_pics/running_triathlete_m.4bpp.lz"), U32("graphics/trainers/front_pics/running_triathlete_m.gbapal.lz"), Trainer), + TRAINER_PIC(RUNNING_TRIATHLETE_F, U32("graphics/trainers/front_pics/running_triathlete_f.4bpp.lz"), U32("graphics/trainers/front_pics/running_triathlete_f.gbapal.lz"), Trainer), + TRAINER_PIC(SWIMMING_TRIATHLETE_M, U32("graphics/trainers/front_pics/swimming_triathlete_m.4bpp.lz"), U32("graphics/trainers/front_pics/swimming_triathlete_m.gbapal.lz"), Trainer), + TRAINER_PIC(SWIMMING_TRIATHLETE_F, U32("graphics/trainers/front_pics/swimming_triathlete_f.4bpp.lz"), U32("graphics/trainers/front_pics/swimming_triathlete_f.gbapal.lz"), Trainer), + TRAINER_PIC(DRAGON_TAMER, U32("graphics/trainers/front_pics/dragon_tamer.4bpp.lz"), U32("graphics/trainers/front_pics/dragon_tamer.gbapal.lz"), Trainer), + TRAINER_PIC(NINJA_BOY, U32("graphics/trainers/front_pics/ninja_boy.4bpp.lz"), U32("graphics/trainers/front_pics/ninja_boy.gbapal.lz"), Trainer), + TRAINER_PIC(BATTLE_GIRL, U32("graphics/trainers/front_pics/battle_girl.4bpp.lz"), U32("graphics/trainers/front_pics/battle_girl.gbapal.lz"), Trainer), + TRAINER_PIC(PARASOL_LADY, U32("graphics/trainers/front_pics/parasol_lady.4bpp.lz"), U32("graphics/trainers/front_pics/parasol_lady.gbapal.lz"), Trainer), + TRAINER_PIC(SWIMMER_F, U32("graphics/trainers/front_pics/swimmer_f.4bpp.lz"), U32("graphics/trainers/front_pics/swimmer_f.gbapal.lz"), Trainer), + TRAINER_PIC(TWINS, U32("graphics/trainers/front_pics/twins.4bpp.lz"), U32("graphics/trainers/front_pics/twins.gbapal.lz"), Trainer), + TRAINER_PIC(SAILOR, U32("graphics/trainers/front_pics/sailor.4bpp.lz"), U32("graphics/trainers/front_pics/sailor.gbapal.lz"), Trainer), + TRAINER_PIC(MAGMA_ADMIN, U32("graphics/trainers/front_pics/magma_admin.4bpp.lz"), U32("graphics/trainers/front_pics/magma_admin.gbapal.lz"), Trainer), + TRAINER_PIC(WALLY, U32("graphics/trainers/front_pics/wally.4bpp.lz"), U32("graphics/trainers/palettes/wally.gbapal.lz"), Trainer), + TRAINER_PIC(BRENDAN, U32("graphics/trainers/front_pics/brendan.4bpp.lz"), U32("graphics/trainers/palettes/brendan.gbapal.lz"), Trainer), + TRAINER_PIC(MAY, U32("graphics/trainers/front_pics/may.4bpp.lz"), U32("graphics/trainers/palettes/may.gbapal.lz"), Trainer), + TRAINER_PIC(BUG_CATCHER, U32("graphics/trainers/front_pics/bug_catcher.4bpp.lz"), U32("graphics/trainers/front_pics/bug_catcher.gbapal.lz"), Trainer), + TRAINER_PIC(POKEMON_RANGER_M, U32("graphics/trainers/front_pics/pokemon_ranger_m.4bpp.lz"), U32("graphics/trainers/front_pics/pokemon_ranger_m.gbapal.lz"), Trainer), + TRAINER_PIC(POKEMON_RANGER_F, U32("graphics/trainers/front_pics/pokemon_ranger_f.4bpp.lz"), U32("graphics/trainers/front_pics/pokemon_ranger_f.gbapal.lz"), Trainer), + TRAINER_PIC(MAGMA_LEADER_MAXIE, U32("graphics/trainers/front_pics/magma_leader_maxie.4bpp.lz"), U32("graphics/trainers/front_pics/magma_leader_maxie.gbapal.lz"), Trainer), + TRAINER_PIC(LASS, U32("graphics/trainers/front_pics/lass.4bpp.lz"), U32("graphics/trainers/front_pics/lass.gbapal.lz"), Trainer), + TRAINER_PIC(YOUNG_COUPLE, U32("graphics/trainers/front_pics/young_couple.4bpp.lz"), U32("graphics/trainers/front_pics/young_couple.gbapal.lz"), Trainer), + TRAINER_PIC(OLD_COUPLE, U32("graphics/trainers/front_pics/old_couple.4bpp.lz"), U32("graphics/trainers/front_pics/old_couple.gbapal.lz"), Trainer), + TRAINER_PIC(SIS_AND_BRO, U32("graphics/trainers/front_pics/sis_and_bro.4bpp.lz"), U32("graphics/trainers/front_pics/sis_and_bro.gbapal.lz"), Trainer), + TRAINER_PIC(STEVEN, U32("graphics/trainers/front_pics/steven.4bpp.lz"), U32("graphics/trainers/front_pics/steven.gbapal.lz"), Trainer), + TRAINER_PIC(SALON_MAIDEN_ANABEL, U32("graphics/trainers/front_pics/salon_maiden_anabel.4bpp.lz"), U32("graphics/trainers/front_pics/salon_maiden_anabel.gbapal.lz"), Trainer), + TRAINER_PIC(DOME_ACE_TUCKER, U32("graphics/trainers/front_pics/dome_ace_tucker.4bpp.lz"), U32("graphics/trainers/front_pics/dome_ace_tucker.gbapal.lz"), Trainer), + TRAINER_PIC(PALACE_MAVEN_SPENSER, U32("graphics/trainers/front_pics/palace_maven_spenser.4bpp.lz"), U32("graphics/trainers/front_pics/palace_maven_spenser.gbapal.lz"), Trainer), + TRAINER_PIC(ARENA_TYCOON_GRETA, U32("graphics/trainers/front_pics/arena_tycoon_greta.4bpp.lz"), U32("graphics/trainers/front_pics/arena_tycoon_greta.gbapal.lz"), Trainer), + TRAINER_PIC(FACTORY_HEAD_NOLAND, U32("graphics/trainers/front_pics/factory_head_noland.4bpp.lz"), U32("graphics/trainers/front_pics/factory_head_noland.gbapal.lz"), Trainer), + TRAINER_PIC(PIKE_QUEEN_LUCY, U32("graphics/trainers/front_pics/pike_queen_lucy.4bpp.lz"), U32("graphics/trainers/front_pics/pike_queen_lucy.gbapal.lz"), Trainer), + TRAINER_PIC(PYRAMID_KING_BRANDON, U32("graphics/trainers/front_pics/pyramid_king_brandon.4bpp.lz"), U32("graphics/trainers/front_pics/pyramid_king_brandon.gbapal.lz"), Trainer), + TRAINER_PIC(RED, U32("graphics/trainers/front_pics/red.4bpp.lz"), U32("graphics/trainers/front_pics/red.gbapal.lz"), Trainer), + TRAINER_PIC(LEAF, U32("graphics/trainers/front_pics/leaf.4bpp.lz"), U32("graphics/trainers/front_pics/leaf.gbapal.lz"), Trainer), + TRAINER_PIC(RS_BRENDAN, U32("graphics/trainers/front_pics/brendan_rs.4bpp.lz"), U32("graphics/trainers/palettes/brendan_rs.gbapal.lz"), Trainer), + TRAINER_PIC(RS_MAY, U32("graphics/trainers/front_pics/may_rs.4bpp.lz"), U32("graphics/trainers/palettes/may_rs.gbapal.lz"), Trainer), }; From 06def9d404b2986b5600e40b1c3353ae5d82a87b Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 26 Nov 2023 17:28:08 -0500 Subject: [PATCH 16/25] Revert adding sprites to preproc as it fails agbcc This reverts commit dce57f8d1bfab70b4c6630a9c4e5b43495891459. --- include/graphics.h | 181 +++++++++++++ src/data/graphics/trainers.h | 487 +++++++++++++++++++++++++++-------- 2 files changed, 558 insertions(+), 110 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index 982b752de555..94a8e322f2dd 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -66,10 +66,191 @@ extern const u32 gOpenPokeballGfx[]; extern const u16 gMonIconPalettes[][16]; // trainer sprites +extern const u32 gTrainerFrontPic_Hiker[]; +extern const u32 gTrainerFrontPic_AquaGruntM[]; +extern const u32 gTrainerFrontPic_PokemonBreederF[]; +extern const u32 gTrainerFrontPic_CoolTrainerM[]; +extern const u32 gTrainerFrontPic_BirdKeeper[]; +extern const u32 gTrainerFrontPic_Collector[]; +extern const u32 gTrainerFrontPic_AquaGruntF[]; +extern const u32 gTrainerFrontPic_SwimmerM[]; +extern const u32 gTrainerFrontPic_MagmaGruntM[]; +extern const u32 gTrainerFrontPic_ExpertM[]; +extern const u32 gTrainerFrontPic_AquaAdminM[]; +extern const u32 gTrainerFrontPic_BlackBelt[]; +extern const u32 gTrainerFrontPic_AquaAdminF[]; +extern const u32 gTrainerFrontPic_AquaLeaderArchie[]; +extern const u32 gTrainerFrontPic_HexManiac[]; +extern const u32 gTrainerFrontPic_AromaLady[]; +extern const u32 gTrainerFrontPic_RuinManiac[]; +extern const u32 gTrainerFrontPic_Interviewer[]; +extern const u32 gTrainerFrontPic_TuberF[]; +extern const u32 gTrainerFrontPic_TuberM[]; +extern const u32 gTrainerFrontPic_CoolTrainerF[]; +extern const u32 gTrainerFrontPic_Lady[]; +extern const u32 gTrainerFrontPic_Beauty[]; +extern const u32 gTrainerFrontPic_RichBoy[]; +extern const u32 gTrainerFrontPic_ExpertF[]; +extern const u32 gTrainerFrontPic_Pokemaniac[]; +extern const u32 gTrainerFrontPic_MagmaGruntF[]; +extern const u32 gTrainerFrontPic_Guitarist[]; +extern const u32 gTrainerFrontPic_Kindler[]; +extern const u32 gTrainerFrontPic_Camper[]; +extern const u32 gTrainerFrontPic_Picnicker[]; +extern const u32 gTrainerFrontPic_BugManiac[]; +extern const u32 gTrainerFrontPic_PokemonBreederM[]; +extern const u32 gTrainerFrontPic_PsychicM[]; +extern const u32 gTrainerFrontPic_PsychicF[]; +extern const u32 gTrainerFrontPic_Gentleman[]; +extern const u32 gTrainerFrontPic_EliteFourSidney[]; +extern const u32 gTrainerFrontPic_EliteFourPhoebe[]; +extern const u32 gTrainerFrontPic_EliteFourGlacia[]; +extern const u32 gTrainerFrontPic_EliteFourDrake[]; +extern const u32 gTrainerFrontPic_LeaderRoxanne[]; +extern const u32 gTrainerFrontPic_LeaderBrawly[]; +extern const u32 gTrainerFrontPic_LeaderWattson[]; +extern const u32 gTrainerFrontPic_LeaderFlannery[]; +extern const u32 gTrainerFrontPic_LeaderNorman[]; +extern const u32 gTrainerFrontPic_LeaderWinona[]; +extern const u32 gTrainerFrontPic_LeaderTateAndLiza[]; +extern const u32 gTrainerFrontPic_LeaderJuan[]; +extern const u32 gTrainerFrontPic_SchoolKidM[]; +extern const u32 gTrainerFrontPic_SchoolKidF[]; +extern const u32 gTrainerFrontPic_SrAndJr[]; +extern const u32 gTrainerFrontPic_PokefanM[]; +extern const u32 gTrainerFrontPic_PokefanF[]; +extern const u32 gTrainerFrontPic_Youngster[]; +extern const u32 gTrainerFrontPic_ChampionWallace[]; +extern const u32 gTrainerFrontPic_Fisherman[]; +extern const u32 gTrainerFrontPic_CyclingTriathleteM[]; +extern const u32 gTrainerFrontPic_CyclingTriathleteF[]; +extern const u32 gTrainerFrontPic_RunningTriathleteM[]; +extern const u32 gTrainerFrontPic_RunningTriathleteF[]; +extern const u32 gTrainerFrontPic_SwimmingTriathleteM[]; +extern const u32 gTrainerFrontPic_SwimmingTriathleteF[]; +extern const u32 gTrainerFrontPic_DragonTamer[]; +extern const u32 gTrainerFrontPic_NinjaBoy[]; +extern const u32 gTrainerFrontPic_BattleGirl[]; +extern const u32 gTrainerFrontPic_ParasolLady[]; +extern const u32 gTrainerFrontPic_SwimmerF[]; +extern const u32 gTrainerFrontPic_Twins[]; +extern const u32 gTrainerFrontPic_Sailor[]; +extern const u32 gTrainerFrontPic_MagmaAdmin[]; +extern const u32 gTrainerFrontPic_Wally[]; +extern const u32 gTrainerFrontPic_Brendan[]; +extern const u32 gTrainerFrontPic_May[]; +extern const u32 gTrainerFrontPic_BugCatcher[]; +extern const u32 gTrainerFrontPic_PokemonRangerM[]; +extern const u32 gTrainerFrontPic_PokemonRangerF[]; +extern const u32 gTrainerFrontPic_MagmaLeaderMaxie[]; +extern const u32 gTrainerFrontPic_Lass[]; +extern const u32 gTrainerFrontPic_YoungCouple[]; +extern const u32 gTrainerFrontPic_OldCouple[]; +extern const u32 gTrainerFrontPic_SisAndBro[]; +extern const u32 gTrainerFrontPic_Steven[]; +extern const u32 gTrainerFrontPic_SalonMaidenAnabel[]; +extern const u32 gTrainerFrontPic_DomeAceTucker[]; +extern const u32 gTrainerFrontPic_PalaceMavenSpenser[]; +extern const u32 gTrainerFrontPic_ArenaTycoonGreta[]; +extern const u32 gTrainerFrontPic_FactoryHeadNoland[]; +extern const u32 gTrainerFrontPic_PikeQueenLucy[]; +extern const u32 gTrainerFrontPic_PyramidKingBrandon[]; +extern const u32 gTrainerFrontPic_Red[]; +extern const u32 gTrainerFrontPic_Leaf[]; +extern const u32 gTrainerFrontPic_RubySapphireBrendan[]; +extern const u32 gTrainerFrontPic_RubySapphireMay[]; + +extern const u32 gTrainerPalette_Hiker[]; +extern const u32 gTrainerPalette_AquaGruntM[]; +extern const u32 gTrainerPalette_PokemonBreederF[]; +extern const u32 gTrainerPalette_CoolTrainerM[]; +extern const u32 gTrainerPalette_BirdKeeper[]; +extern const u32 gTrainerPalette_Collector[]; +extern const u32 gTrainerPalette_AquaGruntF[]; +extern const u32 gTrainerPalette_SwimmerM[]; +extern const u32 gTrainerPalette_MagmaGruntM[]; +extern const u32 gTrainerPalette_ExpertM[]; +extern const u32 gTrainerPalette_AquaAdminM[]; +extern const u32 gTrainerPalette_BlackBelt[]; +extern const u32 gTrainerPalette_AquaAdminF[]; +extern const u32 gTrainerPalette_AquaLeaderArchie[]; +extern const u32 gTrainerPalette_HexManiac[]; +extern const u32 gTrainerPalette_AromaLady[]; +extern const u32 gTrainerPalette_RuinManiac[]; +extern const u32 gTrainerPalette_Interviewer[]; +extern const u32 gTrainerPalette_TuberF[]; +extern const u32 gTrainerPalette_TuberM[]; +extern const u32 gTrainerPalette_CoolTrainerF[]; +extern const u32 gTrainerPalette_Lady[]; +extern const u32 gTrainerPalette_Beauty[]; +extern const u32 gTrainerPalette_RichBoy[]; +extern const u32 gTrainerPalette_ExpertF[]; +extern const u32 gTrainerPalette_Pokemaniac[]; +extern const u32 gTrainerPalette_MagmaGruntF[]; +extern const u32 gTrainerPalette_Guitarist[]; +extern const u32 gTrainerPalette_Kindler[]; +extern const u32 gTrainerPalette_Camper[]; +extern const u32 gTrainerPalette_Picnicker[]; +extern const u32 gTrainerPalette_BugManiac[]; +extern const u32 gTrainerPalette_PokemonBreederM[]; +extern const u32 gTrainerPalette_PsychicM[]; +extern const u32 gTrainerPalette_PsychicF[]; +extern const u32 gTrainerPalette_Gentleman[]; +extern const u32 gTrainerPalette_EliteFourSidney[]; +extern const u32 gTrainerPalette_EliteFourPhoebe[]; +extern const u32 gTrainerPalette_EliteFourGlacia[]; +extern const u32 gTrainerPalette_EliteFourDrake[]; +extern const u32 gTrainerPalette_LeaderRoxanne[]; +extern const u32 gTrainerPalette_LeaderBrawly[]; +extern const u32 gTrainerPalette_LeaderWattson[]; +extern const u32 gTrainerPalette_LeaderFlannery[]; +extern const u32 gTrainerPalette_LeaderNorman[]; +extern const u32 gTrainerPalette_LeaderWinona[]; +extern const u32 gTrainerPalette_LeaderTateAndLiza[]; +extern const u32 gTrainerPalette_LeaderJuan[]; +extern const u32 gTrainerPalette_SchoolKidM[]; +extern const u32 gTrainerPalette_SchoolKidF[]; +extern const u32 gTrainerPalette_SrAndJr[]; +extern const u32 gTrainerPalette_PokefanM[]; +extern const u32 gTrainerPalette_PokefanF[]; +extern const u32 gTrainerPalette_Youngster[]; +extern const u32 gTrainerPalette_ChampionWallace[]; +extern const u32 gTrainerPalette_Fisherman[]; +extern const u32 gTrainerPalette_CyclingTriathleteM[]; +extern const u32 gTrainerPalette_CyclingTriathleteF[]; +extern const u32 gTrainerPalette_RunningTriathleteM[]; +extern const u32 gTrainerPalette_RunningTriathleteF[]; +extern const u32 gTrainerPalette_SwimmingTriathleteM[]; +extern const u32 gTrainerPalette_SwimmingTriathleteF[]; +extern const u32 gTrainerPalette_DragonTamer[]; +extern const u32 gTrainerPalette_NinjaBoy[]; +extern const u32 gTrainerPalette_BattleGirl[]; +extern const u32 gTrainerPalette_ParasolLady[]; +extern const u32 gTrainerPalette_SwimmerF[]; +extern const u32 gTrainerPalette_Twins[]; +extern const u32 gTrainerPalette_Sailor[]; +extern const u32 gTrainerPalette_MagmaAdmin[]; extern const u32 gTrainerPalette_Wally[]; extern const u32 gTrainerPalette_Brendan[]; extern const u32 gTrainerPalette_May[]; +extern const u32 gTrainerPalette_BugCatcher[]; +extern const u32 gTrainerPalette_PokemonRangerM[]; +extern const u32 gTrainerPalette_PokemonRangerF[]; +extern const u32 gTrainerPalette_MagmaLeaderMaxie[]; +extern const u32 gTrainerPalette_Lass[]; +extern const u32 gTrainerPalette_YoungCouple[]; +extern const u32 gTrainerPalette_OldCouple[]; +extern const u32 gTrainerPalette_SisAndBro[]; extern const u32 gTrainerPalette_Steven[]; +extern const u32 gTrainerPalette_SalonMaidenAnabel[]; +extern const u32 gTrainerPalette_DomeAceTucker[]; +extern const u32 gTrainerPalette_PalaceMavenSpenser[]; +extern const u32 gTrainerPalette_ArenaTycoonGreta[]; +extern const u32 gTrainerPalette_FactoryHeadNoland[]; +extern const u32 gTrainerPalette_PikeQueenLucy[]; +extern const u32 gTrainerPalette_PyramidKingBrandon[]; +extern const u32 gTrainerPalette_Red[]; +extern const u32 gTrainerPalette_Leaf[]; extern const u32 gTrainerPalette_RubySapphireBrendan[]; extern const u32 gTrainerPalette_RubySapphireMay[]; diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index f9b71d66cec5..3cbeb181e0ec 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -1,136 +1,403 @@ #include "constants/trainers.h" #include "data.h" -const u8 gTrainerBackPic_Brendan[] = INCBIN_U8("graphics/trainers/back_pics/brendan.4bpp"); +const u32 gTrainerFrontPic_Hiker[] = INCBIN_U32("graphics/trainers/front_pics/hiker.4bpp.lz"); +const u32 gTrainerPalette_Hiker[] = INCBIN_U32("graphics/trainers/front_pics/hiker.gbapal.lz"); + +const u32 gTrainerFrontPic_AquaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_m.4bpp.lz"); +const u32 gTrainerPalette_AquaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_m.gbapal.lz"); + +const u32 gTrainerFrontPic_PokemonBreederF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_f.4bpp.lz"); +const u32 gTrainerPalette_PokemonBreederF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_f.gbapal.lz"); + +const u32 gTrainerFrontPic_CoolTrainerM[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_m.4bpp.lz"); +const u32 gTrainerPalette_CoolTrainerM[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_m.gbapal.lz"); + +const u32 gTrainerFrontPic_BirdKeeper[] = INCBIN_U32("graphics/trainers/front_pics/bird_keeper.4bpp.lz"); +const u32 gTrainerPalette_BirdKeeper[] = INCBIN_U32("graphics/trainers/front_pics/bird_keeper.gbapal.lz"); + +const u32 gTrainerFrontPic_Collector[] = INCBIN_U32("graphics/trainers/front_pics/collector.4bpp.lz"); +const u32 gTrainerPalette_Collector[] = INCBIN_U32("graphics/trainers/front_pics/collector.gbapal.lz"); + +const u32 gTrainerFrontPic_AquaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_f.4bpp.lz"); +const u32 gTrainerPalette_AquaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_grunt_f.gbapal.lz"); + +const u32 gTrainerFrontPic_SwimmerM[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_m.4bpp.lz"); +const u32 gTrainerPalette_SwimmerM[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_m.gbapal.lz"); + +const u32 gTrainerFrontPic_MagmaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_m.4bpp.lz"); +const u32 gTrainerPalette_MagmaGruntM[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_m.gbapal.lz"); + +const u32 gTrainerFrontPic_ExpertM[] = INCBIN_U32("graphics/trainers/front_pics/expert_m.4bpp.lz"); +const u32 gTrainerPalette_ExpertM[] = INCBIN_U32("graphics/trainers/front_pics/expert_m.gbapal.lz"); + +const u32 gTrainerFrontPic_AquaAdminM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_m.4bpp.lz"); +const u32 gTrainerPalette_AquaAdminM[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_m.gbapal.lz"); + +const u32 gTrainerFrontPic_BlackBelt[] = INCBIN_U32("graphics/trainers/front_pics/black_belt.4bpp.lz"); +const u32 gTrainerPalette_BlackBelt[] = INCBIN_U32("graphics/trainers/front_pics/black_belt.gbapal.lz"); + +const u32 gTrainerFrontPic_AquaAdminF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_f.4bpp.lz"); +const u32 gTrainerPalette_AquaAdminF[] = INCBIN_U32("graphics/trainers/front_pics/aqua_admin_f.gbapal.lz"); + +const u32 gTrainerFrontPic_AquaLeaderArchie[] = INCBIN_U32("graphics/trainers/front_pics/aqua_leader_archie.4bpp.lz"); +const u32 gTrainerPalette_AquaLeaderArchie[] = INCBIN_U32("graphics/trainers/front_pics/aqua_leader_archie.gbapal.lz"); + +const u32 gTrainerFrontPic_HexManiac[] = INCBIN_U32("graphics/trainers/front_pics/hex_maniac.4bpp.lz"); +const u32 gTrainerPalette_HexManiac[] = INCBIN_U32("graphics/trainers/front_pics/hex_maniac.gbapal.lz"); + +const u32 gTrainerFrontPic_AromaLady[] = INCBIN_U32("graphics/trainers/front_pics/aroma_lady.4bpp.lz"); +const u32 gTrainerPalette_AromaLady[] = INCBIN_U32("graphics/trainers/front_pics/aroma_lady.gbapal.lz"); + +const u32 gTrainerFrontPic_RuinManiac[] = INCBIN_U32("graphics/trainers/front_pics/ruin_maniac.4bpp.lz"); +const u32 gTrainerPalette_RuinManiac[] = INCBIN_U32("graphics/trainers/front_pics/ruin_maniac.gbapal.lz"); + +const u32 gTrainerFrontPic_Interviewer[] = INCBIN_U32("graphics/trainers/front_pics/interviewer.4bpp.lz"); +const u32 gTrainerPalette_Interviewer[] = INCBIN_U32("graphics/trainers/front_pics/interviewer.gbapal.lz"); + +const u32 gTrainerFrontPic_TuberF[] = INCBIN_U32("graphics/trainers/front_pics/tuber_f.4bpp.lz"); +const u32 gTrainerPalette_TuberF[] = INCBIN_U32("graphics/trainers/front_pics/tuber_f.gbapal.lz"); + +const u32 gTrainerFrontPic_TuberM[] = INCBIN_U32("graphics/trainers/front_pics/tuber_m.4bpp.lz"); +const u32 gTrainerPalette_TuberM[] = INCBIN_U32("graphics/trainers/front_pics/tuber_m.gbapal.lz"); + +const u32 gTrainerFrontPic_CoolTrainerF[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_f.4bpp.lz"); +const u32 gTrainerPalette_CoolTrainerF[] = INCBIN_U32("graphics/trainers/front_pics/cooltrainer_f.gbapal.lz"); + +const u32 gTrainerFrontPic_Lady[] = INCBIN_U32("graphics/trainers/front_pics/lady.4bpp.lz"); +const u32 gTrainerPalette_Lady[] = INCBIN_U32("graphics/trainers/front_pics/lady.gbapal.lz"); + +const u32 gTrainerFrontPic_Beauty[] = INCBIN_U32("graphics/trainers/front_pics/beauty.4bpp.lz"); +const u32 gTrainerPalette_Beauty[] = INCBIN_U32("graphics/trainers/front_pics/beauty.gbapal.lz"); + +const u32 gTrainerFrontPic_RichBoy[] = INCBIN_U32("graphics/trainers/front_pics/rich_boy.4bpp.lz"); +const u32 gTrainerPalette_RichBoy[] = INCBIN_U32("graphics/trainers/front_pics/rich_boy.gbapal.lz"); + +const u32 gTrainerFrontPic_ExpertF[] = INCBIN_U32("graphics/trainers/front_pics/expert_f.4bpp.lz"); +const u32 gTrainerPalette_ExpertF[] = INCBIN_U32("graphics/trainers/front_pics/expert_f.gbapal.lz"); + +const u32 gTrainerFrontPic_Pokemaniac[] = INCBIN_U32("graphics/trainers/front_pics/pokemaniac.4bpp.lz"); +const u32 gTrainerPalette_Pokemaniac[] = INCBIN_U32("graphics/trainers/front_pics/pokemaniac.gbapal.lz"); + +const u32 gTrainerFrontPic_MagmaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_f.4bpp.lz"); +const u32 gTrainerPalette_MagmaGruntF[] = INCBIN_U32("graphics/trainers/front_pics/magma_grunt_f.gbapal.lz"); + +const u32 gTrainerFrontPic_Guitarist[] = INCBIN_U32("graphics/trainers/front_pics/guitarist.4bpp.lz"); +const u32 gTrainerPalette_Guitarist[] = INCBIN_U32("graphics/trainers/front_pics/guitarist.gbapal.lz"); + +const u32 gTrainerFrontPic_Kindler[] = INCBIN_U32("graphics/trainers/front_pics/kindler.4bpp.lz"); +const u32 gTrainerPalette_Kindler[] = INCBIN_U32("graphics/trainers/front_pics/kindler.gbapal.lz"); + +const u32 gTrainerFrontPic_Camper[] = INCBIN_U32("graphics/trainers/front_pics/camper.4bpp.lz"); +const u32 gTrainerPalette_Camper[] = INCBIN_U32("graphics/trainers/front_pics/camper.gbapal.lz"); + +const u32 gTrainerFrontPic_Picnicker[] = INCBIN_U32("graphics/trainers/front_pics/picnicker.4bpp.lz"); +const u32 gTrainerPalette_Picnicker[] = INCBIN_U32("graphics/trainers/front_pics/picnicker.gbapal.lz"); + +const u32 gTrainerFrontPic_BugManiac[] = INCBIN_U32("graphics/trainers/front_pics/bug_maniac.4bpp.lz"); +const u32 gTrainerPalette_BugManiac[] = INCBIN_U32("graphics/trainers/front_pics/bug_maniac.gbapal.lz"); + +const u32 gTrainerFrontPic_PokemonBreederM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_m.4bpp.lz"); +const u32 gTrainerPalette_PokemonBreederM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_breeder_m.gbapal.lz"); + +const u32 gTrainerFrontPic_PsychicM[] = INCBIN_U32("graphics/trainers/front_pics/psychic_m.4bpp.lz"); +const u32 gTrainerPalette_PsychicM[] = INCBIN_U32("graphics/trainers/front_pics/psychic_m.gbapal.lz"); + +const u32 gTrainerFrontPic_PsychicF[] = INCBIN_U32("graphics/trainers/front_pics/psychic_f.4bpp.lz"); +const u32 gTrainerPalette_PsychicF[] = INCBIN_U32("graphics/trainers/front_pics/psychic_f.gbapal.lz"); + +const u32 gTrainerFrontPic_Gentleman[] = INCBIN_U32("graphics/trainers/front_pics/gentleman.4bpp.lz"); +const u32 gTrainerPalette_Gentleman[] = INCBIN_U32("graphics/trainers/front_pics/gentleman.gbapal.lz"); + +const u32 gTrainerFrontPic_EliteFourSidney[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_sidney.4bpp.lz"); +const u32 gTrainerPalette_EliteFourSidney[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_sidney.gbapal.lz"); + +const u32 gTrainerFrontPic_EliteFourPhoebe[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_phoebe.4bpp.lz"); +const u32 gTrainerPalette_EliteFourPhoebe[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_phoebe.gbapal.lz"); + +const u32 gTrainerFrontPic_EliteFourGlacia[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_glacia.4bpp.lz"); +const u32 gTrainerPalette_EliteFourGlacia[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_glacia.gbapal.lz"); + +const u32 gTrainerFrontPic_EliteFourDrake[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_drake.4bpp.lz"); +const u32 gTrainerPalette_EliteFourDrake[] = INCBIN_U32("graphics/trainers/front_pics/elite_four_drake.gbapal.lz"); + +const u32 gTrainerFrontPic_LeaderRoxanne[] = INCBIN_U32("graphics/trainers/front_pics/leader_roxanne.4bpp.lz"); +const u32 gTrainerPalette_LeaderRoxanne[] = INCBIN_U32("graphics/trainers/front_pics/leader_roxanne.gbapal.lz"); + +const u32 gTrainerFrontPic_LeaderBrawly[] = INCBIN_U32("graphics/trainers/front_pics/leader_brawly.4bpp.lz"); +const u32 gTrainerPalette_LeaderBrawly[] = INCBIN_U32("graphics/trainers/front_pics/leader_brawly.gbapal.lz"); + +const u32 gTrainerFrontPic_LeaderWattson[] = INCBIN_U32("graphics/trainers/front_pics/leader_wattson.4bpp.lz"); +const u32 gTrainerPalette_LeaderWattson[] = INCBIN_U32("graphics/trainers/front_pics/leader_wattson.gbapal.lz"); + +const u32 gTrainerFrontPic_LeaderFlannery[] = INCBIN_U32("graphics/trainers/front_pics/leader_flannery.4bpp.lz"); +const u32 gTrainerPalette_LeaderFlannery[] = INCBIN_U32("graphics/trainers/front_pics/leader_flannery.gbapal.lz"); + +const u32 gTrainerFrontPic_LeaderNorman[] = INCBIN_U32("graphics/trainers/front_pics/leader_norman.4bpp.lz"); +const u32 gTrainerPalette_LeaderNorman[] = INCBIN_U32("graphics/trainers/front_pics/leader_norman.gbapal.lz"); + +const u32 gTrainerFrontPic_LeaderWinona[] = INCBIN_U32("graphics/trainers/front_pics/leader_winona.4bpp.lz"); +const u32 gTrainerPalette_LeaderWinona[] = INCBIN_U32("graphics/trainers/front_pics/leader_winona.gbapal.lz"); + +const u32 gTrainerFrontPic_LeaderTateAndLiza[] = INCBIN_U32("graphics/trainers/front_pics/leader_tate_and_liza.4bpp.lz"); +const u32 gTrainerPalette_LeaderTateAndLiza[] = INCBIN_U32("graphics/trainers/front_pics/leader_tate_and_liza.gbapal.lz"); + +const u32 gTrainerFrontPic_LeaderJuan[] = INCBIN_U32("graphics/trainers/front_pics/leader_juan.4bpp.lz"); +const u32 gTrainerPalette_LeaderJuan[] = INCBIN_U32("graphics/trainers/front_pics/leader_juan.gbapal.lz"); + +const u32 gTrainerFrontPic_SchoolKidM[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_m.4bpp.lz"); +const u32 gTrainerPalette_SchoolKidM[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_m.gbapal.lz"); + +const u32 gTrainerFrontPic_SchoolKidF[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_f.4bpp.lz"); +const u32 gTrainerPalette_SchoolKidF[] = INCBIN_U32("graphics/trainers/front_pics/school_kid_f.gbapal.lz"); + +const u32 gTrainerFrontPic_SrAndJr[] = INCBIN_U32("graphics/trainers/front_pics/sr_and_jr.4bpp.lz"); +const u32 gTrainerPalette_SrAndJr[] = INCBIN_U32("graphics/trainers/front_pics/sr_and_jr.gbapal.lz"); + +const u32 gTrainerFrontPic_PokefanM[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_m.4bpp.lz"); +const u32 gTrainerPalette_PokefanM[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_m.gbapal.lz"); + +const u32 gTrainerFrontPic_PokefanF[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_f.4bpp.lz"); +const u32 gTrainerPalette_PokefanF[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_f.gbapal.lz"); + +const u32 gTrainerFrontPic_Youngster[] = INCBIN_U32("graphics/trainers/front_pics/youngster.4bpp.lz"); +const u32 gTrainerPalette_Youngster[] = INCBIN_U32("graphics/trainers/front_pics/youngster.gbapal.lz"); + +const u32 gTrainerFrontPic_ChampionWallace[] = INCBIN_U32("graphics/trainers/front_pics/champion_wallace.4bpp.lz"); +const u32 gTrainerPalette_ChampionWallace[] = INCBIN_U32("graphics/trainers/front_pics/champion_wallace.gbapal.lz"); + +const u32 gTrainerFrontPic_Fisherman[] = INCBIN_U32("graphics/trainers/front_pics/fisherman.4bpp.lz"); +const u32 gTrainerPalette_Fisherman[] = INCBIN_U32("graphics/trainers/front_pics/fisherman.gbapal.lz"); + +const u32 gTrainerFrontPic_CyclingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_m.4bpp.lz"); +const u32 gTrainerPalette_CyclingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_m.gbapal.lz"); + +const u32 gTrainerFrontPic_CyclingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_f.4bpp.lz"); +const u32 gTrainerPalette_CyclingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/cycling_triathlete_f.gbapal.lz"); + +const u32 gTrainerFrontPic_RunningTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_m.4bpp.lz"); +const u32 gTrainerPalette_RunningTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_m.gbapal.lz"); + +const u32 gTrainerFrontPic_RunningTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_f.4bpp.lz"); +const u32 gTrainerPalette_RunningTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/running_triathlete_f.gbapal.lz"); + +const u32 gTrainerFrontPic_SwimmingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_m.4bpp.lz"); +const u32 gTrainerPalette_SwimmingTriathleteM[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_m.gbapal.lz"); + +const u32 gTrainerFrontPic_SwimmingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_f.4bpp.lz"); +const u32 gTrainerPalette_SwimmingTriathleteF[] = INCBIN_U32("graphics/trainers/front_pics/swimming_triathlete_f.gbapal.lz"); + +const u32 gTrainerFrontPic_DragonTamer[] = INCBIN_U32("graphics/trainers/front_pics/dragon_tamer.4bpp.lz"); +const u32 gTrainerPalette_DragonTamer[] = INCBIN_U32("graphics/trainers/front_pics/dragon_tamer.gbapal.lz"); + +const u32 gTrainerFrontPic_NinjaBoy[] = INCBIN_U32("graphics/trainers/front_pics/ninja_boy.4bpp.lz"); +const u32 gTrainerPalette_NinjaBoy[] = INCBIN_U32("graphics/trainers/front_pics/ninja_boy.gbapal.lz"); + +const u32 gTrainerFrontPic_BattleGirl[] = INCBIN_U32("graphics/trainers/front_pics/battle_girl.4bpp.lz"); +const u32 gTrainerPalette_BattleGirl[] = INCBIN_U32("graphics/trainers/front_pics/battle_girl.gbapal.lz"); + +const u32 gTrainerFrontPic_ParasolLady[] = INCBIN_U32("graphics/trainers/front_pics/parasol_lady.4bpp.lz"); +const u32 gTrainerPalette_ParasolLady[] = INCBIN_U32("graphics/trainers/front_pics/parasol_lady.gbapal.lz"); + +const u32 gTrainerFrontPic_SwimmerF[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_f.4bpp.lz"); +const u32 gTrainerPalette_SwimmerF[] = INCBIN_U32("graphics/trainers/front_pics/swimmer_f.gbapal.lz"); + +const u32 gTrainerFrontPic_Twins[] = INCBIN_U32("graphics/trainers/front_pics/twins.4bpp.lz"); +const u32 gTrainerPalette_Twins[] = INCBIN_U32("graphics/trainers/front_pics/twins.gbapal.lz"); + +const u32 gTrainerFrontPic_Sailor[] = INCBIN_U32("graphics/trainers/front_pics/sailor.4bpp.lz"); +const u32 gTrainerPalette_Sailor[] = INCBIN_U32("graphics/trainers/front_pics/sailor.gbapal.lz"); + +const u32 gTrainerFrontPic_MagmaAdmin[] = INCBIN_U32("graphics/trainers/front_pics/magma_admin.4bpp.lz"); +const u32 gTrainerPalette_MagmaAdmin[] = INCBIN_U32("graphics/trainers/front_pics/magma_admin.gbapal.lz"); + +const u32 gTrainerFrontPic_Wally[] = INCBIN_U32("graphics/trainers/front_pics/wally.4bpp.lz"); +const u32 gTrainerPalette_Wally[] = INCBIN_U32("graphics/trainers/palettes/wally.gbapal.lz"); + +const u32 gTrainerFrontPic_Brendan[] = INCBIN_U32("graphics/trainers/front_pics/brendan.4bpp.lz"); const u32 gTrainerPalette_Brendan[] = INCBIN_U32("graphics/trainers/palettes/brendan.gbapal.lz"); -const u8 gTrainerBackPic_May[] = INCBIN_U8("graphics/trainers/back_pics/may.4bpp"); +const u32 gTrainerFrontPic_May[] = INCBIN_U32("graphics/trainers/front_pics/may.4bpp.lz"); const u32 gTrainerPalette_May[] = INCBIN_U32("graphics/trainers/palettes/may.gbapal.lz"); -const u8 gTrainerBackPic_RubySapphireBrendan[] = INCBIN_U8("graphics/trainers/back_pics/brendan_rs.4bpp"); +const u32 gTrainerFrontPic_BugCatcher[] = INCBIN_U32("graphics/trainers/front_pics/bug_catcher.4bpp.lz"); +const u32 gTrainerPalette_BugCatcher[] = INCBIN_U32("graphics/trainers/front_pics/bug_catcher.gbapal.lz"); + +const u32 gTrainerFrontPic_PokemonRangerM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_m.4bpp.lz"); +const u32 gTrainerPalette_PokemonRangerM[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_m.gbapal.lz"); + +const u32 gTrainerFrontPic_PokemonRangerF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_f.4bpp.lz"); +const u32 gTrainerPalette_PokemonRangerF[] = INCBIN_U32("graphics/trainers/front_pics/pokemon_ranger_f.gbapal.lz"); + +const u32 gTrainerFrontPic_MagmaLeaderMaxie[] = INCBIN_U32("graphics/trainers/front_pics/magma_leader_maxie.4bpp.lz"); +const u32 gTrainerPalette_MagmaLeaderMaxie[] = INCBIN_U32("graphics/trainers/front_pics/magma_leader_maxie.gbapal.lz"); + +const u32 gTrainerFrontPic_Lass[] = INCBIN_U32("graphics/trainers/front_pics/lass.4bpp.lz"); +const u32 gTrainerPalette_Lass[] = INCBIN_U32("graphics/trainers/front_pics/lass.gbapal.lz"); + +const u32 gTrainerFrontPic_YoungCouple[] = INCBIN_U32("graphics/trainers/front_pics/young_couple.4bpp.lz"); +const u32 gTrainerPalette_YoungCouple[] = INCBIN_U32("graphics/trainers/front_pics/young_couple.gbapal.lz"); + +const u32 gTrainerFrontPic_OldCouple[] = INCBIN_U32("graphics/trainers/front_pics/old_couple.4bpp.lz"); +const u32 gTrainerPalette_OldCouple[] = INCBIN_U32("graphics/trainers/front_pics/old_couple.gbapal.lz"); + +const u32 gTrainerFrontPic_SisAndBro[] = INCBIN_U32("graphics/trainers/front_pics/sis_and_bro.4bpp.lz"); +const u32 gTrainerPalette_SisAndBro[] = INCBIN_U32("graphics/trainers/front_pics/sis_and_bro.gbapal.lz"); + +const u32 gTrainerFrontPic_Steven[] = INCBIN_U32("graphics/trainers/front_pics/steven.4bpp.lz"); +const u32 gTrainerPalette_Steven[] = INCBIN_U32("graphics/trainers/front_pics/steven.gbapal.lz"); + +const u32 gTrainerFrontPic_SalonMaidenAnabel[] = INCBIN_U32("graphics/trainers/front_pics/salon_maiden_anabel.4bpp.lz"); +const u32 gTrainerPalette_SalonMaidenAnabel[] = INCBIN_U32("graphics/trainers/front_pics/salon_maiden_anabel.gbapal.lz"); + +const u32 gTrainerFrontPic_DomeAceTucker[] = INCBIN_U32("graphics/trainers/front_pics/dome_ace_tucker.4bpp.lz"); +const u32 gTrainerPalette_DomeAceTucker[] = INCBIN_U32("graphics/trainers/front_pics/dome_ace_tucker.gbapal.lz"); + +const u32 gTrainerFrontPic_PalaceMavenSpenser[] = INCBIN_U32("graphics/trainers/front_pics/palace_maven_spenser.4bpp.lz"); +const u32 gTrainerPalette_PalaceMavenSpenser[] = INCBIN_U32("graphics/trainers/front_pics/palace_maven_spenser.gbapal.lz"); + +const u32 gTrainerFrontPic_ArenaTycoonGreta[] = INCBIN_U32("graphics/trainers/front_pics/arena_tycoon_greta.4bpp.lz"); +const u32 gTrainerPalette_ArenaTycoonGreta[] = INCBIN_U32("graphics/trainers/front_pics/arena_tycoon_greta.gbapal.lz"); + +const u32 gTrainerFrontPic_FactoryHeadNoland[] = INCBIN_U32("graphics/trainers/front_pics/factory_head_noland.4bpp.lz"); +const u32 gTrainerPalette_FactoryHeadNoland[] = INCBIN_U32("graphics/trainers/front_pics/factory_head_noland.gbapal.lz"); + +const u32 gTrainerFrontPic_PikeQueenLucy[] = INCBIN_U32("graphics/trainers/front_pics/pike_queen_lucy.4bpp.lz"); +const u32 gTrainerPalette_PikeQueenLucy[] = INCBIN_U32("graphics/trainers/front_pics/pike_queen_lucy.gbapal.lz"); + +const u32 gTrainerFrontPic_PyramidKingBrandon[] = INCBIN_U32("graphics/trainers/front_pics/pyramid_king_brandon.4bpp.lz"); +const u32 gTrainerPalette_PyramidKingBrandon[] = INCBIN_U32("graphics/trainers/front_pics/pyramid_king_brandon.gbapal.lz"); + +const u32 gTrainerFrontPic_Red[] = INCBIN_U32("graphics/trainers/front_pics/red.4bpp.lz"); +const u32 gTrainerPalette_Red[] = INCBIN_U32("graphics/trainers/front_pics/red.gbapal.lz"); + +const u32 gTrainerFrontPic_Leaf[] = INCBIN_U32("graphics/trainers/front_pics/leaf.4bpp.lz"); +const u32 gTrainerPalette_Leaf[] = INCBIN_U32("graphics/trainers/front_pics/leaf.gbapal.lz"); + +const u32 gTrainerFrontPic_RubySapphireBrendan[] = INCBIN_U32("graphics/trainers/front_pics/brendan_rs.4bpp.lz"); const u32 gTrainerPalette_RubySapphireBrendan[] = INCBIN_U32("graphics/trainers/palettes/brendan_rs.gbapal.lz"); -const u8 gTrainerBackPic_RubySapphireMay[] = INCBIN_U8("graphics/trainers/back_pics/may_rs.4bpp"); +const u32 gTrainerFrontPic_RubySapphireMay[] = INCBIN_U32("graphics/trainers/front_pics/may_rs.4bpp.lz"); const u32 gTrainerPalette_RubySapphireMay[] = INCBIN_U32("graphics/trainers/palettes/may_rs.gbapal.lz"); +const u8 gTrainerBackPic_Brendan[] = INCBIN_U8("graphics/trainers/back_pics/brendan.4bpp"); +const u8 gTrainerBackPic_May[] = INCBIN_U8("graphics/trainers/back_pics/may.4bpp"); +const u8 gTrainerBackPic_Red[] = INCBIN_U8("graphics/trainers/back_pics/red.4bpp"); +const u8 gTrainerBackPic_Leaf[] = INCBIN_U8("graphics/trainers/back_pics/leaf.4bpp"); +const u8 gTrainerBackPic_RubySapphireBrendan[] = INCBIN_U8("graphics/trainers/back_pics/brendan_rs.4bpp"); +const u8 gTrainerBackPic_RubySapphireMay[] = INCBIN_U8("graphics/trainers/back_pics/may_rs.4bpp"); const u8 gTrainerBackPic_Wally[] = INCBIN_U8("graphics/trainers/back_pics/wally.4bpp"); -const u32 gTrainerPalette_Wally[] = INCBIN_U32("graphics/trainers/palettes/wally.gbapal.lz"); - const u8 gTrainerBackPic_Steven[] = INCBIN_U8("graphics/trainers/back_pics/steven.4bpp"); -const u32 gTrainerPalette_Steven[] = INCBIN_U32("graphics/trainers/front_pics/steven.gbapal.lz"); -const u8 gTrainerBackPic_Red[] = INCBIN_U8("graphics/trainers/back_pics/red.4bpp"); const u32 gTrainerBackPicPalette_Red[] = INCBIN_U32("graphics/trainers/back_pics/red.gbapal.lz"); - -const u8 gTrainerBackPic_Leaf[] = INCBIN_U8("graphics/trainers/back_pics/leaf.4bpp"); const u32 gTrainerBackPicPalette_Leaf[] = INCBIN_U32("graphics/trainers/back_pics/leaf.gbapal.lz"); static const union AnimCmd *const sAnims_Trainer[] ={ sAnim_GeneralFrame0, }; -#define TRAINER_PIC(trainerPic, spriteFile, paletteFile, anims) \ - [TRAINER_PIC_##trainerPic] = \ - { \ - .y_offset = 8, \ - .frontPic = {(const u32[]) INCBIN_##spriteFile, TRAINER_PIC_SIZE, TRAINER_PIC_##trainerPic}, \ - .palette = {(const u32[]) INCBIN_##paletteFile, TRAINER_PIC_##trainerPic}, \ - .animation = sAnims_##anims, \ +#define TRAINER_PIC(trainerPic, file, anims) \ + [TRAINER_PIC_##trainerPic] = \ + { \ + .y_offset = 8, \ + .frontPic = {gTrainerFrontPic_##file, TRAINER_PIC_SIZE, TRAINER_PIC_##trainerPic},\ + .palette = {gTrainerPalette_##file, TRAINER_PIC_##trainerPic}, \ + .animation = sAnims_##anims, \ } const struct TrainerSprite gTrainerSprites[] = { - TRAINER_PIC(HIKER, U32("graphics/trainers/front_pics/hiker.4bpp.lz"), U32("graphics/trainers/front_pics/hiker.gbapal.lz"), Trainer), - TRAINER_PIC(AQUA_GRUNT_M, U32("graphics/trainers/front_pics/aqua_grunt_m.4bpp.lz"), U32("graphics/trainers/front_pics/aqua_grunt_m.gbapal.lz"), Trainer), - TRAINER_PIC(POKEMON_BREEDER_F, U32("graphics/trainers/front_pics/pokemon_breeder_f.4bpp.lz"), U32("graphics/trainers/front_pics/pokemon_breeder_f.gbapal.lz"), Trainer), - TRAINER_PIC(COOLTRAINER_M, U32("graphics/trainers/front_pics/cooltrainer_m.4bpp.lz"), U32("graphics/trainers/front_pics/cooltrainer_m.gbapal.lz"), Trainer), - TRAINER_PIC(BIRD_KEEPER, U32("graphics/trainers/front_pics/bird_keeper.4bpp.lz"), U32("graphics/trainers/front_pics/bird_keeper.gbapal.lz"), Trainer), - TRAINER_PIC(COLLECTOR, U32("graphics/trainers/front_pics/collector.4bpp.lz"), U32("graphics/trainers/front_pics/collector.gbapal.lz"), Trainer), - TRAINER_PIC(AQUA_GRUNT_F, U32("graphics/trainers/front_pics/aqua_grunt_f.4bpp.lz"), U32("graphics/trainers/front_pics/aqua_grunt_f.gbapal.lz"), Trainer), - TRAINER_PIC(SWIMMER_M, U32("graphics/trainers/front_pics/swimmer_m.4bpp.lz"), U32("graphics/trainers/front_pics/swimmer_m.gbapal.lz"), Trainer), - TRAINER_PIC(MAGMA_GRUNT_M, U32("graphics/trainers/front_pics/magma_grunt_m.4bpp.lz"), U32("graphics/trainers/front_pics/magma_grunt_m.gbapal.lz"), Trainer), - TRAINER_PIC(EXPERT_M, U32("graphics/trainers/front_pics/expert_m.4bpp.lz"), U32("graphics/trainers/front_pics/expert_m.gbapal.lz"), Trainer), - TRAINER_PIC(AQUA_ADMIN_M, U32("graphics/trainers/front_pics/aqua_admin_m.4bpp.lz"), U32("graphics/trainers/front_pics/aqua_admin_m.gbapal.lz"), Trainer), - TRAINER_PIC(BLACK_BELT, U32("graphics/trainers/front_pics/black_belt.4bpp.lz"), U32("graphics/trainers/front_pics/black_belt.gbapal.lz"), Trainer), - TRAINER_PIC(AQUA_ADMIN_F, U32("graphics/trainers/front_pics/aqua_admin_f.4bpp.lz"), U32("graphics/trainers/front_pics/aqua_admin_f.gbapal.lz"), Trainer), - TRAINER_PIC(AQUA_LEADER_ARCHIE, U32("graphics/trainers/front_pics/aqua_leader_archie.4bpp.lz"), U32("graphics/trainers/front_pics/aqua_leader_archie.gbapal.lz"), Trainer), - TRAINER_PIC(HEX_MANIAC, U32("graphics/trainers/front_pics/hex_maniac.4bpp.lz"), U32("graphics/trainers/front_pics/hex_maniac.gbapal.lz"), Trainer), - TRAINER_PIC(AROMA_LADY, U32("graphics/trainers/front_pics/aroma_lady.4bpp.lz"), U32("graphics/trainers/front_pics/aroma_lady.gbapal.lz"), Trainer), - TRAINER_PIC(RUIN_MANIAC, U32("graphics/trainers/front_pics/ruin_maniac.4bpp.lz"), U32("graphics/trainers/front_pics/ruin_maniac.gbapal.lz"), Trainer), - TRAINER_PIC(INTERVIEWER, U32("graphics/trainers/front_pics/interviewer.4bpp.lz"), U32("graphics/trainers/front_pics/interviewer.gbapal.lz"), Trainer), - TRAINER_PIC(TUBER_F, U32("graphics/trainers/front_pics/tuber_f.4bpp.lz"), U32("graphics/trainers/front_pics/tuber_f.gbapal.lz"), Trainer), - TRAINER_PIC(TUBER_M, U32("graphics/trainers/front_pics/tuber_m.4bpp.lz"), U32("graphics/trainers/front_pics/tuber_m.gbapal.lz"), Trainer), - TRAINER_PIC(COOLTRAINER_F, U32("graphics/trainers/front_pics/cooltrainer_f.4bpp.lz"), U32("graphics/trainers/front_pics/cooltrainer_f.gbapal.lz"), Trainer), - TRAINER_PIC(LADY, U32("graphics/trainers/front_pics/lady.4bpp.lz"), U32("graphics/trainers/front_pics/lady.gbapal.lz"), Trainer), - TRAINER_PIC(BEAUTY, U32("graphics/trainers/front_pics/beauty.4bpp.lz"), U32("graphics/trainers/front_pics/beauty.gbapal.lz"), Trainer), - TRAINER_PIC(RICH_BOY, U32("graphics/trainers/front_pics/rich_boy.4bpp.lz"), U32("graphics/trainers/front_pics/rich_boy.gbapal.lz"), Trainer), - TRAINER_PIC(EXPERT_F, U32("graphics/trainers/front_pics/expert_f.4bpp.lz"), U32("graphics/trainers/front_pics/expert_f.gbapal.lz"), Trainer), - TRAINER_PIC(POKEMANIAC, U32("graphics/trainers/front_pics/pokemaniac.4bpp.lz"), U32("graphics/trainers/front_pics/pokemaniac.gbapal.lz"), Trainer), - TRAINER_PIC(MAGMA_GRUNT_F, U32("graphics/trainers/front_pics/magma_grunt_f.4bpp.lz"), U32("graphics/trainers/front_pics/magma_grunt_f.gbapal.lz"), Trainer), - TRAINER_PIC(GUITARIST, U32("graphics/trainers/front_pics/guitarist.4bpp.lz"), U32("graphics/trainers/front_pics/guitarist.gbapal.lz"), Trainer), - TRAINER_PIC(KINDLER, U32("graphics/trainers/front_pics/kindler.4bpp.lz"), U32("graphics/trainers/front_pics/kindler.gbapal.lz"), Trainer), - TRAINER_PIC(CAMPER, U32("graphics/trainers/front_pics/camper.4bpp.lz"), U32("graphics/trainers/front_pics/camper.gbapal.lz"), Trainer), - TRAINER_PIC(PICNICKER, U32("graphics/trainers/front_pics/picnicker.4bpp.lz"), U32("graphics/trainers/front_pics/picnicker.gbapal.lz"), Trainer), - TRAINER_PIC(BUG_MANIAC, U32("graphics/trainers/front_pics/bug_maniac.4bpp.lz"), U32("graphics/trainers/front_pics/bug_maniac.gbapal.lz"), Trainer), - TRAINER_PIC(POKEMON_BREEDER_M, U32("graphics/trainers/front_pics/pokemon_breeder_m.4bpp.lz"), U32("graphics/trainers/front_pics/pokemon_breeder_m.gbapal.lz"), Trainer), - TRAINER_PIC(PSYCHIC_M, U32("graphics/trainers/front_pics/psychic_m.4bpp.lz"), U32("graphics/trainers/front_pics/psychic_m.gbapal.lz"), Trainer), - TRAINER_PIC(PSYCHIC_F, U32("graphics/trainers/front_pics/psychic_f.4bpp.lz"), U32("graphics/trainers/front_pics/psychic_f.gbapal.lz"), Trainer), - TRAINER_PIC(GENTLEMAN, U32("graphics/trainers/front_pics/gentleman.4bpp.lz"), U32("graphics/trainers/front_pics/gentleman.gbapal.lz"), Trainer), - TRAINER_PIC(ELITE_FOUR_SIDNEY, U32("graphics/trainers/front_pics/elite_four_sidney.4bpp.lz"), U32("graphics/trainers/front_pics/elite_four_sidney.gbapal.lz"), Trainer), - TRAINER_PIC(ELITE_FOUR_PHOEBE, U32("graphics/trainers/front_pics/elite_four_phoebe.4bpp.lz"), U32("graphics/trainers/front_pics/elite_four_phoebe.gbapal.lz"), Trainer), - TRAINER_PIC(ELITE_FOUR_GLACIA, U32("graphics/trainers/front_pics/elite_four_glacia.4bpp.lz"), U32("graphics/trainers/front_pics/elite_four_glacia.gbapal.lz"), Trainer), - TRAINER_PIC(ELITE_FOUR_DRAKE, U32("graphics/trainers/front_pics/elite_four_drake.4bpp.lz"), U32("graphics/trainers/front_pics/elite_four_drake.gbapal.lz"), Trainer), - TRAINER_PIC(LEADER_ROXANNE, U32("graphics/trainers/front_pics/leader_roxanne.4bpp.lz"), U32("graphics/trainers/front_pics/leader_roxanne.gbapal.lz"), Trainer), - TRAINER_PIC(LEADER_BRAWLY, U32("graphics/trainers/front_pics/leader_brawly.4bpp.lz"), U32("graphics/trainers/front_pics/leader_brawly.gbapal.lz"), Trainer), - TRAINER_PIC(LEADER_WATTSON, U32("graphics/trainers/front_pics/leader_wattson.4bpp.lz"), U32("graphics/trainers/front_pics/leader_wattson.gbapal.lz"), Trainer), - TRAINER_PIC(LEADER_FLANNERY, U32("graphics/trainers/front_pics/leader_flannery.4bpp.lz"), U32("graphics/trainers/front_pics/leader_flannery.gbapal.lz"), Trainer), - TRAINER_PIC(LEADER_NORMAN, U32("graphics/trainers/front_pics/leader_norman.4bpp.lz"), U32("graphics/trainers/front_pics/leader_norman.gbapal.lz"), Trainer), - TRAINER_PIC(LEADER_WINONA, U32("graphics/trainers/front_pics/leader_winona.4bpp.lz"), U32("graphics/trainers/front_pics/leader_winona.gbapal.lz"), Trainer), - TRAINER_PIC(LEADER_TATE_AND_LIZA, U32("graphics/trainers/front_pics/leader_tate_and_liza.4bpp.lz"), U32("graphics/trainers/front_pics/leader_tate_and_liza.gbapal.lz"), Trainer), - TRAINER_PIC(LEADER_JUAN, U32("graphics/trainers/front_pics/leader_juan.4bpp.lz"), U32("graphics/trainers/front_pics/leader_juan.gbapal.lz"), Trainer), - TRAINER_PIC(SCHOOL_KID_M, U32("graphics/trainers/front_pics/school_kid_m.4bpp.lz"), U32("graphics/trainers/front_pics/school_kid_m.gbapal.lz"), Trainer), - TRAINER_PIC(SCHOOL_KID_F, U32("graphics/trainers/front_pics/school_kid_f.4bpp.lz"), U32("graphics/trainers/front_pics/school_kid_f.gbapal.lz"), Trainer), - TRAINER_PIC(SR_AND_JR, U32("graphics/trainers/front_pics/sr_and_jr.4bpp.lz"), U32("graphics/trainers/front_pics/sr_and_jr.gbapal.lz"), Trainer), - TRAINER_PIC(POKEFAN_M, U32("graphics/trainers/front_pics/pokefan_m.4bpp.lz"), U32("graphics/trainers/front_pics/pokefan_m.gbapal.lz"), Trainer), - TRAINER_PIC(POKEFAN_F, U32("graphics/trainers/front_pics/pokefan_f.4bpp.lz"), U32("graphics/trainers/front_pics/pokefan_f.gbapal.lz"), Trainer), - TRAINER_PIC(YOUNGSTER, U32("graphics/trainers/front_pics/youngster.4bpp.lz"), U32("graphics/trainers/front_pics/youngster.gbapal.lz"), Trainer), - TRAINER_PIC(CHAMPION_WALLACE, U32("graphics/trainers/front_pics/champion_wallace.4bpp.lz"), U32("graphics/trainers/front_pics/champion_wallace.gbapal.lz"), Trainer), - TRAINER_PIC(FISHERMAN, U32("graphics/trainers/front_pics/fisherman.4bpp.lz"), U32("graphics/trainers/front_pics/fisherman.gbapal.lz"), Trainer), - TRAINER_PIC(CYCLING_TRIATHLETE_M, U32("graphics/trainers/front_pics/cycling_triathlete_m.4bpp.lz"), U32("graphics/trainers/front_pics/cycling_triathlete_m.gbapal.lz"), Trainer), - TRAINER_PIC(CYCLING_TRIATHLETE_F, U32("graphics/trainers/front_pics/cycling_triathlete_f.4bpp.lz"), U32("graphics/trainers/front_pics/cycling_triathlete_f.gbapal.lz"), Trainer), - TRAINER_PIC(RUNNING_TRIATHLETE_M, U32("graphics/trainers/front_pics/running_triathlete_m.4bpp.lz"), U32("graphics/trainers/front_pics/running_triathlete_m.gbapal.lz"), Trainer), - TRAINER_PIC(RUNNING_TRIATHLETE_F, U32("graphics/trainers/front_pics/running_triathlete_f.4bpp.lz"), U32("graphics/trainers/front_pics/running_triathlete_f.gbapal.lz"), Trainer), - TRAINER_PIC(SWIMMING_TRIATHLETE_M, U32("graphics/trainers/front_pics/swimming_triathlete_m.4bpp.lz"), U32("graphics/trainers/front_pics/swimming_triathlete_m.gbapal.lz"), Trainer), - TRAINER_PIC(SWIMMING_TRIATHLETE_F, U32("graphics/trainers/front_pics/swimming_triathlete_f.4bpp.lz"), U32("graphics/trainers/front_pics/swimming_triathlete_f.gbapal.lz"), Trainer), - TRAINER_PIC(DRAGON_TAMER, U32("graphics/trainers/front_pics/dragon_tamer.4bpp.lz"), U32("graphics/trainers/front_pics/dragon_tamer.gbapal.lz"), Trainer), - TRAINER_PIC(NINJA_BOY, U32("graphics/trainers/front_pics/ninja_boy.4bpp.lz"), U32("graphics/trainers/front_pics/ninja_boy.gbapal.lz"), Trainer), - TRAINER_PIC(BATTLE_GIRL, U32("graphics/trainers/front_pics/battle_girl.4bpp.lz"), U32("graphics/trainers/front_pics/battle_girl.gbapal.lz"), Trainer), - TRAINER_PIC(PARASOL_LADY, U32("graphics/trainers/front_pics/parasol_lady.4bpp.lz"), U32("graphics/trainers/front_pics/parasol_lady.gbapal.lz"), Trainer), - TRAINER_PIC(SWIMMER_F, U32("graphics/trainers/front_pics/swimmer_f.4bpp.lz"), U32("graphics/trainers/front_pics/swimmer_f.gbapal.lz"), Trainer), - TRAINER_PIC(TWINS, U32("graphics/trainers/front_pics/twins.4bpp.lz"), U32("graphics/trainers/front_pics/twins.gbapal.lz"), Trainer), - TRAINER_PIC(SAILOR, U32("graphics/trainers/front_pics/sailor.4bpp.lz"), U32("graphics/trainers/front_pics/sailor.gbapal.lz"), Trainer), - TRAINER_PIC(MAGMA_ADMIN, U32("graphics/trainers/front_pics/magma_admin.4bpp.lz"), U32("graphics/trainers/front_pics/magma_admin.gbapal.lz"), Trainer), - TRAINER_PIC(WALLY, U32("graphics/trainers/front_pics/wally.4bpp.lz"), U32("graphics/trainers/palettes/wally.gbapal.lz"), Trainer), - TRAINER_PIC(BRENDAN, U32("graphics/trainers/front_pics/brendan.4bpp.lz"), U32("graphics/trainers/palettes/brendan.gbapal.lz"), Trainer), - TRAINER_PIC(MAY, U32("graphics/trainers/front_pics/may.4bpp.lz"), U32("graphics/trainers/palettes/may.gbapal.lz"), Trainer), - TRAINER_PIC(BUG_CATCHER, U32("graphics/trainers/front_pics/bug_catcher.4bpp.lz"), U32("graphics/trainers/front_pics/bug_catcher.gbapal.lz"), Trainer), - TRAINER_PIC(POKEMON_RANGER_M, U32("graphics/trainers/front_pics/pokemon_ranger_m.4bpp.lz"), U32("graphics/trainers/front_pics/pokemon_ranger_m.gbapal.lz"), Trainer), - TRAINER_PIC(POKEMON_RANGER_F, U32("graphics/trainers/front_pics/pokemon_ranger_f.4bpp.lz"), U32("graphics/trainers/front_pics/pokemon_ranger_f.gbapal.lz"), Trainer), - TRAINER_PIC(MAGMA_LEADER_MAXIE, U32("graphics/trainers/front_pics/magma_leader_maxie.4bpp.lz"), U32("graphics/trainers/front_pics/magma_leader_maxie.gbapal.lz"), Trainer), - TRAINER_PIC(LASS, U32("graphics/trainers/front_pics/lass.4bpp.lz"), U32("graphics/trainers/front_pics/lass.gbapal.lz"), Trainer), - TRAINER_PIC(YOUNG_COUPLE, U32("graphics/trainers/front_pics/young_couple.4bpp.lz"), U32("graphics/trainers/front_pics/young_couple.gbapal.lz"), Trainer), - TRAINER_PIC(OLD_COUPLE, U32("graphics/trainers/front_pics/old_couple.4bpp.lz"), U32("graphics/trainers/front_pics/old_couple.gbapal.lz"), Trainer), - TRAINER_PIC(SIS_AND_BRO, U32("graphics/trainers/front_pics/sis_and_bro.4bpp.lz"), U32("graphics/trainers/front_pics/sis_and_bro.gbapal.lz"), Trainer), - TRAINER_PIC(STEVEN, U32("graphics/trainers/front_pics/steven.4bpp.lz"), U32("graphics/trainers/front_pics/steven.gbapal.lz"), Trainer), - TRAINER_PIC(SALON_MAIDEN_ANABEL, U32("graphics/trainers/front_pics/salon_maiden_anabel.4bpp.lz"), U32("graphics/trainers/front_pics/salon_maiden_anabel.gbapal.lz"), Trainer), - TRAINER_PIC(DOME_ACE_TUCKER, U32("graphics/trainers/front_pics/dome_ace_tucker.4bpp.lz"), U32("graphics/trainers/front_pics/dome_ace_tucker.gbapal.lz"), Trainer), - TRAINER_PIC(PALACE_MAVEN_SPENSER, U32("graphics/trainers/front_pics/palace_maven_spenser.4bpp.lz"), U32("graphics/trainers/front_pics/palace_maven_spenser.gbapal.lz"), Trainer), - TRAINER_PIC(ARENA_TYCOON_GRETA, U32("graphics/trainers/front_pics/arena_tycoon_greta.4bpp.lz"), U32("graphics/trainers/front_pics/arena_tycoon_greta.gbapal.lz"), Trainer), - TRAINER_PIC(FACTORY_HEAD_NOLAND, U32("graphics/trainers/front_pics/factory_head_noland.4bpp.lz"), U32("graphics/trainers/front_pics/factory_head_noland.gbapal.lz"), Trainer), - TRAINER_PIC(PIKE_QUEEN_LUCY, U32("graphics/trainers/front_pics/pike_queen_lucy.4bpp.lz"), U32("graphics/trainers/front_pics/pike_queen_lucy.gbapal.lz"), Trainer), - TRAINER_PIC(PYRAMID_KING_BRANDON, U32("graphics/trainers/front_pics/pyramid_king_brandon.4bpp.lz"), U32("graphics/trainers/front_pics/pyramid_king_brandon.gbapal.lz"), Trainer), - TRAINER_PIC(RED, U32("graphics/trainers/front_pics/red.4bpp.lz"), U32("graphics/trainers/front_pics/red.gbapal.lz"), Trainer), - TRAINER_PIC(LEAF, U32("graphics/trainers/front_pics/leaf.4bpp.lz"), U32("graphics/trainers/front_pics/leaf.gbapal.lz"), Trainer), - TRAINER_PIC(RS_BRENDAN, U32("graphics/trainers/front_pics/brendan_rs.4bpp.lz"), U32("graphics/trainers/palettes/brendan_rs.gbapal.lz"), Trainer), - TRAINER_PIC(RS_MAY, U32("graphics/trainers/front_pics/may_rs.4bpp.lz"), U32("graphics/trainers/palettes/may_rs.gbapal.lz"), Trainer), + TRAINER_PIC(HIKER, Hiker, Trainer), + TRAINER_PIC(AQUA_GRUNT_M, AquaGruntM, Trainer), + TRAINER_PIC(POKEMON_BREEDER_F, PokemonBreederF, Trainer), + TRAINER_PIC(COOLTRAINER_M, CoolTrainerM, Trainer), + TRAINER_PIC(BIRD_KEEPER, BirdKeeper, Trainer), + TRAINER_PIC(COLLECTOR, Collector, Trainer), + TRAINER_PIC(AQUA_GRUNT_F, AquaGruntF, Trainer), + TRAINER_PIC(SWIMMER_M, SwimmerM, Trainer), + TRAINER_PIC(MAGMA_GRUNT_M, MagmaGruntM, Trainer), + TRAINER_PIC(EXPERT_M, ExpertM, Trainer), + TRAINER_PIC(AQUA_ADMIN_M, AquaAdminM, Trainer), + TRAINER_PIC(BLACK_BELT, BlackBelt, Trainer), + TRAINER_PIC(AQUA_ADMIN_F, AquaAdminF, Trainer), + TRAINER_PIC(AQUA_LEADER_ARCHIE, AquaLeaderArchie, Trainer), + TRAINER_PIC(HEX_MANIAC, HexManiac, Trainer), + TRAINER_PIC(AROMA_LADY, AromaLady, Trainer), + TRAINER_PIC(RUIN_MANIAC, RuinManiac, Trainer), + TRAINER_PIC(INTERVIEWER, Interviewer, Trainer), + TRAINER_PIC(TUBER_F, TuberF, Trainer), + TRAINER_PIC(TUBER_M, TuberM, Trainer), + TRAINER_PIC(COOLTRAINER_F, CoolTrainerF, Trainer), + TRAINER_PIC(LADY, Lady, Trainer), + TRAINER_PIC(BEAUTY, Beauty, Trainer), + TRAINER_PIC(RICH_BOY, RichBoy, Trainer), + TRAINER_PIC(EXPERT_F, ExpertF, Trainer), + TRAINER_PIC(POKEMANIAC, Pokemaniac, Trainer), + TRAINER_PIC(MAGMA_GRUNT_F, MagmaGruntF, Trainer), + TRAINER_PIC(GUITARIST, Guitarist, Trainer), + TRAINER_PIC(KINDLER, Kindler, Trainer), + TRAINER_PIC(CAMPER, Camper, Trainer), + TRAINER_PIC(PICNICKER, Picnicker, Trainer), + TRAINER_PIC(BUG_MANIAC, BugManiac, Trainer), + TRAINER_PIC(POKEMON_BREEDER_M, PokemonBreederM, Trainer), + TRAINER_PIC(PSYCHIC_M, PsychicM, Trainer), + TRAINER_PIC(PSYCHIC_F, PsychicF, Trainer), + TRAINER_PIC(GENTLEMAN, Gentleman, Trainer), + TRAINER_PIC(ELITE_FOUR_SIDNEY, EliteFourSidney, Trainer), + TRAINER_PIC(ELITE_FOUR_PHOEBE, EliteFourPhoebe, Trainer), + TRAINER_PIC(ELITE_FOUR_GLACIA, EliteFourGlacia, Trainer), + TRAINER_PIC(ELITE_FOUR_DRAKE, EliteFourDrake, Trainer), + TRAINER_PIC(LEADER_ROXANNE, LeaderRoxanne, Trainer), + TRAINER_PIC(LEADER_BRAWLY, LeaderBrawly, Trainer), + TRAINER_PIC(LEADER_WATTSON, LeaderWattson, Trainer), + TRAINER_PIC(LEADER_FLANNERY, LeaderFlannery, Trainer), + TRAINER_PIC(LEADER_NORMAN, LeaderNorman, Trainer), + TRAINER_PIC(LEADER_WINONA, LeaderWinona, Trainer), + TRAINER_PIC(LEADER_TATE_AND_LIZA, LeaderTateAndLiza, Trainer), + TRAINER_PIC(LEADER_JUAN, LeaderJuan, Trainer), + TRAINER_PIC(SCHOOL_KID_M, SchoolKidM, Trainer), + TRAINER_PIC(SCHOOL_KID_F, SchoolKidF, Trainer), + TRAINER_PIC(SR_AND_JR, SrAndJr, Trainer), + TRAINER_PIC(POKEFAN_M, PokefanM, Trainer), + TRAINER_PIC(POKEFAN_F, PokefanF, Trainer), + TRAINER_PIC(YOUNGSTER, Youngster, Trainer), + TRAINER_PIC(CHAMPION_WALLACE, ChampionWallace, Trainer), + TRAINER_PIC(FISHERMAN, Fisherman, Trainer), + TRAINER_PIC(CYCLING_TRIATHLETE_M, CyclingTriathleteM, Trainer), + TRAINER_PIC(CYCLING_TRIATHLETE_F, CyclingTriathleteF, Trainer), + TRAINER_PIC(RUNNING_TRIATHLETE_M, RunningTriathleteM, Trainer), + TRAINER_PIC(RUNNING_TRIATHLETE_F, RunningTriathleteF, Trainer), + TRAINER_PIC(SWIMMING_TRIATHLETE_M, SwimmingTriathleteM, Trainer), + TRAINER_PIC(SWIMMING_TRIATHLETE_F, SwimmingTriathleteF, Trainer), + TRAINER_PIC(DRAGON_TAMER, DragonTamer, Trainer), + TRAINER_PIC(NINJA_BOY, NinjaBoy, Trainer), + TRAINER_PIC(BATTLE_GIRL, BattleGirl, Trainer), + TRAINER_PIC(PARASOL_LADY, ParasolLady, Trainer), + TRAINER_PIC(SWIMMER_F, SwimmerF, Trainer), + TRAINER_PIC(TWINS, Twins, Trainer), + TRAINER_PIC(SAILOR, Sailor, Trainer), + TRAINER_PIC(MAGMA_ADMIN, MagmaAdmin, Trainer), + TRAINER_PIC(WALLY, Wally, Trainer), + TRAINER_PIC(BRENDAN, Brendan, Trainer), + TRAINER_PIC(MAY, May, Trainer), + TRAINER_PIC(BUG_CATCHER, BugCatcher, Trainer), + TRAINER_PIC(POKEMON_RANGER_M, PokemonRangerM, Trainer), + TRAINER_PIC(POKEMON_RANGER_F, PokemonRangerF, Trainer), + TRAINER_PIC(MAGMA_LEADER_MAXIE, MagmaLeaderMaxie, Trainer), + TRAINER_PIC(LASS, Lass, Trainer), + TRAINER_PIC(YOUNG_COUPLE, YoungCouple, Trainer), + TRAINER_PIC(OLD_COUPLE, OldCouple, Trainer), + TRAINER_PIC(SIS_AND_BRO, SisAndBro, Trainer), + TRAINER_PIC(STEVEN, Steven, Trainer), + TRAINER_PIC(SALON_MAIDEN_ANABEL, SalonMaidenAnabel, Trainer), + TRAINER_PIC(DOME_ACE_TUCKER, DomeAceTucker, Trainer), + TRAINER_PIC(PALACE_MAVEN_SPENSER, PalaceMavenSpenser, Trainer), + TRAINER_PIC(ARENA_TYCOON_GRETA, ArenaTycoonGreta, Trainer), + TRAINER_PIC(FACTORY_HEAD_NOLAND, FactoryHeadNoland, Trainer), + TRAINER_PIC(PIKE_QUEEN_LUCY, PikeQueenLucy, Trainer), + TRAINER_PIC(PYRAMID_KING_BRANDON, PyramidKingBrandon, Trainer), + TRAINER_PIC(RED, Red, Trainer), + TRAINER_PIC(LEAF, Leaf, Trainer), + TRAINER_PIC(RS_BRENDAN, RubySapphireBrendan, Trainer), + TRAINER_PIC(RS_MAY, RubySapphireMay, Trainer), }; From fd06116aed8f36189914b2eefc45f79f61c29ae1 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 26 Nov 2023 18:12:42 -0500 Subject: [PATCH 17/25] Added backsprite struct --- include/data.h | 9 ++- src/battle_controller_link_partner.c | 4 +- src/battle_controller_player.c | 6 +- src/battle_controller_player_partner.c | 4 +- src/battle_controller_recorded_player.c | 4 +- src/battle_controller_safari.c | 2 +- src/battle_controller_wally.c | 4 +- src/battle_controllers.c | 2 +- src/battle_gfx_sfx_util.c | 2 +- src/data/graphics/trainers.h | 53 ++++++++++++++ src/data/trainer_graphics/back_pic_tables.h | 76 +++------------------ src/reshow_battle_screen.c | 4 +- 12 files changed, 86 insertions(+), 84 deletions(-) diff --git a/include/data.h b/include/data.h index 64d1090bd8c4..25a1595e3261 100644 --- a/include/data.h +++ b/include/data.h @@ -36,6 +36,12 @@ struct TrainerSprite const union AnimCmd *const *const animation; }; +struct TrainerBacksprite +{ + struct MonCoords coordinates; + struct CompressedSpritePalette palette; +}; + #define MON_COORDS_SIZE(width, height)(DIV_ROUND_UP(width, 8) << 4 | DIV_ROUND_UP(height, 8)) #define GET_MON_COORDS_WIDTH(size)((size >> 4) * 8) #define GET_MON_COORDS_HEIGHT(size)((size & 0xF) * 8) @@ -101,10 +107,9 @@ extern const union AffineAnimCmd *const gAffineAnims_BattleSpriteContest[]; extern const union AnimCmd sAnim_GeneralFrame0[]; extern const union AnimCmd *const gAnims_MonPic[]; extern const struct TrainerSprite gTrainerSprites[]; +extern const struct TrainerBacksprite gTrainerBacksprites[]; extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[]; -extern const struct MonCoords gTrainerBackPicCoords[]; extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; // functionally unused -extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern const struct Trainer gTrainers[]; extern const struct Trainer gBattlePartners[]; diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 4b8daeb1e1fd..58bbe676f096 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -234,7 +234,7 @@ static void LinkPartnerHandleDrawTrainerPic(u32 battler) trainerPicId = LinkPlayerGetTrainerPicId(GetBattlerMultiplayerId(battler)); BtlController_HandleDrawTrainerPic(battler, trainerPicId, FALSE, - xPos, 80 + 4 * (8 - gTrainerBackPicCoords[trainerPicId].size), + xPos, 80 + 4 * (8 - gTrainerBacksprites[trainerPicId].coordinates.size), -1); } @@ -261,7 +261,7 @@ static void LinkPartnerHandleHealthBarUpdate(u32 battler) static void LinkPartnerHandleIntroTrainerBallThrow(u32 battler) { u32 trainerPicId = LinkPlayerGetTrainerPicId(GetBattlerMultiplayerId(battler)); - const u32 *trainerPal = gTrainerBackPicPaletteTable[trainerPicId].data; + const u32 *trainerPal = gTrainerBacksprites[trainerPicId].palette.data; // Link partner uses the same intro sequence as the player partner. BtlController_HandleIntroTrainerBallThrow(battler, 0xD6F9, trainerPal, 24, Controller_PlayerPartnerShowIntroHealthbox); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index cc701b1b12a1..10f0951950b2 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1883,14 +1883,14 @@ static void PlayerHandleDrawTrainerPic(u32 battler) } else { - yPos = (8 - gTrainerBackPicCoords[trainerPicId].size) * 4 + 80; + yPos = (8 - gTrainerBacksprites[trainerPicId].coordinates.size) * 4 + 80; } } else { xPos = 80; - yPos = (8 - gTrainerBackPicCoords[trainerPicId].size) * 4 + 80; + yPos = (8 - gTrainerBacksprites[trainerPicId].coordinates.size) * 4 + 80; } // Use front pic table for any tag battles unless your partner is Steven or a custom partner. @@ -2233,7 +2233,7 @@ static void PlayerHandleOneReturnValue_Duplicate(u32 battler) static void PlayerHandleIntroTrainerBallThrow(u32 battler) { - const u32 *trainerPal = gTrainerBackPicPaletteTable[gSaveBlock2Ptr->playerGender].data; + const u32 *trainerPal = gTrainerBacksprites[gSaveBlock2Ptr->playerGender].palette.data; BtlController_HandleIntroTrainerBallThrow(battler, 0xD6F8, trainerPal, 31, Intro_TryShinyAnimShowHealthbox); } diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 9bdfbefbc668..62941c92af49 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -301,7 +301,7 @@ static void PlayerPartnerHandleDrawTrainerPic(u32 battler) { trainerPicId = gBattlePartners[gPartnerTrainerId - TRAINER_PARTNER(PARTNER_NONE)].trainerPic; xPos = 90; - yPos = (8 - gTrainerBackPicCoords[trainerPicId].size) * 4 + 80; + yPos = (8 - gTrainerBacksprites[trainerPicId].coordinates.size) * 4 + 80; } else if (IsAiVsAiBattle()) { @@ -435,7 +435,7 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(u32 battler) const u32 *trainerPal; if (gPartnerTrainerId > TRAINER_PARTNER(PARTNER_NONE)) - trainerPal = gTrainerBackPicPaletteTable[gPartnerSpriteId].data; + trainerPal = gTrainerBacksprites[gPartnerSpriteId].palette.data; else if (IsAiVsAiBattle()) trainerPal = gTrainerSprites[gTrainers[gPartnerTrainerId].trainerPic].palette.data; else diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index f020f0e09657..b8322b3eaf64 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -397,14 +397,14 @@ static void RecordedPlayerHandleDrawTrainerPic(u32 battler) } else { - yPos = (8 - gTrainerBackPicCoords[trainerPicId].size) * 4 + 80; + yPos = (8 - gTrainerBacksprites[trainerPicId].coordinates.size) * 4 + 80; } } else { xPos = 80; - yPos = (8 - gTrainerBackPicCoords[trainerPicId].size) * 4 + 80; + yPos = (8 - gTrainerBacksprites[trainerPicId].coordinates.size) * 4 + 80; } if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index b5a64c286b8e..39fbc63ab6d2 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -249,7 +249,7 @@ static void SafariHandleDrawTrainerPic(u32 battler) u32 trainerPicId = gSaveBlock2Ptr->playerGender + TRAINER_BACK_PIC_BRENDAN; BtlController_HandleDrawTrainerPic(battler, trainerPicId, FALSE, - 80, 80 + 4 * (8 - gTrainerBackPicCoords[trainerPicId].size), + 80, 80 + 4 * (8 - gTrainerBacksprites[trainerPicId].coordinates.size), 30); } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index a262886f4614..7b0bb6f154f4 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -297,7 +297,7 @@ static void WallyBufferExecCompleted(u32 battler) static void WallyHandleDrawTrainerPic(u32 battler) { BtlController_HandleDrawTrainerPic(battler, TRAINER_BACK_PIC_WALLY, FALSE, - 80, 80 + 4 * (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].size), + 80, 80 + 4 * (8 - gTrainerBacksprites[TRAINER_BACK_PIC_WALLY].coordinates.size), 30); } @@ -420,7 +420,7 @@ static void WallyHandleFaintingCry(u32 battler) static void WallyHandleIntroTrainerBallThrow(u32 battler) { - const u32 *trainerPal = gTrainerBackPicPaletteTable[TRAINER_BACK_PIC_WALLY].data; + const u32 *trainerPal = gTrainerBacksprites[TRAINER_BACK_PIC_WALLY].palette.data; BtlController_HandleIntroTrainerBallThrow(battler, 0xD6F8, trainerPal, 31, Intro_TryShinyAnimShowHealthbox); } diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 1822e984b6cc..632d7e50d848 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -2532,7 +2532,7 @@ void BtlController_HandleTrainerSlide(u32 battler, u32 trainerPicId) SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(battler)); gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, 80, - (8 - gTrainerBackPicCoords[trainerPicId].size) * 4 + 80, + (8 - gTrainerBacksprites[trainerPicId].coordinates.size) * 4 + 80, 30); gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; gSprites[gBattlerSpriteIds[battler]].x2 = -96; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 02a10543331e..f93da6563e97 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -660,7 +660,7 @@ void DecompressTrainerBackPic(u16 backPicId, u8 battler) u8 position = GetBattlerPosition(battler); DecompressPicFromTable(&gTrainerBackPicTable[backPicId], gMonSpritesGfxPtr->sprites.ptr[position]); - LoadCompressedPalette(gTrainerBackPicPaletteTable[backPicId].data, + LoadCompressedPalette(gTrainerBacksprites[backPicId].palette.data, OBJ_PLTT_ID(battler), PLTT_SIZE_4BPP); } diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 3cbeb181e0ec..d7082f644525 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -401,3 +401,56 @@ const struct TrainerSprite gTrainerSprites[] = TRAINER_PIC(RS_BRENDAN, RubySapphireBrendan, Trainer), TRAINER_PIC(RS_MAY, RubySapphireMay, Trainer), }; + +#define TRAINER_BACK_PAL(pal, trainerPic) {gTrainer##pal, TRAINER_BACK_PIC_##trainerPic} + +const struct TrainerBacksprite gTrainerBacksprites[] = +{ + [TRAINER_BACK_PIC_BRENDAN] = + { + .coordinates = {.size = 8, .y_offset = 4}, + .palette = TRAINER_BACK_PAL(Palette_Brendan, BRENDAN), + }, + + [TRAINER_BACK_PIC_MAY] = + { + .coordinates = {.size = 8, .y_offset = 4}, + .palette = TRAINER_BACK_PAL(Palette_May, MAY), + }, + + [TRAINER_BACK_PIC_RED] = + { + .coordinates = {.size = 8, .y_offset = 5}, + .palette = TRAINER_BACK_PAL(BackPicPalette_Red, RED), + }, + + [TRAINER_BACK_PIC_LEAF] = + { + .coordinates = {.size = 8, .y_offset = 5}, + .palette = TRAINER_BACK_PAL(BackPicPalette_Leaf, LEAF), + }, + + [TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN] = + { + .coordinates = {.size = 8, .y_offset = 4}, + .palette = TRAINER_BACK_PAL(Palette_RubySapphireBrendan, RUBY_SAPPHIRE_BRENDAN), + }, + + [TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY] = + { + .coordinates = {.size = 8, .y_offset = 4}, + .palette = TRAINER_BACK_PAL(Palette_RubySapphireMay, RUBY_SAPPHIRE_MAY), + }, + + [TRAINER_BACK_PIC_WALLY] = + { + .coordinates = {.size = 8, .y_offset = 4}, + .palette = TRAINER_BACK_PAL(Palette_Wally, WALLY), + }, + + [TRAINER_BACK_PIC_STEVEN] = + { + .coordinates = {.size = 8, .y_offset = 4}, + .palette = TRAINER_BACK_PAL(Palette_Steven, STEVEN), + }, +}; diff --git a/src/data/trainer_graphics/back_pic_tables.h b/src/data/trainer_graphics/back_pic_tables.h index 524d48d480ef..d5011a5b29ef 100644 --- a/src/data/trainer_graphics/back_pic_tables.h +++ b/src/data/trainer_graphics/back_pic_tables.h @@ -1,72 +1,16 @@ -const struct MonCoords gTrainerBackPicCoords[] = -{ - [TRAINER_BACK_PIC_BRENDAN] = {.size = 8, .y_offset = 4}, - [TRAINER_BACK_PIC_MAY] = {.size = 8, .y_offset = 4}, - [TRAINER_BACK_PIC_RED] = {.size = 8, .y_offset = 5}, - [TRAINER_BACK_PIC_LEAF] = {.size = 8, .y_offset = 5}, - [TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN] = {.size = 8, .y_offset = 4}, - [TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY] = {.size = 8, .y_offset = 4}, - [TRAINER_BACK_PIC_WALLY] = {.size = 8, .y_offset = 4}, - [TRAINER_BACK_PIC_STEVEN] = {.size = 8, .y_offset = 4}, -}; +#define TRAINER_BACK_SPRITE_SHEET(trainerPic, sprite) [TRAINER_BACK_PIC_##trainerPic] = {(const u32 *)gTrainerBackPic_##sprite, TRAINER_PIC_SIZE * ARRAY_COUNT(gTrainerBackPicTable_##sprite), TRAINER_BACK_PIC_##trainerPic} -// this table goes functionally unused, since none of these pics are compressed +// This table goes functionally unused, since none of these pics are compressed // and the place they would get extracted to gets overwritten later anyway // the casts are so they'll play nice with the strict struct definition const struct CompressedSpriteSheet gTrainerBackPicTable[] = { - [TRAINER_BACK_PIC_BRENDAN] = { - .data = (const u32 *)gTrainerBackPic_Brendan, - .size = TRAINER_PIC_SIZE * ARRAY_COUNT(gTrainerBackPicTable_Brendan), - .tag = TRAINER_BACK_PIC_BRENDAN, - }, - [TRAINER_BACK_PIC_MAY] = { - .data = (const u32 *)gTrainerBackPic_May, - .size = TRAINER_PIC_SIZE * ARRAY_COUNT(gTrainerBackPicTable_May), - .tag = TRAINER_BACK_PIC_MAY, - }, - [TRAINER_BACK_PIC_RED] = { - .data = (const u32 *)gTrainerBackPic_Red, - .size = TRAINER_PIC_SIZE * ARRAY_COUNT(gTrainerBackPicTable_Red), - .tag = TRAINER_BACK_PIC_RED, - }, - [TRAINER_BACK_PIC_LEAF] = { - .data = (const u32 *)gTrainerBackPic_Leaf, - .size = TRAINER_PIC_SIZE * ARRAY_COUNT(gTrainerBackPicTable_Leaf), - .tag = TRAINER_BACK_PIC_LEAF, - }, - [TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN] = { - .data = (const u32 *)gTrainerBackPic_RubySapphireBrendan, - .size = TRAINER_PIC_SIZE * ARRAY_COUNT(gTrainerBackPicTable_RubySapphireBrendan), - .tag = TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN, - }, - [TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY] = { - .data = (const u32 *)gTrainerBackPic_RubySapphireMay, - .size = TRAINER_PIC_SIZE * ARRAY_COUNT(gTrainerBackPicTable_RubySapphireMay), - .tag = TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY, - }, - [TRAINER_BACK_PIC_WALLY] = { - .data = (const u32 *)gTrainerBackPic_Wally, - .size = TRAINER_PIC_SIZE * ARRAY_COUNT(gTrainerBackPicTable_Wally), - .tag = TRAINER_BACK_PIC_WALLY, - }, - [TRAINER_BACK_PIC_STEVEN] = { - .data = (const u32 *)gTrainerBackPic_Steven, - .size = TRAINER_PIC_SIZE * ARRAY_COUNT(gTrainerBackPicTable_Steven), - .tag = TRAINER_BACK_PIC_STEVEN, - }, -}; - -#define TRAINER_BACK_PAL(trainerPic, pal) [TRAINER_BACK_PIC_##trainerPic] = {pal, TRAINER_BACK_PIC_##trainerPic} - -const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] = -{ - TRAINER_BACK_PAL(BRENDAN, gTrainerPalette_Brendan), - TRAINER_BACK_PAL(MAY, gTrainerPalette_May), - TRAINER_BACK_PAL(RED, gTrainerBackPicPalette_Red), - TRAINER_BACK_PAL(LEAF, gTrainerBackPicPalette_Leaf), - TRAINER_BACK_PAL(RUBY_SAPPHIRE_BRENDAN, gTrainerPalette_RubySapphireBrendan), - TRAINER_BACK_PAL(RUBY_SAPPHIRE_MAY, gTrainerPalette_RubySapphireMay), - TRAINER_BACK_PAL(WALLY, gTrainerPalette_Wally), - TRAINER_BACK_PAL(STEVEN, gTrainerPalette_Steven), + TRAINER_BACK_SPRITE_SHEET(BRENDAN, Brendan), + TRAINER_BACK_SPRITE_SHEET(MAY, May), + TRAINER_BACK_SPRITE_SHEET(RED, Red), + TRAINER_BACK_SPRITE_SHEET(LEAF, Leaf), + TRAINER_BACK_SPRITE_SHEET(RUBY_SAPPHIRE_BRENDAN, RubySapphireBrendan), + TRAINER_BACK_SPRITE_SHEET(RUBY_SAPPHIRE_MAY, RubySapphireMay), + TRAINER_BACK_SPRITE_SHEET(WALLY, Wally), + TRAINER_BACK_SPRITE_SHEET(STEVEN, Steven), }; diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 82d854215205..87f639194cbb 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -235,7 +235,7 @@ void CreateBattlerSprite(u32 battler) { SetMultiuseSpriteTemplateToTrainerBack(gSaveBlock2Ptr->playerGender, GetBattlerPosition(B_POSITION_PLAYER_LEFT)); gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, 0x50, - (8 - gTrainerBackPicCoords[gSaveBlock2Ptr->playerGender].size) * 4 + 80, + (8 - gTrainerBacksprites[gSaveBlock2Ptr->playerGender].coordinates.size) * 4 + 80, GetBattlerSpriteSubpriority(0)); gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy; @@ -245,7 +245,7 @@ void CreateBattlerSprite(u32 battler) { SetMultiuseSpriteTemplateToTrainerBack(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(0)); gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, 0x50, - (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].size) * 4 + 80, + (8 - gTrainerBacksprites[TRAINER_BACK_PIC_WALLY].coordinates.size) * 4 + 80, GetBattlerSpriteSubpriority(0)); gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy; From 0d04fedec4e955d7e48ea9d67fffcae3ae087892 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 26 Nov 2023 18:24:25 -0500 Subject: [PATCH 18/25] Added animations to backsprite struct --- include/data.h | 3 +- src/data.c | 3 +- src/data/graphics/trainers.h | 40 +++++++ src/data/trainer_graphics/back_pic_anims.h | 129 --------------------- src/pokemon.c | 2 +- 5 files changed, 44 insertions(+), 133 deletions(-) delete mode 100644 src/data/trainer_graphics/back_pic_anims.h diff --git a/include/data.h b/include/data.h index 25a1595e3261..9b9680d5e9f3 100644 --- a/include/data.h +++ b/include/data.h @@ -40,6 +40,7 @@ struct TrainerBacksprite { struct MonCoords coordinates; struct CompressedSpritePalette palette; + const union AnimCmd *const *const animation; }; #define MON_COORDS_SIZE(width, height)(DIV_ROUND_UP(width, 8) << 4 | DIV_ROUND_UP(height, 8)) @@ -105,10 +106,10 @@ extern const union AffineAnimCmd *const gAffineAnims_BattleSpriteOpponentSide[]; extern const union AffineAnimCmd *const gAffineAnims_BattleSpriteContest[]; extern const union AnimCmd sAnim_GeneralFrame0[]; +extern const union AnimCmd sAnim_GeneralFrame3[]; extern const union AnimCmd *const gAnims_MonPic[]; extern const struct TrainerSprite gTrainerSprites[]; extern const struct TrainerBacksprite gTrainerBacksprites[]; -extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[]; extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; // functionally unused extern const struct Trainer gTrainers[]; diff --git a/src/data.c b/src/data.c index 02f973a804d0..d6b97d39073a 100644 --- a/src/data.c +++ b/src/data.c @@ -119,7 +119,7 @@ const union AnimCmd sAnim_GeneralFrame0[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_GeneralFrame3[] = +const union AnimCmd sAnim_GeneralFrame3[] = { ANIMCMD_FRAME(3, 0), ANIMCMD_END, @@ -285,7 +285,6 @@ const union AnimCmd *const gAnims_MonPic[MAX_MON_PIC_FRAMES] = sAnim_MonPic_1, }; -#include "data/trainer_graphics/back_pic_anims.h" #include "data/trainer_graphics/back_pic_tables.h" #include "data/trainer_parties.h" diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index d7082f644525..ead36a9ac46c 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -402,6 +402,38 @@ const struct TrainerSprite gTrainerSprites[] = TRAINER_PIC(RS_MAY, RubySapphireMay, Trainer), }; +static const union AnimCmd sAnimCmd_Hoenn[] = +{ + ANIMCMD_FRAME(0, 24), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(2, 24), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(3, 50), + ANIMCMD_END, +}; + +static const union AnimCmd sAnimCmd_Kanto[] = +{ + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_FRAME(4, 24), + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd *const sBackAnims_Hoenn[] = +{ + sAnim_GeneralFrame3, + sAnimCmd_Hoenn, +}; + +static const union AnimCmd *const sBackAnims_Kanto[] = +{ + sAnim_GeneralFrame0, + sAnimCmd_Kanto, +}; + #define TRAINER_BACK_PAL(pal, trainerPic) {gTrainer##pal, TRAINER_BACK_PIC_##trainerPic} const struct TrainerBacksprite gTrainerBacksprites[] = @@ -410,47 +442,55 @@ const struct TrainerBacksprite gTrainerBacksprites[] = { .coordinates = {.size = 8, .y_offset = 4}, .palette = TRAINER_BACK_PAL(Palette_Brendan, BRENDAN), + .animation = sBackAnims_Hoenn, }, [TRAINER_BACK_PIC_MAY] = { .coordinates = {.size = 8, .y_offset = 4}, .palette = TRAINER_BACK_PAL(Palette_May, MAY), + .animation = sBackAnims_Hoenn, }, [TRAINER_BACK_PIC_RED] = { .coordinates = {.size = 8, .y_offset = 5}, .palette = TRAINER_BACK_PAL(BackPicPalette_Red, RED), + .animation = sBackAnims_Kanto, }, [TRAINER_BACK_PIC_LEAF] = { .coordinates = {.size = 8, .y_offset = 5}, .palette = TRAINER_BACK_PAL(BackPicPalette_Leaf, LEAF), + .animation = sBackAnims_Kanto, }, [TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN] = { .coordinates = {.size = 8, .y_offset = 4}, .palette = TRAINER_BACK_PAL(Palette_RubySapphireBrendan, RUBY_SAPPHIRE_BRENDAN), + .animation = sBackAnims_Hoenn, }, [TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY] = { .coordinates = {.size = 8, .y_offset = 4}, .palette = TRAINER_BACK_PAL(Palette_RubySapphireMay, RUBY_SAPPHIRE_MAY), + .animation = sBackAnims_Hoenn, }, [TRAINER_BACK_PIC_WALLY] = { .coordinates = {.size = 8, .y_offset = 4}, .palette = TRAINER_BACK_PAL(Palette_Wally, WALLY), + .animation = sBackAnims_Hoenn, }, [TRAINER_BACK_PIC_STEVEN] = { .coordinates = {.size = 8, .y_offset = 4}, .palette = TRAINER_BACK_PAL(Palette_Steven, STEVEN), + .animation = sBackAnims_Hoenn, }, }; diff --git a/src/data/trainer_graphics/back_pic_anims.h b/src/data/trainer_graphics/back_pic_anims.h deleted file mode 100644 index ed12e0cb41e7..000000000000 --- a/src/data/trainer_graphics/back_pic_anims.h +++ /dev/null @@ -1,129 +0,0 @@ -static const union AnimCmd sAnimCmd_Brendan_1[] = -{ - ANIMCMD_FRAME(0, 24), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(2, 24), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(3, 50), - ANIMCMD_END, -}; - -static const union AnimCmd sAnimCmd_May_Steven_1[] = -{ - ANIMCMD_FRAME(0, 24), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(2, 24), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(3, 50), - ANIMCMD_END, -}; - -static const union AnimCmd sAnimCmd_Wally_1[] = -{ - ANIMCMD_FRAME(0, 24), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(2, 24), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(3, 50), - ANIMCMD_END, -}; - -static const union AnimCmd sAnimCmd_Red_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(2, 6), - ANIMCMD_FRAME(3, 6), - ANIMCMD_FRAME(4, 24), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnimCmd_Leaf_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(2, 6), - ANIMCMD_FRAME(3, 6), - ANIMCMD_FRAME(4, 24), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnimCmd_RubySapphireBrendan_1[] = -{ - ANIMCMD_FRAME(0, 24), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(2, 24), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(3, 50), - ANIMCMD_END, -}; - -static const union AnimCmd sAnimCmd_RubySapphireMay_1[] = -{ - ANIMCMD_FRAME(0, 24), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(2, 24), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(3, 50), - ANIMCMD_END, -}; - -static const union AnimCmd *const sBackAnims_Brendan[] = -{ - sAnim_GeneralFrame3, - sAnimCmd_Brendan_1, -}; - -static const union AnimCmd *const sBackAnims_May[] = -{ - sAnim_GeneralFrame3, - sAnimCmd_May_Steven_1, -}; - -static const union AnimCmd *const sBackAnims_Red[] = -{ - sAnim_GeneralFrame0, - sAnimCmd_Red_1, -}; - -static const union AnimCmd *const sBackAnims_Leaf[] = -{ - sAnim_GeneralFrame0, - sAnimCmd_Leaf_1, -}; - -static const union AnimCmd *const sBackAnims_RubySapphireBrendan[] = -{ - sAnim_GeneralFrame3, - sAnimCmd_RubySapphireBrendan_1, -}; - -static const union AnimCmd *const sBackAnims_RubySapphireMay[] = -{ - sAnim_GeneralFrame3, - sAnimCmd_RubySapphireMay_1, -}; - -static const union AnimCmd *const sBackAnims_Wally[] = -{ - sAnim_GeneralFrame3, - sAnimCmd_Wally_1, -}; - -static const union AnimCmd *const sBackAnims_Steven[] = -{ - sAnim_GeneralFrame3, - sAnimCmd_May_Steven_1, -}; - -const union AnimCmd *const *const gTrainerBackAnimsPtrTable[] = -{ - [TRAINER_BACK_PIC_BRENDAN] = sBackAnims_Brendan, - [TRAINER_BACK_PIC_MAY] = sBackAnims_May, - [TRAINER_BACK_PIC_RED] = sBackAnims_Red, - [TRAINER_BACK_PIC_LEAF] = sBackAnims_Leaf, - [TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN] = sBackAnims_RubySapphireBrendan, - [TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY] = sBackAnims_RubySapphireMay, - [TRAINER_BACK_PIC_WALLY] = sBackAnims_Wally, - [TRAINER_BACK_PIC_STEVEN] = sBackAnims_Steven, -}; diff --git a/src/pokemon.c b/src/pokemon.c index d29b376acc83..f89a37c61ea6 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1844,7 +1844,7 @@ void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerPicId, u8 battlerPosition if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_PLAYER_RIGHT) { gMultiuseSpriteTemplate = sTrainerBackSpriteTemplates[trainerPicId]; - gMultiuseSpriteTemplate.anims = gTrainerBackAnimsPtrTable[trainerPicId]; + gMultiuseSpriteTemplate.anims = gTrainerBacksprites[trainerPicId].animation; } else { From 268681e76dd62d412c9f2d1f359f047756a471ed Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 26 Nov 2023 18:41:33 -0500 Subject: [PATCH 19/25] Changed TRAINER_PIC to TRAINER_SPRITE --- 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 ead36a9ac46c..609fac9e2ff5 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -296,7 +296,7 @@ static const union AnimCmd *const sAnims_Trainer[] ={ sAnim_GeneralFrame0, }; -#define TRAINER_PIC(trainerPic, file, anims) \ +#define TRAINER_SPRITE(trainerPic, file, anims) \ [TRAINER_PIC_##trainerPic] = \ { \ .y_offset = 8, \ @@ -307,99 +307,99 @@ static const union AnimCmd *const sAnims_Trainer[] ={ const struct TrainerSprite gTrainerSprites[] = { - TRAINER_PIC(HIKER, Hiker, Trainer), - TRAINER_PIC(AQUA_GRUNT_M, AquaGruntM, Trainer), - TRAINER_PIC(POKEMON_BREEDER_F, PokemonBreederF, Trainer), - TRAINER_PIC(COOLTRAINER_M, CoolTrainerM, Trainer), - TRAINER_PIC(BIRD_KEEPER, BirdKeeper, Trainer), - TRAINER_PIC(COLLECTOR, Collector, Trainer), - TRAINER_PIC(AQUA_GRUNT_F, AquaGruntF, Trainer), - TRAINER_PIC(SWIMMER_M, SwimmerM, Trainer), - TRAINER_PIC(MAGMA_GRUNT_M, MagmaGruntM, Trainer), - TRAINER_PIC(EXPERT_M, ExpertM, Trainer), - TRAINER_PIC(AQUA_ADMIN_M, AquaAdminM, Trainer), - TRAINER_PIC(BLACK_BELT, BlackBelt, Trainer), - TRAINER_PIC(AQUA_ADMIN_F, AquaAdminF, Trainer), - TRAINER_PIC(AQUA_LEADER_ARCHIE, AquaLeaderArchie, Trainer), - TRAINER_PIC(HEX_MANIAC, HexManiac, Trainer), - TRAINER_PIC(AROMA_LADY, AromaLady, Trainer), - TRAINER_PIC(RUIN_MANIAC, RuinManiac, Trainer), - TRAINER_PIC(INTERVIEWER, Interviewer, Trainer), - TRAINER_PIC(TUBER_F, TuberF, Trainer), - TRAINER_PIC(TUBER_M, TuberM, Trainer), - TRAINER_PIC(COOLTRAINER_F, CoolTrainerF, Trainer), - TRAINER_PIC(LADY, Lady, Trainer), - TRAINER_PIC(BEAUTY, Beauty, Trainer), - TRAINER_PIC(RICH_BOY, RichBoy, Trainer), - TRAINER_PIC(EXPERT_F, ExpertF, Trainer), - TRAINER_PIC(POKEMANIAC, Pokemaniac, Trainer), - TRAINER_PIC(MAGMA_GRUNT_F, MagmaGruntF, Trainer), - TRAINER_PIC(GUITARIST, Guitarist, Trainer), - TRAINER_PIC(KINDLER, Kindler, Trainer), - TRAINER_PIC(CAMPER, Camper, Trainer), - TRAINER_PIC(PICNICKER, Picnicker, Trainer), - TRAINER_PIC(BUG_MANIAC, BugManiac, Trainer), - TRAINER_PIC(POKEMON_BREEDER_M, PokemonBreederM, Trainer), - TRAINER_PIC(PSYCHIC_M, PsychicM, Trainer), - TRAINER_PIC(PSYCHIC_F, PsychicF, Trainer), - TRAINER_PIC(GENTLEMAN, Gentleman, Trainer), - TRAINER_PIC(ELITE_FOUR_SIDNEY, EliteFourSidney, Trainer), - TRAINER_PIC(ELITE_FOUR_PHOEBE, EliteFourPhoebe, Trainer), - TRAINER_PIC(ELITE_FOUR_GLACIA, EliteFourGlacia, Trainer), - TRAINER_PIC(ELITE_FOUR_DRAKE, EliteFourDrake, Trainer), - TRAINER_PIC(LEADER_ROXANNE, LeaderRoxanne, Trainer), - TRAINER_PIC(LEADER_BRAWLY, LeaderBrawly, Trainer), - TRAINER_PIC(LEADER_WATTSON, LeaderWattson, Trainer), - TRAINER_PIC(LEADER_FLANNERY, LeaderFlannery, Trainer), - TRAINER_PIC(LEADER_NORMAN, LeaderNorman, Trainer), - TRAINER_PIC(LEADER_WINONA, LeaderWinona, Trainer), - TRAINER_PIC(LEADER_TATE_AND_LIZA, LeaderTateAndLiza, Trainer), - TRAINER_PIC(LEADER_JUAN, LeaderJuan, Trainer), - TRAINER_PIC(SCHOOL_KID_M, SchoolKidM, Trainer), - TRAINER_PIC(SCHOOL_KID_F, SchoolKidF, Trainer), - TRAINER_PIC(SR_AND_JR, SrAndJr, Trainer), - TRAINER_PIC(POKEFAN_M, PokefanM, Trainer), - TRAINER_PIC(POKEFAN_F, PokefanF, Trainer), - TRAINER_PIC(YOUNGSTER, Youngster, Trainer), - TRAINER_PIC(CHAMPION_WALLACE, ChampionWallace, Trainer), - TRAINER_PIC(FISHERMAN, Fisherman, Trainer), - TRAINER_PIC(CYCLING_TRIATHLETE_M, CyclingTriathleteM, Trainer), - TRAINER_PIC(CYCLING_TRIATHLETE_F, CyclingTriathleteF, Trainer), - TRAINER_PIC(RUNNING_TRIATHLETE_M, RunningTriathleteM, Trainer), - TRAINER_PIC(RUNNING_TRIATHLETE_F, RunningTriathleteF, Trainer), - TRAINER_PIC(SWIMMING_TRIATHLETE_M, SwimmingTriathleteM, Trainer), - TRAINER_PIC(SWIMMING_TRIATHLETE_F, SwimmingTriathleteF, Trainer), - TRAINER_PIC(DRAGON_TAMER, DragonTamer, Trainer), - TRAINER_PIC(NINJA_BOY, NinjaBoy, Trainer), - TRAINER_PIC(BATTLE_GIRL, BattleGirl, Trainer), - TRAINER_PIC(PARASOL_LADY, ParasolLady, Trainer), - TRAINER_PIC(SWIMMER_F, SwimmerF, Trainer), - TRAINER_PIC(TWINS, Twins, Trainer), - TRAINER_PIC(SAILOR, Sailor, Trainer), - TRAINER_PIC(MAGMA_ADMIN, MagmaAdmin, Trainer), - TRAINER_PIC(WALLY, Wally, Trainer), - TRAINER_PIC(BRENDAN, Brendan, Trainer), - TRAINER_PIC(MAY, May, Trainer), - TRAINER_PIC(BUG_CATCHER, BugCatcher, Trainer), - TRAINER_PIC(POKEMON_RANGER_M, PokemonRangerM, Trainer), - TRAINER_PIC(POKEMON_RANGER_F, PokemonRangerF, Trainer), - TRAINER_PIC(MAGMA_LEADER_MAXIE, MagmaLeaderMaxie, Trainer), - TRAINER_PIC(LASS, Lass, Trainer), - TRAINER_PIC(YOUNG_COUPLE, YoungCouple, Trainer), - TRAINER_PIC(OLD_COUPLE, OldCouple, Trainer), - TRAINER_PIC(SIS_AND_BRO, SisAndBro, Trainer), - TRAINER_PIC(STEVEN, Steven, Trainer), - TRAINER_PIC(SALON_MAIDEN_ANABEL, SalonMaidenAnabel, Trainer), - TRAINER_PIC(DOME_ACE_TUCKER, DomeAceTucker, Trainer), - TRAINER_PIC(PALACE_MAVEN_SPENSER, PalaceMavenSpenser, Trainer), - TRAINER_PIC(ARENA_TYCOON_GRETA, ArenaTycoonGreta, Trainer), - TRAINER_PIC(FACTORY_HEAD_NOLAND, FactoryHeadNoland, Trainer), - TRAINER_PIC(PIKE_QUEEN_LUCY, PikeQueenLucy, Trainer), - TRAINER_PIC(PYRAMID_KING_BRANDON, PyramidKingBrandon, Trainer), - TRAINER_PIC(RED, Red, Trainer), - TRAINER_PIC(LEAF, Leaf, Trainer), - TRAINER_PIC(RS_BRENDAN, RubySapphireBrendan, Trainer), - TRAINER_PIC(RS_MAY, RubySapphireMay, Trainer), + 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), }; static const union AnimCmd sAnimCmd_Hoenn[] = From 0045d1707135511f9ea447ca3948079018910663 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 26 Nov 2023 19:01:24 -0500 Subject: [PATCH 20/25] Added animation to backsprite preproc --- src/data/graphics/trainers.h | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 609fac9e2ff5..6a2dc5cfd98e 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -296,13 +296,13 @@ static const union AnimCmd *const sAnims_Trainer[] ={ sAnim_GeneralFrame0, }; -#define TRAINER_SPRITE(trainerPic, file, anims) \ +#define TRAINER_SPRITE(trainerPic, file, anim) \ [TRAINER_PIC_##trainerPic] = \ { \ .y_offset = 8, \ .frontPic = {gTrainerFrontPic_##file, TRAINER_PIC_SIZE, TRAINER_PIC_##trainerPic},\ .palette = {gTrainerPalette_##file, TRAINER_PIC_##trainerPic}, \ - .animation = sAnims_##anims, \ + .animation = sAnims_##anim, \ } const struct TrainerSprite gTrainerSprites[] = @@ -434,63 +434,57 @@ static const union AnimCmd *const sBackAnims_Kanto[] = sAnimCmd_Kanto, }; -#define TRAINER_BACK_PAL(pal, trainerPic) {gTrainer##pal, TRAINER_BACK_PIC_##trainerPic} +#define TRAINER_BACK_SPRITE(trainerPic, pal, anim) \ + .palette = {gTrainer##pal, TRAINER_BACK_PIC_##trainerPic}, \ + .animation = sBackAnims_##anim const struct TrainerBacksprite gTrainerBacksprites[] = { [TRAINER_BACK_PIC_BRENDAN] = { .coordinates = {.size = 8, .y_offset = 4}, - .palette = TRAINER_BACK_PAL(Palette_Brendan, BRENDAN), - .animation = sBackAnims_Hoenn, + TRAINER_BACK_SPRITE(BRENDAN, Palette_Brendan, Hoenn), }, [TRAINER_BACK_PIC_MAY] = { .coordinates = {.size = 8, .y_offset = 4}, - .palette = TRAINER_BACK_PAL(Palette_May, MAY), - .animation = sBackAnims_Hoenn, + TRAINER_BACK_SPRITE(MAY, Palette_May, Hoenn), }, [TRAINER_BACK_PIC_RED] = { .coordinates = {.size = 8, .y_offset = 5}, - .palette = TRAINER_BACK_PAL(BackPicPalette_Red, RED), - .animation = sBackAnims_Kanto, + TRAINER_BACK_SPRITE(RED, BackPicPalette_Red, Kanto), }, [TRAINER_BACK_PIC_LEAF] = { .coordinates = {.size = 8, .y_offset = 5}, - .palette = TRAINER_BACK_PAL(BackPicPalette_Leaf, LEAF), - .animation = sBackAnims_Kanto, + TRAINER_BACK_SPRITE(LEAF, BackPicPalette_Leaf, Kanto), }, [TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN] = { .coordinates = {.size = 8, .y_offset = 4}, - .palette = TRAINER_BACK_PAL(Palette_RubySapphireBrendan, RUBY_SAPPHIRE_BRENDAN), - .animation = sBackAnims_Hoenn, + TRAINER_BACK_SPRITE(RUBY_SAPPHIRE_BRENDAN, Palette_RubySapphireBrendan, Hoenn), }, [TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY] = { .coordinates = {.size = 8, .y_offset = 4}, - .palette = TRAINER_BACK_PAL(Palette_RubySapphireMay, RUBY_SAPPHIRE_MAY), - .animation = sBackAnims_Hoenn, + TRAINER_BACK_SPRITE(RUBY_SAPPHIRE_MAY, Palette_RubySapphireMay, Hoenn), }, [TRAINER_BACK_PIC_WALLY] = { .coordinates = {.size = 8, .y_offset = 4}, - .palette = TRAINER_BACK_PAL(Palette_Wally, WALLY), - .animation = sBackAnims_Hoenn, + TRAINER_BACK_SPRITE(WALLY, Palette_Wally, Hoenn), }, [TRAINER_BACK_PIC_STEVEN] = { .coordinates = {.size = 8, .y_offset = 4}, - .palette = TRAINER_BACK_PAL(Palette_Steven, STEVEN), - .animation = sBackAnims_Hoenn, + TRAINER_BACK_SPRITE(STEVEN, Palette_Steven, Hoenn), }, }; From dcc7c4997a0ac0789aa937effdc7e4aaf286bc72 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 28 Nov 2023 09:16:20 -0500 Subject: [PATCH 21/25] Added .backPic to struct --- include/data.h | 2 +- src/battle_gfx_sfx_util.c | 2 +- src/data.c | 68 ---------------- src/data/graphics/trainers.h | 90 ++++++++++++++++++--- src/data/trainer_graphics/back_pic_tables.h | 16 ---- src/trainer_pokemon_sprites.c | 2 +- 6 files changed, 83 insertions(+), 97 deletions(-) delete mode 100644 src/data/trainer_graphics/back_pic_tables.h diff --git a/include/data.h b/include/data.h index 9b9680d5e9f3..a5918fcb98cf 100644 --- a/include/data.h +++ b/include/data.h @@ -39,6 +39,7 @@ struct TrainerSprite struct TrainerBacksprite { struct MonCoords coordinates; + struct CompressedSpriteSheet backPic; struct CompressedSpritePalette palette; const union AnimCmd *const *const animation; }; @@ -110,7 +111,6 @@ extern const union AnimCmd sAnim_GeneralFrame3[]; extern const union AnimCmd *const gAnims_MonPic[]; extern const struct TrainerSprite gTrainerSprites[]; extern const struct TrainerBacksprite gTrainerBacksprites[]; -extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; // functionally unused extern const struct Trainer gTrainers[]; extern const struct Trainer gBattlePartners[]; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index f93da6563e97..b38ccf495bfa 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -658,7 +658,7 @@ void DecompressTrainerFrontPic(u16 frontPicId, u8 battler) void DecompressTrainerBackPic(u16 backPicId, u8 battler) { u8 position = GetBattlerPosition(battler); - DecompressPicFromTable(&gTrainerBackPicTable[backPicId], + DecompressPicFromTable(&gTrainerBacksprites[backPicId].backPic, gMonSpritesGfxPtr->sprites.ptr[position]); LoadCompressedPalette(gTrainerBacksprites[backPicId].palette.data, OBJ_PLTT_ID(battler), PLTT_SIZE_4BPP); diff --git a/src/data.c b/src/data.c index d6b97d39073a..da6edde3f351 100644 --- a/src/data.c +++ b/src/data.c @@ -47,72 +47,6 @@ const struct SpriteFrameImage gBattlerPicTable_OpponentRight[] = {BATTLER_OFFSET(15), MON_PIC_SIZE}, }; -const struct SpriteFrameImage gTrainerBackPicTable_Brendan[] = -{ - {gTrainerBackPic_Brendan + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Brendan + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Brendan + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Brendan + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, -}; - -const struct SpriteFrameImage gTrainerBackPicTable_May[] = -{ - {gTrainerBackPic_May + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, - {gTrainerBackPic_May + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, - {gTrainerBackPic_May + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, - {gTrainerBackPic_May + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, -}; - -const struct SpriteFrameImage gTrainerBackPicTable_Red[] = -{ - {gTrainerBackPic_Red + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Red + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Red + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Red + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Red + TRAINER_PIC_SIZE * 4, TRAINER_PIC_SIZE}, -}; - -const struct SpriteFrameImage gTrainerBackPicTable_Leaf[] = -{ - {gTrainerBackPic_Leaf + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Leaf + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Leaf + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Leaf + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Leaf + TRAINER_PIC_SIZE * 4, TRAINER_PIC_SIZE}, -}; - -const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[] = -{ - {gTrainerBackPic_RubySapphireBrendan + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, - {gTrainerBackPic_RubySapphireBrendan + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, - {gTrainerBackPic_RubySapphireBrendan + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, - {gTrainerBackPic_RubySapphireBrendan + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, -}; - -const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[] = -{ - {gTrainerBackPic_RubySapphireMay + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, - {gTrainerBackPic_RubySapphireMay + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, - {gTrainerBackPic_RubySapphireMay + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, - {gTrainerBackPic_RubySapphireMay + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, -}; - -const struct SpriteFrameImage gTrainerBackPicTable_Wally[] = -{ - {gTrainerBackPic_Wally + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Wally + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Wally + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Wally + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, -}; - -const struct SpriteFrameImage gTrainerBackPicTable_Steven[] = -{ - {gTrainerBackPic_Steven + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Steven + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Steven + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, - {gTrainerBackPic_Steven + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, -}; - const union AnimCmd sAnim_GeneralFrame0[] = { ANIMCMD_FRAME(0, 0), @@ -285,8 +219,6 @@ const union AnimCmd *const gAnims_MonPic[MAX_MON_PIC_FRAMES] = sAnim_MonPic_1, }; -#include "data/trainer_graphics/back_pic_tables.h" - #include "data/trainer_parties.h" #include "data/text/trainer_class_names.h" #include "data/trainers.h" diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 6a2dc5cfd98e..076d0e490cb2 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -434,8 +434,78 @@ static const union AnimCmd *const sBackAnims_Kanto[] = sAnimCmd_Kanto, }; -#define TRAINER_BACK_SPRITE(trainerPic, pal, anim) \ - .palette = {gTrainer##pal, TRAINER_BACK_PIC_##trainerPic}, \ +const struct SpriteFrameImage gTrainerBackPicTable_Brendan[] = +{ + {gTrainerBackPic_Brendan + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Brendan + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Brendan + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Brendan + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, +}; + +const struct SpriteFrameImage gTrainerBackPicTable_May[] = +{ + {gTrainerBackPic_May + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, + {gTrainerBackPic_May + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, + {gTrainerBackPic_May + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, + {gTrainerBackPic_May + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, +}; + +const struct SpriteFrameImage gTrainerBackPicTable_Red[] = +{ + {gTrainerBackPic_Red + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Red + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Red + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Red + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Red + TRAINER_PIC_SIZE * 4, TRAINER_PIC_SIZE}, +}; + +const struct SpriteFrameImage gTrainerBackPicTable_Leaf[] = +{ + {gTrainerBackPic_Leaf + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Leaf + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Leaf + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Leaf + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Leaf + TRAINER_PIC_SIZE * 4, TRAINER_PIC_SIZE}, +}; + +const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[] = +{ + {gTrainerBackPic_RubySapphireBrendan + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, + {gTrainerBackPic_RubySapphireBrendan + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, + {gTrainerBackPic_RubySapphireBrendan + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, + {gTrainerBackPic_RubySapphireBrendan + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, +}; + +const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[] = +{ + {gTrainerBackPic_RubySapphireMay + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, + {gTrainerBackPic_RubySapphireMay + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, + {gTrainerBackPic_RubySapphireMay + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, + {gTrainerBackPic_RubySapphireMay + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, +}; + +const struct SpriteFrameImage gTrainerBackPicTable_Wally[] = +{ + {gTrainerBackPic_Wally + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Wally + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Wally + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Wally + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, +}; + +const struct SpriteFrameImage gTrainerBackPicTable_Steven[] = +{ + {gTrainerBackPic_Steven + TRAINER_PIC_SIZE * 0, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Steven + TRAINER_PIC_SIZE * 1, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Steven + TRAINER_PIC_SIZE * 2, TRAINER_PIC_SIZE}, + {gTrainerBackPic_Steven + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE}, +}; + +// .backPic goes functionally unused, since none of these pics are compressed +// and the place they would get extracted to gets overwritten later anyway +// the casts are so they'll play nice with the strict struct definition +#define TRAINER_BACK_SPRITE(trainerPic, sprite, pal, anim) \ + .palette = {gTrainer##pal, TRAINER_BACK_PIC_##trainerPic}, \ + .backPic = {(const u32 *)gTrainerBackPic_##sprite, TRAINER_PIC_SIZE * ARRAY_COUNT(gTrainerBackPicTable_##sprite), TRAINER_BACK_PIC_##trainerPic}, \ .animation = sBackAnims_##anim const struct TrainerBacksprite gTrainerBacksprites[] = @@ -443,48 +513,48 @@ const struct TrainerBacksprite gTrainerBacksprites[] = [TRAINER_BACK_PIC_BRENDAN] = { .coordinates = {.size = 8, .y_offset = 4}, - TRAINER_BACK_SPRITE(BRENDAN, Palette_Brendan, Hoenn), + TRAINER_BACK_SPRITE(BRENDAN, Brendan, Palette_Brendan, Hoenn), }, [TRAINER_BACK_PIC_MAY] = { .coordinates = {.size = 8, .y_offset = 4}, - TRAINER_BACK_SPRITE(MAY, Palette_May, Hoenn), + TRAINER_BACK_SPRITE(MAY, May, Palette_May, Hoenn), }, [TRAINER_BACK_PIC_RED] = { .coordinates = {.size = 8, .y_offset = 5}, - TRAINER_BACK_SPRITE(RED, BackPicPalette_Red, Kanto), + TRAINER_BACK_SPRITE(RED, Red, BackPicPalette_Red, Kanto), }, [TRAINER_BACK_PIC_LEAF] = { .coordinates = {.size = 8, .y_offset = 5}, - TRAINER_BACK_SPRITE(LEAF, BackPicPalette_Leaf, Kanto), + TRAINER_BACK_SPRITE(LEAF, Leaf, BackPicPalette_Leaf, Kanto), }, [TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN] = { .coordinates = {.size = 8, .y_offset = 4}, - TRAINER_BACK_SPRITE(RUBY_SAPPHIRE_BRENDAN, Palette_RubySapphireBrendan, Hoenn), + TRAINER_BACK_SPRITE(RUBY_SAPPHIRE_BRENDAN, RubySapphireBrendan, Palette_RubySapphireBrendan, Hoenn), }, [TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY] = { .coordinates = {.size = 8, .y_offset = 4}, - TRAINER_BACK_SPRITE(RUBY_SAPPHIRE_MAY, Palette_RubySapphireMay, Hoenn), + TRAINER_BACK_SPRITE(RUBY_SAPPHIRE_MAY, RubySapphireMay, Palette_RubySapphireMay, Hoenn), }, [TRAINER_BACK_PIC_WALLY] = { .coordinates = {.size = 8, .y_offset = 4}, - TRAINER_BACK_SPRITE(WALLY, Palette_Wally, Hoenn), + TRAINER_BACK_SPRITE(WALLY, Wally, Palette_Wally, Hoenn), }, [TRAINER_BACK_PIC_STEVEN] = { .coordinates = {.size = 8, .y_offset = 4}, - TRAINER_BACK_SPRITE(STEVEN, Palette_Steven, Hoenn), + TRAINER_BACK_SPRITE(STEVEN, Steven, Palette_Steven, Hoenn), }, }; diff --git a/src/data/trainer_graphics/back_pic_tables.h b/src/data/trainer_graphics/back_pic_tables.h deleted file mode 100644 index d5011a5b29ef..000000000000 --- a/src/data/trainer_graphics/back_pic_tables.h +++ /dev/null @@ -1,16 +0,0 @@ -#define TRAINER_BACK_SPRITE_SHEET(trainerPic, sprite) [TRAINER_BACK_PIC_##trainerPic] = {(const u32 *)gTrainerBackPic_##sprite, TRAINER_PIC_SIZE * ARRAY_COUNT(gTrainerBackPicTable_##sprite), TRAINER_BACK_PIC_##trainerPic} - -// This table goes functionally unused, since none of these pics are compressed -// and the place they would get extracted to gets overwritten later anyway -// the casts are so they'll play nice with the strict struct definition -const struct CompressedSpriteSheet gTrainerBackPicTable[] = -{ - TRAINER_BACK_SPRITE_SHEET(BRENDAN, Brendan), - TRAINER_BACK_SPRITE_SHEET(MAY, May), - TRAINER_BACK_SPRITE_SHEET(RED, Red), - TRAINER_BACK_SPRITE_SHEET(LEAF, Leaf), - TRAINER_BACK_SPRITE_SHEET(RUBY_SAPPHIRE_BRENDAN, RubySapphireBrendan), - TRAINER_BACK_SPRITE_SHEET(RUBY_SAPPHIRE_MAY, RubySapphireMay), - TRAINER_BACK_SPRITE_SHEET(WALLY, Wally), - TRAINER_BACK_SPRITE_SHEET(STEVEN, Steven), -}; diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index 8addb07f2b1b..6ffbc836d7a4 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -68,7 +68,7 @@ static bool16 DecompressPic(u16 species, u32 personality, bool8 isFrontPic, u8 * if (isFrontPic) DecompressPicFromTable(&gTrainerSprites[species].frontPic, dest); else - DecompressPicFromTable(&gTrainerBackPicTable[species], dest); + DecompressPicFromTable(&gTrainerBacksprites[species].backPic, dest); } return FALSE; } From d5679e25da70a9ecb5d998caa6d030b404f7b20e Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 28 Nov 2023 09:20:13 -0500 Subject: [PATCH 22/25] Moved array number into backsprite preproc --- src/data/graphics/trainers.h | 65 +++++++++--------------------------- 1 file changed, 15 insertions(+), 50 deletions(-) diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 076d0e490cb2..88f1438e9f51 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -503,58 +503,23 @@ const struct SpriteFrameImage gTrainerBackPicTable_Steven[] = // .backPic goes functionally unused, since none of these pics are compressed // and the place they would get extracted to gets overwritten later anyway // the casts are so they'll play nice with the strict struct definition -#define TRAINER_BACK_SPRITE(trainerPic, sprite, pal, anim) \ - .palette = {gTrainer##pal, TRAINER_BACK_PIC_##trainerPic}, \ +#define TRAINER_BACK_SPRITE(trainerPic, yOffset, sprite, pal, anim) \ + [TRAINER_BACK_PIC_##trainerPic] = \ + { \ + .coordinates = {.size = 8, .y_offset = yOffset}, \ .backPic = {(const u32 *)gTrainerBackPic_##sprite, TRAINER_PIC_SIZE * ARRAY_COUNT(gTrainerBackPicTable_##sprite), TRAINER_BACK_PIC_##trainerPic}, \ - .animation = sBackAnims_##anim + .palette = {gTrainer##pal, TRAINER_BACK_PIC_##trainerPic}, \ + .animation = sBackAnims_##anim, \ + } const struct TrainerBacksprite gTrainerBacksprites[] = { - [TRAINER_BACK_PIC_BRENDAN] = - { - .coordinates = {.size = 8, .y_offset = 4}, - TRAINER_BACK_SPRITE(BRENDAN, Brendan, Palette_Brendan, Hoenn), - }, - - [TRAINER_BACK_PIC_MAY] = - { - .coordinates = {.size = 8, .y_offset = 4}, - TRAINER_BACK_SPRITE(MAY, May, Palette_May, Hoenn), - }, - - [TRAINER_BACK_PIC_RED] = - { - .coordinates = {.size = 8, .y_offset = 5}, - TRAINER_BACK_SPRITE(RED, Red, BackPicPalette_Red, Kanto), - }, - - [TRAINER_BACK_PIC_LEAF] = - { - .coordinates = {.size = 8, .y_offset = 5}, - TRAINER_BACK_SPRITE(LEAF, Leaf, BackPicPalette_Leaf, Kanto), - }, - - [TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN] = - { - .coordinates = {.size = 8, .y_offset = 4}, - TRAINER_BACK_SPRITE(RUBY_SAPPHIRE_BRENDAN, RubySapphireBrendan, Palette_RubySapphireBrendan, Hoenn), - }, - - [TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY] = - { - .coordinates = {.size = 8, .y_offset = 4}, - TRAINER_BACK_SPRITE(RUBY_SAPPHIRE_MAY, RubySapphireMay, Palette_RubySapphireMay, Hoenn), - }, - - [TRAINER_BACK_PIC_WALLY] = - { - .coordinates = {.size = 8, .y_offset = 4}, - TRAINER_BACK_SPRITE(WALLY, Wally, Palette_Wally, Hoenn), - }, - - [TRAINER_BACK_PIC_STEVEN] = - { - .coordinates = {.size = 8, .y_offset = 4}, - TRAINER_BACK_SPRITE(STEVEN, Steven, Palette_Steven, Hoenn), - }, + TRAINER_BACK_SPRITE(BRENDAN, 4, Brendan, Palette_Brendan, Hoenn), + TRAINER_BACK_SPRITE(MAY, 4, May, Palette_May, Hoenn), + TRAINER_BACK_SPRITE(RED, 5, Red, BackPicPalette_Red, Kanto), + TRAINER_BACK_SPRITE(LEAF, 5, Leaf, BackPicPalette_Leaf, Kanto), + TRAINER_BACK_SPRITE(RUBY_SAPPHIRE_BRENDAN, 4, RubySapphireBrendan, Palette_RubySapphireBrendan, Hoenn), + TRAINER_BACK_SPRITE(RUBY_SAPPHIRE_MAY, 4, RubySapphireMay, Palette_RubySapphireMay, Hoenn), + TRAINER_BACK_SPRITE(WALLY, 4, Wally, Palette_Wally, Hoenn), + TRAINER_BACK_SPRITE(STEVEN, 4, Steven, Palette_Steven, Hoenn), }; From 3c536837a3dacd9621f05a3ba482777d427720ee Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 28 Nov 2023 09:23:44 -0500 Subject: [PATCH 23/25] Removed definitions for trainer sprites --- include/graphics.h | 201 --------------------------------------------- 1 file changed, 201 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index 94a8e322f2dd..9d7258e32db9 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -65,207 +65,6 @@ extern const u32 gOpenPokeballGfx[]; // pokemon gfx extern const u16 gMonIconPalettes[][16]; -// trainer sprites -extern const u32 gTrainerFrontPic_Hiker[]; -extern const u32 gTrainerFrontPic_AquaGruntM[]; -extern const u32 gTrainerFrontPic_PokemonBreederF[]; -extern const u32 gTrainerFrontPic_CoolTrainerM[]; -extern const u32 gTrainerFrontPic_BirdKeeper[]; -extern const u32 gTrainerFrontPic_Collector[]; -extern const u32 gTrainerFrontPic_AquaGruntF[]; -extern const u32 gTrainerFrontPic_SwimmerM[]; -extern const u32 gTrainerFrontPic_MagmaGruntM[]; -extern const u32 gTrainerFrontPic_ExpertM[]; -extern const u32 gTrainerFrontPic_AquaAdminM[]; -extern const u32 gTrainerFrontPic_BlackBelt[]; -extern const u32 gTrainerFrontPic_AquaAdminF[]; -extern const u32 gTrainerFrontPic_AquaLeaderArchie[]; -extern const u32 gTrainerFrontPic_HexManiac[]; -extern const u32 gTrainerFrontPic_AromaLady[]; -extern const u32 gTrainerFrontPic_RuinManiac[]; -extern const u32 gTrainerFrontPic_Interviewer[]; -extern const u32 gTrainerFrontPic_TuberF[]; -extern const u32 gTrainerFrontPic_TuberM[]; -extern const u32 gTrainerFrontPic_CoolTrainerF[]; -extern const u32 gTrainerFrontPic_Lady[]; -extern const u32 gTrainerFrontPic_Beauty[]; -extern const u32 gTrainerFrontPic_RichBoy[]; -extern const u32 gTrainerFrontPic_ExpertF[]; -extern const u32 gTrainerFrontPic_Pokemaniac[]; -extern const u32 gTrainerFrontPic_MagmaGruntF[]; -extern const u32 gTrainerFrontPic_Guitarist[]; -extern const u32 gTrainerFrontPic_Kindler[]; -extern const u32 gTrainerFrontPic_Camper[]; -extern const u32 gTrainerFrontPic_Picnicker[]; -extern const u32 gTrainerFrontPic_BugManiac[]; -extern const u32 gTrainerFrontPic_PokemonBreederM[]; -extern const u32 gTrainerFrontPic_PsychicM[]; -extern const u32 gTrainerFrontPic_PsychicF[]; -extern const u32 gTrainerFrontPic_Gentleman[]; -extern const u32 gTrainerFrontPic_EliteFourSidney[]; -extern const u32 gTrainerFrontPic_EliteFourPhoebe[]; -extern const u32 gTrainerFrontPic_EliteFourGlacia[]; -extern const u32 gTrainerFrontPic_EliteFourDrake[]; -extern const u32 gTrainerFrontPic_LeaderRoxanne[]; -extern const u32 gTrainerFrontPic_LeaderBrawly[]; -extern const u32 gTrainerFrontPic_LeaderWattson[]; -extern const u32 gTrainerFrontPic_LeaderFlannery[]; -extern const u32 gTrainerFrontPic_LeaderNorman[]; -extern const u32 gTrainerFrontPic_LeaderWinona[]; -extern const u32 gTrainerFrontPic_LeaderTateAndLiza[]; -extern const u32 gTrainerFrontPic_LeaderJuan[]; -extern const u32 gTrainerFrontPic_SchoolKidM[]; -extern const u32 gTrainerFrontPic_SchoolKidF[]; -extern const u32 gTrainerFrontPic_SrAndJr[]; -extern const u32 gTrainerFrontPic_PokefanM[]; -extern const u32 gTrainerFrontPic_PokefanF[]; -extern const u32 gTrainerFrontPic_Youngster[]; -extern const u32 gTrainerFrontPic_ChampionWallace[]; -extern const u32 gTrainerFrontPic_Fisherman[]; -extern const u32 gTrainerFrontPic_CyclingTriathleteM[]; -extern const u32 gTrainerFrontPic_CyclingTriathleteF[]; -extern const u32 gTrainerFrontPic_RunningTriathleteM[]; -extern const u32 gTrainerFrontPic_RunningTriathleteF[]; -extern const u32 gTrainerFrontPic_SwimmingTriathleteM[]; -extern const u32 gTrainerFrontPic_SwimmingTriathleteF[]; -extern const u32 gTrainerFrontPic_DragonTamer[]; -extern const u32 gTrainerFrontPic_NinjaBoy[]; -extern const u32 gTrainerFrontPic_BattleGirl[]; -extern const u32 gTrainerFrontPic_ParasolLady[]; -extern const u32 gTrainerFrontPic_SwimmerF[]; -extern const u32 gTrainerFrontPic_Twins[]; -extern const u32 gTrainerFrontPic_Sailor[]; -extern const u32 gTrainerFrontPic_MagmaAdmin[]; -extern const u32 gTrainerFrontPic_Wally[]; -extern const u32 gTrainerFrontPic_Brendan[]; -extern const u32 gTrainerFrontPic_May[]; -extern const u32 gTrainerFrontPic_BugCatcher[]; -extern const u32 gTrainerFrontPic_PokemonRangerM[]; -extern const u32 gTrainerFrontPic_PokemonRangerF[]; -extern const u32 gTrainerFrontPic_MagmaLeaderMaxie[]; -extern const u32 gTrainerFrontPic_Lass[]; -extern const u32 gTrainerFrontPic_YoungCouple[]; -extern const u32 gTrainerFrontPic_OldCouple[]; -extern const u32 gTrainerFrontPic_SisAndBro[]; -extern const u32 gTrainerFrontPic_Steven[]; -extern const u32 gTrainerFrontPic_SalonMaidenAnabel[]; -extern const u32 gTrainerFrontPic_DomeAceTucker[]; -extern const u32 gTrainerFrontPic_PalaceMavenSpenser[]; -extern const u32 gTrainerFrontPic_ArenaTycoonGreta[]; -extern const u32 gTrainerFrontPic_FactoryHeadNoland[]; -extern const u32 gTrainerFrontPic_PikeQueenLucy[]; -extern const u32 gTrainerFrontPic_PyramidKingBrandon[]; -extern const u32 gTrainerFrontPic_Red[]; -extern const u32 gTrainerFrontPic_Leaf[]; -extern const u32 gTrainerFrontPic_RubySapphireBrendan[]; -extern const u32 gTrainerFrontPic_RubySapphireMay[]; - -extern const u32 gTrainerPalette_Hiker[]; -extern const u32 gTrainerPalette_AquaGruntM[]; -extern const u32 gTrainerPalette_PokemonBreederF[]; -extern const u32 gTrainerPalette_CoolTrainerM[]; -extern const u32 gTrainerPalette_BirdKeeper[]; -extern const u32 gTrainerPalette_Collector[]; -extern const u32 gTrainerPalette_AquaGruntF[]; -extern const u32 gTrainerPalette_SwimmerM[]; -extern const u32 gTrainerPalette_MagmaGruntM[]; -extern const u32 gTrainerPalette_ExpertM[]; -extern const u32 gTrainerPalette_AquaAdminM[]; -extern const u32 gTrainerPalette_BlackBelt[]; -extern const u32 gTrainerPalette_AquaAdminF[]; -extern const u32 gTrainerPalette_AquaLeaderArchie[]; -extern const u32 gTrainerPalette_HexManiac[]; -extern const u32 gTrainerPalette_AromaLady[]; -extern const u32 gTrainerPalette_RuinManiac[]; -extern const u32 gTrainerPalette_Interviewer[]; -extern const u32 gTrainerPalette_TuberF[]; -extern const u32 gTrainerPalette_TuberM[]; -extern const u32 gTrainerPalette_CoolTrainerF[]; -extern const u32 gTrainerPalette_Lady[]; -extern const u32 gTrainerPalette_Beauty[]; -extern const u32 gTrainerPalette_RichBoy[]; -extern const u32 gTrainerPalette_ExpertF[]; -extern const u32 gTrainerPalette_Pokemaniac[]; -extern const u32 gTrainerPalette_MagmaGruntF[]; -extern const u32 gTrainerPalette_Guitarist[]; -extern const u32 gTrainerPalette_Kindler[]; -extern const u32 gTrainerPalette_Camper[]; -extern const u32 gTrainerPalette_Picnicker[]; -extern const u32 gTrainerPalette_BugManiac[]; -extern const u32 gTrainerPalette_PokemonBreederM[]; -extern const u32 gTrainerPalette_PsychicM[]; -extern const u32 gTrainerPalette_PsychicF[]; -extern const u32 gTrainerPalette_Gentleman[]; -extern const u32 gTrainerPalette_EliteFourSidney[]; -extern const u32 gTrainerPalette_EliteFourPhoebe[]; -extern const u32 gTrainerPalette_EliteFourGlacia[]; -extern const u32 gTrainerPalette_EliteFourDrake[]; -extern const u32 gTrainerPalette_LeaderRoxanne[]; -extern const u32 gTrainerPalette_LeaderBrawly[]; -extern const u32 gTrainerPalette_LeaderWattson[]; -extern const u32 gTrainerPalette_LeaderFlannery[]; -extern const u32 gTrainerPalette_LeaderNorman[]; -extern const u32 gTrainerPalette_LeaderWinona[]; -extern const u32 gTrainerPalette_LeaderTateAndLiza[]; -extern const u32 gTrainerPalette_LeaderJuan[]; -extern const u32 gTrainerPalette_SchoolKidM[]; -extern const u32 gTrainerPalette_SchoolKidF[]; -extern const u32 gTrainerPalette_SrAndJr[]; -extern const u32 gTrainerPalette_PokefanM[]; -extern const u32 gTrainerPalette_PokefanF[]; -extern const u32 gTrainerPalette_Youngster[]; -extern const u32 gTrainerPalette_ChampionWallace[]; -extern const u32 gTrainerPalette_Fisherman[]; -extern const u32 gTrainerPalette_CyclingTriathleteM[]; -extern const u32 gTrainerPalette_CyclingTriathleteF[]; -extern const u32 gTrainerPalette_RunningTriathleteM[]; -extern const u32 gTrainerPalette_RunningTriathleteF[]; -extern const u32 gTrainerPalette_SwimmingTriathleteM[]; -extern const u32 gTrainerPalette_SwimmingTriathleteF[]; -extern const u32 gTrainerPalette_DragonTamer[]; -extern const u32 gTrainerPalette_NinjaBoy[]; -extern const u32 gTrainerPalette_BattleGirl[]; -extern const u32 gTrainerPalette_ParasolLady[]; -extern const u32 gTrainerPalette_SwimmerF[]; -extern const u32 gTrainerPalette_Twins[]; -extern const u32 gTrainerPalette_Sailor[]; -extern const u32 gTrainerPalette_MagmaAdmin[]; -extern const u32 gTrainerPalette_Wally[]; -extern const u32 gTrainerPalette_Brendan[]; -extern const u32 gTrainerPalette_May[]; -extern const u32 gTrainerPalette_BugCatcher[]; -extern const u32 gTrainerPalette_PokemonRangerM[]; -extern const u32 gTrainerPalette_PokemonRangerF[]; -extern const u32 gTrainerPalette_MagmaLeaderMaxie[]; -extern const u32 gTrainerPalette_Lass[]; -extern const u32 gTrainerPalette_YoungCouple[]; -extern const u32 gTrainerPalette_OldCouple[]; -extern const u32 gTrainerPalette_SisAndBro[]; -extern const u32 gTrainerPalette_Steven[]; -extern const u32 gTrainerPalette_SalonMaidenAnabel[]; -extern const u32 gTrainerPalette_DomeAceTucker[]; -extern const u32 gTrainerPalette_PalaceMavenSpenser[]; -extern const u32 gTrainerPalette_ArenaTycoonGreta[]; -extern const u32 gTrainerPalette_FactoryHeadNoland[]; -extern const u32 gTrainerPalette_PikeQueenLucy[]; -extern const u32 gTrainerPalette_PyramidKingBrandon[]; -extern const u32 gTrainerPalette_Red[]; -extern const u32 gTrainerPalette_Leaf[]; -extern const u32 gTrainerPalette_RubySapphireBrendan[]; -extern const u32 gTrainerPalette_RubySapphireMay[]; - -extern const u8 gTrainerBackPic_Brendan[]; -extern const u8 gTrainerBackPic_May[]; -extern const u8 gTrainerBackPic_Red[]; -extern const u8 gTrainerBackPic_Leaf[]; -extern const u8 gTrainerBackPic_RubySapphireBrendan[]; -extern const u8 gTrainerBackPic_RubySapphireMay[]; -extern const u8 gTrainerBackPic_Wally[]; -extern const u8 gTrainerBackPic_Steven[]; - -extern const u32 gTrainerBackPicPalette_Red[]; -extern const u32 gTrainerBackPicPalette_Leaf[]; - // pokeblock extern const u32 gMenuPokeblock_Gfx[]; extern const u32 gMenuPokeblock_Pal[]; From 208c73baad6a50df1c07d80fe42cc9efa200d4b9 Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 18 Dec 2023 10:13:53 -0500 Subject: [PATCH 24/25] 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[] = From 15c56424deda5874a85861870ec829f2ad41ff08 Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 18 Dec 2023 10:19:05 -0500 Subject: [PATCH 25/25] Fixed TRAINER_SPRITE arguments --- src/data/graphics/trainers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 04d4f825db16..57269f0723c6 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -296,7 +296,7 @@ static const union AnimCmd *const sAnims_Trainer[] ={ sAnim_GeneralFrame0, }; -#define TRAINER_SPRITE(trainerPic, file, anim) \ +#define TRAINER_SPRITE(trainerPic, file) \ [TRAINER_PIC_##trainerPic] = \ { \ .y_offset = 8, \