diff --git a/data/api/v2/gender/1/index.json b/data/api/v2/gender/1/index.json
index 613ecade64..0916e6685a 100644
--- a/data/api/v2/gender/1/index.json
+++ b/data/api/v2/gender/1/index.json
@@ -4720,6 +4720,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "nymble",
+                "url": "/api/v2/pokemon-species/919/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "hakamo-o",
@@ -4860,13 +4867,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "lokix",
-                "url": "/api/v2/pokemon-species/920/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "silicobra",
@@ -5035,13 +5035,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "nymble",
-                "url": "/api/v2/pokemon-species/919/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "sandaconda",
@@ -5191,15 +5184,15 @@
         },
         {
             "pokemon_species": {
-                "name": "ursaluna",
-                "url": "/api/v2/pokemon-species/901/"
+                "name": "basculegion",
+                "url": "/api/v2/pokemon-species/902/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "basculegion",
-                "url": "/api/v2/pokemon-species/902/"
+                "name": "sneasler",
+                "url": "/api/v2/pokemon-species/903/"
             },
             "rate": 4
         },
@@ -5476,6 +5469,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "pawmo",
+                "url": "/api/v2/pokemon-species/922/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "pawmot",
@@ -5672,13 +5672,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "arctibax",
-                "url": "/api/v2/pokemon-species/997/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "ivysaur",
@@ -5842,15 +5835,15 @@
         },
         {
             "pokemon_species": {
-                "name": "sneasler",
-                "url": "/api/v2/pokemon-species/903/"
+                "name": "ursaluna",
+                "url": "/api/v2/pokemon-species/901/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "pawmo",
-                "url": "/api/v2/pokemon-species/922/"
+                "name": "lokix",
+                "url": "/api/v2/pokemon-species/920/"
             },
             "rate": 4
         },
@@ -5868,6 +5861,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "arctibax",
+                "url": "/api/v2/pokemon-species/997/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "baxcalibur",
diff --git a/data/api/v2/gender/2/index.json b/data/api/v2/gender/2/index.json
index 7a229b0a9e..f9dc6cb659 100644
--- a/data/api/v2/gender/2/index.json
+++ b/data/api/v2/gender/2/index.json
@@ -4671,6 +4671,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "nymble",
+                "url": "/api/v2/pokemon-species/919/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "hakamo-o",
@@ -4811,13 +4818,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "lokix",
-                "url": "/api/v2/pokemon-species/920/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "silicobra",
@@ -4972,13 +4972,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "nymble",
-                "url": "/api/v2/pokemon-species/919/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "sandaconda",
@@ -5016,8 +5009,8 @@
         },
         {
             "pokemon_species": {
-                "name": "grimmsnarl",
-                "url": "/api/v2/pokemon-species/861/"
+                "name": "morgrem",
+                "url": "/api/v2/pokemon-species/860/"
             },
             "rate": 0
         },
@@ -5114,15 +5107,15 @@
         },
         {
             "pokemon_species": {
-                "name": "ursaluna",
-                "url": "/api/v2/pokemon-species/901/"
+                "name": "basculegion",
+                "url": "/api/v2/pokemon-species/902/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "basculegion",
-                "url": "/api/v2/pokemon-species/902/"
+                "name": "sneasler",
+                "url": "/api/v2/pokemon-species/903/"
             },
             "rate": 4
         },
@@ -5399,6 +5392,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "pawmo",
+                "url": "/api/v2/pokemon-species/922/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "pawmot",
@@ -5581,13 +5581,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "arctibax",
-                "url": "/api/v2/pokemon-species/997/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "ivysaur",
@@ -5744,22 +5737,22 @@
         },
         {
             "pokemon_species": {
-                "name": "morgrem",
-                "url": "/api/v2/pokemon-species/860/"
+                "name": "grimmsnarl",
+                "url": "/api/v2/pokemon-species/861/"
             },
             "rate": 0
         },
         {
             "pokemon_species": {
-                "name": "sneasler",
-                "url": "/api/v2/pokemon-species/903/"
+                "name": "ursaluna",
+                "url": "/api/v2/pokemon-species/901/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "pawmo",
-                "url": "/api/v2/pokemon-species/922/"
+                "name": "lokix",
+                "url": "/api/v2/pokemon-species/920/"
             },
             "rate": 4
         },
