From 169b9207c491dd52662c709aa1c92fc95c37799d Mon Sep 17 00:00:00 2001
From: Papa Cancer <thechurchofcage@gmail.com>
Date: Tue, 9 Apr 2019 13:40:35 +0100
Subject: [PATCH 1/2] Gens 6 & 7 position coordinates

---
 .../pokemon_graphics/back_pic_coordinates.h   | 792 ++++++++++++++++++
 .../pokemon_graphics/enemy_mon_elevation.h    |   9 +
 .../pokemon_graphics/front_pic_coordinates.h  | 791 +++++++++++++++++
 3 files changed, 1592 insertions(+)

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_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,

From dfeb2ebcea9597a2d59f402f4212611e6dd7c9ab Mon Sep 17 00:00:00 2001
From: Papa Cancer <thechurchofcage@gmail.com>
Date: Tue, 9 Apr 2019 19:46:45 +0100
Subject: [PATCH 2/2] Gen 6 mon animations

Includes 2-frame Chespin sprite
---
 graphics/pokemon/chespin/back.png           | Bin 591 -> 564 bytes
 graphics/pokemon/chespin/front.png          | Bin 622 -> 836 bytes
 graphics/pokemon/chespin/normal.pal         |  28 ++++----
 graphics/pokemon/chespin/shiny.pal          |  28 ++++----
 src/data/pokemon_graphics/front_pic_anims.h |   4 ++
 src/pokemon.c                               |  74 ++++++++++++++++++++
 6 files changed, 106 insertions(+), 28 deletions(-)

