diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-15 09:54:43 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-15 09:54:43 -0400 |
commit | 951bbcf64d95a66bb4188a779f4d30fcf1afa4bf (patch) | |
tree | d31b93b123b9097b86671fa1d74490685e6af281 /src | |
parent | 19df609026e349c893c92e2c1018a3727c13acb8 (diff) | |
parent | 28d2e6f312e9acf98d0c1da57dd3c75d71836f7a (diff) |
Merge branch 'mail' of github.com:PikalaxALT/pokefirered into mail
Diffstat (limited to 'src')
-rw-r--r-- | src/data.c | 12 | ||||
-rw-r--r-- | src/data/pokemon_graphics/front_pic_coordinates.h | 2203 | ||||
-rw-r--r-- | src/pokemon.c | 24 | ||||
-rw-r--r-- | src/trainer_pokemon_sprites.c | 4 |
4 files changed, 2229 insertions, 14 deletions
diff --git a/src/data.c b/src/data.c new file mode 100644 index 000000000..16bee8db7 --- /dev/null +++ b/src/data.c @@ -0,0 +1,12 @@ +#include "global.h" +#include "malloc.h" +#include "battle.h" +#include "data.h" +#include "graphics.h" +#include "constants/items.h" +#include "constants/moves.h" +#include "constants/species.h" +#include "constants/trainers.h" +#include "constants/battle_ai.h" + +#include "data/pokemon_graphics/front_pic_coordinates.h" diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h new file mode 100644 index 000000000..1bb67f1f5 --- /dev/null +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -0,0 +1,2203 @@ +const struct MonCoords gMonFrontPicCoords[] = +{ + [SPECIES_NONE] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_BULBASAUR] = + { + .size = 0x55, + .y_offset = 0x10, + }, + [SPECIES_IVYSAUR] = + { + .size = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_VENUSAUR] = + { + .size = 0x87, + .y_offset = 0x04, + }, + [SPECIES_CHARMANDER] = + { + .size = 0x55, + .y_offset = 0x0d, + }, + [SPECIES_CHARMELEON] = + { + .size = 0x76, + .y_offset = 0x09, + }, + [SPECIES_CHARIZARD] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SQUIRTLE] = + { + .size = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_WARTORTLE] = + { + .size = 0x76, + .y_offset = 0x09, + }, + [SPECIES_BLASTOISE] = + { + .size = 0x87, + .y_offset = 0x05, + }, + [SPECIES_CATERPIE] = + { + .size = 0x54, + .y_offset = 0x10, + }, + [SPECIES_METAPOD] = + { + .size = 0x54, + .y_offset = 0x14, + }, + [SPECIES_BUTTERFREE] = + { + .size = 0x76, + .y_offset = 0x09, + }, + [SPECIES_WEEDLE] = + { + .size = 0x54, + .y_offset = 0x11, + }, + [SPECIES_KAKUNA] = + { + .size = 0x45, + .y_offset = 0x0e, + }, + [SPECIES_BEEDRILL] = + { + .size = 0x86, + .y_offset = 0x09, + }, + [SPECIES_PIDGEY] = + { + .size = 0x55, + .y_offset = 0x0d, + }, + [SPECIES_PIDGEOTTO] = + { + .size = 0x67, + .y_offset = 0x07, + }, + [SPECIES_PIDGEOT] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_RATTATA] = + { + .size = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_RATICATE] = + { + .size = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_SPEAROW] = + { + .size = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_FEAROW] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_EKANS] = + { + .size = 0x65, + .y_offset = 0x0f, + }, + [SPECIES_ARBOK] = + { + .size = 0x78, + .y_offset = 0x03, + }, + [SPECIES_PIKACHU] = + { + .size = 0x67, + .y_offset = 0x09, + }, + [SPECIES_RAICHU] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SANDSHREW] = + { + .size = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_SANDSLASH] = + { + .size = 0x77, + .y_offset = 0x06, + }, + [SPECIES_NIDORAN_F] = + { + .size = 0x54, + .y_offset = 0x10, + }, + [SPECIES_NIDORINA] = + { + .size = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_NIDOQUEEN] = + { + .size = 0x78, + .y_offset = 0x02, + }, + [SPECIES_NIDORAN_M] = + { + .size = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_NIDORINO] = + { + .size = 0x66, + .y_offset = 0x08, + }, + [SPECIES_NIDOKING] = + { + .size = 0x88, + .y_offset = 0x02, + }, + [SPECIES_CLEFAIRY] = + { + .size = 0x55, + .y_offset = 0x10, + }, + [SPECIES_CLEFABLE] = + { + .size = 0x67, + .y_offset = 0x07, + }, + [SPECIES_VULPIX] = + { + .size = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_NINETALES] = + { + .size = 0x88, + .y_offset = 0x03, + }, + [SPECIES_JIGGLYPUFF] = + { + .size = 0x55, + .y_offset = 0x10, + }, + [SPECIES_WIGGLYTUFF] = + { + .size = 0x67, + .y_offset = 0x08, + }, + [SPECIES_ZUBAT] = + { + .size = 0x66, + .y_offset = 0x0d, + }, + [SPECIES_GOLBAT] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_ODDISH] = + { + .size = 0x45, + .y_offset = 0x0c, + }, + [SPECIES_GLOOM] = + { + .size = 0x66, + .y_offset = 0x08, + }, + [SPECIES_VILEPLUME] = + { + .size = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_PARAS] = + { + .size = 0x64, + .y_offset = 0x12, + }, + [SPECIES_PARASECT] = + { + .size = 0x86, + .y_offset = 0x08, + }, + [SPECIES_VENONAT] = + { + .size = 0x57, + .y_offset = 0x0b, + }, + [SPECIES_VENOMOTH] = + { + .size = 0x87, + .y_offset = 0x08, + }, + [SPECIES_DIGLETT] = + { + .size = 0x54, + .y_offset = 0x11, + }, + [SPECIES_DUGTRIO] = + { + .size = 0x75, + .y_offset = 0x0c, + }, + [SPECIES_MEOWTH] = + { + .size = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_PERSIAN] = + { + .size = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_PSYDUCK] = + { + .size = 0x56, + .y_offset = 0x09, + }, + [SPECIES_GOLDUCK] = + { + .size = 0x77, + .y_offset = 0x06, + }, + [SPECIES_MANKEY] = + { + .size = 0x66, + .y_offset = 0x0e, + }, + [SPECIES_PRIMEAPE] = + { + .size = 0x77, + .y_offset = 0x06, + }, + [SPECIES_GROWLITHE] = + { + .size = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_ARCANINE] = + { + .size = 0x88, + .y_offset = 0x02, + }, + [SPECIES_POLIWAG] = + { + .size = 0x74, + .y_offset = 0x10, + }, + [SPECIES_POLIWHIRL] = + { + .size = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_POLIWRATH] = + { + .size = 0x77, + .y_offset = 0x07, + }, + [SPECIES_ABRA] = + { + .size = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_KADABRA] = + { + .size = 0x87, + .y_offset = 0x04, + }, + [SPECIES_ALAKAZAM] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_MACHOP] = + { + .size = 0x46, + .y_offset = 0x0b, + }, + [SPECIES_MACHOKE] = + { + .size = 0x77, + .y_offset = 0x06, + }, + [SPECIES_MACHAMP] = + { + .size = 0x88, + .y_offset = 0x03, + }, + [SPECIES_BELLSPROUT] = + { + .size = 0x66, + .y_offset = 0x0f, + }, + [SPECIES_WEEPINBELL] = + { + .size = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_VICTREEBEL] = + { + .size = 0x77, + .y_offset = 0x05, + }, + [SPECIES_TENTACOOL] = + { + .size = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_TENTACRUEL] = + { + .size = 0x78, + .y_offset = 0x01, + }, + [SPECIES_GEODUDE] = + { + .size = 0x74, + .y_offset = 0x12, + }, + [SPECIES_GRAVELER] = + { + .size = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_GOLEM] = + { + .size = 0x87, + .y_offset = 0x07, + }, + [SPECIES_PONYTA] = + { + .size = 0x67, + .y_offset = 0x07, + }, + [SPECIES_RAPIDASH] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SLOWPOKE] = + { + .size = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_SLOWBRO] = + { + .size = 0x88, + .y_offset = 0x02, + }, + [SPECIES_MAGNEMITE] = + { + .size = 0x53, + .y_offset = 0x16, + }, + [SPECIES_MAGNETON] = + { + .size = 0x75, + .y_offset = 0x10, + }, + [SPECIES_FARFETCHD] = + { + .size = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_DODUO] = + { + .size = 0x67, + .y_offset = 0x07, + }, + [SPECIES_DODRIO] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SEEL] = + { + .size = 0x76, + .y_offset = 0x09, + }, + [SPECIES_DEWGONG] = + { + .size = 0x87, + .y_offset = 0x07, + }, + [SPECIES_GRIMER] = + { + .size = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_MUK] = + { + .size = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_SHELLDER] = + { + .size = 0x55, + .y_offset = 0x10, + }, + [SPECIES_CLOYSTER] = + { + .size = 0x87, + .y_offset = 0x04, + }, + [SPECIES_GASTLY] = + { + .size = 0x77, + .y_offset = 0x06, + }, + [SPECIES_HAUNTER] = + { + .size = 0x87, + .y_offset = 0x07, + }, + [SPECIES_GENGAR] = + { + .size = 0x76, + .y_offset = 0x09, + }, + [SPECIES_ONIX] = + { + .size = 0x78, + .y_offset = 0x03, + }, + [SPECIES_DROWZEE] = + { + .size = 0x66, + .y_offset = 0x09, + }, + [SPECIES_HYPNO] = + { + .size = 0x87, + .y_offset = 0x04, + }, + [SPECIES_KRABBY] = + { + .size = 0x75, + .y_offset = 0x0e, + }, + [SPECIES_KINGLER] = + { + .size = 0x87, + .y_offset = 0x05, + }, + [SPECIES_VOLTORB] = + { + .size = 0x44, + .y_offset = 0x13, + }, + [SPECIES_ELECTRODE] = + { + .size = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_EXEGGCUTE] = + { + .size = 0x76, + .y_offset = 0x09, + }, + [SPECIES_EXEGGUTOR] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_CUBONE] = + { + .size = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_MAROWAK] = + { + .size = 0x87, + .y_offset = 0x0d, + }, + [SPECIES_HITMONLEE] = + { + .size = 0x77, + .y_offset = 0x04, + }, + [SPECIES_HITMONCHAN] = + { + .size = 0x67, + .y_offset = 0x04, + }, + [SPECIES_LICKITUNG] = + { + .size = 0x86, + .y_offset = 0x08, + }, + [SPECIES_KOFFING] = + { + .size = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_WEEZING] = + { + .size = 0x88, + .y_offset = 0x07, + }, + [SPECIES_RHYHORN] = + { + .size = 0x76, + .y_offset = 0x09, + }, + [SPECIES_RHYDON] = + { + .size = 0x88, + .y_offset = 0x02, + }, + [SPECIES_CHANSEY] = + { + .size = 0x76, + .y_offset = 0x09, + }, + [SPECIES_TANGELA] = + { + .size = 0x66, + .y_offset = 0x08, + }, + [SPECIES_KANGASKHAN] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_HORSEA] = + { + .size = 0x45, + .y_offset = 0x10, + }, + [SPECIES_SEADRA] = + { + .size = 0x77, + .y_offset = 0x06, + }, + [SPECIES_GOLDEEN] = + { + .size = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_SEAKING] = + { + .size = 0x77, + .y_offset = 0x04, + }, + [SPECIES_STARYU] = + { + .size = 0x66, + .y_offset = 0x0d, + }, + [SPECIES_STARMIE] = + { + .size = 0x67, + .y_offset = 0x0a, + }, + [SPECIES_MR_MIME] = + { + .size = 0x76, + .y_offset = 0x08, + }, + [SPECIES_SCYTHER] = + { + .size = 0x78, + .y_offset = 0x02, + }, + [SPECIES_JYNX] = + { + .size = 0x66, + .y_offset = 0x08, + }, + [SPECIES_ELECTABUZZ] = + { + .size = 0x88, + .y_offset = 0x04, + }, + [SPECIES_MAGMAR] = + { + .size = 0x87, + .y_offset = 0x04, + }, + [SPECIES_PINSIR] = + { + .size = 0x77, + .y_offset = 0x04, + }, + [SPECIES_TAUROS] = + { + .size = 0x88, + .y_offset = 0x05, + }, + [SPECIES_MAGIKARP] = + { + .size = 0x77, + .y_offset = 0x0b, + }, + [SPECIES_GYARADOS] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_LAPRAS] = + { + .size = 0x87, + .y_offset = 0x04, + }, + [SPECIES_DITTO] = + { + .size = 0x54, + .y_offset = 0x11, + }, + [SPECIES_EEVEE] = + { + .size = 0x56, + .y_offset = 0x0d, + }, + [SPECIES_VAPOREON] = + { + .size = 0x67, + .y_offset = 0x06, + }, + [SPECIES_JOLTEON] = + { + .size = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_FLAREON] = + { + .size = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_PORYGON] = + { + .size = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_OMANYTE] = + { + .size = 0x45, + .y_offset = 0x0f, + }, + [SPECIES_OMASTAR] = + { + .size = 0x67, + .y_offset = 0x07, + }, + [SPECIES_KABUTO] = + { + .size = 0x54, + .y_offset = 0x14, + }, + [SPECIES_KABUTOPS] = + { + .size = 0x88, + .y_offset = 0x03, + }, + [SPECIES_AERODACTYL] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SNORLAX] = + { + .size = 0x87, + .y_offset = 0x05, + }, + [SPECIES_ARTICUNO] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_ZAPDOS] = + { + .size = 0x88, + .y_offset = 0x04, + }, + [SPECIES_MOLTRES] = + { + .size = 0x88, + .y_offset = 0x06, + }, + [SPECIES_DRATINI] = + { + .size = 0x75, + .y_offset = 0x0f, + }, + [SPECIES_DRAGONAIR] = + { + .size = 0x87, + .y_offset = 0x06, + }, + [SPECIES_DRAGONITE] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_MEWTWO] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_MEW] = + { + .size = 0x77, + .y_offset = 0x0d, + }, + [SPECIES_CHIKORITA] = + { + .size = 0x75, + .y_offset = 0x0d, + }, + [SPECIES_BAYLEEF] = + { + .size = 0x77, + .y_offset = 0x04, + }, + [SPECIES_MEGANIUM] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CYNDAQUIL] = + { + .size = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_QUILAVA] = + { + .size = 0x76, + .y_offset = 0x08, + }, + [SPECIES_TYPHLOSION] = + { + .size = 0x78, + .y_offset = 0x00, + }, + [SPECIES_TOTODILE] = + { + .size = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_CROCONAW] = + { + .size = 0x67, + .y_offset = 0x06, + }, + [SPECIES_FERALIGATR] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SENTRET] = + { + .size = 0x47, + .y_offset = 0x04, + }, + [SPECIES_FURRET] = + { + .size = 0x67, + .y_offset = 0x07, + }, + [SPECIES_HOOTHOOT] = + { + .size = 0x55, + .y_offset = 0x0d, + }, + [SPECIES_NOCTOWL] = + { + .size = 0x58, + .y_offset = 0x03, + }, + [SPECIES_LEDYBA] = + { + .size = 0x56, + .y_offset = 0x0c, + }, + [SPECIES_LEDIAN] = + { + .size = 0x67, + .y_offset = 0x04, + }, + [SPECIES_SPINARAK] = + { + .size = 0x54, + .y_offset = 0x13, + }, + [SPECIES_ARIADOS] = + { + .size = 0x87, + .y_offset = 0x05, + }, + [SPECIES_CROBAT] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CHINCHOU] = + { + .size = 0x75, + .y_offset = 0x10, + }, + [SPECIES_LANTURN] = + { + .size = 0x87, + .y_offset = 0x0b, + }, + [SPECIES_PICHU] = + { + .size = 0x45, + .y_offset = 0x0c, + }, + [SPECIES_CLEFFA] = + { + .size = 0x44, + .y_offset = 0x14, + }, + [SPECIES_IGGLYBUFF] = + { + .size = 0x44, + .y_offset = 0x12, + }, + [SPECIES_TOGEPI] = + { + .size = 0x34, + .y_offset = 0x14, + }, + [SPECIES_TOGETIC] = + { + .size = 0x46, + .y_offset = 0x09, + }, + [SPECIES_NATU] = + { + .size = 0x44, + .y_offset = 0x14, + }, + [SPECIES_XATU] = + { + .size = 0x47, + .y_offset = 0x07, + }, + [SPECIES_MAREEP] = + { + .size = 0x55, + .y_offset = 0x10, + }, + [SPECIES_FLAAFFY] = + { + .size = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_AMPHAROS] = + { + .size = 0x77, + .y_offset = 0x05, + }, + [SPECIES_BELLOSSOM] = + { + .size = 0x45, + .y_offset = 0x0e, + }, + [SPECIES_MARILL] = + { + .size = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_AZUMARILL] = + { + .size = 0x76, + .y_offset = 0x09, + }, + [SPECIES_SUDOWOODO] = + { + .size = 0x67, + .y_offset = 0x06, + }, + [SPECIES_POLITOED] = + { + .size = 0x67, + .y_offset = 0x06, + }, + [SPECIES_HOPPIP] = + { + .size = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_SKIPLOOM] = + { + .size = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_JUMPLUFF] = + { + .size = 0x77, + .y_offset = 0x07, + }, + [SPECIES_AIPOM] = + { + .size = 0x58, + .y_offset = 0x03, + }, + [SPECIES_SUNKERN] = + { + .size = 0x44, + .y_offset = 0x10, + }, + [SPECIES_SUNFLORA] = + { + .size = 0x56, + .y_offset = 0x08, + }, + [SPECIES_YANMA] = + { + .size = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_WOOPER] = + { + .size = 0x54, + .y_offset = 0x10, + }, + [SPECIES_QUAGSIRE] = + { + .size = 0x77, + .y_offset = 0x07, + }, + [SPECIES_ESPEON] = + { + .size = 0x66, + .y_offset = 0x08, + }, + [SPECIES_UMBREON] = + { + .size = 0x67, + .y_offset = 0x08, + }, + [SPECIES_MURKROW] = + { + .size = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_SLOWKING] = + { + .size = 0x58, + .y_offset = 0x01, + }, + [SPECIES_MISDREAVUS] = + { + .size = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_UNOWN] = + { + .size = 0x35, + .y_offset = 0x0f, + }, + [SPECIES_WOBBUFFET] = + { + .size = 0x77, + .y_offset = 0x06, + }, + [SPECIES_GIRAFARIG] = + { + .size = 0x88, + .y_offset = 0x03, + }, + [SPECIES_PINECO] = + { + .size = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_FORRETRESS] = + { + .size = 0x76, + .y_offset = 0x09, + }, + [SPECIES_DUNSPARCE] = + { + .size = 0x74, + .y_offset = 0x11, + }, + [SPECIES_GLIGAR] = + { + .size = 0x78, + .y_offset = 0x03, + }, + [SPECIES_STEELIX] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SNUBBULL] = + { + .size = 0x55, + .y_offset = 0x0d, + }, + [SPECIES_GRANBULL] = + { + .size = 0x57, + .y_offset = 0x06, + }, + [SPECIES_QWILFISH] = + { + .size = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_SCIZOR] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SHUCKLE] = + { + .size = 0x66, + .y_offset = 0x09, + }, + [SPECIES_HERACROSS] = + { + .size = 0x88, + .y_offset = 0x03, + }, + [SPECIES_SNEASEL] = + { + .size = 0x67, + .y_offset = 0x05, + }, + [SPECIES_TEDDIURSA] = + { + .size = 0x46, + .y_offset = 0x0b, + }, + [SPECIES_URSARING] = + { + .size = 0x78, + .y_offset = 0x01, + }, + [SPECIES_SLUGMA] = + { + .size = 0x45, + .y_offset = 0x0d, + }, + [SPECIES_MAGCARGO] = + { + .size = 0x57, + .y_offset = 0x0d, + }, + [SPECIES_SWINUB] = + { + .size = 0x43, + .y_offset = 0x14, + }, + [SPECIES_PILOSWINE] = + { + .size = 0x66, + .y_offset = 0x08, + }, + [SPECIES_CORSOLA] = + { + .size = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_REMORAID] = + { + .size = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_OCTILLERY] = + { + .size = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_DELIBIRD] = + { + .size = 0x56, + .y_offset = 0x08, + }, + [SPECIES_MANTINE] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SKARMORY] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_HOUNDOUR] = + { + .size = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_HOUNDOOM] = + { + .size = 0x77, + .y_offset = 0x05, + }, + [SPECIES_KINGDRA] = + { + .size = 0x78, + .y_offset = 0x04, + }, + [SPECIES_PHANPY] = + { + .size = 0x54, + .y_offset = 0x10, + }, + [SPECIES_DONPHAN] = + { + .size = 0x86, + .y_offset = 0x08, + }, + [SPECIES_PORYGON2] = + { + .size = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_STANTLER] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SMEARGLE] = + { + .size = 0x77, + .y_offset = 0x06, + }, + [SPECIES_TYROGUE] = + { + .size = 0x46, + .y_offset = 0x09, + }, + [SPECIES_HITMONTOP] = + { + .size = 0x67, + .y_offset = 0x05, + }, + [SPECIES_SMOOCHUM] = + { + .size = 0x35, + .y_offset = 0x0f, + }, + [SPECIES_ELEKID] = + { + .size = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_MAGBY] = + { + .size = 0x45, + .y_offset = 0x0d, + }, + [SPECIES_MILTANK] = + { + .size = 0x77, + .y_offset = 0x04, + }, + [SPECIES_BLISSEY] = + { + .size = 0x77, + .y_offset = 0x06, + }, + [SPECIES_RAIKOU] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_ENTEI] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SUICUNE] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_LARVITAR] = + { + .size = 0x46, + .y_offset = 0x09, + }, + [SPECIES_PUPITAR] = + { + .size = 0x56, + .y_offset = 0x09, + }, + [SPECIES_TYRANITAR] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_LUGIA] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_HO_OH] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CELEBI] = + { + .size = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_OLD_UNOWN_B] = + { + .size = 0x88, + .y_offset = 0x06, + }, + [SPECIES_OLD_UNOWN_C] = + { + .size = 0x88, + .y_offset = 0x06, + }, + [SPECIES_OLD_UNOWN_D] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_E] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_F] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_G] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_H] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_I] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_J] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_K] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_L] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_M] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_N] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_O] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_P] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_Q] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_R] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_S] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_T] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_U] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_V] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_W] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_X] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_Y] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_OLD_UNOWN_Z] = + { + .size = 0x88, + .y_offset = 0x06 + }, + [SPECIES_TREECKO] = + { + .size = 0x66, + .y_offset = 0x08, + }, + [SPECIES_GROVYLE] = + { + .size = 0x87, + .y_offset = 0x04, + }, + [SPECIES_SCEPTILE] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_TORCHIC] = + { + .size = 0x56, + .y_offset = 0x08, + }, + [SPECIES_COMBUSKEN] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_BLAZIKEN] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_MUDKIP] = + { + .size = 0x56, + .y_offset = 0x0c, + }, + [SPECIES_MARSHTOMP] = + { + .size = 0x67, + .y_offset = 0x06, + }, + [SPECIES_SWAMPERT] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_POOCHYENA] = + { + .size = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_MIGHTYENA] = + { + .size = 0x87, + .y_offset = 0x04, + }, + [SPECIES_ZIGZAGOON] = + { + .size = 0x85, + .y_offset = 0x0f, + }, + [SPECIES_LINOONE] = + { + .size = 0x78, + .y_offset = 0x03, + }, + [SPECIES_WURMPLE] = + { + .size = 0x45, + .y_offset = 0x0e, + }, + [SPECIES_SILCOON] = + { + .size = 0x75, + .y_offset = 0x11, + }, + [SPECIES_BEAUTIFLY] = + { + .size = 0x86, + .y_offset = 0x09, + }, + [SPECIES_CASCOON] = + { + .size = 0x74, + .y_offset = 0x10, + }, + [SPECIES_DUSTOX] = + { + .size = 0x86, + .y_offset = 0x0f, + }, + [SPECIES_LOTAD] = + { + .size = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_LOMBRE] = + { + .size = 0x66, + .y_offset = 0x09, + }, + [SPECIES_LUDICOLO] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SEEDOT] = + { + .size = 0x46, + .y_offset = 0x10, + }, + [SPECIES_NUZLEAF] = + { + .size = 0x56, + .y_offset = 0x08, + }, + [SPECIES_SHIFTRY] = + { + .size = 0x88, + .y_offset = 0x02, + }, + [SPECIES_NINCADA] = + { + .size = 0x74, + .y_offset = 0x12, + }, + [SPECIES_NINJASK] = + { + .size = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_SHEDINJA] = + { + .size = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_TAILLOW] = + { + .size = 0x64, + .y_offset = 0x10, + }, + [SPECIES_SWELLOW] = + { + .size = 0x87, + .y_offset = 0x06, + }, + [SPECIES_SHROOMISH] = + { + .size = 0x54, + .y_offset = 0x10, + }, + [SPECIES_BRELOOM] = + { + .size = 0x77, + .y_offset = 0x04, + }, + [SPECIES_SPINDA] = + { + .size = 0x67, + .y_offset = 0x08, + }, + [SPECIES_WINGULL] = + { + .size = 0x84, + .y_offset = 0x18, + }, + [SPECIES_PELIPPER] = + { + .size = 0x77, + .y_offset = 0x04, + }, + [SPECIES_SURSKIT] = + { + .size = 0x65, + .y_offset = 0x0f, + }, + [SPECIES_MASQUERAIN] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_WAILMER] = + { + .size = 0x75, + .y_offset = 0x0f, + }, + [SPECIES_WAILORD] = + { + .size = 0x87, + .y_offset = 0x0a, + }, + [SPECIES_SKITTY] = + { + .size = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_DELCATTY] = + { + .size = 0x66, + .y_offset = 0x08, + }, + [SPECIES_KECLEON] = + { + .size = 0x67, + .y_offset = 0x07, + }, + [SPECIES_BALTOY] = + { + .size = 0x55, + .y_offset = 0x10, + }, + [SPECIES_CLAYDOL] = + { + .size = 0x78, + .y_offset = 0x06, + }, + [SPECIES_NOSEPASS] = + { + .size = 0x56, + .y_offset = 0x0c, + }, + [SPECIES_TORKOAL] = + { + .size = 0x88, + .y_offset = 0x02, + }, + [SPECIES_SABLEYE] = + { + .size = 0x66, + .y_offset = 0x09, + }, + [SPECIES_BARBOACH] = + { + .size = 0x46, + .y_offset = 0x0b, + }, + [SPECIES_WHISCASH] = + { + .size = 0x76, + .y_offset = 0x09, + }, + [SPECIES_LUVDISC] = + { + .size = 0x46, + .y_offset = 0x18, + }, + [SPECIES_CORPHISH] = + { + .size = 0x66, + .y_offset = 0x0c, + }, + [SPECIES_CRAWDAUNT] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_FEEBAS] = + { + .size = 0x46, + .y_offset = 0x0d, + }, + [SPECIES_MILOTIC] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CARVANHA] = + { + .size = 0x67, + .y_offset = 0x06, + }, + [SPECIES_SHARPEDO] = + { + .size = 0x78, + .y_offset = 0x03, + }, + [SPECIES_TRAPINCH] = + { + .size = 0x54, + .y_offset = 0x10, + }, + [SPECIES_VIBRAVA] = + { + .size = 0x86, + .y_offset = 0x0c, + }, + [SPECIES_FLYGON] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_MAKUHITA] = + { + .size = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_HARIYAMA] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_ELECTRIKE] = + { + .size = 0x64, + .y_offset = 0x12, + }, + [SPECIES_MANECTRIC] = + { + .size = 0x67, + .y_offset = 0x04, + }, + [SPECIES_NUMEL] = + { + .size = 0x65, + .y_offset = 0x0f, + }, + [SPECIES_CAMERUPT] = + { + .size = 0x87, + .y_offset = 0x09, + }, + [SPECIES_SPHEAL] = + { + .size = 0x65, + .y_offset = 0x10, + }, + [SPECIES_SEALEO] = + { + .size = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_WALREIN] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_CACNEA] = + { + .size = 0x74, + .y_offset = 0x10, + }, + [SPECIES_CACTURNE] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SNORUNT] = + { + .size = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_GLALIE] = + { + .size = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_LUNATONE] = + { + .size = 0x66, + .y_offset = 0x09, + }, + [SPECIES_SOLROCK] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_AZURILL] = + { + .size = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_SPOINK] = + { + .size = 0x46, + .y_offset = 0x09, + }, + [SPECIES_GRUMPIG] = + { + .size = 0x77, + .y_offset = 0x05, + }, + [SPECIES_PLUSLE] = + { + .size = 0x56, + .y_offset = 0x0e, + }, + [SPECIES_MINUN] = + { + .size = 0x66, + .y_offset = 0x0c, + }, + [SPECIES_MAWILE] = + { + .size = 0x76, + .y_offset = 0x08, + }, + [SPECIES_MEDITITE] = + { + .size = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_MEDICHAM] = + { + .size = 0x68, + .y_offset = 0x01, + }, + [SPECIES_SWABLU] = + { + .size = 0x76, + .y_offset = 0x11, + }, + [SPECIES_ALTARIA] = + { + .size = 0x88, + .y_offset = 0x02, + }, + [SPECIES_WYNAUT] = + { + .size = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_DUSKULL] = + { + .size = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_DUSCLOPS] = + { + .size = 0x77, + .y_offset = 0x05, + }, + [SPECIES_ROSELIA] = + { + .size = 0x76, + .y_offset = 0x08, + }, + [SPECIES_SLAKOTH] = + { + .size = 0x74, + .y_offset = 0x12, + }, + [SPECIES_VIGOROTH] = + { + .size = 0x78, + .y_offset = 0x00, + }, + [SPECIES_SLAKING] = + { + .size = 0x86, + .y_offset = 0x08, + }, + [SPECIES_GULPIN] = + { + .size = 0x55, + .y_offset = 0x12, + }, + [SPECIES_SWALOT] = + { + .size = 0x66, + .y_offset = 0x08, + }, + [SPECIES_TROPIUS] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_WHISMUR] = + { + .size = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_LOUDRED] = + { + .size = 0x78, + .y_offset = 0x03, + }, + [SPECIES_EXPLOUD] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_CLAMPERL] = + { + .size = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_HUNTAIL] = + { + .size = 0x78, + .y_offset = 0x03, + }, + [SPECIES_GOREBYSS] = + { + .size = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_ABSOL] = + { + .size = 0x68, + .y_offset = 0x00, + }, + [SPECIES_SHUPPET] = + { + .size = 0x56, + .y_offset = 0x0e, + }, + [SPECIES_BANETTE] = + { + .size = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_SEVIPER] = + { + .size = 0x77, + .y_offset = 0x08, + }, + [SPECIES_ZANGOOSE] = + { + .size = 0x87, + .y_offset = 0x05, + }, + [SPECIES_RELICANTH] = + { + .size = 0x77, + .y_offset = 0x0b, + }, + [SPECIES_ARON] = + { + .size = 0x43, + .y_offset = 0x14, + }, + [SPECIES_LAIRON] = + { + .size = 0x75, + .y_offset = 0x0d, + }, + [SPECIES_AGGRON] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CASTFORM] = + { + .size = 0x34, + .y_offset = 0x11, + }, + [SPECIES_VOLBEAT] = + { + .size = 0x66, + .y_offset = 0x08, + }, + [SPECIES_ILLUMISE] = + { + .size = 0x56, + .y_offset = 0x08, + }, + [SPECIES_LILEEP] = + { + .size = 0x67, + .y_offset = 0x07, + }, + [SPECIES_CRADILY] = + { + .size = 0x78, + .y_offset = 0x00, + }, + [SPECIES_ANORITH] = + { + .size = 0x66, + .y_offset = 0x08, + }, + [SPECIES_ARMALDO] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_RALTS] = + { + .size = 0x35, + .y_offset = 0x0f, + }, + [SPECIES_KIRLIA] = + { + .size = 0x47, + .y_offset = 0x06, + }, + [SPECIES_GARDEVOIR] = + { + .size = 0x78, + .y_offset = 0x01, + }, + [SPECIES_BAGON] = + { + .size = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_SHELGON] = + { + .size = 0x66, + .y_offset = 0x09, + }, + [SPECIES_SALAMENCE] = + { + .size = 0x87, + .y_offset = 0x04, + }, + [SPECIES_BELDUM] = + { + .size = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_METANG] = + { + .size = 0x87, + .y_offset = 0x07, + }, + [SPECIES_METAGROSS] = + { + .size = 0x87, + .y_offset = 0x06, + }, + [SPECIES_REGIROCK] = + { + .size = 0x78, + .y_offset = 0x04, + }, + [SPECIES_REGICE] = + { + .size = 0x88, + .y_offset = 0x02, + }, + [SPECIES_REGISTEEL] = + { + .size = 0x88, + .y_offset = 0x03, + }, + [SPECIES_KYOGRE] = + { + .size = 0x87, + .y_offset = 0x04, + }, + [SPECIES_GROUDON] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_RAYQUAZA] = + { + .size = 0x88, + .y_offset = 0x00, + }, + [SPECIES_LATIAS] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_LATIOS] = + { + .size = 0x88, + .y_offset = 0x02, + }, + [SPECIES_JIRACHI] = + { + .size = 0x66, + .y_offset = 0x0d, + }, + [SPECIES_DEOXYS] = + { + .size = 0x88, + .y_offset = 0x01, + }, + [SPECIES_CHIMECHO] = + { + .size = 0x37, + .y_offset = 0x06, + }, + [SPECIES_EGG] = + { + .size = 0x33, + .y_offset = 0x14, + }, + [SPECIES_UNOWN_B] = + { + .size = 0x34, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_C] = + { + .size = 0x44, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_D] = + { + .size = 0x44, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_E] = + { + .size = 0x44, + .y_offset = 0x11, + }, + [SPECIES_UNOWN_F] = + { + .size = 0x44, + .y_offset = 0x11, + }, + [SPECIES_UNOWN_G] = + { + .size = 0x35, + .y_offset = 0x0e, + }, + [SPECIES_UNOWN_H] = + { + .size = 0x44, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_I] = + { + .size = 0x34, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_J] = + { + .size = 0x34, + .y_offset = 0x11, + }, + [SPECIES_UNOWN_K] = + { + .size = 0x44, + .y_offset = 0x11, + }, + [SPECIES_UNOWN_L] = + { + .size = 0x34, + .y_offset = 0x13, + }, + [SPECIES_UNOWN_M] = + { + .size = 0x44, + .y_offset = 0x13, + }, + [SPECIES_UNOWN_N] = + { + .size = 0x43, + .y_offset = 0x14, + }, + [SPECIES_UNOWN_O] = + { + .size = 0x44, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_P] = + { + .size = 0x34, + .y_offset = 0x13, + }, + [SPECIES_UNOWN_Q] = + { + .size = 0x43, + .y_offset = 0x15, + }, + [SPECIES_UNOWN_R] = + { + .size = 0x34, + .y_offset = 0x13, + }, + [SPECIES_UNOWN_S] = + { + .size = 0x45, + .y_offset = 0x0c, + }, + [SPECIES_UNOWN_T] = + { + .size = 0x34, + .y_offset = 0x12, + }, + [SPECIES_UNOWN_U] = + { + .size = 0x44, + .y_offset = 0x12, + }, + [SPECIES_UNOWN_V] = + { + .size = 0x44, + .y_offset = 0x12, + }, + [SPECIES_UNOWN_W] = + { + .size = 0x44, + .y_offset = 0x13, + }, + [SPECIES_UNOWN_X] = + { + .size = 0x33, + .y_offset = 0x15, + }, + [SPECIES_UNOWN_Y] = + { + .size = 0x34, + .y_offset = 0x11, + }, + [SPECIES_UNOWN_Z] = + { + .size = 0x34, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_EMARK] = + { + .size = 0x35, + .y_offset = 0x0f, + }, + [SPECIES_UNOWN_QMARK] = + { + .size = 0x35, + .y_offset = 0x0d, + }, +}; diff --git a/src/pokemon.c b/src/pokemon.c index 1159b1861..752fe5338 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1470,7 +1470,7 @@ const struct SpriteTemplate gUnknown_825DEF0[] = .oam = &gUnknown_824F018, .anims = NULL, .images = gUnknown_8234698, - .affineAnims = gUnknown_82348C8, + .affineAnims = gSpriteAffineAnimTable_82348C8, .callback = sub_80120C4, }, { @@ -1479,7 +1479,7 @@ const struct SpriteTemplate gUnknown_825DEF0[] = .oam = &gUnknown_824F010, .anims = NULL, .images = gUnknown_82346B8, - .affineAnims = gUnknown_8234944, + .affineAnims = gSpriteAffineAnimTable_8234944, .callback = oac_poke_opponent, }, { @@ -1488,7 +1488,7 @@ const struct SpriteTemplate gUnknown_825DEF0[] = .oam = &gUnknown_824F018, .anims = NULL, .images = gUnknown_82346D8, - .affineAnims = gUnknown_82348C8, + .affineAnims = gSpriteAffineAnimTable_82348C8, .callback = sub_80120C4, }, { @@ -1497,7 +1497,7 @@ const struct SpriteTemplate gUnknown_825DEF0[] = .oam = &gUnknown_824F010, .anims = NULL, .images = gUnknown_82346F8, - .affineAnims = gUnknown_8234944, + .affineAnims = gSpriteAffineAnimTable_8234944, .callback = oac_poke_opponent, }, }; @@ -1510,7 +1510,7 @@ const struct SpriteTemplate gUnknown_825DF50[] = .oam = &gUnknown_824F018, .anims = NULL, .images = gUnknown_8234718, - .affineAnims = gUnknown_82348C8, + .affineAnims = gSpriteAffineAnimTable_82348C8, .callback = sub_80120C4, }, { @@ -1519,7 +1519,7 @@ const struct SpriteTemplate gUnknown_825DF50[] = .oam = &gUnknown_824F018, .anims = NULL, .images = gUnknown_8234740, - .affineAnims = gUnknown_82348C8, + .affineAnims = gSpriteAffineAnimTable_82348C8, .callback = sub_80120C4, }, { @@ -1528,7 +1528,7 @@ const struct SpriteTemplate gUnknown_825DF50[] = .oam = &gUnknown_824F018, .anims = NULL, .images = gUnknown_82347A8, - .affineAnims = gUnknown_82348C8, + .affineAnims = gSpriteAffineAnimTable_82348C8, .callback = sub_80120C4, }, { @@ -1537,7 +1537,7 @@ const struct SpriteTemplate gUnknown_825DF50[] = .oam = &gUnknown_824F018, .anims = NULL, .images = gUnknown_82347C8, - .affineAnims = gUnknown_82348C8, + .affineAnims = gSpriteAffineAnimTable_82348C8, .callback = sub_80120C4, }, { @@ -1546,7 +1546,7 @@ const struct SpriteTemplate gUnknown_825DF50[] = .oam = &gUnknown_824F018, .anims = NULL, .images = gUnknown_8234768, - .affineAnims = gUnknown_82348C8, + .affineAnims = gSpriteAffineAnimTable_82348C8, .callback = sub_80120C4, }, { @@ -1555,7 +1555,7 @@ const struct SpriteTemplate gUnknown_825DF50[] = .oam = &gUnknown_824F018, .anims = NULL, .images = gUnknown_8234788, - .affineAnims = gUnknown_82348C8, + .affineAnims = gSpriteAffineAnimTable_82348C8, .callback = sub_80120C4, }, }; @@ -2698,7 +2698,7 @@ void SetMultiuseSpriteTemplateToPokemon(u16 speciesTag, u8 battlerPosition) } } gMultiuseSpriteTemplate.paletteTag = speciesTag; - gMultiuseSpriteTemplate.anims = gUnknown_82349BC; + gMultiuseSpriteTemplate.anims = gSpriteAnimTable_82349BC; } void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition) @@ -6089,7 +6089,7 @@ static void OakSpeechNidoranFSetupTemplateDummy(struct OakSpeechNidoranFStruct * for (j = 0; j < structPtr->frameCount; ++j) structPtr->frameImages[i * structPtr->spriteCount + j].data = &structPtr->bufferPtrs[i][j * 0x800]; structPtr->templates[i].images = &structPtr->frameImages[i * structPtr->spriteCount]; // should be frameCount logically - structPtr->templates[i].anims = gUnknown_82349BC; + structPtr->templates[i].anims = gSpriteAnimTable_82349BC; structPtr->templates[i].paletteTag = i; } } diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index 2ef5e02f0..7262954c9 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -14,7 +14,7 @@ extern const struct CompressedSpriteSheet gMonBackPicTable[]; extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; -extern const union AnimCmd *const gUnknown_82349BC[]; +extern const union AnimCmd *const gSpriteAnimTable_82349BC[]; extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[]; // Static type declarations @@ -138,7 +138,7 @@ void LoadPicPaletteBySlot(u16 species, u32 otId, u32 personality, u8 paletteSlot void AssignSpriteAnimsTable(bool8 isTrainer) { if (!isTrainer) - sCreatingSpriteTemplate.anims = gUnknown_82349BC; + sCreatingSpriteTemplate.anims = gSpriteAnimTable_82349BC; else sCreatingSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[0]; } |