@@ -5777,6 +5770,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "arctibax",
+                "url": "/api/v2/pokemon-species/997/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "baxcalibur",
diff --git a/data/api/v2/generation/8/index.json b/data/api/v2/generation/8/index.json
index 9af748f8a7..616aaa0b37 100644
--- a/data/api/v2/generation/8/index.json
+++ b/data/api/v2/generation/8/index.json
@@ -940,8 +940,8 @@
             "url": "/api/v2/pokemon-species/858/"
         },
         {
-            "name": "grimmsnarl",
-            "url": "/api/v2/pokemon-species/861/"
+            "name": "morgrem",
+            "url": "/api/v2/pokemon-species/860/"
         },
         {
             "name": "obstagoon",
@@ -999,14 +999,14 @@
             "name": "kleavor",
             "url": "/api/v2/pokemon-species/900/"
         },
-        {
-            "name": "ursaluna",
-            "url": "/api/v2/pokemon-species/901/"
-        },
         {
             "name": "basculegion",
             "url": "/api/v2/pokemon-species/902/"
         },
+        {
+            "name": "sneasler",
+            "url": "/api/v2/pokemon-species/903/"
+        },
         {
             "name": "overqwil",
             "url": "/api/v2/pokemon-species/904/"
@@ -1020,12 +1020,12 @@
             "url": "/api/v2/pokemon-species/842/"
         },
         {
-            "name": "morgrem",
-            "url": "/api/v2/pokemon-species/860/"
+            "name": "grimmsnarl",
+            "url": "/api/v2/pokemon-species/861/"
         },
         {
-            "name": "sneasler",
-            "url": "/api/v2/pokemon-species/903/"
+            "name": "ursaluna",
+            "url": "/api/v2/pokemon-species/901/"
         }
     ],
     "types": [],
