From 47c3134bd37ed295239b8d41997621802bf1370e Mon Sep 17 00:00:00 2001
From: pokeapi-machine-user <pokeapi.co@gmail.com>
Date: Thu, 12 Sep 2024 08:50:40 +0000
Subject: [PATCH] [Updater Bot] Regenerate data from
 https://github.com/PokeAPI/pokeapi/pull/1122

---
 data/api/v2/gender/1/index.json               |  84 ++++++------
 data/api/v2/gender/2/index.json               |  86 ++++++------
 data/api/v2/gender/3/index.json               |  18 +--
 data/api/v2/generation/8/index.json           |  24 ++--
 data/api/v2/generation/9/index.json           |  72 +++++-----
 data/api/v2/growth-rate/1/index.json          |  28 ++--
 data/api/v2/growth-rate/2/index.json          |  40 +++---
 data/api/v2/growth-rate/3/index.json          |   8 +-
 data/api/v2/growth-rate/4/index.json          |  32 ++---
 data/api/v2/pokemon-color/10/index.json       |  16 +--
 data/api/v2/pokemon-color/2/index.json        |   8 +-
 data/api/v2/pokemon-color/3/index.json        |  24 ++--
 data/api/v2/pokemon-color/4/index.json        |  28 ++--
 data/api/v2/pokemon-color/5/index.json        |   8 +-
 data/api/v2/pokemon-color/6/index.json        |   8 +-
 data/api/v2/pokemon-color/8/index.json        |  16 +--
 data/api/v2/pokemon-color/9/index.json        |  12 +-
 data/api/v2/pokemon-shape/1/index.json        |  36 +++++
 data/api/v2/pokemon-shape/10/index.json       | 108 ++++++++++++++-
 data/api/v2/pokemon-shape/11/index.json       |  24 ++++
 data/api/v2/pokemon-shape/12/index.json       |  76 ++++++++++-
 data/api/v2/pokemon-shape/13/index.json       |   4 +
 data/api/v2/pokemon-shape/14/index.json       |   4 +
 data/api/v2/pokemon-shape/2/index.json        |  24 ++++
 data/api/v2/pokemon-shape/3/index.json        |  16 +++
 data/api/v2/pokemon-shape/4/index.json        | 124 ++++++++++++++++++
 data/api/v2/pokemon-shape/5/index.json        |  16 +++
 data/api/v2/pokemon-shape/6/index.json        |   8 +-
 data/api/v2/pokemon-shape/7/index.json        |  20 +++
 data/api/v2/pokemon-shape/8/index.json        |  16 ++-
 data/api/v2/pokemon-shape/9/index.json        |  28 ++++
 data/api/v2/pokemon-species/1000/index.json   |  12 +-
 data/api/v2/pokemon-species/1001/index.json   |  12 +-
 data/api/v2/pokemon-species/1002/index.json   |  12 +-
 data/api/v2/pokemon-species/1003/index.json   |  12 +-
 data/api/v2/pokemon-species/1004/index.json   |  12 +-
 data/api/v2/pokemon-species/1005/index.json   |  12 +-
 data/api/v2/pokemon-species/1006/index.json   |  12 +-
 data/api/v2/pokemon-species/1007/index.json   |  12 +-
 data/api/v2/pokemon-species/1008/index.json   |  12 +-
 data/api/v2/pokemon-species/1009/index.json   |  12 +-
 data/api/v2/pokemon-species/1010/index.json   |  12 +-
 data/api/v2/pokemon-species/1011/index.json   |  12 +-
 data/api/v2/pokemon-species/1012/index.json   |  12 +-
 data/api/v2/pokemon-species/1013/index.json   |  12 +-
 data/api/v2/pokemon-species/1014/index.json   |  12 +-
 data/api/v2/pokemon-species/1015/index.json   |  12 +-
 data/api/v2/pokemon-species/1016/index.json   |  12 +-
 data/api/v2/pokemon-species/1017/index.json   |  12 +-
 data/api/v2/pokemon-species/1018/index.json   |  12 +-
 data/api/v2/pokemon-species/1019/index.json   |  12 +-
 data/api/v2/pokemon-species/1020/index.json   |  12 +-
 data/api/v2/pokemon-species/1021/index.json   |  12 +-
 data/api/v2/pokemon-species/1022/index.json   |  12 +-
 data/api/v2/pokemon-species/1023/index.json   |  12 +-
 data/api/v2/pokemon-species/1024/index.json   |  12 +-
 data/api/v2/pokemon-species/1025/index.json   |  19 ++-
 data/api/v2/pokemon-species/899/index.json    |   7 +
 data/api/v2/pokemon-species/900/index.json    |   7 +
 data/api/v2/pokemon-species/901/index.json    |   7 +
 data/api/v2/pokemon-species/902/index.json    |   7 +
 data/api/v2/pokemon-species/903/index.json    |   7 +
 data/api/v2/pokemon-species/904/index.json    |   7 +
 data/api/v2/pokemon-species/905/index.json    |   7 +
 data/api/v2/pokemon-species/906/index.json    |  26 ++--
 data/api/v2/pokemon-species/907/index.json    |  12 +-
 data/api/v2/pokemon-species/908/index.json    |  12 +-
 data/api/v2/pokemon-species/909/index.json    |  12 +-
 data/api/v2/pokemon-species/910/index.json    |  12 +-
 data/api/v2/pokemon-species/911/index.json    |  12 +-
 data/api/v2/pokemon-species/912/index.json    |  12 +-
 data/api/v2/pokemon-species/913/index.json    |  12 +-
 data/api/v2/pokemon-species/914/index.json    |  12 +-
 data/api/v2/pokemon-species/915/index.json    |  12 +-
 data/api/v2/pokemon-species/916/index.json    |  12 +-
 data/api/v2/pokemon-species/917/index.json    |  26 ++--
 data/api/v2/pokemon-species/918/index.json    |  12 +-
 data/api/v2/pokemon-species/919/index.json    |  12 +-
 data/api/v2/pokemon-species/920/index.json    |  12 +-
 data/api/v2/pokemon-species/921/index.json    |  12 +-
 data/api/v2/pokemon-species/922/index.json    |  12 +-
 data/api/v2/pokemon-species/923/index.json    |  12 +-
 data/api/v2/pokemon-species/924/index.json    |  12 +-
 data/api/v2/pokemon-species/925/index.json    |  12 +-
 data/api/v2/pokemon-species/926/index.json    |  12 +-
 data/api/v2/pokemon-species/927/index.json    |  12 +-
 data/api/v2/pokemon-species/928/index.json    |  12 +-
 data/api/v2/pokemon-species/929/index.json    |  12 +-
 data/api/v2/pokemon-species/930/index.json    |  12 +-
 data/api/v2/pokemon-species/931/index.json    |  12 +-
 data/api/v2/pokemon-species/932/index.json    |  12 +-
 data/api/v2/pokemon-species/933/index.json    |  12 +-
 data/api/v2/pokemon-species/934/index.json    |  12 +-
 data/api/v2/pokemon-species/935/index.json    |  12 +-
 data/api/v2/pokemon-species/936/index.json    |  12 +-
 data/api/v2/pokemon-species/937/index.json    |  12 +-
 data/api/v2/pokemon-species/938/index.json    |  12 +-
 data/api/v2/pokemon-species/939/index.json    |  12 +-
 data/api/v2/pokemon-species/940/index.json    |  12 +-
 data/api/v2/pokemon-species/941/index.json    |  12 +-
 data/api/v2/pokemon-species/942/index.json    |  12 +-
 data/api/v2/pokemon-species/943/index.json    |  12 +-
 data/api/v2/pokemon-species/944/index.json    |  12 +-
 data/api/v2/pokemon-species/945/index.json    |  12 +-
 data/api/v2/pokemon-species/946/index.json    |  12 +-
 data/api/v2/pokemon-species/947/index.json    |  12 +-
 data/api/v2/pokemon-species/948/index.json    |  12 +-
 data/api/v2/pokemon-species/949/index.json    |  12 +-
 data/api/v2/pokemon-species/950/index.json    |  12 +-
 data/api/v2/pokemon-species/951/index.json    |  12 +-
 data/api/v2/pokemon-species/952/index.json    |  38 ++++--
 data/api/v2/pokemon-species/953/index.json    |  12 +-
 data/api/v2/pokemon-species/954/index.json    |  12 +-
 data/api/v2/pokemon-species/955/index.json    |  12 +-
 data/api/v2/pokemon-species/956/index.json    |  12 +-
 data/api/v2/pokemon-species/957/index.json    |  12 +-
 data/api/v2/pokemon-species/958/index.json    |  12 +-
 data/api/v2/pokemon-species/959/index.json    |  12 +-
 data/api/v2/pokemon-species/960/index.json    |  12 +-
 data/api/v2/pokemon-species/961/index.json    |  12 +-
 data/api/v2/pokemon-species/962/index.json    |  12 +-
 data/api/v2/pokemon-species/963/index.json    |  12 +-
 data/api/v2/pokemon-species/964/index.json    |  12 +-
 data/api/v2/pokemon-species/965/index.json    |  12 +-
 data/api/v2/pokemon-species/966/index.json    |  12 +-
 data/api/v2/pokemon-species/967/index.json    |  12 +-
 data/api/v2/pokemon-species/968/index.json    |  12 +-
 data/api/v2/pokemon-species/969/index.json    |  12 +-
 data/api/v2/pokemon-species/970/index.json    |  12 +-
 data/api/v2/pokemon-species/971/index.json    |  12 +-
 data/api/v2/pokemon-species/972/index.json    |  12 +-
 data/api/v2/pokemon-species/973/index.json    |  12 +-
 data/api/v2/pokemon-species/974/index.json    |  12 +-
 data/api/v2/pokemon-species/975/index.json    |  12 +-
 data/api/v2/pokemon-species/976/index.json    |  12 +-
 data/api/v2/pokemon-species/977/index.json    |  12 +-
 data/api/v2/pokemon-species/978/index.json    |  12 +-
 data/api/v2/pokemon-species/979/index.json    |  12 +-
 data/api/v2/pokemon-species/980/index.json    |  12 +-
 data/api/v2/pokemon-species/981/index.json    |  12 +-
 data/api/v2/pokemon-species/982/index.json    |  12 +-
 data/api/v2/pokemon-species/983/index.json    |  12 +-
 data/api/v2/pokemon-species/984/index.json    |  12 +-
 data/api/v2/pokemon-species/985/index.json    |  12 +-
 data/api/v2/pokemon-species/986/index.json    |  12 +-
 data/api/v2/pokemon-species/987/index.json    |  12 +-
 data/api/v2/pokemon-species/988/index.json    |  12 +-
 data/api/v2/pokemon-species/989/index.json    |  26 ++--
 data/api/v2/pokemon-species/990/index.json    |  12 +-
 data/api/v2/pokemon-species/991/index.json    |  12 +-
 data/api/v2/pokemon-species/992/index.json    |  12 +-
 data/api/v2/pokemon-species/993/index.json    |  12 +-
 data/api/v2/pokemon-species/994/index.json    |  12 +-
 data/api/v2/pokemon-species/995/index.json    |  12 +-
 data/api/v2/pokemon-species/996/index.json    |  12 +-
 data/api/v2/pokemon-species/997/index.json    |  12 +-
 data/api/v2/pokemon-species/998/index.json    |  26 ++--
 data/api/v2/pokemon-species/999/index.json    |  12 +-
 data/schema/v2/pokemon-species/$id/index.json |   9 +-
 159 files changed, 2166 insertions(+), 437 deletions(-)

diff --git a/data/api/v2/gender/1/index.json b/data/api/v2/gender/1/index.json
index 6d448cbf26..613ecade64 100644
--- a/data/api/v2/gender/1/index.json
+++ b/data/api/v2/gender/1/index.json
@@ -4720,13 +4720,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "pawmi",
-                "url": "/api/v2/pokemon-species/921/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "hakamo-o",
@@ -4867,6 +4860,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "lokix",
+                "url": "/api/v2/pokemon-species/920/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "silicobra",
@@ -5063,6 +5063,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "centiskorch",
+                "url": "/api/v2/pokemon-species/851/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "grapploct",
@@ -5184,15 +5191,15 @@
         },
         {
             "pokemon_species": {
-                "name": "basculegion",
-                "url": "/api/v2/pokemon-species/902/"
+                "name": "ursaluna",
+                "url": "/api/v2/pokemon-species/901/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "sneasler",
-                "url": "/api/v2/pokemon-species/903/"
+                "name": "basculegion",
+                "url": "/api/v2/pokemon-species/902/"
             },
             "rate": 4
         },
@@ -5224,6 +5231,13 @@
             },
             "rate": 1
         },
+        {
+            "pokemon_species": {
+                "name": "skeledirge",
+                "url": "/api/v2/pokemon-species/911/"
+            },
+            "rate": 1
+        },
         {
             "pokemon_species": {
                 "name": "quaxwell",
@@ -5247,8 +5261,8 @@
         },
         {
             "pokemon_species": {
-                "name": "lokix",
-                "url": "/api/v2/pokemon-species/920/"
+                "name": "pawmi",
+                "url": "/api/v2/pokemon-species/921/"
             },
             "rate": 4
         },
@@ -5483,13 +5497,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "arboliva",
-                "url": "/api/v2/pokemon-species/930/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "naclstack",
@@ -5532,6 +5539,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "mabosstiff",
+                "url": "/api/v2/pokemon-species/943/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "grafaiai",
@@ -5604,8 +5618,8 @@
         },
         {
             "pokemon_species": {
-                "name": "revavroom",
-                "url": "/api/v2/pokemon-species/966/"
+                "name": "glimmora",
+                "url": "/api/v2/pokemon-species/970/"
             },
             "rate": 4
         },
