diff --git a/graphics/pokemon/chespin/back.png b/graphics/pokemon/chespin/back.png
index 0fb5486c2..55438cc0e 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 1940c964d..efb818c9e 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 33fff1917..962832e5d 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 854c09af1..8837babdb 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 302aa47f8..c4e9b4260 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 f6e52b8de..999a240bd 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] =