diff --git a/graphics/pokemon/chespin/back.png b/graphics/pokemon/chespin/back.png
index 0fb5486c2d3061a2e54e02c2fffda486ad7fcd06..55438cc0eb7aa6a0aef3401e2984b16dd22e8a8d 100644
GIT binary patch
delta 539
zcmV+$0_6SA1hfQ@B!4haOjJbxweLz}84wT<rPfM&oI2L;j6x|8wR=)?N-5^0Yf3^o
z|NsA-LMiuaLe|#S0002`&HmQ_000SaNLh0L01m_e01m_fl`9S#00051Nkl<ZNQu>y
zO>ToQ5QS~j13>Hp5C^eO#}}|Y2dPkndX6rl9J^zRiT_9%Wq(x*f$)5K@7ac7?1|Am
z0z~^Fz~THCfcJL*AP=zvbSuDN2N05Kx@EWv=#~RodhYCofHOz5q+)NjF-rlu1;7pH
z;5`KlA`Z9#G-G4H=@kgN0(6p>N^$}EO&|rj1&|vc05Aa>MB^{h1_3b1;WdK?wu~g8
z<BSB@#bC|o1%EKzGA;)%u=*kiq!DNt79II^ZHSmUFlHny!$*5_B#<2ncK{nf5ioZU
zp$^*63+4_SZUb9^cLWG9SPHlph<3c@pgoYUQMy>5Ou!_j^#dyajO#Z43Avwjp<Hp`
zn2o1_=JOFSJp$(8Wgzu1MKc;xAU}x$C|f`V<Pq|9mVXWza4Z29FVjJ#qc#z6s&!O(
zlduDn5*)1zo7D3PAW^Ab;-KiQ@Zd<(>L{r^&WbfM2O8z?$_JR|xo1tao2tp_1^E7`
zmHm<Xk9M5Du2U5l=aUCW;(G0?0u%bb4i!mUDkfw2X8MsNE;V4?OWSypLV{)kz!sBg
d&VM_802Gq_u`ECUrCk63002ovPDHLkV1oOA;urt`

delta 566
zcmV-60?GZf1kVJJB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0000mP)t-s0I=vd
z000mW5WpB1a0n1cI53!iSV$-!(5QG&P*C{z_>f2d=)f>27!c6V&;S4c-P8lT00009
za7bBm000id000id0mpBsWB>pGs7XXYR7l6&ls#_4FbstyqkjjmY8}8)yn0Bf3rOOL
zx@5{7gP=es-=&mmEBbTXAX|wbfyEE+QDjW^Oo%<8YhMI7oc;pv{s92w(QN=?0XS>`
zour&@8Eyi)<$#ucH@eZmi6dH4v3FaMRw!lw10did1q>n%7yvr4G2rw9h+wLddMPDm
zpbr8mAZ9=Ypnn6v1ZWVA|Cn|a0Fw-_89WebBmo`QNPwLUmKwbPrY+-g@B)i3k^p8+
zA1pfZ742GL>cE(hFo!Sg&5=Mh6z%{5K_y`B(5-pUh8{3?;BXIYJA5EOfWcD0#X!{Y
znuGR0en;tIfwBT7G0nfT0>C(L^OunOQ@5ro4ji+18h>cM_JG?SFbyvQsfQ_+(U=1H
zBnm+60p$`&?^!xzz@Y?Kd`$<HjoL)Ov9?j=UBV7fN^rDtZBoxGfJCK!iFZX$g$GAE
zRtHJxaZ;?2InXHot$YE~H1({hZc}x0dImnPwX`3(|I?1s_xV-@#_8w*k~p9Hs=y8X
zTZf7yE-%-bz%q`0B#BE6SbAw2Z*nai0>EYy_K$+GA29gDBYuSjS^xk507*qoM6N<$
Ef*j81MF0Q*

diff --git a/graphics/pokemon/chespin/front.png b/graphics/pokemon/chespin/front.png
index 1940c964d79ee03324d2f672d3cd2926d41b2ba7..efb818c9e71dee6f2bbd7e0b813c061cac533726 100644
GIT binary patch
delta 826
zcmV-A1I7IA1jGiA7k_{R0{{R3Nw0EQ0000mP)t-s0JZN*V;K+-5T({idz?Df?~Fnz
z5Vd<!b4n@ZrE5w;I{*LwoI)x0YeLr6)&Kwi`py2=00009a7bBm000ie000ie0hKEb
z8vp<Tx=BPqR9J=WmN9GFKoo#=8ZvnD<+2nyC}-g`PAJHiW`DOW+No2?9zs#<RTQi4
z&>@3+T}{BbOr={>$p0v$|Dav66g>1d^xa9+MtV<4hZYKc*l_rLdhecO`#aBD$6pE-
z+yRI>fHfV!f#J<kjyoV~G8J$Ij4BsuS%RquUaAZEDxhplp|}#N%M?JR@KxkW3;+m3
zwEzH6f^EfvgMR^9!1jokIC`O!>R|<33Gw6z@~}%Kv769}RF8AMrO*bpggAVy^(1Yn
zKGML37+vUh#-wqK1MF}z*T$H6NCKDUy}2|djQcq7?DHpM;60;&(cb=z+1srFI$ytk
z>FmzW2*4Z7QfX!rO#%;$i;FX23U9-VjD1mKdfd#UoPWT5==aOtw>+;#u0<M$@g_Ee
z>PnlRg_}Ow#Fv2w4YIH&-5T3uGL_kwOP$~|Btt#TvaCJSIypx2@VRco3~3t{(<(8X
zYJFnInE5~qr&VC6<*^0M10beVz?Twkr2}BSk4}*T8S$iS>`WkUfg1|QZ1nlVZ?(Xy
z@HqkaS$_dgkNY=({_s`+DxdFRoTX&mlj9R9Pg7zCUgIju0$b+I2OPM*{*eQV1zuqB
z^VV+9e@p=Iw1Q&Mp|`n?b^LK)e}SvPaA6ezeimJiK@rBw7rK96(FA~5MwAQrk#jf5
z-MX2HiW+lw3&?_3w=wrR{pWJ;3e2tGZYy_nFn>_n3X?aun=j>#&DvU#d$(G^&asp`
zmWL76a(8hLxu;U@)XE)vbBEmL87=pXBuNUnC&|ld6K7s0_ooSIUhU-mNK@w3x!e=G
zK+P+qle=Bu=Lfi#c9VE&37iubyGhJ_fd518Y3C!+p#Uhc7JC?<zNG=*${naHx<cR@
z5i@)A8hJ`m2aLvb-Pyvk$Aep{c3xmnpQlct>-cx^3;tp|k#yF(=>Px#07*qoM6N<$
Ef=Nz_lK=n!

delta 610
zcmV-o0-gQD2JQrq7k@wm0{{R3SVwH_00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^
z1poj5Fi=cXMF6nqC{PFx5D<{SIADMvNH{RKcxYfa80e^gU|?YQ`1p`00QguqI3Nhn
z(9i$?05pg7-v9sr32;bRa{vGi!vFvd!vV){sAK>D0mn&1L4Q<8$L*9cPuoBg$L}mL
zFjUIn43$`{i$R2nO3s515XWNb#DF|o<ZxFcxGr9-DtXyD(hhtMB>D~70d?_|g`rXw
zJ_GMAC_{1=7TEafES>!S`Ty>{lg!@rR^rhMK)4RzEei-@L~F?t7D!qgA_2s}a!|(*
z91>d4BYzbDlYbe4fDn2d2wGAAiH#T#5QVD&1W*KTXM@9mGr-hHIDJX#y8>*)+^185
zWDa!_=nEm*;4EMw!lQGo%c29RXP99=)>nu{mbn3bRE{(vj$$t`!EZQ0jI-1Y9RIpT
zq^I@)`TnOn+}~RRbbtT7?e2{(JOIn<LSkKNFYpnq#(x){F4zX<XqK-{Ca{*Wq&cK%
z%jrXIOB7k0Z8>}nJ!$+p-U^&W0vRzXpyIx?dxt(uFQpm^si(|sH~La3b<k)%y?6NZ
zUhhy3#Q|-qRidf1{%6{#10tGg6=<})H^BFZh^lflA!(ErFnjkbEucI%Wwcw8Z-6@=
zpo~(n{aa@(a29{@0D*c2eAm4IBwG*o{P`J%s_^<u4o{>!EquSZ&7Vp|Cg$r8H*j<F
we-6xM?tt0jgE?OC*#j(YD3D$Du2&ahPvaDrD8|8#eE<Le07*qoM6N<$f}S7*_W%F@

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/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/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] =