@@ -5828,25 +5842,11 @@
         },
         {
             "pokemon_species": {
-                "name": "centiskorch",
-                "url": "/api/v2/pokemon-species/851/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "ursaluna",
-                "url": "/api/v2/pokemon-species/901/"
+                "name": "sneasler",
+                "url": "/api/v2/pokemon-species/903/"
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "skeledirge",
-                "url": "/api/v2/pokemon-species/911/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "pawmo",
@@ -5856,15 +5856,15 @@
         },
         {
             "pokemon_species": {
-                "name": "mabosstiff",
-                "url": "/api/v2/pokemon-species/943/"
+                "name": "arboliva",
+                "url": "/api/v2/pokemon-species/930/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "glimmora",
-                "url": "/api/v2/pokemon-species/970/"
+                "name": "revavroom",
+                "url": "/api/v2/pokemon-species/966/"
             },
             "rate": 4
         },
diff --git a/data/api/v2/gender/2/index.json b/data/api/v2/gender/2/index.json
index a241aa00e5..7a229b0a9e 100644
--- a/data/api/v2/gender/2/index.json
+++ b/data/api/v2/gender/2/index.json
@@ -4671,13 +4671,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "pawmi",
-                "url": "/api/v2/pokemon-species/921/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "hakamo-o",
@@ -4818,6 +4811,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "lokix",
+                "url": "/api/v2/pokemon-species/920/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "silicobra",
@@ -5002,17 +5002,17 @@
         },
         {
             "pokemon_species": {
-                "name": "grapploct",
-                "url": "/api/v2/pokemon-species/853/"
+                "name": "centiskorch",
+                "url": "/api/v2/pokemon-species/851/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "morgrem",
-                "url": "/api/v2/pokemon-species/860/"
+                "name": "grapploct",
+                "url": "/api/v2/pokemon-species/853/"
             },
-            "rate": 0
+            "rate": 4
         },
         {
             "pokemon_species": {
@@ -5114,15 +5114,15 @@
         },
         {
             "pokemon_species": {
-                "name": "basculegion",
-                "url": "/api/v2/pokemon-species/902/"
+                "name": "ursaluna",
+                "url": "/api/v2/pokemon-species/901/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "sneasler",
-                "url": "/api/v2/pokemon-species/903/"
+                "name": "basculegion",
+                "url": "/api/v2/pokemon-species/902/"
             },
             "rate": 4
         },
@@ -5154,6 +5154,13 @@
             },
             "rate": 1
         },
+        {
+            "pokemon_species": {
+                "name": "skeledirge",
+                "url": "/api/v2/pokemon-species/911/"
+            },
+            "rate": 1
+        },
         {
             "pokemon_species": {
                 "name": "quaxwell",
@@ -5184,8 +5191,8 @@
         },
         {
             "pokemon_species": {
-                "name": "lokix",
-                "url": "/api/v2/pokemon-species/920/"
+                "name": "pawmi",
+                "url": "/api/v2/pokemon-species/921/"
             },
             "rate": 4
         },
@@ -5413,13 +5420,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "arboliva",
-                "url": "/api/v2/pokemon-species/930/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "naclstack",
@@ -5462,6 +5462,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "mabosstiff",
+                "url": "/api/v2/pokemon-species/943/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "grafaiai",
@@ -5520,8 +5527,8 @@
         },
         {
             "pokemon_species": {
-                "name": "revavroom",
-                "url": "/api/v2/pokemon-species/966/"
+                "name": "glimmora",
+                "url": "/api/v2/pokemon-species/970/"
             },
             "rate": 4
         },
@@ -5737,25 +5744,18 @@
         },
         {
             "pokemon_species": {
-                "name": "centiskorch",
-                "url": "/api/v2/pokemon-species/851/"
+                "name": "morgrem",
+                "url": "/api/v2/pokemon-species/860/"
             },
-            "rate": 4
+            "rate": 0
         },
         {
             "pokemon_species": {
-                "name": "ursaluna",
-                "url": "/api/v2/pokemon-species/901/"
+                "name": "sneasler",
+                "url": "/api/v2/pokemon-species/903/"
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "skeledirge",
-                "url": "/api/v2/pokemon-species/911/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "pawmo",
@@ -5765,15 +5765,15 @@
         },
         {
             "pokemon_species": {
-                "name": "mabosstiff",
-                "url": "/api/v2/pokemon-species/943/"
+                "name": "arboliva",
+                "url": "/api/v2/pokemon-species/930/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "glimmora",
-                "url": "/api/v2/pokemon-species/970/"
+                "name": "revavroom",
+                "url": "/api/v2/pokemon-species/966/"
             },
             "rate": 4
         },
diff --git a/data/api/v2/gender/3/index.json b/data/api/v2/gender/3/index.json
index d48d4cfecb..7b0da09178 100644
--- a/data/api/v2/gender/3/index.json
+++ b/data/api/v2/gender/3/index.json
@@ -933,6 +933,13 @@
             },
             "rate": -1
         },
+        {
+            "pokemon_species": {
+                "name": "maushold",
+                "url": "/api/v2/pokemon-species/925/"
+            },
+            "rate": -1
+        },
         {
             "pokemon_species": {
                 "name": "gimmighoul",
@@ -954,13 +961,6 @@
             },
             "rate": -1
         },
-        {
-            "pokemon_species": {
-                "name": "gholdengo",
-                "url": "/api/v2/pokemon-species/1000/"
-            },
-            "rate": -1
-        },
         {
             "pokemon_species": {
                 "name": "ting-lu",
@@ -1110,8 +1110,8 @@
         },
         {
             "pokemon_species": {
-                "name": "maushold",
-                "url": "/api/v2/pokemon-species/925/"
+                "name": "gholdengo",
+                "url": "/api/v2/pokemon-species/1000/"
             },
             "rate": -1
         },
diff --git a/data/api/v2/generation/8/index.json b/data/api/v2/generation/8/index.json
index 763dd7979e..9af748f8a7 100644
--- a/data/api/v2/generation/8/index.json
+++ b/data/api/v2/generation/8/index.json
@@ -919,6 +919,10 @@
             "name": "toxtricity",
             "url": "/api/v2/pokemon-species/849/"
         },
+        {
+            "name": "centiskorch",
+            "url": "/api/v2/pokemon-species/851/"
+        },
         {
             "name": "grapploct",
             "url": "/api/v2/pokemon-species/853/"
@@ -935,10 +939,6 @@
             "name": "hatterene",
             "url": "/api/v2/pokemon-species/858/"
         },
-        {
-            "name": "morgrem",
-            "url": "/api/v2/pokemon-species/860/"
-        },
         {
             "name": "grimmsnarl",
             "url": "/api/v2/pokemon-species/861/"
@@ -1000,12 +1000,12 @@
             "url": "/api/v2/pokemon-species/900/"
         },
         {
-            "name": "basculegion",
-            "url": "/api/v2/pokemon-species/902/"
+            "name": "ursaluna",
+            "url": "/api/v2/pokemon-species/901/"
         },
         {
-            "name": "sneasler",
-            "url": "/api/v2/pokemon-species/903/"
+            "name": "basculegion",
+            "url": "/api/v2/pokemon-species/902/"
         },
         {
             "name": "overqwil",
@@ -1020,12 +1020,12 @@
             "url": "/api/v2/pokemon-species/842/"
         },
         {
-            "name": "centiskorch",
-            "url": "/api/v2/pokemon-species/851/"
+            "name": "morgrem",
+            "url": "/api/v2/pokemon-species/860/"
         },
         {
-            "name": "ursaluna",
-            "url": "/api/v2/pokemon-species/901/"
+            "name": "sneasler",
+            "url": "/api/v2/pokemon-species/903/"
         }
     ],
     "types": [],
