diff --git a/graphics/pokemon/chespin/back.png b/graphics/pokemon/chespin/back.png index 0fb5486c2d..55438cc0eb 100644 Binary files a/graphics/pokemon/chespin/back.png and b/graphics/pokemon/chespin/back.png differ diff --git a/graphics/pokemon/chespin/front.png b/graphics/pokemon/chespin/front.png index 1940c964d7..efb818c9e7 100644 Binary files a/graphics/pokemon/chespin/front.png and b/graphics/pokemon/chespin/front.png differ diff --git a/graphics/pokemon/chespin/normal.pal b/graphics/pokemon/chespin/normal.pal index 33fff19173..962832e5d8 100644 --- a/graphics/pokemon/chespin/normal.pal +++ b/graphics/pokemon/chespin/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -40 80 8 +0 181 239 +74 99 25 16 16 16 -144 192 56 -96 128 32 -72 56 48 -184 120 104 -96 56 24 -232 168 128 -96 96 96 -248 248 248 -144 40 0 -248 88 56 -56 32 8 -208 208 208 +165 214 74 +123 156 58 +214 239 140 +66 41 16 +181 123 82 +115 74 41 +230 165 107 +74 66 58 +255 255 255 +156 66 41 +247 107 66 +214 214 214 0 0 0 diff --git a/graphics/pokemon/chespin/shiny.pal b/graphics/pokemon/chespin/shiny.pal index 854c09af10..8837babdb2 100644 --- a/graphics/pokemon/chespin/shiny.pal +++ b/graphics/pokemon/chespin/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -56 0 0 +0 181 239 +99 8 8 16 16 16 -192 24 24 -112 8 16 -72 56 48 -152 128 88 -72 40 32 -208 168 120 -80 80 80 -248 248 248 -144 72 0 -232 192 48 -40 24 16 -208 208 208 +222 41 58 +140 25 25 +239 74 82 +49 25 16 +148 132 99 +82 49 41 +197 173 140 +82 82 82 +255 255 255 +140 90 25 +214 181 66 +214 214 214 0 0 0 diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 9a5d34cc74..051a94d386 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -3245,6 +3245,798 @@ const struct MonCoords gMonBackPicCoords[] = .size = 0x64, .y_offset = 0x8, }, + // Gens 6 & 7 + [SPECIES_CHESPIN] = + { + .size = 0x64, + .y_offset = 0x06, + }, + [SPECIES_QUILLADIN] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_CHESNAUGHT] = + { + .size = 0x64, + .y_offset = 0x0A, + }, + [SPECIES_FENNEKIN] = + { + .size = 0x64, + .y_offset = 0x08, + }, + [SPECIES_BRAIXEN] = + { + .size = 0x64, + .y_offset = 0x0A, + }, + [SPECIES_DELPHOX] = + { + .size = 0x64, + .y_offset = 0x03, + }, + [SPECIES_FROAKIE] = + { + .size = 0x64, + .y_offset = 0x07, + }, + [SPECIES_FROGADIER] = + { + .size = 0x64, + .y_offset = 0x06, + }, + [SPECIES_GRENINJA] = + { + .size = 0x64, + .y_offset = 0x0B, + }, + [SPECIES_BUNNELBY] = + { + .size = 0x64, + .y_offset = 0x00, + }, + [SPECIES_DIGGERSBY] = + { + .size = 0x64, + .y_offset = 0x03, + }, + [SPECIES_FLETCHLING] = + { + .size = 0x64, + .y_offset = 0x0E, + }, + [SPECIES_FLETCHINDER] = + { + .size = 0x64, + .y_offset = 0x0B, + }, + [SPECIES_TALONFLAME] = + { + .size = 0x64, + .y_offset = 0x05, + }, + [SPECIES_SCATTERBUG] = + { + .size = 0x64, + .y_offset = 0x0C, + }, + [SPECIES_SPEWPA] = + { + .size = 0x64, + .y_offset = 0x0C, + }, + [SPECIES_VIVILLON] = + { + .size = 0x64, + .y_offset = 0x00, + }, + [SPECIES_LITLEO] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_PYROAR] = + { + .size = 0x64, + .y_offset = 0x03, + }, + [SPECIES_FLABEBE] = + { + .size = 0x64, + .y_offset = 0x0C, + }, + [SPECIES_FLOETTE] = + { + .size = 0x64, + .y_offset = 0x02, + }, + [SPECIES_FLORGES] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_SKIDDO] = + { + .size = 0x64, + .y_offset = 0x08, + }, + [SPECIES_GOGOAT] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_PANCHAM] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_PANGORO] = + { + .size = 0x64, + .y_offset = 0x04, + }, + [SPECIES_FURFROU] = + { + .size = 0x64, + .y_offset = 0x00, + }, + [SPECIES_ESPURR] = + { + .size = 0x64, + .y_offset = 0x07, + }, + [SPECIES_MEOWSTIC] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_HONEDGE] = + { + .size = 0x64, + .y_offset = 0x04, + }, + [SPECIES_DOUBLADE] = + { + .size = 0x64, + .y_offset = 0x07, + }, + [SPECIES_AEGISLASH] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_SPRITZEE] = + { + .size = 0x64, + .y_offset = 0x0B, + }, + [SPECIES_AROMATISSE] = + { + .size = 0x64, + .y_offset = 0x05, + }, + [SPECIES_SWIRLIX] = + { + .size = 0x64, + .y_offset = 0x0C, + }, + [SPECIES_SLURPUFF] = + { + .size = 0x64, + .y_offset = 0x04, + }, + [SPECIES_INKAY] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_MALAMAR] = + { + .size = 0x64, + .y_offset = 0x08, + }, + [SPECIES_BINACLE] = + { + .size = 0x64, + .y_offset = 0x05, + }, + [SPECIES_BARBARACLE] = + { + .size = 0x64, + .y_offset = 0x00, + }, + [SPECIES_SKRELP] = + { + .size = 0x64, + .y_offset = 0x05, + }, + [SPECIES_DRAGALGE] = + { + .size = 0x64, + .y_offset = 0x00, + }, + [SPECIES_CLAUNCHER] = + { + .size = 0x64, + .y_offset = 0x0B, + }, + [SPECIES_CLAWITZER] = + { + .size = 0x64, + .y_offset = 0x0B, + }, + [SPECIES_HELIOPTILE] = + { + .size = 0x64, + .y_offset = 0x0B, + }, + [SPECIES_HELIOLISK] = + { + .size = 0x64, + .y_offset = 0x02, + }, + [SPECIES_TYRUNT] = + { + .size = 0x64, + .y_offset = 0x0B, + }, + [SPECIES_TYRANTRUM] = + { + .size = 0x64, + .y_offset = 0x0B, + }, + [SPECIES_AMAURA] = + { + .size = 0x64, + .y_offset = 0x03, + }, + [SPECIES_AURORUS] = + { + .size = 0x64, + .y_offset = 0x00, + }, + [SPECIES_SYLVEON] = + { + .size = 0x64, + .y_offset = 0x04, + }, + [SPECIES_HAWLUCHA] = + { + .size = 0x64, + .y_offset = 0x0A, + }, + [SPECIES_DEDENNE] = + { + .size = 0x64, + .y_offset = 0x0C, + }, + [SPECIES_CARBINK] = + { + .size = 0x64, + .y_offset = 0x07, + }, + [SPECIES_GOOMY] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_SLIGGOO] = + { + .size = 0x64, + .y_offset = 0x00, + }, + [SPECIES_GOODRA] = + { + .size = 0x64, + .y_offset = 0x00, + }, + [SPECIES_KLEFKI] = + { + .size = 0x64, + .y_offset = 0x08, + }, + [SPECIES_PHANTUMP] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_TREVENANT] = + { + .size = 0x64, + .y_offset = 0x05, + }, + [SPECIES_PUMPKABOO] = + { + .size = 0x64, + .y_offset = 0x0D, + }, + [SPECIES_GOURGEIST] = + { + .size = 0x64, + .y_offset = 0x03, + }, + [SPECIES_BERGMITE] = + { + .size = 0x64, + .y_offset = 0x0D, + }, + [SPECIES_AVALUGG] = + { + .size = 0x64, + .y_offset = 0x0C, + }, + [SPECIES_NOIBAT] = + { + .size = 0x64, + .y_offset = 0x07, + }, + [SPECIES_NOIVERN] = + { + .size = 0x64, + .y_offset = 0x04, + }, + [SPECIES_XERNEAS] = + { + .size = 0x64, + .y_offset = 0x00, + }, + [SPECIES_YVELTAL] = + { + .size = 0x64, + .y_offset = 0x0A, + }, + [SPECIES_ZYGARDE] = + { + .size = 0x64, + .y_offset = 0x04, + }, + [SPECIES_DIANCIE] = + { + .size = 0x64, + .y_offset = 0x07, + }, + [SPECIES_HOOPA] = + { + .size = 0x64, + .y_offset = 0x07, + }, + [SPECIES_VOLCANION] = + { + .size = 0x64, + .y_offset = 0x03, + }, + [SPECIES_ROWLET] = + { + .size = 0x64, + .y_offset = 0x0F, + }, + [SPECIES_DARTRIX] = + { + .size = 0x64, + .y_offset = 0x04, + }, + [SPECIES_DECIDUEYE] = + { + .size = 0x64, + .y_offset = 0x00, + }, + [SPECIES_LITTEN] = + { + .size = 0x64, + .y_offset = 0x0B, + }, + [SPECIES_TORRACAT] = + { + .size = 0x64, + .y_offset = 0x07, + }, + [SPECIES_INCINEROAR] = + { + .size = 0x64, + .y_offset = 0x04, + }, + [SPECIES_POPPLIO] = + { + .size = 0x64, + .y_offset = 0x0B, + }, + [SPECIES_BRIONNE] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_PRIMARINA] = + { + .size = 0x64, + .y_offset = 0x00, + }, + [SPECIES_PIKIPEK] = + { + .size = 0x64, + .y_offset = 0x08, + }, + [SPECIES_TRUMBEAK] = + { + .size = 0x64, + .y_offset = 0x06, + }, + [SPECIES_TOUCANNON] = + { + .size = 0x64, + .y_offset = 0x06, + }, + [SPECIES_YUNGOOS] = + { + .size = 0x64, + .y_offset = 0x0E, + }, + [SPECIES_GUMSHOOS] = + { + .size = 0x64, + .y_offset = 0x07, + }, + [SPECIES_GRUBBIN] = + { + .size = 0x64, + .y_offset = 0x10, + }, + [SPECIES_CHARJABUG] = + { + .size = 0x64, + .y_offset = 0x0F, + }, + [SPECIES_VIKAVOLT] = + { + .size = 0x64, + .y_offset = 0x07, + }, + [SPECIES_CRABRAWLER] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_CRABOMINABLE] = + { + .size = 0x64, + .y_offset = 0x03, + }, + [SPECIES_ORICORIO] = + { + .size = 0x64, + .y_offset = 0x00, + }, + [SPECIES_CUTIEFLY] = + { + .size = 0x64, + .y_offset = 0x0F, + }, + [SPECIES_RIBOMBEE] = + { + .size = 0x64, + .y_offset = 0x0B, + }, + [SPECIES_ROCKRUFF] = + { + .size = 0x64, + .y_offset = 0x07, + }, + [SPECIES_LYCANROC] = + { + .size = 0x64, + .y_offset = 0x07, + }, + [SPECIES_WISHIWASHI] = + { + .size = 0x64, + .y_offset = 0x12, + }, + [SPECIES_MAREANIE] = + { + .size = 0x64, + .y_offset = 0x0F, + }, + [SPECIES_TOXAPEX] = + { + .size = 0x64, + .y_offset = 0x08, + }, + [SPECIES_MUDBRAY] = + { + .size = 0x64, + .y_offset = 0x08, + }, + [SPECIES_MUDSDALE] = + { + .size = 0x64, + .y_offset = 0x05, + }, + [SPECIES_DEWPIDER] = + { + .size = 0x64, + .y_offset = 0x08, + }, + [SPECIES_ARAQUANID] = + { + .size = 0x64, + .y_offset = 0x0C, + }, + [SPECIES_FOMANTIS] = + { + .size = 0x64, + .y_offset = 0x05, + }, + [SPECIES_LURANTIS] = + { + .size = 0x64, + .y_offset = 0x01, + }, + [SPECIES_MORELULL] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_SHIINOTIC] = + { + .size = 0x64, + .y_offset = 0x08, + }, + [SPECIES_SALANDIT] = + { + .size = 0x64, + .y_offset = 0x0C, + }, + [SPECIES_SALAZZLE] = + { + .size = 0x64, + .y_offset = 0x03, + }, + [SPECIES_STUFFUL] = + { + .size = 0x64, + .y_offset = 0x0C, + }, + [SPECIES_BEWEAR] = + { + .size = 0x64, + .y_offset = 0x02, + }, + [SPECIES_BOUNSWEET] = + { + .size = 0x64, + .y_offset = 0x0E, + }, + [SPECIES_STEENEE] = + { + .size = 0x64, + .y_offset = 0x08, + }, + [SPECIES_TSAREENA] = + { + .size = 0x64, + .y_offset = 0x06, + }, + [SPECIES_COMFEY] = + { + .size = 0x64, + .y_offset = 0x0B, + }, + [SPECIES_ORANGURU] = + { + .size = 0x64, + .y_offset = 0x0C, + }, + [SPECIES_PASSIMIAN] = + { + .size = 0x64, + .y_offset = 0x07, + }, + [SPECIES_WIMPOD] = + { + .size = 0x64, + .y_offset = 0x0A, + }, + [SPECIES_GOLISOPOD] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_SANDYGAST] = + { + .size = 0x64, + .y_offset = 0x0B, + }, + [SPECIES_PALOSSAND] = + { + .size = 0x64, + .y_offset = 0x02, + }, + [SPECIES_PYUKUMUKU] = + { + .size = 0x64, + .y_offset = 0x10, + }, + [SPECIES_TYPE_NULL] = + { + .size = 0x64, + .y_offset = 0x01, + }, + [SPECIES_SILVALLY] = + { + .size = 0x64, + .y_offset = 0x00, + }, + [SPECIES_MINIOR] = + { + .size = 0x64, + .y_offset = 0x0E, + }, + [SPECIES_KOMALA] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_TURTONATOR] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_TOGEDEMARU] = + { + .size = 0x64, + .y_offset = 0x0D, + }, + [SPECIES_MIMIKYU] = + { + .size = 0x64, + .y_offset = 0x07, + }, + [SPECIES_BRUXISH] = + { + .size = 0x64, + .y_offset = 0x0E, + }, + [SPECIES_DRAMPA] = + { + .size = 0x64, + .y_offset = 0x05, + }, + [SPECIES_DHELMISE] = + { + .size = 0x64, + .y_offset = 0x03, + }, + [SPECIES_JANGMO_O] = + { + .size = 0x64, + .y_offset = 0x07, + }, + [SPECIES_HAKAMO_O] = + { + .size = 0x64, + .y_offset = 0x05, + }, + [SPECIES_KOMMO_O] = + { + .size = 0x64, + .y_offset = 0x02, + }, + [SPECIES_TAPU_KOKO] = + { + .size = 0x64, + .y_offset = 0x02, + }, + [SPECIES_TAPU_LELE] = + { + .size = 0x64, + .y_offset = 0x06, + }, + [SPECIES_TAPU_BULU] = + { + .size = 0x64, + .y_offset = 0x01, + }, + [SPECIES_TAPU_FINI] = + { + .size = 0x64, + .y_offset = 0x04, + }, + [SPECIES_COSMOG] = + { + .size = 0x64, + .y_offset = 0x0A, + }, + [SPECIES_COSMOEM] = + { + .size = 0x64, + .y_offset = 0x11, + }, + [SPECIES_SOLGALEO] = + { + .size = 0x64, + .y_offset = 0x03, + }, + [SPECIES_LUNALA] = + { + .size = 0x64, + .y_offset = 0x02, + }, + [SPECIES_NIHILEGO] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_BUZZWOLE] = + { + .size = 0x64, + .y_offset = 0x0E, + }, + [SPECIES_PHEROMOSA] = + { + .size = 0x64, + .y_offset = 0x02, + }, + [SPECIES_XURKITREE] = + { + .size = 0x64, + .y_offset = 0x02, + }, + [SPECIES_CELESTEELA] = + { + .size = 0x64, + .y_offset = 0x00, + }, + [SPECIES_KARTANA] = + { + .size = 0x64, + .y_offset = 0x0B, + }, + [SPECIES_GUZZLORD] = + { + .size = 0x64, + .y_offset = 0x0A, + }, + [SPECIES_NECROZMA] = + { + .size = 0x64, + .y_offset = 0x04, + }, + [SPECIES_MAGEARNA] = + { + .size = 0x64, + .y_offset = 0x04, + }, + [SPECIES_MARSHADOW] = + { + .size = 0x64, + .y_offset = 0x06, + }, + [SPECIES_POIPOLE] = + { + .size = 0x64, + .y_offset = 0x06, + }, + [SPECIES_NAGANADEL] = + { + .size = 0x64, + .y_offset = 0x06, + }, + [SPECIES_STAKATAKA] = + { + .size = 0x64, + .y_offset = 0x0C, + }, + [SPECIES_BLACEPHALON] = + { + .size = 0x64, + .y_offset = 0x09, + }, + [SPECIES_ZERAORA] = + { + .size = 0x64, + .y_offset = 0x0B, + }, + // Eggs + Unown [SPECIES_EGG] = { .size = 0x36, diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 91d4ae4d22..5a1a944bd8 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -94,5 +94,14 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_TORNADUS] = 7, [SPECIES_THUNDURUS] = 7, [SPECIES_LANDORUS] = 7, + // Gens 6 & 7 + [SPECIES_FLETCHINDER] = 9, + [SPECIES_TALONFLAME] = 7, + [SPECIES_VIVILLON] = 9, + [SPECIES_NOIBAT] = 8, + [SPECIES_HOOPA] = 13, + [SPECIES_VIKAVOLT] = 8, + [SPECIES_CUTIEFLY] = 10, + [SPECIES_MINIOR] = 17, }; diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 302aa47f87..c4e9b42605 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -6827,6 +6827,10 @@ static const union AnimCmd sAnim_GENESECT_1[] = static const union AnimCmd sAnim_CHESPIN_1[] = { + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 24), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 24), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 0339404af0..d965794f60 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -3245,6 +3245,797 @@ const struct MonCoords gMonFrontPicCoords[] = .size = 0x45, .y_offset = 0x0, }, + // Gen 6 and 7 + [SPECIES_CHESPIN] = + { + .size = 0x45, + .y_offset = 0x0A, + }, + [SPECIES_QUILLADIN] = + { + .size = 0x45, + .y_offset = 0x0A, + }, + [SPECIES_CHESNAUGHT] = + { + .size = 0x45, + .y_offset = 0x04, + }, + [SPECIES_FENNEKIN] = + { + .size = 0x45, + .y_offset = 0x0A, + }, + [SPECIES_BRAIXEN] = + { + .size = 0x45, + .y_offset = 0x04, + }, + [SPECIES_DELPHOX] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_FROAKIE] = + { + .size = 0x45, + .y_offset = 0x0C, + }, + [SPECIES_FROGADIER] = + { + .size = 0x45, + .y_offset = 0x08, + }, + [SPECIES_GRENINJA] = + { + .size = 0x45, + .y_offset = 0x07, + }, + [SPECIES_BUNNELBY] = + { + .size = 0x45, + .y_offset = 0x05, + }, + [SPECIES_DIGGERSBY] = + { + .size = 0x45, + .y_offset = 0x04, + }, + [SPECIES_FLETCHLING] = + { + .size = 0x45, + .y_offset = 0x0C, + }, + [SPECIES_FLETCHINDER] = + { + .size = 0x45, + .y_offset = 0x08, + }, + [SPECIES_TALONFLAME] = + { + .size = 0x45, + .y_offset = 0x01, + }, + [SPECIES_SCATTERBUG] = + { + .size = 0x45, + .y_offset = 0x0D, + }, + [SPECIES_SPEWPA] = + { + .size = 0x45, + .y_offset = 0x0B, + }, + [SPECIES_VIVILLON] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_LITLEO] = + { + .size = 0x45, + .y_offset = 0x0A, + }, + [SPECIES_PYROAR] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_FLABEBE] = + { + .size = 0x45, + .y_offset = 0x06, + }, + [SPECIES_FLOETTE] = + { + .size = 0x45, + .y_offset = 0x03, + }, + [SPECIES_FLORGES] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_SKIDDO] = + { + .size = 0x45, + .y_offset = 0x07, + }, + [SPECIES_GOGOAT] = + { + .size = 0x45, + .y_offset = 0x02, + }, + [SPECIES_PANCHAM] = + { + .size = 0x45, + .y_offset = 0x0C, + }, + [SPECIES_PANGORO] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_FURFROU] = + { + .size = 0x45, + .y_offset = 0x03, + }, + [SPECIES_ESPURR] = + { + .size = 0x45, + .y_offset = 0x0A, + }, + [SPECIES_MEOWSTIC] = + { + .size = 0x45, + .y_offset = 0x06, + }, + [SPECIES_HONEDGE] = + { + .size = 0x45, + .y_offset = 0x04, + }, + [SPECIES_DOUBLADE] = + { + .size = 0x45, + .y_offset = 0x05, + }, + [SPECIES_AEGISLASH] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_SPRITZEE] = + { + .size = 0x45, + .y_offset = 0x0C, + }, + [SPECIES_AROMATISSE] = + { + .size = 0x45, + .y_offset = 0x04, + }, + [SPECIES_SWIRLIX] = + { + .size = 0x45, + .y_offset = 0x0E, + }, + [SPECIES_SLURPUFF] = + { + .size = 0x45, + .y_offset = 0x08, + }, + [SPECIES_INKAY] = + { + .size = 0x45, + .y_offset = 0x0E, + }, + [SPECIES_MALAMAR] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_BINACLE] = + { + .size = 0x45, + .y_offset = 0x09, + }, + [SPECIES_BARBARACLE] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_SKRELP] = + { + .size = 0x45, + .y_offset = 0x08, + }, + [SPECIES_DRAGALGE] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_CLAUNCHER] = + { + .size = 0x45, + .y_offset = 0x0E, + }, + [SPECIES_CLAWITZER] = + { + .size = 0x45, + .y_offset = 0x0A, + }, + [SPECIES_HELIOPTILE] = + { + .size = 0x45, + .y_offset = 0x0D, + }, + [SPECIES_HELIOLISK] = + { + .size = 0x45, + .y_offset = 0x04, + }, + [SPECIES_TYRUNT] = + { + .size = 0x45, + .y_offset = 0x0B, + }, + [SPECIES_TYRANTRUM] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_AMAURA] = + { + .size = 0x45, + .y_offset = 0x08, + }, + [SPECIES_AURORUS] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_SYLVEON] = + { + .size = 0x45, + .y_offset = 0x04, + }, + [SPECIES_HAWLUCHA] = + { + .size = 0x45, + .y_offset = 0x08, + }, + [SPECIES_DEDENNE] = + { + .size = 0x45, + .y_offset = 0x0D, + }, + [SPECIES_CARBINK] = + { + .size = 0x45, + .y_offset = 0x0A, + }, + [SPECIES_GOOMY] = + { + .size = 0x45, + .y_offset = 0x0D, + }, + [SPECIES_SLIGGOO] = + { + .size = 0x45, + .y_offset = 0x06, + }, + [SPECIES_GOODRA] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_KLEFKI] = + { + .size = 0x45, + .y_offset = 0x04, + }, + [SPECIES_PHANTUMP] = + { + .size = 0x45, + .y_offset = 0x0A, + }, + [SPECIES_TREVENANT] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_PUMPKABOO] = + { + .size = 0x45, + .y_offset = 0x0D, + }, + [SPECIES_GOURGEIST] = + { + .size = 0x45, + .y_offset = 0x04, + }, + [SPECIES_BERGMITE] = + { + .size = 0x45, + .y_offset = 0x0E, + }, + [SPECIES_AVALUGG] = + { + .size = 0x45, + .y_offset = 0x06, + }, + [SPECIES_NOIBAT] = + { + .size = 0x45, + .y_offset = 0x08, + }, + [SPECIES_NOIVERN] = + { + .size = 0x45, + .y_offset = 0x03, + }, + [SPECIES_XERNEAS] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_YVELTAL] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_ZYGARDE] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_DIANCIE] = + { + .size = 0x45, + .y_offset = 0x01, + }, + [SPECIES_HOOPA] = + { + .size = 0x45, + .y_offset = 0x0B, + }, + [SPECIES_VOLCANION] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_ROWLET] = + { + .size = 0x45, + .y_offset = 0x0C, + }, + [SPECIES_DARTRIX] = + { + .size = 0x45, + .y_offset = 0x08, + }, + [SPECIES_DECIDUEYE] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_LITTEN] = + { + .size = 0x45, + .y_offset = 0x0C, + }, + [SPECIES_TORRACAT] = + { + .size = 0x45, + .y_offset = 0x02, + }, + [SPECIES_INCINEROAR] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_POPPLIO] = + { + .size = 0x45, + .y_offset = 0x0B, + }, + [SPECIES_BRIONNE] = + { + .size = 0x45, + .y_offset = 0x06, + }, + [SPECIES_PRIMARINA] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_PIKIPEK] = + { + .size = 0x45, + .y_offset = 0x0B, + }, + [SPECIES_TRUMBEAK] = + { + .size = 0x45, + .y_offset = 0x06, + }, + [SPECIES_TOUCANNON] = + { + .size = 0x45, + .y_offset = 0x02, + }, + [SPECIES_YUNGOOS] = + { + .size = 0x45, + .y_offset = 0x0C, + }, + [SPECIES_GUMSHOOS] = + { + .size = 0x45, + .y_offset = 0x05, + }, + [SPECIES_GRUBBIN] = + { + .size = 0x45, + .y_offset = 0x11, + }, + [SPECIES_CHARJABUG] = + { + .size = 0x45, + .y_offset = 0x0E, + }, + [SPECIES_VIKAVOLT] = + { + .size = 0x45, + .y_offset = 0x06, + }, + [SPECIES_CRABRAWLER] = + { + .size = 0x45, + .y_offset = 0x07, + }, + [SPECIES_CRABOMINABLE] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_ORICORIO] = + { + .size = 0x45, + .y_offset = 0x02, + }, + [SPECIES_CUTIEFLY] = + { + .size = 0x45, + .y_offset = 0x10, + }, + [SPECIES_RIBOMBEE] = + { + .size = 0x45, + .y_offset = 0x05, + }, + [SPECIES_ROCKRUFF] = + { + .size = 0x45, + .y_offset = 0x0B, + }, + [SPECIES_LYCANROC] = + { + .size = 0x45, + .y_offset = 0x06, + }, + [SPECIES_WISHIWASHI] = + { + .size = 0x45, + .y_offset = 0x0F, + }, + [SPECIES_MAREANIE] = + { + .size = 0x45, + .y_offset = 0x0E, + }, + [SPECIES_TOXAPEX] = + { + .size = 0x45, + .y_offset = 0x02, + }, + [SPECIES_MUDBRAY] = + { + .size = 0x45, + .y_offset = 0x07, + }, + [SPECIES_MUDSDALE] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_DEWPIDER] = + { + .size = 0x45, + .y_offset = 0x0D, + }, + [SPECIES_ARAQUANID] = + { + .size = 0x45, + .y_offset = 0x02, + }, + [SPECIES_FOMANTIS] = + { + .size = 0x45, + .y_offset = 0x0B, + }, + [SPECIES_LURANTIS] = + { + .size = 0x45, + .y_offset = 0x02, + }, + [SPECIES_MORELULL] = + { + .size = 0x45, + .y_offset = 0x0A, + }, + [SPECIES_SHIINOTIC] = + { + .size = 0x45, + .y_offset = 0x04, + }, + [SPECIES_SALANDIT] = + { + .size = 0x45, + .y_offset = 0x0C, + }, + [SPECIES_SALAZZLE] = + { + .size = 0x45, + .y_offset = 0x01, + }, + [SPECIES_STUFFUL] = + { + .size = 0x45, + .y_offset = 0x0A, + }, + [SPECIES_BEWEAR] = + { + .size = 0x45, + .y_offset = 0x01, + }, + [SPECIES_BOUNSWEET] = + { + .size = 0x45, + .y_offset = 0x10, + }, + [SPECIES_STEENEE] = + { + .size = 0x45, + .y_offset = 0x07, + }, + [SPECIES_TSAREENA] = + { + .size = 0x45, + .y_offset = 0x01, + }, + [SPECIES_COMFEY] = + { + .size = 0x45, + .y_offset = 0x03, + }, + [SPECIES_ORANGURU] = + { + .size = 0x45, + .y_offset = 0x05, + }, + [SPECIES_PASSIMIAN] = + { + .size = 0x45, + .y_offset = 0x02, + }, + [SPECIES_WIMPOD] = + { + .size = 0x45, + .y_offset = 0x0E, + }, + [SPECIES_GOLISOPOD] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_SANDYGAST] = + { + .size = 0x45, + .y_offset = 0x0B, + }, + [SPECIES_PALOSSAND] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_PYUKUMUKU] = + { + .size = 0x45, + .y_offset = 0x0F, + }, + [SPECIES_TYPE_NULL] = + { + .size = 0x45, + .y_offset = 0x02, + }, + [SPECIES_SILVALLY] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_MINIOR] = + { + .size = 0x45, + .y_offset = 0x0E, + }, + [SPECIES_KOMALA] = + { + .size = 0x45, + .y_offset = 0x0C, + }, + [SPECIES_TURTONATOR] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_TOGEDEMARU] = + { + .size = 0x45, + .y_offset = 0x0C, + }, + [SPECIES_MIMIKYU] = + { + .size = 0x45, + .y_offset = 0x0C, + }, + [SPECIES_BRUXISH] = + { + .size = 0x45, + .y_offset = 0x0A, + }, + [SPECIES_DRAMPA] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_DHELMISE] = + { + .size = 0x45, + .y_offset = 0x01, + }, + [SPECIES_JANGMO_O] = + { + .size = 0x45, + .y_offset = 0x08, + }, + [SPECIES_HAKAMO_O] = + { + .size = 0x45, + .y_offset = 0x01, + }, + [SPECIES_KOMMO_O] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_TAPU_KOKO] = + { + .size = 0x45, + .y_offset = 0x01, + }, + [SPECIES_TAPU_LELE] = + { + .size = 0x45, + .y_offset = 0x06, + }, + [SPECIES_TAPU_BULU] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_TAPU_FINI] = + { + .size = 0x45, + .y_offset = 0x02, + }, + [SPECIES_COSMOG] = + { + .size = 0x45, + .y_offset = 0x0A, + }, + [SPECIES_COSMOEM] = + { + .size = 0x45, + .y_offset = 0x09, + }, + [SPECIES_SOLGALEO] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_LUNALA] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_NIHILEGO] = + { + .size = 0x45, + .y_offset = 0x03, + }, + [SPECIES_BUZZWOLE] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_PHEROMOSA] = + { + .size = 0x45, + .y_offset = 0x01, + }, + [SPECIES_XURKITREE] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_CELESTEELA] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_KARTANA] = + { + .size = 0x45, + .y_offset = 0x02, + }, + [SPECIES_GUZZLORD] = + { + .size = 0x45, + .y_offset = 0x03, + }, + [SPECIES_NECROZMA] = + { + .size = 0x45, + .y_offset = 0x02, + }, + [SPECIES_MAGEARNA] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_MARSHADOW] = + { + .size = 0x45, + .y_offset = 0x09, + }, + [SPECIES_POIPOLE] = + { + .size = 0x45, + .y_offset = 0x08, + }, + [SPECIES_NAGANADEL] = + { + .size = 0x45, + .y_offset = 0x01, + }, + [SPECIES_STAKATAKA] = + { + .size = 0x45, + .y_offset = 0x00, + }, + [SPECIES_BLACEPHALON] = + { + .size = 0x45, + .y_offset = 0x01, + }, + [SPECIES_ZERAORA] = + { + .size = 0x45, + .y_offset = 0x04, + }, [SPECIES_EGG] = { .size = 0x33, diff --git a/src/pokemon.c b/src/pokemon.c index f6e52b8dec..999a240bd0 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1764,6 +1764,80 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_DEOXYS - 1] = 0x1b, [SPECIES_CHIMECHO - 1] = 0x1d, [SPECIES_MOTHIM - 1] = 0x1d, + + //Gen 6 animations + [SPECIES_CHESPIN - 1] = 0x31, + [SPECIES_QUILLADIN - 1] = 0x00, + [SPECIES_CHESNAUGHT - 1] = 0x19, + [SPECIES_FENNEKIN - 1] = 0x00, + [SPECIES_BRAIXEN - 1] = 0x21, + [SPECIES_DELPHOX - 1] = 0x17, + [SPECIES_FROAKIE - 1] = 0x32, + [SPECIES_FROGADIER - 1] = 0x00, + [SPECIES_GRENINJA - 1] = 0x13, + [SPECIES_BUNNELBY - 1] = 0x52, + [SPECIES_DIGGERSBY - 1] = 0x19, + [SPECIES_FLETCHLING - 1] = 0x16, + [SPECIES_FLETCHINDER - 1] = 0x09, + [SPECIES_TALONFLAME - 1] = 0x3a, + [SPECIES_SCATTERBUG - 1] = 0x31, + [SPECIES_SPEWPA - 1] = 0x10, + [SPECIES_VIVILLON - 1] = 0x1d, + [SPECIES_LITLEO - 1] = 0x25, + [SPECIES_PYROAR - 1] = 0x9, + [SPECIES_FLABEBE - 1] = 0x51, + [SPECIES_FLOETTE - 1] = 0x0d, + [SPECIES_FLORGES - 1] = 0x47, + [SPECIES_SKIDDO - 1] = 0x16, + [SPECIES_GOGOAT - 1] = 0x17, + [SPECIES_PANCHAM - 1] = 0x52, + [SPECIES_PANGORO - 1] = 0x19, + [SPECIES_FURFROU - 1] = 0x16, + [SPECIES_ESPURR - 1] = 0x16, + [SPECIES_MEOWSTIC - 1] = 0x13, + [SPECIES_HONEDGE - 1] = 0x0d, + [SPECIES_DOUBLADE - 1] = 0x0d, + [SPECIES_AEGISLASH - 1] = 0x02, + [SPECIES_SPRITZEE - 1] = 0x1c, + [SPECIES_AROMATISSE - 1] = 0x45, + [SPECIES_SWIRLIX - 1] = 0x32, + [SPECIES_SLURPUFF - 1] = 0x0, + [SPECIES_INKAY - 1] = 0x1c, + [SPECIES_MALAMAR - 1] = 0x01, + [SPECIES_BINACLE - 1] = 0x17, + [SPECIES_BARBARACLE - 1] = 0x2f, + [SPECIES_SKRELP - 1] = 0x51, + [SPECIES_DRAGALGE - 1] = 0x13, + [SPECIES_CLAUNCHER - 1] = 0x52, + [SPECIES_CLAWITZER - 1] = 0x25, + [SPECIES_HELIOPTILE - 1] = 0x00, + [SPECIES_HELIOLISK - 1] = 0x09, + [SPECIES_TYRUNT - 1] = 0x10, + [SPECIES_TYRANTRUM - 1] = 0x0f, + [SPECIES_AMAURA - 1] = 0x17, + [SPECIES_AURORUS - 1] = 0x19, + [SPECIES_SYLVEON - 1] = 0x16, + [SPECIES_HAWLUCHA - 1] = 0x16, + [SPECIES_DEDENNE - 1] = 0x52, + [SPECIES_CARBINK - 1] = 0x0d, + [SPECIES_GOOMY - 1] = 0x01, + [SPECIES_SLIGGOO - 1] = 0x3e, + [SPECIES_GOODRA - 1] = 0x10, + [SPECIES_KLEFKI - 1] = 0x0d, + [SPECIES_PHANTUMP - 1] = 0x1c, + [SPECIES_TREVENANT - 1] = 0x35, + [SPECIES_PUMPKABOO - 1] = 0x1d, + [SPECIES_GOURGEIST - 1] = 0x0d, + [SPECIES_BERGMITE - 1] = 0x10, + [SPECIES_AVALUGG - 1] = 0x2f, + [SPECIES_NOIBAT - 1] = 0x51, + [SPECIES_NOIVERN - 1] = 0x32, + [SPECIES_XERNEAS - 1] = 0x23, + [SPECIES_YVELTAL - 1] = 0x15, + [SPECIES_ZYGARDE - 1] = 0x0f, + [SPECIES_DIANCIE - 1] = 0x0d, + [SPECIES_HOOPA - 1] = 0x51, + [SPECIES_VOLCANION - 1] = 0x10, }; static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] =