diff --git a/data/api/v2/generation/9/index.json b/data/api/v2/generation/9/index.json
index 13d4e35c08..8768206b4b 100644
--- a/data/api/v2/generation/9/index.json
+++ b/data/api/v2/generation/9/index.json
@@ -512,8 +512,8 @@
     ],
     "pokemon_species": [
         {
-            "name": "lokix",
-            "url": "/api/v2/pokemon-species/920/"
+            "name": "nymble",
+            "url": "/api/v2/pokemon-species/919/"
         },
         {
             "name": "sprigatito",
@@ -535,10 +535,6 @@
             "name": "tarountula",
             "url": "/api/v2/pokemon-species/917/"
         },
-        {
-            "name": "nymble",
-            "url": "/api/v2/pokemon-species/919/"
-        },
         {
             "name": "floragato",
             "url": "/api/v2/pokemon-species/907/"
@@ -747,6 +743,10 @@
             "name": "frigibax",
             "url": "/api/v2/pokemon-species/996/"
         },
+        {
+            "name": "pawmo",
+            "url": "/api/v2/pokemon-species/922/"
+        },
         {
             "name": "pawmot",
             "url": "/api/v2/pokemon-species/923/"
@@ -863,10 +863,6 @@
             "name": "kingambit",
             "url": "/api/v2/pokemon-species/983/"
         },
-        {
-            "name": "arctibax",
-            "url": "/api/v2/pokemon-species/997/"
-        },
         {
             "name": "gimmighoul",
             "url": "/api/v2/pokemon-species/999/"
@@ -956,8 +952,8 @@
             "url": "/api/v2/pokemon-species/1025/"
         },
         {
-            "name": "pawmo",
-            "url": "/api/v2/pokemon-species/922/"
+            "name": "lokix",
+            "url": "/api/v2/pokemon-species/920/"
         },
         {
             "name": "arboliva",
@@ -967,6 +963,10 @@
             "name": "revavroom",
             "url": "/api/v2/pokemon-species/966/"
         },
+        {
+            "name": "arctibax",
+            "url": "/api/v2/pokemon-species/997/"
+        },
         {
             "name": "baxcalibur",
             "url": "/api/v2/pokemon-species/998/"
diff --git a/data/api/v2/growth-rate/1/index.json b/data/api/v2/growth-rate/1/index.json
index 8d3c673f00..11870181ea 100644
--- a/data/api/v2/growth-rate/1/index.json
+++ b/data/api/v2/growth-rate/1/index.json
@@ -1328,10 +1328,6 @@
             "name": "palafin",
             "url": "/api/v2/pokemon-species/964/"
         },
-        {
-            "name": "arctibax",
-            "url": "/api/v2/pokemon-species/997/"
-        },
         {
             "name": "gimmighoul",
             "url": "/api/v2/pokemon-species/999/"
@@ -1432,6 +1428,10 @@
             "name": "mamoswine",
             "url": "/api/v2/pokemon-species/473/"
         },
+        {
+            "name": "arctibax",
+            "url": "/api/v2/pokemon-species/997/"
+        },
         {
             "name": "baxcalibur",
             "url": "/api/v2/pokemon-species/998/"
diff --git a/data/api/v2/growth-rate/2/index.json b/data/api/v2/growth-rate/2/index.json
index 9bcd8a5feb..84d5d80698 100644
--- a/data/api/v2/growth-rate/2/index.json
+++ b/data/api/v2/growth-rate/2/index.json
@@ -1756,6 +1756,10 @@
             "name": "chewtle",
             "url": "/api/v2/pokemon-species/833/"
         },
+        {
+            "name": "nymble",
+            "url": "/api/v2/pokemon-species/919/"
+        },
         {
             "name": "greedent",
             "url": "/api/v2/pokemon-species/820/"
@@ -1776,10 +1780,6 @@
             "name": "drednaw",
             "url": "/api/v2/pokemon-species/834/"
         },
-        {
-            "name": "lokix",
-            "url": "/api/v2/pokemon-species/920/"
-        },
         {
             "name": "silicobra",
             "url": "/api/v2/pokemon-species/843/"
@@ -1832,10 +1832,6 @@
             "name": "lechonk",
             "url": "/api/v2/pokemon-species/915/"
         },
-        {
-            "name": "nymble",
-            "url": "/api/v2/pokemon-species/919/"
-        },
         {
             "name": "sandaconda",
             "url": "/api/v2/pokemon-species/844/"
@@ -1849,8 +1845,8 @@
             "url": "/api/v2/pokemon-species/855/"
         },
         {
-            "name": "grimmsnarl",
-            "url": "/api/v2/pokemon-species/861/"
+            "name": "morgrem",
+            "url": "/api/v2/pokemon-species/860/"
         },
         {
             "name": "obstagoon",
@@ -1888,10 +1884,6 @@
             "name": "kleavor",
             "url": "/api/v2/pokemon-species/900/"
         },
-        {
-            "name": "ursaluna",
-            "url": "/api/v2/pokemon-species/901/"
-        },
         {
             "name": "basculegion",
             "url": "/api/v2/pokemon-species/902/"
@@ -1932,6 +1924,10 @@
             "name": "varoom",
             "url": "/api/v2/pokemon-species/965/"
         },
+        {
+            "name": "pawmo",
+            "url": "/api/v2/pokemon-species/922/"
+        },
         {
             "name": "pawmot",
             "url": "/api/v2/pokemon-species/923/"
@@ -2009,12 +2005,16 @@
             "url": "/api/v2/pokemon-species/826/"
         },
         {
-            "name": "morgrem",
-            "url": "/api/v2/pokemon-species/860/"
+            "name": "grimmsnarl",
+            "url": "/api/v2/pokemon-species/861/"
         },
         {
-            "name": "pawmo",
-            "url": "/api/v2/pokemon-species/922/"
+            "name": "ursaluna",
+            "url": "/api/v2/pokemon-species/901/"
+        },
+        {
+            "name": "lokix",
+            "url": "/api/v2/pokemon-species/920/"
         },
         {
             "name": "revavroom",
diff --git a/data/api/v2/growth-rate/4/index.json b/data/api/v2/growth-rate/4/index.json
index f402ce6601..b4491be902 100644
--- a/data/api/v2/growth-rate/4/index.json
+++ b/data/api/v2/growth-rate/4/index.json
@@ -1280,6 +1280,10 @@
             "name": "grapploct",
             "url": "/api/v2/pokemon-species/853/"
         },
+        {
+            "name": "sneasler",
+            "url": "/api/v2/pokemon-species/903/"
+        },
         {
             "name": "floragato",
             "url": "/api/v2/pokemon-species/907/"
@@ -1464,10 +1468,6 @@
             "name": "tsareena",
             "url": "/api/v2/pokemon-species/763/"
         },
-        {
-            "name": "sneasler",
-            "url": "/api/v2/pokemon-species/903/"
-        },
         {
             "name": "arboliva",
             "url": "/api/v2/pokemon-species/930/"
diff --git a/data/api/v2/pokemon-color/10/index.json b/data/api/v2/pokemon-color/10/index.json
index 5e7017f4b2..67a95d2f54 100644
--- a/data/api/v2/pokemon-color/10/index.json
+++ b/data/api/v2/pokemon-color/10/index.json
@@ -394,6 +394,10 @@
             "name": "iron-moth",
             "url": "/api/v2/pokemon-species/994/"
         },
+        {
+            "name": "pawmo",
+            "url": "/api/v2/pokemon-species/922/"
+        },
         {
             "name": "pawmot",
             "url": "/api/v2/pokemon-species/923/"
@@ -418,10 +422,6 @@
             "name": "cofagrigus",
             "url": "/api/v2/pokemon-species/563/"
         },
-        {
-            "name": "pawmo",
-            "url": "/api/v2/pokemon-species/922/"
-        },
         {
             "name": "gholdengo",
             "url": "/api/v2/pokemon-species/1000/"
diff --git a/data/api/v2/pokemon-color/3/index.json b/data/api/v2/pokemon-color/3/index.json
index a7df23aa78..8d96f2ff2d 100644
--- a/data/api/v2/pokemon-color/3/index.json
+++ b/data/api/v2/pokemon-color/3/index.json
@@ -586,10 +586,6 @@
             "name": "kleavor",
             "url": "/api/v2/pokemon-species/900/"
         },
-        {
-            "name": "ursaluna",
-            "url": "/api/v2/pokemon-species/901/"
-        },
         {
             "name": "nacli",
             "url": "/api/v2/pokemon-species/932/"
@@ -661,6 +657,10 @@
         {
             "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 95e785c029..38cce3b284 100644
--- a/data/api/v2/pokemon-color/4/index.json
+++ b/data/api/v2/pokemon-color/4/index.json
@@ -358,6 +358,10 @@
             "name": "meltan",
             "url": "/api/v2/pokemon-species/808/"
         },
+        {
+            "name": "nymble",
+            "url": "/api/v2/pokemon-species/919/"
+        },
         {
             "name": "silvally",
             "url": "/api/v2/pokemon-species/773/"
@@ -378,10 +382,6 @@
             "name": "raboot",
             "url": "/api/v2/pokemon-species/814/"
         },
-        {
-            "name": "lokix",
-            "url": "/api/v2/pokemon-species/920/"
-        },
         {
             "name": "stonjourner",
             "url": "/api/v2/pokemon-species/874/"
@@ -394,10 +394,6 @@
             "name": "lechonk",
             "url": "/api/v2/pokemon-species/915/"
         },
-        {
-            "name": "nymble",
-            "url": "/api/v2/pokemon-species/919/"
-        },
         {
             "name": "obstagoon",
             "url": "/api/v2/pokemon-species/862/"
@@ -414,6 +410,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/"
@@ -466,10 +466,6 @@
             "name": "annihilape",
             "url": "/api/v2/pokemon-species/979/"
         },
-        {
-            "name": "arctibax",
-            "url": "/api/v2/pokemon-species/997/"
-        },
         {
             "name": "iron-boulder",
             "url": "/api/v2/pokemon-species/1022/"
@@ -491,13 +487,17 @@
             "url": "/api/v2/pokemon-species/768/"
         },
         {
-            "name": "sneasler",
-            "url": "/api/v2/pokemon-species/903/"
+            "name": "lokix",
+            "url": "/api/v2/pokemon-species/920/"
         },
         {
             "name": "revavroom",
             "url": "/api/v2/pokemon-species/966/"
         },
+        {
+            "name": "arctibax",
+            "url": "/api/v2/pokemon-species/997/"
+        },
         {
             "name": "baxcalibur",
             "url": "/api/v2/pokemon-species/998/"
diff --git a/data/api/v2/pokemon-color/6/index.json b/data/api/v2/pokemon-color/6/index.json
index 6253f4b0c4..e0d5c896c6 100644
--- a/data/api/v2/pokemon-color/6/index.json
+++ b/data/api/v2/pokemon-color/6/index.json
@@ -282,6 +282,10 @@
             "name": "hatterene",
             "url": "/api/v2/pokemon-species/858/"
         },
+        {
+            "name": "morgrem",
+            "url": "/api/v2/pokemon-species/860/"
+        },
         {
             "name": "tinkatink",
             "url": "/api/v2/pokemon-species/957/"
@@ -309,10 +313,6 @@
         {
             "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/7/index.json b/data/api/v2/pokemon-color/7/index.json
index 53cffcffe6..959522f950 100644
--- a/data/api/v2/pokemon-color/7/index.json
+++ b/data/api/v2/pokemon-color/7/index.json
@@ -386,10 +386,6 @@
             "name": "polteageist",
             "url": "/api/v2/pokemon-species/855/"
         },
-        {
-            "name": "grimmsnarl",
-            "url": "/api/v2/pokemon-species/861/"
-        },
         {
             "name": "mr-rime",
             "url": "/api/v2/pokemon-species/866/"
@@ -421,6 +417,10 @@
         {
             "name": "tsareena",
             "url": "/api/v2/pokemon-species/763/"
+        },
+        {
+            "name": "grimmsnarl",
+            "url": "/api/v2/pokemon-species/861/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-form/10359/index.json b/data/api/v2/pokemon-form/10359/index.json
index ec4f149724..f32cd6b869 100644
--- a/data/api/v2/pokemon-form/10359/index.json
+++ b/data/api/v2/pokemon-form/10359/index.json
@@ -113,7 +113,7 @@
         "back_shiny_female": null,
         "front_default": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/10190.png",
         "front_female": null,
-        "front_shiny": null,
+        "front_shiny": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/shiny/10190.png",
         "front_shiny_female": null
     },
     "types": [
diff --git a/data/api/v2/pokemon-form/10385/index.json b/data/api/v2/pokemon-form/10385/index.json
index 34b1250bbb..1b5979465f 100644
--- a/data/api/v2/pokemon-form/10385/index.json
+++ b/data/api/v2/pokemon-form/10385/index.json
@@ -64,7 +64,7 @@
         "back_shiny_female": null,
         "front_default": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/10216.png",
         "front_female": null,
-        "front_shiny": null,
+        "front_shiny": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/shiny/10216.png",
         "front_shiny_female": null
     },
     "types": [
diff --git a/data/api/v2/pokemon-form/10386/index.json b/data/api/v2/pokemon-form/10386/index.json
index 092b778f7d..d8a89f6bc5 100644
--- a/data/api/v2/pokemon-form/10386/index.json
+++ b/data/api/v2/pokemon-form/10386/index.json
@@ -64,7 +64,7 @@
         "back_shiny_female": null,
         "front_default": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/10217.png",
         "front_female": null,
-        "front_shiny": null,
+        "front_shiny": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/shiny/10217.png",
         "front_shiny_female": null
     },
     "types": [
diff --git a/data/api/v2/pokemon-shape/12/index.json b/data/api/v2/pokemon-shape/12/index.json
index e17d010908..5ed1baeddd 100644
--- a/data/api/v2/pokemon-shape/12/index.json
+++ b/data/api/v2/pokemon-shape/12/index.json
@@ -522,10 +522,6 @@
             "name": "coalossal",
             "url": "/api/v2/pokemon-species/839/"
         },
-        {
-            "name": "lokix",
-            "url": "/api/v2/pokemon-species/920/"
-        },
         {
             "name": "impidimp",
             "url": "/api/v2/pokemon-species/859/"
@@ -551,8 +547,8 @@
             "url": "/api/v2/pokemon-species/857/"
         },
         {
-            "name": "grimmsnarl",
-            "url": "/api/v2/pokemon-species/861/"
+            "name": "morgrem",
+            "url": "/api/v2/pokemon-species/860/"
         },
         {
             "name": "mr-rime",
@@ -643,8 +639,12 @@
             "url": "/api/v2/pokemon-species/768/"
         },
         {
-            "name": "morgrem",
-            "url": "/api/v2/pokemon-species/860/"
+            "name": "grimmsnarl",
+            "url": "/api/v2/pokemon-species/861/"
+        },
+        {
+            "name": "lokix",
+            "url": "/api/v2/pokemon-species/920/"
         },
         {
             "name": "arboliva",
diff --git a/data/api/v2/pokemon-shape/14/index.json b/data/api/v2/pokemon-shape/14/index.json
index 18b8ea889b..a1501ceea3 100644
--- a/data/api/v2/pokemon-shape/14/index.json
+++ b/data/api/v2/pokemon-shape/14/index.json
@@ -190,6 +190,10 @@
             "name": "blipbug",
             "url": "/api/v2/pokemon-species/824/"
         },
+        {
+            "name": "nymble",
+            "url": "/api/v2/pokemon-species/919/"
+        },
         {
             "name": "dottler",
             "url": "/api/v2/pokemon-species/825/"
@@ -198,10 +202,6 @@
             "name": "tarountula",
             "url": "/api/v2/pokemon-species/917/"
         },
-        {
-            "name": "nymble",
-            "url": "/api/v2/pokemon-species/919/"
-        },
         {
             "name": "spidops",
             "url": "/api/v2/pokemon-species/918/"
diff --git a/data/api/v2/pokemon-shape/6/index.json b/data/api/v2/pokemon-shape/6/index.json
index 14d87b52ba..64ff0d438d 100644
--- a/data/api/v2/pokemon-shape/6/index.json
+++ b/data/api/v2/pokemon-shape/6/index.json
@@ -786,6 +786,10 @@
             "name": "dragapult",
             "url": "/api/v2/pokemon-species/887/"
         },
+        {
+            "name": "sneasler",
+            "url": "/api/v2/pokemon-species/903/"
+        },
         {
             "name": "floragato",
             "url": "/api/v2/pokemon-species/907/"
@@ -834,6 +838,10 @@
             "name": "frigibax",
             "url": "/api/v2/pokemon-species/996/"
         },
+        {
+            "name": "pawmo",
+            "url": "/api/v2/pokemon-species/922/"
+        },
         {
             "name": "pawmot",
             "url": "/api/v2/pokemon-species/923/"
@@ -854,10 +862,6 @@
             "name": "cetitan",
             "url": "/api/v2/pokemon-species/975/"
         },
-        {
-            "name": "arctibax",
-            "url": "/api/v2/pokemon-species/997/"
-        },
         {
             "name": "koraidon",
             "url": "/api/v2/pokemon-species/1007/"
@@ -883,12 +887,8 @@
             "url": "/api/v2/pokemon-species/697/"
         },
         {
-            "name": "sneasler",
-            "url": "/api/v2/pokemon-species/903/"
-        },
-        {
-            "name": "pawmo",
-            "url": "/api/v2/pokemon-species/922/"
+            "name": "arctibax",
+            "url": "/api/v2/pokemon-species/997/"
         },
         {
             "name": "baxcalibur",
diff --git a/data/api/v2/pokemon-shape/8/index.json b/data/api/v2/pokemon-shape/8/index.json
index 8e01009708..6c716f930d 100644
--- a/data/api/v2/pokemon-shape/8/index.json
+++ b/data/api/v2/pokemon-shape/8/index.json
@@ -690,10 +690,6 @@
             "name": "wyrdeer",
             "url": "/api/v2/pokemon-species/899/"
         },
-        {
-            "name": "ursaluna",
-            "url": "/api/v2/pokemon-species/901/"
-        },
         {
             "name": "skeledirge",
             "url": "/api/v2/pokemon-species/911/"
@@ -833,6 +829,10 @@
         {
             "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-species/899/index.json b/data/api/v2/pokemon-species/899/index.json
index 85b2970491..fa7885e5ed 100644
--- a/data/api/v2/pokemon-species/899/index.json
+++ b/data/api/v2/pokemon-species/899/index.json
@@ -1,5 +1,5 @@
 {
-    "base_happiness": null,
+    "base_happiness": 50,
     "capture_rate": 135,
     "color": {
         "name": "gray",
@@ -109,7 +109,7 @@
     },
     "habitat": null,
     "has_gender_differences": false,
-    "hatch_counter": null,
+    "hatch_counter": 20,
     "id": 899,
     "is_baby": false,
     "is_legendary": false,
diff --git a/data/api/v2/pokemon-species/900/index.json b/data/api/v2/pokemon-species/900/index.json
index 936c724299..8b5795422a 100644
--- a/data/api/v2/pokemon-species/900/index.json
+++ b/data/api/v2/pokemon-species/900/index.json
@@ -1,5 +1,5 @@
 {
-    "base_happiness": null,
+    "base_happiness": 50,
     "capture_rate": 115,
     "color": {
         "name": "brown",
@@ -109,7 +109,7 @@
     },
     "habitat": null,
     "has_gender_differences": false,
-    "hatch_counter": null,
+    "hatch_counter": 20,
     "id": 900,
     "is_baby": false,
     "is_legendary": false,
diff --git a/data/api/v2/pokemon-species/901/index.json b/data/api/v2/pokemon-species/901/index.json
index 7754ca8ad0..ad18f37109 100644
--- a/data/api/v2/pokemon-species/901/index.json
+++ b/data/api/v2/pokemon-species/901/index.json
@@ -1,5 +1,5 @@
 {
-    "base_happiness": null,
+    "base_happiness": 50,
     "capture_rate": 75,
     "color": {
         "name": "brown",
@@ -109,7 +109,7 @@
     },
     "habitat": null,
     "has_gender_differences": false,
-    "hatch_counter": null,
+    "hatch_counter": 20,
     "id": 901,
     "is_baby": false,
     "is_legendary": false,
diff --git a/data/api/v2/pokemon-species/902/index.json b/data/api/v2/pokemon-species/902/index.json
index ee97f349df..dfc20ee34b 100644
--- a/data/api/v2/pokemon-species/902/index.json
+++ b/data/api/v2/pokemon-species/902/index.json
@@ -1,5 +1,5 @@
 {
-    "base_happiness": null,
+    "base_happiness": 50,
     "capture_rate": 135,
     "color": {
         "name": "green",
@@ -109,7 +109,7 @@
     },
     "habitat": null,
     "has_gender_differences": true,
-    "hatch_counter": null,
+    "hatch_counter": 20,
     "id": 902,
     "is_baby": false,
     "is_legendary": false,
diff --git a/data/api/v2/pokemon-species/903/index.json b/data/api/v2/pokemon-species/903/index.json
index 057e50419f..f200777e90 100644
--- a/data/api/v2/pokemon-species/903/index.json
+++ b/data/api/v2/pokemon-species/903/index.json
@@ -1,5 +1,5 @@
 {
-    "base_happiness": null,
+    "base_happiness": 50,
     "capture_rate": 135,
     "color": {
         "name": "gray",
@@ -109,7 +109,7 @@
     },
     "habitat": null,
     "has_gender_differences": false,
-    "hatch_counter": null,
+    "hatch_counter": 20,
     "id": 903,
     "is_baby": false,
     "is_legendary": false,
diff --git a/data/api/v2/pokemon-species/904/index.json b/data/api/v2/pokemon-species/904/index.json
index cf12de43f8..243e5eea4f 100644
--- a/data/api/v2/pokemon-species/904/index.json
+++ b/data/api/v2/pokemon-species/904/index.json
@@ -1,5 +1,5 @@
 {
-    "base_happiness": null,
+    "base_happiness": 50,
     "capture_rate": 135,
     "color": {
         "name": "black",
@@ -109,7 +109,7 @@
     },
     "habitat": null,
     "has_gender_differences": false,
-    "hatch_counter": null,
+    "hatch_counter": 20,
     "id": 904,
     "is_baby": false,
     "is_legendary": false,
diff --git a/data/api/v2/pokemon-species/905/index.json b/data/api/v2/pokemon-species/905/index.json
index 92a507ec38..1b1b64e98a 100644
--- a/data/api/v2/pokemon-species/905/index.json
+++ b/data/api/v2/pokemon-species/905/index.json
@@ -1,5 +1,5 @@
 {
-    "base_happiness": null,
+    "base_happiness": 50,
     "capture_rate": 3,
     "color": {
         "name": "pink",
@@ -106,7 +106,7 @@
     },
     "habitat": null,
     "has_gender_differences": false,
-    "hatch_counter": null,
+    "hatch_counter": 20,
     "id": 905,
     "is_baby": false,
     "is_legendary": true,
diff --git a/data/api/v2/pokemon/10190/index.json b/data/api/v2/pokemon/10190/index.json
index d1ae61a3db..4977f80589 100644
--- a/data/api/v2/pokemon/10190/index.json
+++ b/data/api/v2/pokemon/10190/index.json
@@ -999,7 +999,7 @@
         "back_shiny_female": null,
         "front_default": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/10190.png",
         "front_female": null,
-        "front_shiny": null,
+        "front_shiny": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/shiny/10190.png",
         "front_shiny_female": null,
         "other": {
             "dream_world": {
diff --git a/data/api/v2/pokemon/10216/index.json b/data/api/v2/pokemon/10216/index.json
index 9ee97b7975..c394077bd2 100644
--- a/data/api/v2/pokemon/10216/index.json
+++ b/data/api/v2/pokemon/10216/index.json
@@ -58,7 +58,7 @@
         "back_shiny_female": null,
         "front_default": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/10216.png",
         "front_female": null,
-        "front_shiny": null,
+        "front_shiny": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/shiny/10216.png",
         "front_shiny_female": null,
         "other": {
             "dream_world": {
diff --git a/data/api/v2/pokemon/10217/index.json b/data/api/v2/pokemon/10217/index.json
index 807118941a..f367d8a9b3 100644
--- a/data/api/v2/pokemon/10217/index.json
+++ b/data/api/v2/pokemon/10217/index.json
@@ -58,7 +58,7 @@
         "back_shiny_female": null,
         "front_default": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/10217.png",
         "front_female": null,
-        "front_shiny": null,
+        "front_shiny": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/shiny/10217.png",
         "front_shiny_female": null,
         "other": {
             "dream_world": {
diff --git a/data/schema/v2/pokemon-species/$id/index.json b/data/schema/v2/pokemon-species/$id/index.json
index 6243798ec7..ee1ec24518 100644
--- a/data/schema/v2/pokemon-species/$id/index.json
+++ b/data/schema/v2/pokemon-species/$id/index.json
@@ -2,10 +2,7 @@
     "$schema": "http://json-schema.org/schema#",
     "properties": {
         "base_happiness": {
-            "type": [
-                "integer",
-                "null"
-            ]
+            "type": "integer"
         },
         "capture_rate": {
             "type": "integer"
@@ -104,10 +101,7 @@
             "type": "boolean"
         },
         "hatch_counter": {
-            "type": [
-                "integer",
-                "null"
-            ]
+            "type": "integer"
         },
         "id": {
             "type": "integer"