diff --git a/data/api/v2/generation/9/index.json b/data/api/v2/generation/9/index.json
index 1ed939eec2..13d4e35c08 100644
--- a/data/api/v2/generation/9/index.json
+++ b/data/api/v2/generation/9/index.json
@@ -512,8 +512,8 @@
     ],
     "pokemon_species": [
         {
-            "name": "pawmi",
-            "url": "/api/v2/pokemon-species/921/"
+            "name": "lokix",
+            "url": "/api/v2/pokemon-species/920/"
         },
         {
             "name": "sprigatito",
@@ -551,6 +551,10 @@
             "name": "crocalor",
             "url": "/api/v2/pokemon-species/910/"
         },
+        {
+            "name": "skeledirge",
+            "url": "/api/v2/pokemon-species/911/"
+        },
         {
             "name": "quaxwell",
             "url": "/api/v2/pokemon-species/913/"
@@ -568,8 +572,8 @@
             "url": "/api/v2/pokemon-species/918/"
         },
         {
-            "name": "lokix",
-            "url": "/api/v2/pokemon-species/920/"
+            "name": "pawmi",
+            "url": "/api/v2/pokemon-species/921/"
         },
         {
             "name": "tandemaus",
@@ -743,22 +747,14 @@
             "name": "frigibax",
             "url": "/api/v2/pokemon-species/996/"
         },
-        {
-            "name": "gimmighoul",
-            "url": "/api/v2/pokemon-species/999/"
-        },
-        {
-            "name": "wo-chien",
-            "url": "/api/v2/pokemon-species/1001/"
-        },
-        {
-            "name": "chien-pao",
-            "url": "/api/v2/pokemon-species/1002/"
-        },
         {
             "name": "pawmot",
             "url": "/api/v2/pokemon-species/923/"
         },
+        {
+            "name": "maushold",
+            "url": "/api/v2/pokemon-species/925/"
+        },
         {
             "name": "dachsbun",
             "url": "/api/v2/pokemon-species/927/"
@@ -767,10 +763,6 @@
             "name": "dolliv",
             "url": "/api/v2/pokemon-species/929/"
         },
-        {
-            "name": "arboliva",
-            "url": "/api/v2/pokemon-species/930/"
-        },
         {
             "name": "naclstack",
             "url": "/api/v2/pokemon-species/933/"
@@ -795,6 +787,10 @@
             "name": "kilowattrel",
             "url": "/api/v2/pokemon-species/941/"
         },
+        {
+            "name": "mabosstiff",
+            "url": "/api/v2/pokemon-species/943/"
+        },
         {
             "name": "grafaiai",
             "url": "/api/v2/pokemon-species/945/"
@@ -836,8 +832,8 @@
             "url": "/api/v2/pokemon-species/964/"
         },
         {
-            "name": "revavroom",
-            "url": "/api/v2/pokemon-species/966/"
+            "name": "glimmora",
+            "url": "/api/v2/pokemon-species/970/"
         },
         {
             "name": "houndstone",
@@ -872,8 +868,16 @@
             "url": "/api/v2/pokemon-species/997/"
         },
         {
-            "name": "gholdengo",
-            "url": "/api/v2/pokemon-species/1000/"
+            "name": "gimmighoul",
+            "url": "/api/v2/pokemon-species/999/"
+        },
+        {
+            "name": "wo-chien",
+            "url": "/api/v2/pokemon-species/1001/"
+        },
+        {
+            "name": "chien-pao",
+            "url": "/api/v2/pokemon-species/1002/"
         },
         {
             "name": "ting-lu",
@@ -951,30 +955,26 @@
             "name": "pecharunt",
             "url": "/api/v2/pokemon-species/1025/"
         },
-        {
-            "name": "skeledirge",
-            "url": "/api/v2/pokemon-species/911/"
-        },
         {
             "name": "pawmo",
             "url": "/api/v2/pokemon-species/922/"
         },
         {
-            "name": "maushold",
-            "url": "/api/v2/pokemon-species/925/"
-        },
-        {
-            "name": "mabosstiff",
-            "url": "/api/v2/pokemon-species/943/"
+            "name": "arboliva",
+            "url": "/api/v2/pokemon-species/930/"
         },
         {
-            "name": "glimmora",
-            "url": "/api/v2/pokemon-species/970/"
+            "name": "revavroom",
+            "url": "/api/v2/pokemon-species/966/"
         },
         {
             "name": "baxcalibur",
             "url": "/api/v2/pokemon-species/998/"
         },
+        {
+            "name": "gholdengo",
+            "url": "/api/v2/pokemon-species/1000/"
+        },
         {
             "name": "dipplin",
             "url": "/api/v2/pokemon-species/1011/"
diff --git a/data/api/v2/growth-rate/1/index.json b/data/api/v2/growth-rate/1/index.json
index 155c335283..8d3c673f00 100644
--- a/data/api/v2/growth-rate/1/index.json
+++ b/data/api/v2/growth-rate/1/index.json
@@ -1316,18 +1316,6 @@
             "name": "frigibax",
             "url": "/api/v2/pokemon-species/996/"
         },
-        {
-            "name": "gimmighoul",
-            "url": "/api/v2/pokemon-species/999/"
-        },
-        {
-            "name": "wo-chien",
-            "url": "/api/v2/pokemon-species/1001/"
-        },
-        {
-            "name": "chien-pao",
-            "url": "/api/v2/pokemon-species/1002/"
-        },
         {
             "name": "armarouge",
             "url": "/api/v2/pokemon-species/936/"
@@ -1345,8 +1333,16 @@
             "url": "/api/v2/pokemon-species/997/"
         },
         {
-            "name": "gholdengo",
-            "url": "/api/v2/pokemon-species/1000/"
+            "name": "gimmighoul",
+            "url": "/api/v2/pokemon-species/999/"
+        },
+        {
+            "name": "wo-chien",
+            "url": "/api/v2/pokemon-species/1001/"
+        },
+        {
+            "name": "chien-pao",
+            "url": "/api/v2/pokemon-species/1002/"
         },
         {
             "name": "ting-lu",
@@ -1440,6 +1436,10 @@
             "name": "baxcalibur",
             "url": "/api/v2/pokemon-species/998/"
         },
+        {
+            "name": "gholdengo",
+            "url": "/api/v2/pokemon-species/1000/"
+        },
         {
             "name": "dipplin",
             "url": "/api/v2/pokemon-species/1011/"
diff --git a/data/api/v2/growth-rate/2/index.json b/data/api/v2/growth-rate/2/index.json
index dc32025b4d..9bcd8a5feb 100644
--- a/data/api/v2/growth-rate/2/index.json
+++ b/data/api/v2/growth-rate/2/index.json
@@ -1756,10 +1756,6 @@
             "name": "chewtle",
             "url": "/api/v2/pokemon-species/833/"
         },
-        {
-            "name": "pawmi",
-            "url": "/api/v2/pokemon-species/921/"
-        },
         {
             "name": "greedent",
             "url": "/api/v2/pokemon-species/820/"
@@ -1780,6 +1776,10 @@
             "name": "drednaw",
             "url": "/api/v2/pokemon-species/834/"
         },
+        {
+            "name": "lokix",
+            "url": "/api/v2/pokemon-species/920/"
+        },
         {
             "name": "silicobra",
             "url": "/api/v2/pokemon-species/843/"
@@ -1841,12 +1841,12 @@
             "url": "/api/v2/pokemon-species/844/"
         },
         {
-            "name": "polteageist",
-            "url": "/api/v2/pokemon-species/855/"
+            "name": "centiskorch",
+            "url": "/api/v2/pokemon-species/851/"
         },
         {
-            "name": "morgrem",
-            "url": "/api/v2/pokemon-species/860/"
+            "name": "polteageist",
+            "url": "/api/v2/pokemon-species/855/"
         },
         {
             "name": "grimmsnarl",
@@ -1888,6 +1888,10 @@
             "name": "kleavor",
             "url": "/api/v2/pokemon-species/900/"
         },
+        {
+            "name": "ursaluna",
+            "url": "/api/v2/pokemon-species/901/"
+        },
         {
             "name": "basculegion",
             "url": "/api/v2/pokemon-species/902/"
@@ -1901,8 +1905,8 @@
             "url": "/api/v2/pokemon-species/916/"
         },
         {
-            "name": "lokix",
-            "url": "/api/v2/pokemon-species/920/"
+            "name": "pawmi",
+            "url": "/api/v2/pokemon-species/921/"
         },
         {
             "name": "tadbulb",
@@ -1948,10 +1952,6 @@
             "name": "wugtrio",
             "url": "/api/v2/pokemon-species/961/"
         },
-        {
-            "name": "revavroom",
-            "url": "/api/v2/pokemon-species/966/"
-        },
         {
             "name": "annihilape",
             "url": "/api/v2/pokemon-species/979/"
@@ -2009,17 +2009,17 @@
             "url": "/api/v2/pokemon-species/826/"
         },
         {
-            "name": "centiskorch",
-            "url": "/api/v2/pokemon-species/851/"
-        },
-        {
-            "name": "ursaluna",
-            "url": "/api/v2/pokemon-species/901/"
+            "name": "morgrem",
+            "url": "/api/v2/pokemon-species/860/"
         },
         {
             "name": "pawmo",
             "url": "/api/v2/pokemon-species/922/"
         },
+        {
+            "name": "revavroom",
+            "url": "/api/v2/pokemon-species/966/"
+        },
         {
             "name": "archaludon",
             "url": "/api/v2/pokemon-species/1018/"
diff --git a/data/api/v2/growth-rate/3/index.json b/data/api/v2/growth-rate/3/index.json
index 1b7c42f427..2f0d685c39 100644
--- a/data/api/v2/growth-rate/3/index.json
+++ b/data/api/v2/growth-rate/3/index.json
@@ -684,6 +684,10 @@
             "name": "veluza",
             "url": "/api/v2/pokemon-species/976/"
         },
+        {
+            "name": "maushold",
+            "url": "/api/v2/pokemon-species/925/"
+        },
         {
             "name": "rabsca",
             "url": "/api/v2/pokemon-species/954/"
@@ -691,10 +695,6 @@
         {
             "name": "delcatty",
             "url": "/api/v2/pokemon-species/301/"
-        },
-        {
-            "name": "maushold",
-            "url": "/api/v2/pokemon-species/925/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/growth-rate/4/index.json b/data/api/v2/growth-rate/4/index.json
index 291ee2e44d..f402ce6601 100644
--- a/data/api/v2/growth-rate/4/index.json
+++ b/data/api/v2/growth-rate/4/index.json
@@ -1280,10 +1280,6 @@
             "name": "grapploct",
             "url": "/api/v2/pokemon-species/853/"
         },
-        {
-            "name": "sneasler",
-            "url": "/api/v2/pokemon-species/903/"
-        },
         {
             "name": "floragato",
             "url": "/api/v2/pokemon-species/907/"
@@ -1296,6 +1292,10 @@
             "name": "crocalor",
             "url": "/api/v2/pokemon-species/910/"
         },
+        {
+            "name": "skeledirge",
+            "url": "/api/v2/pokemon-species/911/"
+        },
         {
             "name": "quaxwell",
             "url": "/api/v2/pokemon-species/913/"
@@ -1372,10 +1372,6 @@
             "name": "dolliv",
             "url": "/api/v2/pokemon-species/929/"
         },
-        {
-            "name": "arboliva",
-            "url": "/api/v2/pokemon-species/930/"
-        },
         {
             "name": "naclstack",
             "url": "/api/v2/pokemon-species/933/"
@@ -1388,6 +1384,10 @@
             "name": "kilowattrel",
             "url": "/api/v2/pokemon-species/941/"
         },
+        {
+            "name": "mabosstiff",
+            "url": "/api/v2/pokemon-species/943/"
+        },
         {
             "name": "grafaiai",
             "url": "/api/v2/pokemon-species/945/"
@@ -1408,6 +1408,10 @@
             "name": "tinkaton",
             "url": "/api/v2/pokemon-species/959/"
         },
+        {
+            "name": "glimmora",
+            "url": "/api/v2/pokemon-species/970/"
+        },
         {
             "name": "houndstone",
             "url": "/api/v2/pokemon-species/972/"
@@ -1461,16 +1465,12 @@
             "url": "/api/v2/pokemon-species/763/"
         },
         {
-            "name": "skeledirge",
-            "url": "/api/v2/pokemon-species/911/"
-        },
-        {
-            "name": "mabosstiff",
-            "url": "/api/v2/pokemon-species/943/"
+            "name": "sneasler",
+            "url": "/api/v2/pokemon-species/903/"
         },
         {
-            "name": "glimmora",
-            "url": "/api/v2/pokemon-species/970/"
+            "name": "arboliva",
+            "url": "/api/v2/pokemon-species/930/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/10/index.json b/data/api/v2/pokemon-color/10/index.json
index f0132b7461..5e7017f4b2 100644
--- a/data/api/v2/pokemon-color/10/index.json
+++ b/data/api/v2/pokemon-color/10/index.json
@@ -346,10 +346,6 @@
             "name": "yamper",
             "url": "/api/v2/pokemon-species/835/"
         },
-        {
-            "name": "pawmi",
-            "url": "/api/v2/pokemon-species/921/"
-        },
         {
             "name": "dottler",
             "url": "/api/v2/pokemon-species/825/"
@@ -374,6 +370,10 @@
             "name": "regieleki",
             "url": "/api/v2/pokemon-species/894/"
         },
+        {
+            "name": "pawmi",
+            "url": "/api/v2/pokemon-species/921/"
+        },
         {
             "name": "fidough",
             "url": "/api/v2/pokemon-species/926/"
@@ -410,10 +410,6 @@
             "name": "dudunsparce",
             "url": "/api/v2/pokemon-species/982/"
         },
-        {
-            "name": "gholdengo",
-            "url": "/api/v2/pokemon-species/1000/"
-        },
         {
             "name": "raging-bolt",
             "url": "/api/v2/pokemon-species/1021/"
@@ -425,6 +421,10 @@
         {
             "name": "pawmo",
             "url": "/api/v2/pokemon-species/922/"
+        },
+        {
+            "name": "gholdengo",
+            "url": "/api/v2/pokemon-species/1000/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/2/index.json b/data/api/v2/pokemon-color/2/index.json
index 1a0ba89120..6e4ce4c82e 100644
--- a/data/api/v2/pokemon-color/2/index.json
+++ b/data/api/v2/pokemon-color/2/index.json
@@ -718,6 +718,10 @@
             "name": "palafin",
             "url": "/api/v2/pokemon-species/964/"
         },
+        {
+            "name": "glimmora",
+            "url": "/api/v2/pokemon-species/970/"
+        },
         {
             "name": "miraidon",
             "url": "/api/v2/pokemon-species/1008/"
@@ -749,10 +753,6 @@
         {
             "name": "brionne",
             "url": "/api/v2/pokemon-species/729/"
-        },
-        {
-            "name": "glimmora",
-            "url": "/api/v2/pokemon-species/970/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/3/index.json b/data/api/v2/pokemon-color/3/index.json
index 83d5661c03..a7df23aa78 100644
--- a/data/api/v2/pokemon-color/3/index.json
+++ b/data/api/v2/pokemon-color/3/index.json
@@ -586,6 +586,10 @@
             "name": "kleavor",
             "url": "/api/v2/pokemon-species/900/"
         },
+        {
+            "name": "ursaluna",
+            "url": "/api/v2/pokemon-species/901/"
+        },
         {
             "name": "nacli",
             "url": "/api/v2/pokemon-species/932/"
@@ -602,14 +606,6 @@
             "name": "rellor",
             "url": "/api/v2/pokemon-species/953/"
         },
-        {
-            "name": "gimmighoul",
-            "url": "/api/v2/pokemon-species/999/"
-        },
-        {
-            "name": "wo-chien",
-            "url": "/api/v2/pokemon-species/1001/"
-        },
         {
             "name": "dachsbun",
             "url": "/api/v2/pokemon-species/927/"
@@ -634,6 +630,14 @@
             "name": "farigiraf",
             "url": "/api/v2/pokemon-species/981/"
         },
+        {
+            "name": "gimmighoul",
+            "url": "/api/v2/pokemon-species/999/"
+        },
+        {
+            "name": "wo-chien",
+            "url": "/api/v2/pokemon-species/1001/"
+        },
         {
             "name": "ting-lu",
             "url": "/api/v2/pokemon-species/1003/"
@@ -657,10 +661,6 @@
         {
             "name": "palossand",
             "url": "/api/v2/pokemon-species/770/"
-        },
-        {
-            "name": "ursaluna",
-            "url": "/api/v2/pokemon-species/901/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/4/index.json b/data/api/v2/pokemon-color/4/index.json
index f5e5135ed5..95e785c029 100644
--- a/data/api/v2/pokemon-color/4/index.json
+++ b/data/api/v2/pokemon-color/4/index.json
@@ -378,6 +378,10 @@
             "name": "raboot",
             "url": "/api/v2/pokemon-species/814/"
         },
+        {
+            "name": "lokix",
+            "url": "/api/v2/pokemon-species/920/"
+        },
         {
             "name": "stonjourner",
             "url": "/api/v2/pokemon-species/874/"
@@ -410,18 +414,10 @@
             "name": "wyrdeer",
             "url": "/api/v2/pokemon-species/899/"
         },
-        {
-            "name": "sneasler",
-            "url": "/api/v2/pokemon-species/903/"
-        },
         {
             "name": "oinkologne",
             "url": "/api/v2/pokemon-species/916/"
         },
-        {
-            "name": "lokix",
-            "url": "/api/v2/pokemon-species/920/"
-        },
         {
             "name": "shroodle",
             "url": "/api/v2/pokemon-species/944/"
@@ -459,12 +455,12 @@
             "url": "/api/v2/pokemon-species/996/"
         },
         {
-            "name": "grafaiai",
-            "url": "/api/v2/pokemon-species/945/"
+            "name": "mabosstiff",
+            "url": "/api/v2/pokemon-species/943/"
         },
         {
-            "name": "revavroom",
-            "url": "/api/v2/pokemon-species/966/"
+            "name": "grafaiai",
+            "url": "/api/v2/pokemon-species/945/"
         },
         {
             "name": "annihilape",
@@ -495,8 +491,12 @@
             "url": "/api/v2/pokemon-species/768/"
         },
         {
-            "name": "mabosstiff",
-            "url": "/api/v2/pokemon-species/943/"
+            "name": "sneasler",
+            "url": "/api/v2/pokemon-species/903/"
+        },
+        {
+            "name": "revavroom",
+            "url": "/api/v2/pokemon-species/966/"
         },
         {
             "name": "baxcalibur",
diff --git a/data/api/v2/pokemon-color/5/index.json b/data/api/v2/pokemon-color/5/index.json
index 260810b6a6..7cf3d4adc9 100644
--- a/data/api/v2/pokemon-color/5/index.json
+++ b/data/api/v2/pokemon-color/5/index.json
@@ -538,10 +538,6 @@
             "name": "dolliv",
             "url": "/api/v2/pokemon-species/929/"
         },
-        {
-            "name": "arboliva",
-            "url": "/api/v2/pokemon-species/930/"
-        },
         {
             "name": "bellibolt",
             "url": "/api/v2/pokemon-species/939/"
@@ -582,6 +578,10 @@
             "name": "appletun",
             "url": "/api/v2/pokemon-species/842/"
         },
+        {
+            "name": "arboliva",
+            "url": "/api/v2/pokemon-species/930/"
+        },
         {
             "name": "dipplin",
             "url": "/api/v2/pokemon-species/1011/"
diff --git a/data/api/v2/pokemon-color/6/index.json b/data/api/v2/pokemon-color/6/index.json
index e0d5c896c6..6253f4b0c4 100644
--- a/data/api/v2/pokemon-color/6/index.json
+++ b/data/api/v2/pokemon-color/6/index.json
@@ -282,10 +282,6 @@
             "name": "hatterene",
             "url": "/api/v2/pokemon-species/858/"
         },
-        {
-            "name": "morgrem",
-            "url": "/api/v2/pokemon-species/860/"
-        },
         {
             "name": "tinkatink",
             "url": "/api/v2/pokemon-species/957/"
@@ -313,6 +309,10 @@
         {
             "name": "tinkaton",
             "url": "/api/v2/pokemon-species/959/"
+        },
+        {
+            "name": "morgrem",
+            "url": "/api/v2/pokemon-species/860/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/8/index.json b/data/api/v2/pokemon-color/8/index.json
index 933b3f5538..263a2ab6b3 100644
--- a/data/api/v2/pokemon-color/8/index.json
+++ b/data/api/v2/pokemon-color/8/index.json
@@ -410,10 +410,18 @@
             "name": "fuecoco",
             "url": "/api/v2/pokemon-species/909/"
         },
+        {
+            "name": "centiskorch",
+            "url": "/api/v2/pokemon-species/851/"
+        },
         {
             "name": "crocalor",
             "url": "/api/v2/pokemon-species/910/"
         },
+        {
+            "name": "skeledirge",
+            "url": "/api/v2/pokemon-species/911/"
+        },
         {
             "name": "charcadet",
             "url": "/api/v2/pokemon-species/935/"
@@ -453,14 +461,6 @@
         {
             "name": "orbeetle",
             "url": "/api/v2/pokemon-species/826/"
-        },
-        {
-            "name": "centiskorch",
-            "url": "/api/v2/pokemon-species/851/"
-        },
-        {
-            "name": "skeledirge",
-            "url": "/api/v2/pokemon-species/911/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/9/index.json b/data/api/v2/pokemon-color/9/index.json
index 671cdc5817..fdedc668f0 100644
--- a/data/api/v2/pokemon-color/9/index.json
+++ b/data/api/v2/pokemon-color/9/index.json
@@ -399,8 +399,8 @@
             "url": "/api/v2/pokemon-species/974/"
         },
         {
-            "name": "chien-pao",
-            "url": "/api/v2/pokemon-species/1002/"
+            "name": "maushold",
+            "url": "/api/v2/pokemon-species/925/"
         },
         {
             "name": "houndstone",
@@ -410,6 +410,10 @@
             "name": "cetitan",
             "url": "/api/v2/pokemon-species/975/"
         },
+        {
+            "name": "chien-pao",
+            "url": "/api/v2/pokemon-species/1002/"
+        },
         {
             "name": "iron-valiant",
             "url": "/api/v2/pokemon-species/1006/"
@@ -418,10 +422,6 @@
             "name": "vivillon",
             "url": "/api/v2/pokemon-species/666/"
         },
-        {
-            "name": "maushold",
-            "url": "/api/v2/pokemon-species/925/"
-        },
         {
             "name": "archaludon",
             "url": "/api/v2/pokemon-species/1018/"
diff --git a/data/api/v2/pokemon-shape/1/index.json b/data/api/v2/pokemon-shape/1/index.json
index 0f99006af8..ea462b72a5 100644
--- a/data/api/v2/pokemon-shape/1/index.json
+++ b/data/api/v2/pokemon-shape/1/index.json
@@ -201,6 +201,42 @@
         {
             "name": "polteageist",
             "url": "/api/v2/pokemon-species/855/"
+        },
+        {
+            "name": "nacli",
+            "url": "/api/v2/pokemon-species/932/"
+        },
+        {
+            "name": "bramblin",
+            "url": "/api/v2/pokemon-species/946/"
+        },
+        {
+            "name": "glimmet",
+            "url": "/api/v2/pokemon-species/969/"
+        },
+        {
+            "name": "brambleghast",
+            "url": "/api/v2/pokemon-species/947/"
+        },
+        {
+            "name": "glimmora",
+            "url": "/api/v2/pokemon-species/970/"
+        },
+        {
+            "name": "gimmighoul",
+            "url": "/api/v2/pokemon-species/999/"
+        },
+        {
+            "name": "poltchageist",
+            "url": "/api/v2/pokemon-species/1012/"
+        },
+        {
+            "name": "pecharunt",
+            "url": "/api/v2/pokemon-species/1025/"
+        },
+        {
+            "name": "sinistcha",
+            "url": "/api/v2/pokemon-species/1013/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/10/index.json b/data/api/v2/pokemon-shape/10/index.json
index f939cd7dee..0a5c4ed567 100644
--- a/data/api/v2/pokemon-shape/10/index.json
+++ b/data/api/v2/pokemon-shape/10/index.json
@@ -119,12 +119,116 @@
             "url": "/api/v2/pokemon-species/871/"
         },
         {
-            "name": "grapploct",
-            "url": "/api/v2/pokemon-species/853/"
+            "name": "fuecoco",
+            "url": "/api/v2/pokemon-species/909/"
+        },
+        {
+            "name": "quaxly",
+            "url": "/api/v2/pokemon-species/912/"
         },
         {
             "name": "centiskorch",
             "url": "/api/v2/pokemon-species/851/"
+        },
+        {
+            "name": "grapploct",
+            "url": "/api/v2/pokemon-species/853/"
+        },
+        {
+            "name": "floragato",
+            "url": "/api/v2/pokemon-species/907/"
+        },
+        {
+            "name": "meowscarada",
+            "url": "/api/v2/pokemon-species/908/"
+        },
+        {
+            "name": "crocalor",
+            "url": "/api/v2/pokemon-species/910/"
+        },
+        {
+            "name": "quaxwell",
+            "url": "/api/v2/pokemon-species/913/"
+        },
+        {
+            "name": "quaquaval",
+            "url": "/api/v2/pokemon-species/914/"
+        },
+        {
+            "name": "capsakid",
+            "url": "/api/v2/pokemon-species/951/"
+        },
+        {
+            "name": "cetoddle",
+            "url": "/api/v2/pokemon-species/974/"
+        },
+        {
+            "name": "scream-tail",
+            "url": "/api/v2/pokemon-species/985/"
+        },
+        {
+            "name": "iron-bundle",
+            "url": "/api/v2/pokemon-species/991/"
+        },
+        {
+            "name": "iron-jugulis",
+            "url": "/api/v2/pokemon-species/993/"
+        },
+        {
+            "name": "iron-thorns",
+            "url": "/api/v2/pokemon-species/995/"
+        },
+        {
+            "name": "frigibax",
+            "url": "/api/v2/pokemon-species/996/"
+        },
+        {
+            "name": "pawmot",
+            "url": "/api/v2/pokemon-species/923/"
+        },
+        {
+            "name": "grafaiai",
+            "url": "/api/v2/pokemon-species/945/"
+        },
+        {
+            "name": "scovillain",
+            "url": "/api/v2/pokemon-species/952/"
+        },
+        {
+            "name": "espathra",
+            "url": "/api/v2/pokemon-species/956/"
+        },
+        {
+            "name": "cetitan",
+            "url": "/api/v2/pokemon-species/975/"
+        },
+        {
+            "name": "arctibax",
+            "url": "/api/v2/pokemon-species/997/"
+        },
+        {
+            "name": "koraidon",
+            "url": "/api/v2/pokemon-species/1007/"
+        },
+        {
+            "name": "walking-wake",
+            "url": "/api/v2/pokemon-species/1009/"
+        },
+        {
+            "name": "okidogi",
+            "url": "/api/v2/pokemon-species/1014/"
+        },
+        {
+            "name": "pawmo",
+            "url": "/api/v2/pokemon-species/922/"
+        },
+        {
+            "name": "baxcalibur",
+            "url": "/api/v2/pokemon-species/998/"
+        },
+        {
+            "name": "archaludon",
+            "url": "/api/v2/pokemon-species/1018/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/11/index.json b/data/api/v2/pokemon-shape/11/index.json
index 2d64953269..a687f066df 100644
--- a/data/api/v2/pokemon-shape/11/index.json
+++ b/data/api/v2/pokemon-shape/11/index.json
@@ -90,6 +90,30 @@
             "name": "falinks",
             "url": "/api/v2/pokemon-species/870/"
         },
+        {
+            "name": "tarountula",
+            "url": "/api/v2/pokemon-species/917/"
+        },
+        {
+            "name": "nymble",
+            "url": "/api/v2/pokemon-species/919/"
+        },
+        {
+            "name": "spidops",
+            "url": "/api/v2/pokemon-species/918/"
+        },
+        {
+            "name": "klawf",
+            "url": "/api/v2/pokemon-species/950/"
+        },
+        {
+            "name": "rellor",
+            "url": "/api/v2/pokemon-species/953/"
+        },
+        {
+            "name": "rabsca",
+            "url": "/api/v2/pokemon-species/954/"
+        },
         {
             "name": "metagross",
             "url": "/api/v2/pokemon-species/376/"
diff --git a/data/api/v2/pokemon-shape/12/index.json b/data/api/v2/pokemon-shape/12/index.json
index 38c7234ace..c024dd00ca 100644
--- a/data/api/v2/pokemon-shape/12/index.json
+++ b/data/api/v2/pokemon-shape/12/index.json
@@ -522,6 +522,10 @@
             "name": "coalossal",
             "url": "/api/v2/pokemon-species/839/"
         },
+        {
+            "name": "lokix",
+            "url": "/api/v2/pokemon-species/920/"
+        },
         {
             "name": "impidimp",
             "url": "/api/v2/pokemon-species/859/"
@@ -546,10 +550,6 @@
             "name": "hattrem",
             "url": "/api/v2/pokemon-species/857/"
         },
-        {
-            "name": "morgrem",
-            "url": "/api/v2/pokemon-species/860/"
-        },
         {
             "name": "grimmsnarl",
             "url": "/api/v2/pokemon-species/861/"
@@ -562,6 +562,62 @@
             "name": "urshifu",
             "url": "/api/v2/pokemon-species/892/"
         },
+        {
+            "name": "charcadet",
+            "url": "/api/v2/pokemon-species/935/"
+        },
+        {
+            "name": "tinkatink",
+            "url": "/api/v2/pokemon-species/957/"
+        },
+        {
+            "name": "iron-hands",
+            "url": "/api/v2/pokemon-species/992/"
+        },
+        {
+            "name": "dolliv",
+            "url": "/api/v2/pokemon-species/929/"
+        },
+        {
+            "name": "garganacl",
+            "url": "/api/v2/pokemon-species/934/"
+        },
+        {
+            "name": "armarouge",
+            "url": "/api/v2/pokemon-species/936/"
+        },
+        {
+            "name": "ceruledge",
+            "url": "/api/v2/pokemon-species/937/"
+        },
+        {
+            "name": "tinkatuff",
+            "url": "/api/v2/pokemon-species/958/"
+        },
+        {
+            "name": "tinkaton",
+            "url": "/api/v2/pokemon-species/959/"
+        },
+        {
+            "name": "annihilape",
+            "url": "/api/v2/pokemon-species/979/"
+        },
+        {
+            "name": "kingambit",
+            "url": "/api/v2/pokemon-species/983/"
+        },
+        {
+            "name": "iron-valiant",
+            "url": "/api/v2/pokemon-species/1006/"
+        },
+        {
+            "name": "munkidori",
+            "url": "/api/v2/pokemon-species/1015/"
+        },
+        {
+            "name": "ogerpon",
+            "url": "/api/v2/pokemon-species/1017/"
+        },
         {
             "name": "golem",
             "url": "/api/v2/pokemon-species/76/"
@@ -581,6 +637,18 @@
         {
             "name": "golisopod",
             "url": "/api/v2/pokemon-species/768/"
+        },
+        {
+            "name": "morgrem",
+            "url": "/api/v2/pokemon-species/860/"
+        },
+        {
+            "name": "arboliva",
+            "url": "/api/v2/pokemon-species/930/"
+        },
+        {
+            "name": "gholdengo",
+            "url": "/api/v2/pokemon-species/1000/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/13/index.json b/data/api/v2/pokemon-shape/13/index.json
index c052dc299c..0999af9a76 100644
--- a/data/api/v2/pokemon-shape/13/index.json
+++ b/data/api/v2/pokemon-shape/13/index.json
@@ -114,6 +114,10 @@
             "name": "kleavor",
             "url": "/api/v2/pokemon-species/900/"
         },
+        {
+            "name": "toedscruel",
+            "url": "/api/v2/pokemon-species/949/"
+        },
         {
             "name": "vivillon",
             "url": "/api/v2/pokemon-species/666/"
diff --git a/data/api/v2/pokemon-shape/14/index.json b/data/api/v2/pokemon-shape/14/index.json
index 3934106ee2..b3d8fce0be 100644
--- a/data/api/v2/pokemon-shape/14/index.json
+++ b/data/api/v2/pokemon-shape/14/index.json
@@ -193,6 +193,10 @@
         {
             "name": "dottler",
             "url": "/api/v2/pokemon-species/825/"
+        },
+        {
+            "name": "iron-moth",
+            "url": "/api/v2/pokemon-species/994/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/2/index.json b/data/api/v2/pokemon-shape/2/index.json
index 09b31b5cb5..b95b43fcd4 100644
--- a/data/api/v2/pokemon-shape/2/index.json
+++ b/data/api/v2/pokemon-shape/2/index.json
@@ -174,6 +174,30 @@
             "name": "sandaconda",
             "url": "/api/v2/pokemon-species/844/"
         },
+        {
+            "name": "tadbulb",
+            "url": "/api/v2/pokemon-species/938/"
+        },
+        {
+            "name": "finizen",
+            "url": "/api/v2/pokemon-species/963/"
+        },
+        {
+            "name": "veluza",
+            "url": "/api/v2/pokemon-species/976/"
+        },
+        {
+            "name": "dondozo",
+            "url": "/api/v2/pokemon-species/977/"
+        },
+        {
+            "name": "palafin",
+            "url": "/api/v2/pokemon-species/964/"
+        },
+        {
+            "name": "chi-yu",
+            "url": "/api/v2/pokemon-species/1004/"
+        },
         {
             "name": "gastrodon",
             "url": "/api/v2/pokemon-species/423/"
diff --git a/data/api/v2/pokemon-shape/3/index.json b/data/api/v2/pokemon-shape/3/index.json
index dc0a0a1a28..052cf1ef29 100644
--- a/data/api/v2/pokemon-shape/3/index.json
+++ b/data/api/v2/pokemon-shape/3/index.json
@@ -194,9 +194,25 @@
             "name": "overqwil",
             "url": "/api/v2/pokemon-species/904/"
         },
+        {
+            "name": "tandemaus",
+            "url": "/api/v2/pokemon-species/924/"
+        },
+        {
+            "name": "maushold",
+            "url": "/api/v2/pokemon-species/925/"
+        },
         {
             "name": "brionne",
             "url": "/api/v2/pokemon-species/729/"
+        },
+        {
+            "name": "dipplin",
+            "url": "/api/v2/pokemon-species/1011/"
+        },
+        {
+            "name": "hydrapple",
+            "url": "/api/v2/pokemon-species/1019/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/4/index.json b/data/api/v2/pokemon-shape/4/index.json
index 15e2a9c8cc..acaa974a16 100644
--- a/data/api/v2/pokemon-shape/4/index.json
+++ b/data/api/v2/pokemon-shape/4/index.json
@@ -214,6 +214,14 @@
             "name": "enamorus",
             "url": "/api/v2/pokemon-species/905/"
         },
+        {
+            "name": "sprigatito",
+            "url": "/api/v2/pokemon-species/906/"
+        },
+        {
+            "name": "lechonk",
+            "url": "/api/v2/pokemon-species/915/"
+        },
         {
             "name": "cursola",
             "url": "/api/v2/pokemon-species/864/"
@@ -222,6 +230,122 @@
             "name": "drakloak",
             "url": "/api/v2/pokemon-species/886/"
         },
+        {
+            "name": "skeledirge",
+            "url": "/api/v2/pokemon-species/911/"
+        },
+        {
+            "name": "oinkologne",
+            "url": "/api/v2/pokemon-species/916/"
+        },
+        {
+            "name": "pawmi",
+            "url": "/api/v2/pokemon-species/921/"
+        },
+        {
+            "name": "fidough",
+            "url": "/api/v2/pokemon-species/926/"
+        },
+        {
+            "name": "maschiff",
+            "url": "/api/v2/pokemon-species/942/"
+        },
+        {
+            "name": "shroodle",
+            "url": "/api/v2/pokemon-species/944/"
+        },
+        {
+            "name": "cyclizar",
+            "url": "/api/v2/pokemon-species/967/"
+        },
+        {
+            "name": "greavard",
+            "url": "/api/v2/pokemon-species/971/"
+        },
+        {
+            "name": "great-tusk",
+            "url": "/api/v2/pokemon-species/984/"
+        },
+        {
+            "name": "brute-bonnet",
+            "url": "/api/v2/pokemon-species/986/"
+        },
+        {
+            "name": "slither-wing",
+            "url": "/api/v2/pokemon-species/988/"
+        },
+        {
+            "name": "sandy-shocks",
+            "url": "/api/v2/pokemon-species/989/"
+        },
+        {
+            "name": "iron-treads",
+            "url": "/api/v2/pokemon-species/990/"
+        },
+        {
+            "name": "dachsbun",
+            "url": "/api/v2/pokemon-species/927/"
+        },
+        {
+            "name": "naclstack",
+            "url": "/api/v2/pokemon-species/933/"
+        },
+        {
+            "name": "mabosstiff",
+            "url": "/api/v2/pokemon-species/943/"
+        },
+        {
+            "name": "houndstone",
+            "url": "/api/v2/pokemon-species/972/"
+        },
+        {
+            "name": "clodsire",
+            "url": "/api/v2/pokemon-species/980/"
+        },
+        {
+            "name": "farigiraf",
+            "url": "/api/v2/pokemon-species/981/"
+        },
+        {
+            "name": "chien-pao",
+            "url": "/api/v2/pokemon-species/1002/"
+        },
+        {
+            "name": "ting-lu",
+            "url": "/api/v2/pokemon-species/1003/"
+        },
+        {
+            "name": "roaring-moon",
+            "url": "/api/v2/pokemon-species/1005/"
+        },
+        {
+            "name": "miraidon",
+            "url": "/api/v2/pokemon-species/1008/"
+        },
+        {
+            "name": "iron-leaves",
+            "url": "/api/v2/pokemon-species/1010/"
+        },
+        {
+            "name": "gouging-fire",
+            "url": "/api/v2/pokemon-species/1020/"
+        },
+        {
+            "name": "raging-bolt",
+            "url": "/api/v2/pokemon-species/1021/"
+        },
+        {
+            "name": "iron-boulder",
+            "url": "/api/v2/pokemon-species/1022/"
+        },
+        {
+            "name": "iron-crown",
+            "url": "/api/v2/pokemon-species/1023/"
+        },
+        {
+            "name": "terapagos",
+            "url": "/api/v2/pokemon-species/1024/"
+        },
         {
             "name": "chandelure",
             "url": "/api/v2/pokemon-species/609/"
diff --git a/data/api/v2/pokemon-shape/5/index.json b/data/api/v2/pokemon-shape/5/index.json
index 513bd90315..e4d64ee955 100644
--- a/data/api/v2/pokemon-shape/5/index.json
+++ b/data/api/v2/pokemon-shape/5/index.json
@@ -178,6 +178,22 @@
             "name": "alcremie",
             "url": "/api/v2/pokemon-species/869/"
         },
+        {
+            "name": "orthworm",
+            "url": "/api/v2/pokemon-species/968/"
+        },
+        {
+            "name": "tatsugiri",
+            "url": "/api/v2/pokemon-species/978/"
+        },
+        {
+            "name": "dudunsparce",
+            "url": "/api/v2/pokemon-species/982/"
+        },
+        {
+            "name": "wo-chien",
+            "url": "/api/v2/pokemon-species/1001/"
+        },
         {
             "name": "cofagrigus",
             "url": "/api/v2/pokemon-species/563/"
diff --git a/data/api/v2/pokemon-shape/6/index.json b/data/api/v2/pokemon-shape/6/index.json
index 1b4e31b8b1..c7fca0d2a8 100644
--- a/data/api/v2/pokemon-shape/6/index.json
+++ b/data/api/v2/pokemon-shape/6/index.json
@@ -779,8 +779,8 @@
             "url": "/api/v2/pokemon-species/887/"
         },
         {
-            "name": "sneasler",
-            "url": "/api/v2/pokemon-species/903/"
+            "name": "bellibolt",
+            "url": "/api/v2/pokemon-species/939/"
         },
         {
             "name": "monferno",
@@ -793,6 +793,10 @@
         {
             "name": "tyrantrum",
             "url": "/api/v2/pokemon-species/697/"
+        },
+        {
+            "name": "sneasler",
+            "url": "/api/v2/pokemon-species/903/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/7/index.json b/data/api/v2/pokemon-shape/7/index.json
index 51cfe8a427..1b0cf1625e 100644
--- a/data/api/v2/pokemon-shape/7/index.json
+++ b/data/api/v2/pokemon-shape/7/index.json
@@ -125,6 +125,26 @@
         {
             "name": "dracovish",
             "url": "/api/v2/pokemon-species/882/"
+        },
+        {
+            "name": "smoliv",
+            "url": "/api/v2/pokemon-species/928/"
+        },
+        {
+            "name": "toedscool",
+            "url": "/api/v2/pokemon-species/948/"
+        },
+        {
+            "name": "flittle",
+            "url": "/api/v2/pokemon-species/955/"
+        },
+        {
+            "name": "varoom",
+            "url": "/api/v2/pokemon-species/965/"
+        },
+        {
+            "name": "revavroom",
+            "url": "/api/v2/pokemon-species/966/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/8/index.json b/data/api/v2/pokemon-shape/8/index.json
index e439ff30f1..ac591909ff 100644
--- a/data/api/v2/pokemon-shape/8/index.json
+++ b/data/api/v2/pokemon-shape/8/index.json
@@ -682,6 +682,18 @@
             "name": "wyrdeer",
             "url": "/api/v2/pokemon-species/899/"
         },
+        {
+            "name": "ursaluna",
+            "url": "/api/v2/pokemon-species/901/"
+        },
+        {
+            "name": "wiglett",
+            "url": "/api/v2/pokemon-species/960/"
+        },
+        {
+            "name": "wugtrio",
+            "url": "/api/v2/pokemon-species/961/"
+        },
         {
             "name": "ivysaur",
             "url": "/api/v2/pokemon-species/2/"
@@ -705,10 +717,6 @@
         {
             "name": "appletun",
             "url": "/api/v2/pokemon-species/842/"
-        },
-        {
-            "name": "ursaluna",
-            "url": "/api/v2/pokemon-species/901/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/9/index.json b/data/api/v2/pokemon-shape/9/index.json
index b50fc42e8c..0a920dac4f 100644
--- a/data/api/v2/pokemon-shape/9/index.json
+++ b/data/api/v2/pokemon-shape/9/index.json
@@ -346,6 +346,34 @@
             "name": "sirfetchd",
             "url": "/api/v2/pokemon-species/865/"
         },
+        {
+            "name": "squawkabilly",
+            "url": "/api/v2/pokemon-species/931/"
+        },
+        {
+            "name": "wattrel",
+            "url": "/api/v2/pokemon-species/940/"
+        },
+        {
+            "name": "bombirdier",
+            "url": "/api/v2/pokemon-species/962/"
+        },
+        {
+            "name": "flamigo",
+            "url": "/api/v2/pokemon-species/973/"
+        },
+        {
+            "name": "flutter-mane",
+            "url": "/api/v2/pokemon-species/987/"
+        },
+        {
+            "name": "kilowattrel",
+            "url": "/api/v2/pokemon-species/941/"
+        },
+        {
+            "name": "fezandipiti",
+            "url": "/api/v2/pokemon-species/1016/"
+        },
         {
             "name": "mantine",
             "url": "/api/v2/pokemon-species/226/"
diff --git a/data/api/v2/pokemon-species/1000/index.json b/data/api/v2/pokemon-species/1000/index.json
index cd2d62efa1..8fadea821f 100644
--- a/data/api/v2/pokemon-species/1000/index.json
+++ b/data/api/v2/pokemon-species/1000/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ubcf4\ubb3c\uc0dd\uba85\uccb4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5bf6\u8005\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1001/index.json b/data/api/v2/pokemon-species/1001/index.json
index 106d58dd51..d559a86e62 100644
--- a/data/api/v2/pokemon-species/1001/index.json
+++ b/data/api/v2/pokemon-species/1001/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc7ac\uc561\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u707d\u5384\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "blob",
+        "url": "/api/v2/pokemon-shape/5/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1002/index.json b/data/api/v2/pokemon-species/1002/index.json
index 0302f0c79f..0771fb6e82 100644
--- a/data/api/v2/pokemon-species/1002/index.json
+++ b/data/api/v2/pokemon-species/1002/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc7ac\uc561\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u707d\u5384\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1003/index.json b/data/api/v2/pokemon-species/1003/index.json
index f902584588..3b3eb80480 100644
--- a/data/api/v2/pokemon-species/1003/index.json
+++ b/data/api/v2/pokemon-species/1003/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc7ac\uc561\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u707d\u5384\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1004/index.json b/data/api/v2/pokemon-species/1004/index.json
index 337e5d552b..1994b05019 100644
--- a/data/api/v2/pokemon-species/1004/index.json
+++ b/data/api/v2/pokemon-species/1004/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc7ac\uc561\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u707d\u5384\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "squiggle",
+        "url": "/api/v2/pokemon-shape/2/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1005/index.json b/data/api/v2/pokemon-species/1005/index.json
index 6247225a77..a7169b4036 100644
--- a/data/api/v2/pokemon-species/1005/index.json
+++ b/data/api/v2/pokemon-species/1005/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1006/index.json b/data/api/v2/pokemon-species/1006/index.json
index 5e3a298b3e..dd9699e27b 100644
--- a/data/api/v2/pokemon-species/1006/index.json
+++ b/data/api/v2/pokemon-species/1006/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1007/index.json b/data/api/v2/pokemon-species/1007/index.json
index 1233505b67..916770df87 100644
--- a/data/api/v2/pokemon-species/1007/index.json
+++ b/data/api/v2/pokemon-species/1007/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1008/index.json b/data/api/v2/pokemon-species/1008/index.json
index 7d2a7eb20d..9bae21ba88 100644
--- a/data/api/v2/pokemon-species/1008/index.json
+++ b/data/api/v2/pokemon-species/1008/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1009/index.json b/data/api/v2/pokemon-species/1009/index.json
index 8698e488f4..6fbfb61338 100644
--- a/data/api/v2/pokemon-species/1009/index.json
+++ b/data/api/v2/pokemon-species/1009/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1010/index.json b/data/api/v2/pokemon-species/1010/index.json
index 61a637808f..61e22bf618 100644
--- a/data/api/v2/pokemon-species/1010/index.json
+++ b/data/api/v2/pokemon-species/1010/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1011/index.json b/data/api/v2/pokemon-species/1011/index.json
index e100b533b1..6d580d7177 100644
--- a/data/api/v2/pokemon-species/1011/index.json
+++ b/data/api/v2/pokemon-species/1011/index.json
@@ -41,6 +41,13 @@
     "forms_switchable": false,
     "gender_rate": -1,
     "genera": [
+        {
+            "genus": "\uc0ac\uacfc\uc0ac\ud0d5\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "Candy Apple Pok\u00e9mon",
             "language": {
@@ -155,7 +162,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "fish",
+        "url": "/api/v2/pokemon-shape/3/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1012/index.json b/data/api/v2/pokemon-species/1012/index.json
index 600a344e8f..44f10dbb83 100644
--- a/data/api/v2/pokemon-species/1012/index.json
+++ b/data/api/v2/pokemon-species/1012/index.json
@@ -38,6 +38,13 @@
     "forms_switchable": false,
     "gender_rate": -1,
     "genera": [
+        {
+            "genus": "\ub9d0\ucc28\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "Matcha Pok\u00e9mon",
             "language": {
@@ -152,7 +159,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "ball",
+        "url": "/api/v2/pokemon-shape/1/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1013/index.json b/data/api/v2/pokemon-species/1013/index.json
index 62059a83a4..4b2aed6a96 100644
--- a/data/api/v2/pokemon-species/1013/index.json
+++ b/data/api/v2/pokemon-species/1013/index.json
@@ -41,6 +41,13 @@
     "forms_switchable": false,
     "gender_rate": -1,
     "genera": [
+        {
+            "genus": "\ub9d0\ucc28\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "Matcha Pok\u00e9mon",
             "language": {
@@ -155,7 +162,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "ball",
+        "url": "/api/v2/pokemon-shape/1/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1014/index.json b/data/api/v2/pokemon-species/1014/index.json
index db0bbea94d..9689b3aded 100644
--- a/data/api/v2/pokemon-species/1014/index.json
+++ b/data/api/v2/pokemon-species/1014/index.json
@@ -38,6 +38,13 @@
     "forms_switchable": false,
     "gender_rate": -1,
     "genera": [
+        {
+            "genus": "\uc218\ud558\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "Retainer Pok\u00e9mon",
             "language": {
@@ -152,7 +159,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1015/index.json b/data/api/v2/pokemon-species/1015/index.json
index 4be57e5ea2..cb5188d6fb 100644
--- a/data/api/v2/pokemon-species/1015/index.json
+++ b/data/api/v2/pokemon-species/1015/index.json
@@ -38,6 +38,13 @@
     "forms_switchable": false,
     "gender_rate": -1,
     "genera": [
+        {
+            "genus": "\uc218\ud558\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "Retainer Pok\u00e9mon",
             "language": {
@@ -152,7 +159,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1016/index.json b/data/api/v2/pokemon-species/1016/index.json
index 1ba2cccd8a..0475f7ee85 100644
--- a/data/api/v2/pokemon-species/1016/index.json
+++ b/data/api/v2/pokemon-species/1016/index.json
@@ -38,6 +38,13 @@
     "forms_switchable": false,
     "gender_rate": -1,
     "genera": [
+        {
+            "genus": "\uc218\ud558\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "Retainer Pok\u00e9mon",
             "language": {
@@ -152,7 +159,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "wings",
+        "url": "/api/v2/pokemon-shape/9/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1017/index.json b/data/api/v2/pokemon-species/1017/index.json
index d5736cd060..8916d321dc 100644
--- a/data/api/v2/pokemon-species/1017/index.json
+++ b/data/api/v2/pokemon-species/1017/index.json
@@ -38,6 +38,13 @@
     "forms_switchable": false,
     "gender_rate": -1,
     "genera": [
+        {
+            "genus": "\uac00\uba74\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "Mask Pok\u00e9mon",
             "language": {
@@ -152,7 +159,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1018/index.json b/data/api/v2/pokemon-species/1018/index.json
index 7d64e7ae7b..024bd6d53b 100644
--- a/data/api/v2/pokemon-species/1018/index.json
+++ b/data/api/v2/pokemon-species/1018/index.json
@@ -48,6 +48,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud569\uae08\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "Alloy Pok\u00e9mon",
             "language": {
@@ -169,7 +176,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1019/index.json b/data/api/v2/pokemon-species/1019/index.json
index 999a389dd9..fa43be1034 100644
--- a/data/api/v2/pokemon-species/1019/index.json
+++ b/data/api/v2/pokemon-species/1019/index.json
@@ -48,6 +48,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc0ac\uacfc\uc774\ubb34\uae30\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "Apple Hydra Pok\u00e9mon",
             "language": {
@@ -169,7 +176,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "fish",
+        "url": "/api/v2/pokemon-shape/3/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1020/index.json b/data/api/v2/pokemon-species/1020/index.json
index 8cb2baf512..5e25909db8 100644
--- a/data/api/v2/pokemon-species/1020/index.json
+++ b/data/api/v2/pokemon-species/1020/index.json
@@ -45,6 +45,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "Paradox Pok\u00e9mon",
             "language": {
@@ -166,7 +173,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1021/index.json b/data/api/v2/pokemon-species/1021/index.json
index d0d35c1911..70b349ad40 100644
--- a/data/api/v2/pokemon-species/1021/index.json
+++ b/data/api/v2/pokemon-species/1021/index.json
@@ -45,6 +45,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "Paradox Pok\u00e9mon",
             "language": {
@@ -166,7 +173,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1022/index.json b/data/api/v2/pokemon-species/1022/index.json
index 32a47f8792..4cd1f779dc 100644
--- a/data/api/v2/pokemon-species/1022/index.json
+++ b/data/api/v2/pokemon-species/1022/index.json
@@ -45,6 +45,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "Paradox Pok\u00e9mon",
             "language": {
@@ -166,7 +173,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1023/index.json b/data/api/v2/pokemon-species/1023/index.json
index 96561ce4e5..c1c7e6d02b 100644
--- a/data/api/v2/pokemon-species/1023/index.json
+++ b/data/api/v2/pokemon-species/1023/index.json
@@ -45,6 +45,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "Paradox Pok\u00e9mon",
             "language": {
@@ -166,7 +173,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1024/index.json b/data/api/v2/pokemon-species/1024/index.json
index d6259b17c6..797d964cd9 100644
--- a/data/api/v2/pokemon-species/1024/index.json
+++ b/data/api/v2/pokemon-species/1024/index.json
@@ -45,6 +45,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud14c\ub77c\uc2a4\ud0c8\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "Tera Pok\u00e9mon",
             "language": {
@@ -166,7 +173,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/1025/index.json b/data/api/v2/pokemon-species/1025/index.json
index 760ab8a036..6ec5e16658 100644
--- a/data/api/v2/pokemon-species/1025/index.json
+++ b/data/api/v2/pokemon-species/1025/index.json
@@ -45,6 +45,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc9c0\ubc30\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "Subjugation Pok\u00e9mon",
             "language": {
@@ -84,6 +91,13 @@
             },
             "name": "\u30e2\u30e2\u30ef\u30ed\u30a6"
         },
+        {
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            },
+            "name": "\ubcf5\uc22d\uc545\ub3d9"
+        },
         {
             "language": {
                 "name": "zh-Hant",
@@ -159,7 +173,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "ball",
+        "url": "/api/v2/pokemon-shape/1/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/899/index.json b/data/api/v2/pokemon-species/899/index.json
index e8ec7c0461..85b2970491 100644
--- a/data/api/v2/pokemon-species/899/index.json
+++ b/data/api/v2/pokemon-species/899/index.json
@@ -42,6 +42,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud070\ubfd4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5927\u89d2\u5bf6\u53ef\u5922",
             "language": {
diff --git a/data/api/v2/pokemon-species/900/index.json b/data/api/v2/pokemon-species/900/index.json
index 8eb57dbe08..936c724299 100644
--- a/data/api/v2/pokemon-species/900/index.json
+++ b/data/api/v2/pokemon-species/900/index.json
@@ -42,6 +42,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud070\ub3c4\ub07c\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u65a7\u925e\u5bf6\u53ef\u5922",
             "language": {
diff --git a/data/api/v2/pokemon-species/901/index.json b/data/api/v2/pokemon-species/901/index.json
index 44e1e72d92..7754ca8ad0 100644
--- a/data/api/v2/pokemon-species/901/index.json
+++ b/data/api/v2/pokemon-species/901/index.json
@@ -42,6 +42,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc774\ud0c4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6ce5\u70ad\u5bf6\u53ef\u5922",
             "language": {
diff --git a/data/api/v2/pokemon-species/902/index.json b/data/api/v2/pokemon-species/902/index.json
index 124554aa89..ee97f349df 100644
--- a/data/api/v2/pokemon-species/902/index.json
+++ b/data/api/v2/pokemon-species/902/index.json
@@ -42,6 +42,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud070\ubb3c\uace0\uae30\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5927\u9b5a\u5bf6\u53ef\u5922",
             "language": {
diff --git a/data/api/v2/pokemon-species/903/index.json b/data/api/v2/pokemon-species/903/index.json
index 04adf9df94..057e50419f 100644
--- a/data/api/v2/pokemon-species/903/index.json
+++ b/data/api/v2/pokemon-species/903/index.json
@@ -42,6 +42,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud074\ub77c\uc774\ubc0d\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6500\u5d16\u5bf6\u53ef\u5922",
             "language": {
diff --git a/data/api/v2/pokemon-species/904/index.json b/data/api/v2/pokemon-species/904/index.json
index 559e8b5569..cf12de43f8 100644
--- a/data/api/v2/pokemon-species/904/index.json
+++ b/data/api/v2/pokemon-species/904/index.json
@@ -42,6 +42,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uce68\ubd95\ud3ec\ucf13\ubaac\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u528d\u5c71\u5bf6\u53ef\u5922",
             "language": {
diff --git a/data/api/v2/pokemon-species/905/index.json b/data/api/v2/pokemon-species/905/index.json
index be6fe13e08..92a507ec38 100644
--- a/data/api/v2/pokemon-species/905/index.json
+++ b/data/api/v2/pokemon-species/905/index.json
@@ -39,6 +39,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc560\uc99d\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u611b\u618e\u5bf6\u53ef\u5922",
             "language": {
diff --git a/data/api/v2/pokemon-species/906/index.json b/data/api/v2/pokemon-species/906/index.json
index 0c212084f2..ec3c394ef5 100644
--- a/data/api/v2/pokemon-species/906/index.json
+++ b/data/api/v2/pokemon-species/906/index.json
@@ -54,6 +54,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud480\uace0\uc591\uc774\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u8349\u8c93\u5bf6\u53ef\u5922",
             "language": {
@@ -93,13 +100,6 @@
     "is_mythical": false,
     "name": "sprigatito",
     "names": [
-        {
-            "language": {
-                "name": "ko",
-                "url": "/api/v2/language/3/"
-            },
-            "name": "\ub098\uc624\ud558"
-        },
         {
             "language": {
                 "name": "ja-Hrkt",
@@ -114,6 +114,13 @@
             },
             "name": "Nyahoja"
         },
+        {
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            },
+            "name": "\ub098\uc624\ud558"
+        },
         {
             "language": {
                 "name": "zh-Hant",
@@ -189,7 +196,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/907/index.json b/data/api/v2/pokemon-species/907/index.json
index 7580f0fab5..52d0e7ca25 100644
--- a/data/api/v2/pokemon-species/907/index.json
+++ b/data/api/v2/pokemon-species/907/index.json
@@ -57,6 +57,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud480\uace0\uc591\uc774\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u8349\u8c93\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/908/index.json b/data/api/v2/pokemon-species/908/index.json
index 42087f9505..60e14f31e3 100644
--- a/data/api/v2/pokemon-species/908/index.json
+++ b/data/api/v2/pokemon-species/908/index.json
@@ -57,6 +57,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub9e4\uc9c0\uc158\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u9b54\u8853\u5e2b\u5bf6\u53ef\u5922",
             "language": {
@@ -199,7 +206,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/909/index.json b/data/api/v2/pokemon-species/909/index.json
index dd782f64db..af190bc238 100644
--- a/data/api/v2/pokemon-species/909/index.json
+++ b/data/api/v2/pokemon-species/909/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ubd88\uaf43\uc545\uc5b4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u706b\u9c77\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/910/index.json b/data/api/v2/pokemon-species/910/index.json
index 1b3fb75d19..1591a8fdd1 100644
--- a/data/api/v2/pokemon-species/910/index.json
+++ b/data/api/v2/pokemon-species/910/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ubd88\uaf43\uc545\uc5b4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u706b\u9c77\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/911/index.json b/data/api/v2/pokemon-species/911/index.json
index 35f823cbb5..3c9c92753e 100644
--- a/data/api/v2/pokemon-species/911/index.json
+++ b/data/api/v2/pokemon-species/911/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc2f1\uc5b4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6b4c\u624b\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/912/index.json b/data/api/v2/pokemon-species/912/index.json
index 9b76b72001..c8e0fa289f 100644
--- a/data/api/v2/pokemon-species/912/index.json
+++ b/data/api/v2/pokemon-species/912/index.json
@@ -54,6 +54,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uaf2c\ub9c8\uc624\ub9ac\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5c0f\u9d28\u5bf6\u53ef\u5922",
             "language": {
@@ -196,7 +203,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/913/index.json b/data/api/v2/pokemon-species/913/index.json
index 499f35eee3..3f5bc4518d 100644
--- a/data/api/v2/pokemon-species/913/index.json
+++ b/data/api/v2/pokemon-species/913/index.json
@@ -57,6 +57,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub808\uc2a8\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u7fd2\u85dd\u5bf6\u53ef\u5922",
             "language": {
@@ -199,7 +206,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/914/index.json b/data/api/v2/pokemon-species/914/index.json
index 721555d990..fed83d9f7f 100644
--- a/data/api/v2/pokemon-species/914/index.json
+++ b/data/api/v2/pokemon-species/914/index.json
@@ -57,6 +57,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub304\uc11c\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u821e\u8005\u5bf6\u53ef\u5922",
             "language": {
@@ -199,7 +206,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/915/index.json b/data/api/v2/pokemon-species/915/index.json
index f6f791c867..e67ba4661d 100644
--- a/data/api/v2/pokemon-species/915/index.json
+++ b/data/api/v2/pokemon-species/915/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub3fc\uc9c0\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u8c6c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/916/index.json b/data/api/v2/pokemon-species/916/index.json
index dc996120d6..e24540b792 100644
--- a/data/api/v2/pokemon-species/916/index.json
+++ b/data/api/v2/pokemon-species/916/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub3fc\uc9c0\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u8c6c\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/917/index.json b/data/api/v2/pokemon-species/917/index.json
index 22c15bebcf..e3a9576a1f 100644
--- a/data/api/v2/pokemon-species/917/index.json
+++ b/data/api/v2/pokemon-species/917/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc2e4\ud0c0\ub798\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u7dda\u7403\u5bf6\u53ef\u5922",
             "language": {
@@ -96,6 +103,13 @@
     "is_mythical": false,
     "name": "tarountula",
     "names": [
+        {
+            "language": {
+                "name": "it",
+                "url": "/api/v2/language/8/"
+            },
+            "name": "Tarountula"
+        },
         {
             "language": {
                 "name": "ja-Hrkt",
@@ -145,13 +159,6 @@
             },
             "name": "Tarountula"
         },
-        {
-            "language": {
-                "name": "it",
-                "url": "/api/v2/language/8/"
-            },
-            "name": "Tarountula"
-        },
         {
             "language": {
                 "name": "en",
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "heads",
+        "url": "/api/v2/pokemon-shape/11/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/918/index.json b/data/api/v2/pokemon-species/918/index.json
index ec38d76c79..3298e587af 100644
--- a/data/api/v2/pokemon-species/918/index.json
+++ b/data/api/v2/pokemon-species/918/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud2b8\ub7a9\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u9677\u9631\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "heads",
+        "url": "/api/v2/pokemon-shape/11/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/919/index.json b/data/api/v2/pokemon-species/919/index.json
index fbe900ea21..eb5e892911 100644
--- a/data/api/v2/pokemon-species/919/index.json
+++ b/data/api/v2/pokemon-species/919/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uba54\ub69c\uae30\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u8757\u87f2\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "heads",
+        "url": "/api/v2/pokemon-shape/11/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/920/index.json b/data/api/v2/pokemon-species/920/index.json
index a69f055bd1..09b8ec757f 100644
--- a/data/api/v2/pokemon-species/920/index.json
+++ b/data/api/v2/pokemon-species/920/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uba54\ub69c\uae30\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u8757\u87f2\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/921/index.json b/data/api/v2/pokemon-species/921/index.json
index afac30da99..12355dd131 100644
--- a/data/api/v2/pokemon-species/921/index.json
+++ b/data/api/v2/pokemon-species/921/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc950\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u9f20\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/922/index.json b/data/api/v2/pokemon-species/922/index.json
index 2ba14e7dec..c8eb84f145 100644
--- a/data/api/v2/pokemon-species/922/index.json
+++ b/data/api/v2/pokemon-species/922/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc950\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u9f20\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/923/index.json b/data/api/v2/pokemon-species/923/index.json
index 535bdd480d..b7223e7c1e 100644
--- a/data/api/v2/pokemon-species/923/index.json
+++ b/data/api/v2/pokemon-species/923/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc190\uae38\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u62bc\u638c\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/924/index.json b/data/api/v2/pokemon-species/924/index.json
index 75ddb2e153..33e064745b 100644
--- a/data/api/v2/pokemon-species/924/index.json
+++ b/data/api/v2/pokemon-species/924/index.json
@@ -54,6 +54,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ucee4\ud50c\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6210\u5c0d\u5bf6\u53ef\u5922",
             "language": {
@@ -203,7 +210,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "fish",
+        "url": "/api/v2/pokemon-shape/3/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/925/index.json b/data/api/v2/pokemon-species/925/index.json
index 5ea94c1706..c334dfe4a1 100644
--- a/data/api/v2/pokemon-species/925/index.json
+++ b/data/api/v2/pokemon-species/925/index.json
@@ -57,6 +57,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ubc00\ub9ac\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5bb6\u65cf\u5bf6\u53ef\u5922",
             "language": {
@@ -206,7 +213,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "fish",
+        "url": "/api/v2/pokemon-shape/3/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/926/index.json b/data/api/v2/pokemon-species/926/index.json
index ac36756186..9632d1a281 100644
--- a/data/api/v2/pokemon-species/926/index.json
+++ b/data/api/v2/pokemon-species/926/index.json
@@ -54,6 +54,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uac15\uc544\uc9c0\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5c0f\u72d7\u5bf6\u53ef\u5922",
             "language": {
@@ -196,7 +203,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/927/index.json b/data/api/v2/pokemon-species/927/index.json
index c55a0860d8..94fa5172b7 100644
--- a/data/api/v2/pokemon-species/927/index.json
+++ b/data/api/v2/pokemon-species/927/index.json
@@ -57,6 +57,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uac1c\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u72d7\u5bf6\u53ef\u5922",
             "language": {
@@ -199,7 +206,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/928/index.json b/data/api/v2/pokemon-species/928/index.json
index 602c6e7467..1a7fe53acf 100644
--- a/data/api/v2/pokemon-species/928/index.json
+++ b/data/api/v2/pokemon-species/928/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc62c\ub9ac\ube0c\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6a44\u6b16\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "legs",
+        "url": "/api/v2/pokemon-shape/7/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/929/index.json b/data/api/v2/pokemon-species/929/index.json
index ae119592c2..b33065ce84 100644
--- a/data/api/v2/pokemon-species/929/index.json
+++ b/data/api/v2/pokemon-species/929/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc62c\ub9ac\ube0c\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6a44\u6b16\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/930/index.json b/data/api/v2/pokemon-species/930/index.json
index 62cf31986c..a1aba7dbba 100644
--- a/data/api/v2/pokemon-species/930/index.json
+++ b/data/api/v2/pokemon-species/930/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc62c\ub9ac\ube0c\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6a44\u6b16\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/931/index.json b/data/api/v2/pokemon-species/931/index.json
index e03b4fa4df..649cdfae5a 100644
--- a/data/api/v2/pokemon-species/931/index.json
+++ b/data/api/v2/pokemon-species/931/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc789\uaf2c\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u9e1a\u9d61\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "wings",
+        "url": "/api/v2/pokemon-shape/9/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/932/index.json b/data/api/v2/pokemon-species/932/index.json
index c9bb02b5bb..9e0c00f900 100644
--- a/data/api/v2/pokemon-species/932/index.json
+++ b/data/api/v2/pokemon-species/932/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc554\uc5fc\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5ca9\u9e7d\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "ball",
+        "url": "/api/v2/pokemon-shape/1/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/933/index.json b/data/api/v2/pokemon-species/933/index.json
index 780b26a972..556c8d87f8 100644
--- a/data/api/v2/pokemon-species/933/index.json
+++ b/data/api/v2/pokemon-species/933/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc554\uc5fc\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5ca9\u9e7d\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/934/index.json b/data/api/v2/pokemon-species/934/index.json
index 3c18744661..8d71ab3803 100644
--- a/data/api/v2/pokemon-species/934/index.json
+++ b/data/api/v2/pokemon-species/934/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc554\uc5fc\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5ca9\u9e7d\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/935/index.json b/data/api/v2/pokemon-species/935/index.json
index 04f827704b..a9f6c5d02c 100644
--- a/data/api/v2/pokemon-species/935/index.json
+++ b/data/api/v2/pokemon-species/935/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ubd88\uc758\uc544\uc774\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5c0f\u706b\u661f\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/936/index.json b/data/api/v2/pokemon-species/936/index.json
index 6b5e7df5e4..8cae04d6a3 100644
--- a/data/api/v2/pokemon-species/936/index.json
+++ b/data/api/v2/pokemon-species/936/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ubd88\uc758\uc804\uc0ac\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u706b\u6230\u58eb\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/937/index.json b/data/api/v2/pokemon-species/937/index.json
index 0ee0295e67..eb3bad747e 100644
--- a/data/api/v2/pokemon-species/937/index.json
+++ b/data/api/v2/pokemon-species/937/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ubd88\uc758\uac80\uc0ac\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u706b\u528d\u58eb\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/938/index.json b/data/api/v2/pokemon-species/938/index.json
index 239afe4fdb..2fcc58a7de 100644
--- a/data/api/v2/pokemon-species/938/index.json
+++ b/data/api/v2/pokemon-species/938/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc804\uae30\uc62c\ucc59\uc774\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u96fb\u874c\u86aa\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "squiggle",
+        "url": "/api/v2/pokemon-shape/2/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/939/index.json b/data/api/v2/pokemon-species/939/index.json
index ba47832ea1..fcad83719b 100644
--- a/data/api/v2/pokemon-species/939/index.json
+++ b/data/api/v2/pokemon-species/939/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc804\uae30\uac1c\uad6c\ub9ac\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u96fb\u86d9\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "upright",
+        "url": "/api/v2/pokemon-shape/6/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/940/index.json b/data/api/v2/pokemon-species/940/index.json
index a782f11dcb..42cac86951 100644
--- a/data/api/v2/pokemon-species/940/index.json
+++ b/data/api/v2/pokemon-species/940/index.json
@@ -54,6 +54,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ubc14\ub2e4\uc81c\ube44\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6d77\u71d5\u5bf6\u53ef\u5922",
             "language": {
@@ -196,7 +203,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "wings",
+        "url": "/api/v2/pokemon-shape/9/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/941/index.json b/data/api/v2/pokemon-species/941/index.json
index cd705cb852..1be6d3f388 100644
--- a/data/api/v2/pokemon-species/941/index.json
+++ b/data/api/v2/pokemon-species/941/index.json
@@ -57,6 +57,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uad70\ud568\uc870\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u8ecd\u8266\u9ce5\u5bf6\u53ef\u5922",
             "language": {
@@ -199,7 +206,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "wings",
+        "url": "/api/v2/pokemon-shape/9/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/942/index.json b/data/api/v2/pokemon-species/942/index.json
index b498cb4aca..c10f58e026 100644
--- a/data/api/v2/pokemon-species/942/index.json
+++ b/data/api/v2/pokemon-species/942/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc560\uc1a1\uc774\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5c0f\u8f29\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/943/index.json b/data/api/v2/pokemon-species/943/index.json
index 561d3725d2..5ee02855ab 100644
--- a/data/api/v2/pokemon-species/943/index.json
+++ b/data/api/v2/pokemon-species/943/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub450\ubaa9\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5927\u4f6c\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/944/index.json b/data/api/v2/pokemon-species/944/index.json
index fa912fe1c1..5bd9858d0b 100644
--- a/data/api/v2/pokemon-species/944/index.json
+++ b/data/api/v2/pokemon-species/944/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub3c5\uc950\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6bd2\u9f20\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/945/index.json b/data/api/v2/pokemon-species/945/index.json
index e3fdacbc85..bfcdc97601 100644
--- a/data/api/v2/pokemon-species/945/index.json
+++ b/data/api/v2/pokemon-species/945/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub3c5\uc6d0\uc22d\uc774\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6bd2\u7334\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/946/index.json b/data/api/v2/pokemon-species/946/index.json
index 8ef3067473..53fcce32ba 100644
--- a/data/api/v2/pokemon-species/946/index.json
+++ b/data/api/v2/pokemon-species/946/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud68c\uc804\ucd08\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6efe\u8349\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "ball",
+        "url": "/api/v2/pokemon-shape/1/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/947/index.json b/data/api/v2/pokemon-species/947/index.json
index 582e950ed0..38f25bfafa 100644
--- a/data/api/v2/pokemon-species/947/index.json
+++ b/data/api/v2/pokemon-species/947/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud68c\uc804\ucd08\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6efe\u8349\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "ball",
+        "url": "/api/v2/pokemon-shape/1/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/948/index.json b/data/api/v2/pokemon-species/948/index.json
index 612307b4d8..ab0b87fae5 100644
--- a/data/api/v2/pokemon-species/948/index.json
+++ b/data/api/v2/pokemon-species/948/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ubaa9\uc774\ubc84\uc12f\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6728\u8033\u5bf6\u53ef\u5922",
             "language": {
@@ -199,7 +206,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "legs",
+        "url": "/api/v2/pokemon-shape/7/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/949/index.json b/data/api/v2/pokemon-species/949/index.json
index e0d2e4cb58..3732efc2bc 100644
--- a/data/api/v2/pokemon-species/949/index.json
+++ b/data/api/v2/pokemon-species/949/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ubaa9\uc774\ubc84\uc12f\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6728\u8033\u5bf6\u53ef\u5922",
             "language": {
@@ -202,7 +209,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "bug-wings",
+        "url": "/api/v2/pokemon-shape/13/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/950/index.json b/data/api/v2/pokemon-species/950/index.json
index 1e5fe3a078..26d36927d0 100644
--- a/data/api/v2/pokemon-species/950/index.json
+++ b/data/api/v2/pokemon-species/950/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub9e4\ubcf5\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u57cb\u4f0f\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "heads",
+        "url": "/api/v2/pokemon-shape/11/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/951/index.json b/data/api/v2/pokemon-species/951/index.json
index 2443a0f47e..52f0c58134 100644
--- a/data/api/v2/pokemon-species/951/index.json
+++ b/data/api/v2/pokemon-species/951/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud558\ubc14\ub124\ub85c\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u71b1\u8fa3\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/952/index.json b/data/api/v2/pokemon-species/952/index.json
index 4e112e86c7..91c80243e2 100644
--- a/data/api/v2/pokemon-species/952/index.json
+++ b/data/api/v2/pokemon-species/952/index.json
@@ -46,6 +46,13 @@
     "forms_switchable": false,
     "gender_rate": 4,
     "genera": [
+        {
+            "genus": "Habanero",
+            "language": {
+                "name": "de",
+                "url": "/api/v2/language/6/"
+            }
+        },
         {
             "genus": "\u30cf\u30d0\u30cd\u30ed\u30dd\u30b1\u30e2\u30f3",
             "language": {
@@ -54,17 +61,17 @@
             }
         },
         {
-            "genus": "\u71b1\u8fa3\u5bf6\u53ef\u5922",
+            "genus": "\ud558\ubc14\ub124\ub85c\ud3ec\ucf13\ubaac",
             "language": {
-                "name": "zh-Hant",
-                "url": "/api/v2/language/4/"
+                "name": "ko",
+                "url": "/api/v2/language/3/"
             }
         },
         {
-            "genus": "Habanero",
+            "genus": "\u71b1\u8fa3\u5bf6\u53ef\u5922",
             "language": {
-                "name": "de",
-                "url": "/api/v2/language/6/"
+                "name": "zh-Hant",
+                "url": "/api/v2/language/4/"
             }
         },
         {
@@ -99,6 +106,13 @@
     "is_mythical": false,
     "name": "scovillain",
     "names": [
+        {
+            "language": {
+                "name": "de",
+                "url": "/api/v2/language/6/"
+            },
+            "name": "Halupenjo"
+        },
         {
             "language": {
                 "name": "ja-Hrkt",
@@ -134,13 +148,6 @@
             },
             "name": "Scovilain"
         },
-        {
-            "language": {
-                "name": "de",
-                "url": "/api/v2/language/6/"
-            },
-            "name": "Halupenjo"
-        },
         {
             "language": {
                 "name": "es",
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/953/index.json b/data/api/v2/pokemon-species/953/index.json
index 2977ca3d4d..b5d2edae18 100644
--- a/data/api/v2/pokemon-species/953/index.json
+++ b/data/api/v2/pokemon-species/953/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uad74\ub9ac\uae30\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6efe\u52d5\u5bf6\u53ef\u5922",
             "language": {
@@ -199,7 +206,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "heads",
+        "url": "/api/v2/pokemon-shape/11/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/954/index.json b/data/api/v2/pokemon-species/954/index.json
index 8a33ff8b32..d65fe4d145 100644
--- a/data/api/v2/pokemon-species/954/index.json
+++ b/data/api/v2/pokemon-species/954/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uad74\ub9ac\uae30\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6efe\u52d5\u5bf6\u53ef\u5922",
             "language": {
@@ -202,7 +209,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "heads",
+        "url": "/api/v2/pokemon-shape/11/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/955/index.json b/data/api/v2/pokemon-species/955/index.json
index f9e5ecf310..70942f1667 100644
--- a/data/api/v2/pokemon-species/955/index.json
+++ b/data/api/v2/pokemon-species/955/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud504\ub9b4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u8936\u908a\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "legs",
+        "url": "/api/v2/pokemon-shape/7/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/956/index.json b/data/api/v2/pokemon-species/956/index.json
index fdd9ad9946..d5b5b689a3 100644
--- a/data/api/v2/pokemon-species/956/index.json
+++ b/data/api/v2/pokemon-species/956/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud0c0\uc870\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u9d15\u9ce5\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/957/index.json b/data/api/v2/pokemon-species/957/index.json
index 8d7680e981..8374966dad 100644
--- a/data/api/v2/pokemon-species/957/index.json
+++ b/data/api/v2/pokemon-species/957/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub300\uc7a5\uc7a5\uc774\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u9318\u934a\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/958/index.json b/data/api/v2/pokemon-species/958/index.json
index 201a8b9fb1..d61b08fd16 100644
--- a/data/api/v2/pokemon-species/958/index.json
+++ b/data/api/v2/pokemon-species/958/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud574\uba38\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u9318\u5b50\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/959/index.json b/data/api/v2/pokemon-species/959/index.json
index 5d83f82f76..1dd28567bd 100644
--- a/data/api/v2/pokemon-species/959/index.json
+++ b/data/api/v2/pokemon-species/959/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud574\uba38\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u9318\u5b50\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/960/index.json b/data/api/v2/pokemon-species/960/index.json
index 5810a85b3d..b52515df33 100644
--- a/data/api/v2/pokemon-species/960/index.json
+++ b/data/api/v2/pokemon-species/960/index.json
@@ -45,6 +45,13 @@
     "genera": [
         {
             "genus": "\u3042\u306a\u3054\u30dd\u30b1\u30e2\u30f3",
+            "language": {
+                "name": "ja-Hrkt",
+                "url": "/api/v2/language/1/"
+            }
+        },
+        {
+            "genus": "\uc815\uc6d0\uc7a5\uc5b4\ud3ec\ucf13\ubaac",
             "language": {
                 "name": "ko",
                 "url": "/api/v2/language/3/"
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "quadruped",
+        "url": "/api/v2/pokemon-shape/8/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/961/index.json b/data/api/v2/pokemon-species/961/index.json
index bbc2e6e1ab..a5098b5a0c 100644
--- a/data/api/v2/pokemon-species/961/index.json
+++ b/data/api/v2/pokemon-species/961/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc815\uc6d0\uc7a5\uc5b4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u7cef\u9c3b\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "quadruped",
+        "url": "/api/v2/pokemon-shape/8/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/962/index.json b/data/api/v2/pokemon-species/962/index.json
index c9c1b9665b..f53df1f122 100644
--- a/data/api/v2/pokemon-species/962/index.json
+++ b/data/api/v2/pokemon-species/962/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub099\ud558\ubb3c\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6389\u6771\u897f\u5bf6\u53ef\u5922",
             "language": {
@@ -199,7 +206,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "wings",
+        "url": "/api/v2/pokemon-shape/9/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/963/index.json b/data/api/v2/pokemon-species/963/index.json
index 097399a1af..2a13962697 100644
--- a/data/api/v2/pokemon-species/963/index.json
+++ b/data/api/v2/pokemon-species/963/index.json
@@ -54,6 +54,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub3cc\uace0\ub798\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6d77\u8c5a\u5bf6\u53ef\u5922",
             "language": {
@@ -196,7 +203,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "squiggle",
+        "url": "/api/v2/pokemon-shape/2/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/964/index.json b/data/api/v2/pokemon-species/964/index.json
index 2da8114ebc..faf311069d 100644
--- a/data/api/v2/pokemon-species/964/index.json
+++ b/data/api/v2/pokemon-species/964/index.json
@@ -57,6 +57,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub3cc\uace0\ub798\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6d77\u8c5a\u5bf6\u53ef\u5922",
             "language": {
@@ -199,7 +206,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "squiggle",
+        "url": "/api/v2/pokemon-shape/2/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/965/index.json b/data/api/v2/pokemon-species/965/index.json
index 766cf440c4..a1a0a99b6e 100644
--- a/data/api/v2/pokemon-species/965/index.json
+++ b/data/api/v2/pokemon-species/965/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub2e8\uae30\ud1b5\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u55ae\u6c7d\u7f38\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "legs",
+        "url": "/api/v2/pokemon-shape/7/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/966/index.json b/data/api/v2/pokemon-species/966/index.json
index b45a4cef8e..403b2d643f 100644
--- a/data/api/v2/pokemon-species/966/index.json
+++ b/data/api/v2/pokemon-species/966/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub2e4\uae30\ud1b5\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u591a\u6c7d\u7f38\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "legs",
+        "url": "/api/v2/pokemon-shape/7/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/967/index.json b/data/api/v2/pokemon-species/967/index.json
index d41c36b302..cf97c56c3c 100644
--- a/data/api/v2/pokemon-species/967/index.json
+++ b/data/api/v2/pokemon-species/967/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub77c\uc774\ub4dc\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5750\u9a0e\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/968/index.json b/data/api/v2/pokemon-species/968/index.json
index dba03931d9..123352e961 100644
--- a/data/api/v2/pokemon-species/968/index.json
+++ b/data/api/v2/pokemon-species/968/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc9c0\ub801\uc774\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u86af\u8693\u5bf6\u53ef\u5922",
             "language": {
@@ -199,7 +206,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "blob",
+        "url": "/api/v2/pokemon-shape/5/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/969/index.json b/data/api/v2/pokemon-species/969/index.json
index db9e07be54..1886d47463 100644
--- a/data/api/v2/pokemon-species/969/index.json
+++ b/data/api/v2/pokemon-species/969/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uad11\uc11d\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u7926\u77f3\u5bf6\u53ef\u5922",
             "language": {
@@ -199,7 +206,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "ball",
+        "url": "/api/v2/pokemon-shape/1/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/970/index.json b/data/api/v2/pokemon-species/970/index.json
index b87917875e..dbb0746dd7 100644
--- a/data/api/v2/pokemon-species/970/index.json
+++ b/data/api/v2/pokemon-species/970/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uad11\uc11d\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u7926\u77f3\u5bf6\u53ef\u5922",
             "language": {
@@ -202,7 +209,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "ball",
+        "url": "/api/v2/pokemon-shape/1/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/971/index.json b/data/api/v2/pokemon-species/971/index.json
index fb71bab460..2d95b6d813 100644
--- a/data/api/v2/pokemon-species/971/index.json
+++ b/data/api/v2/pokemon-species/971/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc720\ub839\uac1c\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u9b3c\u72ac\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/972/index.json b/data/api/v2/pokemon-species/972/index.json
index f9327146aa..2aa596b037 100644
--- a/data/api/v2/pokemon-species/972/index.json
+++ b/data/api/v2/pokemon-species/972/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc720\ub839\uac1c\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u9b3c\u72ac\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/973/index.json b/data/api/v2/pokemon-species/973/index.json
index 159c1e05bc..6deea71f06 100644
--- a/data/api/v2/pokemon-species/973/index.json
+++ b/data/api/v2/pokemon-species/973/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc2f1\ud06c\ub85c\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u540c\u6b65\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "wings",
+        "url": "/api/v2/pokemon-shape/9/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/974/index.json b/data/api/v2/pokemon-species/974/index.json
index be295b0c4f..da53ddb715 100644
--- a/data/api/v2/pokemon-species/974/index.json
+++ b/data/api/v2/pokemon-species/974/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc721\uc9c0\uace0\ub798\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u9678\u9be8\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/975/index.json b/data/api/v2/pokemon-species/975/index.json
index 318955808a..b7ebc74767 100644
--- a/data/api/v2/pokemon-species/975/index.json
+++ b/data/api/v2/pokemon-species/975/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc721\uc9c0\uace0\ub798\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u9678\u9be8\u5bf6\u53ef\u5922",
             "language": {
@@ -195,7 +202,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/976/index.json b/data/api/v2/pokemon-species/976/index.json
index 8b22551589..5aaaa9a68b 100644
--- a/data/api/v2/pokemon-species/976/index.json
+++ b/data/api/v2/pokemon-species/976/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ubd84\ub9ac\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5378\u9664\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "squiggle",
+        "url": "/api/v2/pokemon-shape/2/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/977/index.json b/data/api/v2/pokemon-species/977/index.json
index f9ad0af7de..0d43f7e037 100644
--- a/data/api/v2/pokemon-species/977/index.json
+++ b/data/api/v2/pokemon-species/977/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud070\uba54\uae30\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5927\u9bf0\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "squiggle",
+        "url": "/api/v2/pokemon-shape/2/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/978/index.json b/data/api/v2/pokemon-species/978/index.json
index 8249adf147..a6685ec131 100644
--- a/data/api/v2/pokemon-species/978/index.json
+++ b/data/api/v2/pokemon-species/978/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc758\ud0dc\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u64ec\u614b\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "blob",
+        "url": "/api/v2/pokemon-shape/5/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/979/index.json b/data/api/v2/pokemon-species/979/index.json
index 3dd572f21f..7c4379f62f 100644
--- a/data/api/v2/pokemon-species/979/index.json
+++ b/data/api/v2/pokemon-species/979/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ubd84\ub178\uc22d\uc774\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u61a4\u6012\u7334\u5bf6\u53ef\u5922",
             "language": {
@@ -202,7 +209,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/980/index.json b/data/api/v2/pokemon-species/980/index.json
index 1ad95b15fa..c4fd098e32 100644
--- a/data/api/v2/pokemon-species/980/index.json
+++ b/data/api/v2/pokemon-species/980/index.json
@@ -57,6 +57,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uac00\uc2dc\ubb3c\uace0\uae30\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u523a\u9b5a\u5bf6\u53ef\u5922",
             "language": {
@@ -199,7 +206,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/981/index.json b/data/api/v2/pokemon-species/981/index.json
index 2c106d3174..2ec00c3150 100644
--- a/data/api/v2/pokemon-species/981/index.json
+++ b/data/api/v2/pokemon-species/981/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uae34\ubaa9\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u9577\u9838\u5bf6\u53ef\u5922",
             "language": {
@@ -202,7 +209,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/982/index.json b/data/api/v2/pokemon-species/982/index.json
index 80dad35737..4ebadcee6f 100644
--- a/data/api/v2/pokemon-species/982/index.json
+++ b/data/api/v2/pokemon-species/982/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub545\ubc40\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5730\u86c7\u5bf6\u53ef\u5922",
             "language": {
@@ -202,7 +209,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "blob",
+        "url": "/api/v2/pokemon-shape/5/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/983/index.json b/data/api/v2/pokemon-species/983/index.json
index 4553801217..2ec153d158 100644
--- a/data/api/v2/pokemon-species/983/index.json
+++ b/data/api/v2/pokemon-species/983/index.json
@@ -53,6 +53,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ub300\ub3c4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5927\u5200\u5bf6\u53ef\u5922",
             "language": {
@@ -202,7 +209,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/984/index.json b/data/api/v2/pokemon-species/984/index.json
index 299c2ee10c..338e41fe7b 100644
--- a/data/api/v2/pokemon-species/984/index.json
+++ b/data/api/v2/pokemon-species/984/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/985/index.json b/data/api/v2/pokemon-species/985/index.json
index a2efbc4a54..66dd65f887 100644
--- a/data/api/v2/pokemon-species/985/index.json
+++ b/data/api/v2/pokemon-species/985/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/986/index.json b/data/api/v2/pokemon-species/986/index.json
index 6ff0a5c2a7..a596f8bc61 100644
--- a/data/api/v2/pokemon-species/986/index.json
+++ b/data/api/v2/pokemon-species/986/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/987/index.json b/data/api/v2/pokemon-species/987/index.json
index e94e77ad96..1236c52c02 100644
--- a/data/api/v2/pokemon-species/987/index.json
+++ b/data/api/v2/pokemon-species/987/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "wings",
+        "url": "/api/v2/pokemon-shape/9/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/988/index.json b/data/api/v2/pokemon-species/988/index.json
index cd7253f873..a42fd7f177 100644
--- a/data/api/v2/pokemon-species/988/index.json
+++ b/data/api/v2/pokemon-species/988/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/989/index.json b/data/api/v2/pokemon-species/989/index.json
index c50888837c..5ff48ce4e9 100644
--- a/data/api/v2/pokemon-species/989/index.json
+++ b/data/api/v2/pokemon-species/989/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -96,13 +103,6 @@
     "is_mythical": false,
     "name": "sandy-shocks",
     "names": [
-        {
-            "language": {
-                "name": "es",
-                "url": "/api/v2/language/7/"
-            },
-            "name": "Pelarena"
-        },
         {
             "language": {
                 "name": "ja-Hrkt",
@@ -145,6 +145,13 @@
             },
             "name": "Sandfell"
         },
+        {
+            "language": {
+                "name": "es",
+                "url": "/api/v2/language/7/"
+            },
+            "name": "Pelarena"
+        },
         {
             "language": {
                 "name": "it",
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/990/index.json b/data/api/v2/pokemon-species/990/index.json
index 0314d402dd..282b8901eb 100644
--- a/data/api/v2/pokemon-species/990/index.json
+++ b/data/api/v2/pokemon-species/990/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "arms",
+        "url": "/api/v2/pokemon-shape/4/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/991/index.json b/data/api/v2/pokemon-species/991/index.json
index b16705d08e..7be779dba9 100644
--- a/data/api/v2/pokemon-species/991/index.json
+++ b/data/api/v2/pokemon-species/991/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/992/index.json b/data/api/v2/pokemon-species/992/index.json
index e1394a3c67..8d9c9be157 100644
--- a/data/api/v2/pokemon-species/992/index.json
+++ b/data/api/v2/pokemon-species/992/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "humanoid",
+        "url": "/api/v2/pokemon-shape/12/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/993/index.json b/data/api/v2/pokemon-species/993/index.json
index 0422afdc71..95349bc8d2 100644
--- a/data/api/v2/pokemon-species/993/index.json
+++ b/data/api/v2/pokemon-species/993/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/994/index.json b/data/api/v2/pokemon-species/994/index.json
index 57e15bf5df..23cb4bef76 100644
--- a/data/api/v2/pokemon-species/994/index.json
+++ b/data/api/v2/pokemon-species/994/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "armor",
+        "url": "/api/v2/pokemon-shape/14/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/995/index.json b/data/api/v2/pokemon-species/995/index.json
index 5bbe04c73d..2fa3300706 100644
--- a/data/api/v2/pokemon-species/995/index.json
+++ b/data/api/v2/pokemon-species/995/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ud328\ub7ec\ub3c5\uc2a4\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u6096\u8b2c\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/996/index.json b/data/api/v2/pokemon-species/996/index.json
index 16d47f2dd5..d79e946f4c 100644
--- a/data/api/v2/pokemon-species/996/index.json
+++ b/data/api/v2/pokemon-species/996/index.json
@@ -54,6 +54,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc5bc\uc74c\uc9c0\ub290\ub7ec\ubbf8\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u51b0\u9c2d\u5bf6\u53ef\u5922",
             "language": {
@@ -196,7 +203,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/997/index.json b/data/api/v2/pokemon-species/997/index.json
index f4005b0df4..77d4e6e5dd 100644
--- a/data/api/v2/pokemon-species/997/index.json
+++ b/data/api/v2/pokemon-species/997/index.json
@@ -57,6 +57,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\uc5bc\uc74c\uc9c0\ub290\ub7ec\ubbf8\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u51b0\u9c2d\u5bf6\u53ef\u5922",
             "language": {
@@ -199,7 +206,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/998/index.json b/data/api/v2/pokemon-species/998/index.json
index a7a45b6774..a017d27f49 100644
--- a/data/api/v2/pokemon-species/998/index.json
+++ b/data/api/v2/pokemon-species/998/index.json
@@ -57,6 +57,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ube59\ub8e1\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u51b0\u9f8d\u5bf6\u53ef\u5922",
             "language": {
@@ -103,6 +110,13 @@
     "is_mythical": false,
     "name": "baxcalibur",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "Glaivodo"
+        },
         {
             "language": {
                 "name": "ja-Hrkt",
@@ -131,13 +145,6 @@
             },
             "name": "\u621f\u810a\u9f8d"
         },
-        {
-            "language": {
-                "name": "fr",
-                "url": "/api/v2/language/5/"
-            },
-            "name": "Glaivodo"
-        },
         {
             "language": {
                 "name": "de",
@@ -199,7 +206,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "tentacles",
+        "url": "/api/v2/pokemon-shape/10/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/api/v2/pokemon-species/999/index.json b/data/api/v2/pokemon-species/999/index.json
index 094a45b4e1..e9324d9590 100644
--- a/data/api/v2/pokemon-species/999/index.json
+++ b/data/api/v2/pokemon-species/999/index.json
@@ -50,6 +50,13 @@
                 "url": "/api/v2/language/1/"
             }
         },
+        {
+            "genus": "\ubcf4\ubb3c\uc0c1\uc790\ud3ec\ucf13\ubaac",
+            "language": {
+                "name": "ko",
+                "url": "/api/v2/language/3/"
+            }
+        },
         {
             "genus": "\u5bf6\u7bb1\u5bf6\u53ef\u5922",
             "language": {
@@ -192,7 +199,10 @@
             }
         }
     ],
-    "shape": null,
+    "shape": {
+        "name": "ball",
+        "url": "/api/v2/pokemon-shape/1/"
+    },
     "varieties": [
         {
             "is_default": true,
diff --git a/data/schema/v2/pokemon-species/$id/index.json b/data/schema/v2/pokemon-species/$id/index.json
index 6a5586520a..6243798ec7 100644
--- a/data/schema/v2/pokemon-species/$id/index.json
+++ b/data/schema/v2/pokemon-species/$id/index.json
@@ -174,14 +174,7 @@
             "type": "array"
         },
         "shape": {
-            "anyOf": [
-                {
-                    "type": "null"
-                },
-                {
-                    "$ref": "/schema/v2/named_api_resource.json"
-                }
-            ]
+            "$ref": "/schema/v2/named_api_resource.json"
         },
         "varieties": {
             "items": {