diff --git a/data.json b/data.json
index 278185e..fe20591 100644
--- a/data.json
+++ b/data.json
@@ -10,7 +10,7 @@
                         "name": "CHIKORITA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "CHIKORITA"
                     },
                     "shinies": 0
                 },
@@ -19,7 +19,7 @@
                         "name": "SNOVER"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SNOVER"
                     },
                     "shinies": 0
                 }
@@ -30,7 +30,7 @@
                         "name": "CHIKORITA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "CHIKORITA"
                     },
                     "slot": 0
                 },
@@ -39,7 +39,7 @@
                         "name": "SNOVER"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SNOVER"
                     },
                     "slot": 0
                 },
@@ -48,7 +48,7 @@
                         "name": "FERROTHORN"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "FERROTHORN"
                     },
                     "slot": 1
                 },
@@ -57,7 +57,7 @@
                         "name": "BAYLEEF"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "BAYLEEF"
                     },
                     "slot": 1
                 },
@@ -66,7 +66,7 @@
                         "name": "LILEEP"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "LILEEP"
                     },
                     "slot": 1
                 },
@@ -75,7 +75,7 @@
                         "name": "MEGANIUM"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MEGANIUM"
                     },
                     "slot": 2
                 },
@@ -84,7 +84,7 @@
                         "name": "VILEPLUME"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "VILEPLUME"
                     },
                     "slot": 2
                 },
@@ -93,7 +93,7 @@
                         "name": "CACTURNE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "CACTURNE"
                     },
                     "slot": 2
                 }
@@ -109,7 +109,7 @@
                         "name": "CYNDAQUIL"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "CYNDAQUIL"
                     },
                     "shinies": 0
                 },
@@ -118,7 +118,7 @@
                         "name": "DARUMAKA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DARUMAKA"
                     },
                     "shinies": 0
                 }
@@ -129,7 +129,7 @@
                         "name": "CYNDAQUIL"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "CYNDAQUIL"
                     },
                     "slot": 0
                 },
@@ -138,7 +138,7 @@
                         "name": "DARUMAKA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DARUMAKA"
                     },
                     "slot": 0
                 },
@@ -147,7 +147,7 @@
                         "name": "HOUNDOOM"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "HOUNDOOM"
                     },
                     "slot": 1
                 },
@@ -156,7 +156,7 @@
                         "name": "QUILAVA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "QUILAVA"
                     },
                     "slot": 1
                 },
@@ -165,7 +165,7 @@
                         "name": "DARMANITAN"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DARMANITAN"
                     },
                     "slot": 2
                 },
@@ -174,7 +174,7 @@
                         "name": "HOUNDOOM"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "HOUNDOOM"
                     },
                     "slot": 2
                 },
@@ -183,7 +183,7 @@
                         "name": "TYPHLOSION"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TYPHLOSION"
                     },
                     "slot": 2
                 }
@@ -199,16 +199,16 @@
                         "name": "OMANYTE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "OMANYTE"
                     },
-                    "shinies": 0
+                    "shinies": 1
                 },
                 {
                     "pokemon": {
                         "name": "TOTODILE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TOTODILE"
                     },
                     "shinies": 0
                 },
@@ -217,7 +217,7 @@
                         "name": "TIRTOUGA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TIRTOUGA"
                     },
                     "shinies": 0
                 }
@@ -228,7 +228,7 @@
                         "name": "OMANYTE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "OMANYTE"
                     },
                     "slot": 0
                 },
@@ -237,7 +237,7 @@
                         "name": "TOTODILE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TOTODILE"
                     },
                     "slot": 0
                 },
@@ -246,7 +246,7 @@
                         "name": "TIRTOUGA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TIRTOUGA"
                     },
                     "slot": 0
                 },
@@ -255,7 +255,7 @@
                         "name": "CROCONAW"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "CROCONAW"
                     },
                     "slot": 1
                 },
@@ -264,7 +264,7 @@
                         "name": "CRAWDAUNT"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "CRAWDAUNT"
                     },
                     "slot": 1
                 },
@@ -273,7 +273,7 @@
                         "name": "WHISCASH"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "WHISCASH"
                     },
                     "slot": 2
                 },
@@ -282,7 +282,7 @@
                         "name": "CARRACOSTA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "CARRACOSTA"
                     },
                     "slot": 2
                 },
@@ -291,7 +291,7 @@
                         "name": "FERALIGATR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "FERALIGATR"
                     },
                     "slot": 2
                 }
@@ -307,7 +307,7 @@
                         "name": "MAGIKARP"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MAGIKARP"
                     },
                     "shinies": 0
                 }
@@ -318,7 +318,7 @@
                         "name": "MAGIKARP"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MAGIKARP"
                     },
                     "slot": 0
                 },
@@ -327,7 +327,7 @@
                         "name": "MAGIKARP"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MAGIKARP"
                     },
                     "slot": 1
                 },
@@ -336,7 +336,7 @@
                         "name": "MAGIKARP"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MAGIKARP"
                     },
                     "slot": 2
                 },
@@ -345,7 +345,7 @@
                         "name": "GYARADOS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GYARADOS"
                     },
                     "slot": 2
                 }
@@ -361,7 +361,7 @@
                         "name": "JOLTIK"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "JOLTIK"
                     },
                     "shinies": 0
                 },
@@ -370,16 +370,16 @@
                         "name": "MAGNEMITE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MAGNEMITE"
                     },
-                    "shinies": 0
+                    "shinies": 1
                 },
                 {
                     "pokemon": {
                         "name": "BLITZLE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "BLITZLE"
                     },
                     "shinies": 0
                 },
@@ -388,7 +388,7 @@
                         "name": "VOLTORB"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "VOLTORB"
                     },
                     "shinies": 0
                 },
@@ -406,7 +406,7 @@
                         "name": "ELECTABUZZ"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "ELECTABUZZ"
                     },
                     "shinies": 0
                 }
@@ -417,7 +417,7 @@
                         "name": "JOLTIK"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "JOLTIK"
                     },
                     "slot": 0
                 },
@@ -426,7 +426,7 @@
                         "name": "MAGNEMITE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MAGNEMITE"
                     },
                     "slot": 0
                 },
@@ -435,7 +435,7 @@
                         "name": "BLITZLE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "BLITZLE"
                     },
                     "slot": 0
                 },
@@ -444,7 +444,7 @@
                         "name": "VOLTORB"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "VOLTORB"
                     },
                     "slot": 1
                 },
@@ -462,7 +462,7 @@
                         "name": "ELECTABUZZ"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "ELECTABUZZ"
                     },
                     "slot": 1
                 },
@@ -471,7 +471,7 @@
                         "name": "GALVANTULA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GALVANTULA"
                     },
                     "slot": 2
                 },
@@ -480,7 +480,7 @@
                         "name": "AMPHAROS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "AMPHAROS"
                     },
                     "slot": 2
                 },
@@ -489,7 +489,7 @@
                         "name": "LUXRAY"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "LUXRAY"
                     },
                     "slot": 2
                 }
@@ -505,7 +505,7 @@
                         "name": "WOOPER"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "WOOPER"
                     },
                     "shinies": 0
                 },
@@ -523,7 +523,7 @@
                         "name": "DRILBUR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DRILBUR"
                     },
                     "shinies": 0
                 },
@@ -532,7 +532,7 @@
                         "name": "VIBRAVA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "VIBRAVA"
                     },
                     "shinies": 0
                 },
@@ -541,7 +541,7 @@
                         "name": "RHYHORN"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "RHYHORN"
                     },
                     "shinies": 0
                 }
@@ -552,7 +552,7 @@
                         "name": "WOOPER"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "WOOPER"
                     },
                     "slot": 0
                 },
@@ -570,7 +570,7 @@
                         "name": "DRILBUR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DRILBUR"
                     },
                     "slot": 0
                 },
@@ -579,7 +579,7 @@
                         "name": "VIBRAVA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "VIBRAVA"
                     },
                     "slot": 1
                 },
@@ -588,7 +588,7 @@
                         "name": "RHYHORN"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "RHYHORN"
                     },
                     "slot": 1
                 },
@@ -597,7 +597,7 @@
                         "name": "TORTERRA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TORTERRA"
                     },
                     "slot": 2
                 },
@@ -606,7 +606,7 @@
                         "name": "WHISCASH"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "WHISCASH"
                     },
                     "slot": 2
                 },
@@ -615,7 +615,7 @@
                         "name": "FLYGON"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "FLYGON"
                     },
                     "slot": 2
                 }
@@ -631,7 +631,7 @@
                         "name": "SWINUB"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SWINUB"
                     },
                     "shinies": 0
                 },
@@ -649,7 +649,7 @@
                         "name": "SNOVER"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SNOVER"
                     },
                     "shinies": 0
                 }
@@ -660,7 +660,7 @@
                         "name": "SWINUB"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SWINUB"
                     },
                     "slot": 0
                 },
@@ -678,7 +678,7 @@
                         "name": "SNOVER"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SNOVER"
                     },
                     "slot": 0
                 },
@@ -696,7 +696,7 @@
                         "name": "GLALIE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GLALIE"
                     },
                     "slot": 1
                 },
@@ -705,7 +705,7 @@
                         "name": "FROSLASS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "FROSLASS"
                     },
                     "slot": 1
                 },
@@ -714,7 +714,7 @@
                         "name": "ABOMASNOW"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "ABOMASNOW"
                     },
                     "slot": 2
                 },
@@ -723,7 +723,7 @@
                         "name": "GLALIE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GLALIE"
                     },
                     "slot": 2
                 },
@@ -732,7 +732,7 @@
                         "name": "FROSLASS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "FROSLASS"
                     },
                     "slot": 2
                 }
@@ -748,7 +748,7 @@
                         "name": "TIRTOUGA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TIRTOUGA"
                     },
                     "shinies": 0
                 },
@@ -757,7 +757,7 @@
                         "name": "ARCHEN"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "ARCHEN"
                     },
                     "shinies": 0
                 }
@@ -768,7 +768,7 @@
                         "name": "TIRTOUGA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TIRTOUGA"
                     },
                     "slot": 0
                 },
@@ -777,7 +777,7 @@
                         "name": "ARCHEN"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "ARCHEN"
                     },
                     "slot": 0
                 },
@@ -786,7 +786,7 @@
                         "name": "GRAVELER"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GRAVELER"
                     },
                     "slot": 1
                 },
@@ -795,7 +795,7 @@
                         "name": "LILEEP"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "LILEEP"
                     },
                     "slot": 1
                 },
@@ -804,7 +804,7 @@
                         "name": "ANORITH"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "ANORITH"
                     },
                     "slot": 1
                 },
@@ -813,7 +813,7 @@
                         "name": "ARCHEOPS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "ARCHEOPS"
                     },
                     "slot": 2
                 },
@@ -822,7 +822,7 @@
                         "name": "CARRACOSTA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "CARRACOSTA"
                     },
                     "slot": 2
                 },
@@ -831,7 +831,7 @@
                         "name": "GOLEM"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GOLEM"
                     },
                     "slot": 2
                 }
@@ -856,7 +856,7 @@
                         "name": "SKARMORY"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SKARMORY"
                     },
                     "shinies": 0
                 },
@@ -865,7 +865,7 @@
                         "name": "FERROSEED"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "FERROSEED"
                     },
                     "shinies": 0
                 }
@@ -885,7 +885,7 @@
                         "name": "SKARMORY"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SKARMORY"
                     },
                     "slot": 0
                 },
@@ -894,7 +894,7 @@
                         "name": "FERROSEED"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "FERROSEED"
                     },
                     "slot": 0
                 },
@@ -903,7 +903,7 @@
                         "name": "LAIRON"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "LAIRON"
                     },
                     "slot": 1
                 },
@@ -912,7 +912,7 @@
                         "name": "SKARMORY"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SKARMORY"
                     },
                     "slot": 1
                 },
@@ -921,7 +921,7 @@
                         "name": "METANG"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "METANG"
                     },
                     "slot": 1
                 },
@@ -930,7 +930,7 @@
                         "name": "EMPOLEON"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "EMPOLEON"
                     },
                     "slot": 2
                 },
@@ -939,7 +939,7 @@
                         "name": "SCIZOR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SCIZOR"
                     },
                     "slot": 2
                 },
@@ -964,16 +964,16 @@
                         "name": "MACHOP"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MACHOP"
                     },
-                    "shinies": 0
+                    "shinies": 1
                 },
                 {
                     "pokemon": {
                         "name": "TIMBURR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TIMBURR"
                     },
                     "shinies": 0
                 },
@@ -982,7 +982,7 @@
                         "name": "MAKUHITA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MAKUHITA"
                     },
                     "shinies": 0
                 },
@@ -991,7 +991,7 @@
                         "name": "HITMONLEE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "HITMONLEE"
                     },
                     "shinies": 0
                 },
@@ -1000,7 +1000,7 @@
                         "name": "HITMONCHAN"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "HITMONCHAN"
                     },
                     "shinies": 0
                 },
@@ -1009,7 +1009,7 @@
                         "name": "GURDURR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GURDURR"
                     },
                     "shinies": 0
                 }
@@ -1020,7 +1020,7 @@
                         "name": "MACHOP"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MACHOP"
                     },
                     "slot": 0
                 },
@@ -1029,7 +1029,7 @@
                         "name": "TIMBURR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TIMBURR"
                     },
                     "slot": 0
                 },
@@ -1038,7 +1038,7 @@
                         "name": "MAKUHITA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MAKUHITA"
                     },
                     "slot": 0
                 },
@@ -1047,7 +1047,7 @@
                         "name": "HITMONLEE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "HITMONLEE"
                     },
                     "slot": 1
                 },
@@ -1056,7 +1056,7 @@
                         "name": "HITMONCHAN"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "HITMONCHAN"
                     },
                     "slot": 1
                 },
@@ -1065,7 +1065,7 @@
                         "name": "GURDURR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GURDURR"
                     },
                     "slot": 1
                 },
@@ -1074,7 +1074,7 @@
                         "name": "TOXICROAK"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TOXICROAK"
                     },
                     "slot": 2
                 },
@@ -1083,7 +1083,7 @@
                         "name": "CONKELDURR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "CONKELDURR"
                     },
                     "slot": 2
                 },
@@ -1092,7 +1092,7 @@
                         "name": "INFERNAPE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "INFERNAPE"
                     },
                     "slot": 2
                 }
@@ -1108,7 +1108,7 @@
                         "name": "GOTHITA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GOTHITA"
                     },
                     "shinies": 0
                 },
@@ -1117,7 +1117,7 @@
                         "name": "SOLOSIS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SOLOSIS"
                     },
                     "shinies": 0
                 }
@@ -1128,7 +1128,7 @@
                         "name": "GOTHITA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GOTHITA"
                     },
                     "slot": 0
                 },
@@ -1137,7 +1137,7 @@
                         "name": "SOLOSIS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SOLOSIS"
                     },
                     "slot": 0
                 },
@@ -1146,7 +1146,7 @@
                         "name": "RALTS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "RALTS"
                     },
                     "slot": 1
                 },
@@ -1155,7 +1155,7 @@
                         "name": "GOTHITA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GOTHITA"
                     },
                     "slot": 1
                 },
@@ -1164,7 +1164,7 @@
                         "name": "WOBBUFFET"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "WOBBUFFET"
                     },
                     "slot": 1
                 },
@@ -1173,7 +1173,7 @@
                         "name": "GALLADE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GALLADE"
                     },
                     "slot": 2
                 },
@@ -1182,7 +1182,7 @@
                         "name": "METAGROSS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "METAGROSS"
                     },
                     "slot": 2
                 },
@@ -1191,7 +1191,7 @@
                         "name": "REUNICLUS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "REUNICLUS"
                     },
                     "slot": 2
                 }
@@ -1207,7 +1207,7 @@
                         "name": "MISDREAVUS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MISDREAVUS"
                     },
                     "shinies": 0
                 },
@@ -1216,7 +1216,7 @@
                         "name": "GOLETT"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GOLETT"
                     },
                     "shinies": 0
                 },
@@ -1225,7 +1225,7 @@
                         "name": "DRIFLOON"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DRIFLOON"
                     },
                     "shinies": 0
                 },
@@ -1234,7 +1234,7 @@
                         "name": "GOLETT"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GOLETT"
                     },
                     "shinies": 0
                 },
@@ -1243,16 +1243,16 @@
                         "name": "SABLEYE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SABLEYE"
                     },
-                    "shinies": 0
+                    "shinies": 1
                 },
                 {
                     "pokemon": {
                         "name": "DUSCLOPS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DUSCLOPS"
                     },
                     "shinies": 0
                 }
@@ -1263,7 +1263,7 @@
                         "name": "MISDREAVUS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MISDREAVUS"
                     },
                     "slot": 0
                 },
@@ -1272,7 +1272,7 @@
                         "name": "GOLETT"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GOLETT"
                     },
                     "slot": 0
                 },
@@ -1281,7 +1281,7 @@
                         "name": "DRIFLOON"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DRIFLOON"
                     },
                     "slot": 0
                 },
@@ -1290,7 +1290,7 @@
                         "name": "GOLETT"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GOLETT"
                     },
                     "slot": 1
                 },
@@ -1299,7 +1299,7 @@
                         "name": "SABLEYE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SABLEYE"
                     },
                     "slot": 1
                 },
@@ -1308,7 +1308,7 @@
                         "name": "DUSCLOPS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DUSCLOPS"
                     },
                     "slot": 1
                 },
@@ -1317,7 +1317,7 @@
                         "name": "GENGAR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GENGAR"
                     },
                     "slot": 2
                 },
@@ -1335,7 +1335,7 @@
                         "name": "FROSLASS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "FROSLASS"
                     },
                     "slot": 2
                 }
@@ -1351,7 +1351,7 @@
                         "name": "STUNKY"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "STUNKY"
                     },
                     "shinies": 0
                 },
@@ -1369,7 +1369,7 @@
                         "name": "HOUNDOUR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "HOUNDOUR"
                     },
                     "shinies": 0
                 }
@@ -1380,7 +1380,7 @@
                         "name": "STUNKY"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "STUNKY"
                     },
                     "slot": 0
                 },
@@ -1398,7 +1398,7 @@
                         "name": "HOUNDOUR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "HOUNDOUR"
                     },
                     "slot": 0
                 },
@@ -1434,7 +1434,7 @@
                         "name": "SKUNTANK"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SKUNTANK"
                     },
                     "slot": 2
                 }
@@ -1450,9 +1450,9 @@
                         "name": "MAWILE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MAWILE"
                     },
-                    "shinies": 0
+                    "shinies": 1
                 },
                 {
                     "pokemon": {
@@ -1468,7 +1468,7 @@
                         "name": "RALTS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "RALTS"
                     },
                     "shinies": 0
                 },
@@ -1477,7 +1477,7 @@
                         "name": "KIRLIA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "KIRLIA"
                     },
                     "shinies": 0
                 },
@@ -1486,7 +1486,7 @@
                         "name": "SNUBBULL"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SNUBBULL"
                     },
                     "shinies": 0
                 },
@@ -1495,7 +1495,7 @@
                         "name": "GRANBULL"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GRANBULL"
                     },
                     "shinies": 0
                 }
@@ -1506,7 +1506,7 @@
                         "name": "MAWILE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MAWILE"
                     },
                     "slot": 0
                 },
@@ -1524,7 +1524,7 @@
                         "name": "RALTS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "RALTS"
                     },
                     "slot": 0
                 },
@@ -1533,7 +1533,7 @@
                         "name": "KIRLIA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "KIRLIA"
                     },
                     "slot": 1
                 },
@@ -1542,7 +1542,7 @@
                         "name": "SNUBBULL"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SNUBBULL"
                     },
                     "slot": 1
                 },
@@ -1551,7 +1551,7 @@
                         "name": "GRANBULL"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GRANBULL"
                     },
                     "slot": 1
                 },
@@ -1560,7 +1560,7 @@
                         "name": "GRANBULL"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GRANBULL"
                     },
                     "slot": 2
                 },
@@ -1569,7 +1569,7 @@
                         "name": "GARDEVOIR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GARDEVOIR"
                     },
                     "slot": 2
                 },
@@ -1594,7 +1594,7 @@
                         "name": "CROAGUNK"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "CROAGUNK"
                     },
                     "shinies": 0
                 },
@@ -1614,7 +1614,7 @@
                         "name": "CROAGUNK"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "CROAGUNK"
                     },
                     "slot": 0
                 },
@@ -1632,7 +1632,7 @@
                         "name": "NIDORINA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "NIDORINA"
                     },
                     "slot": 1
                 },
@@ -1641,7 +1641,7 @@
                         "name": "NIDORINO"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "NIDORINO"
                     },
                     "slot": 1
                 },
@@ -1650,7 +1650,7 @@
                         "name": "WEEZING"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "WEEZING"
                     },
                     "slot": 2
                 },
@@ -1659,7 +1659,7 @@
                         "name": "TOXICROAK"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TOXICROAK"
                     },
                     "slot": 2
                 },
@@ -1668,7 +1668,7 @@
                         "name": "AMOONGUSS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "AMOONGUSS"
                     },
                     "slot": 2
                 }
@@ -1684,7 +1684,7 @@
                         "name": "DWEBBLE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DWEBBLE"
                     },
                     "shinies": 0
                 },
@@ -1693,16 +1693,16 @@
                         "name": "SCYTHER"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SCYTHER"
                     },
-                    "shinies": 0
+                    "shinies": 1
                 },
                 {
                     "pokemon": {
                         "name": "SHUCKLE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SHUCKLE"
                     },
                     "shinies": 0
                 },
@@ -1711,7 +1711,7 @@
                         "name": "SHUCKLE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SHUCKLE"
                     },
                     "shinies": 0
                 },
@@ -1720,7 +1720,7 @@
                         "name": "SKORUPI"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SKORUPI"
                     },
                     "shinies": 0
                 },
@@ -1729,9 +1729,9 @@
                         "name": "ANORITH"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "ANORITH"
                     },
-                    "shinies": 0
+                    "shinies": 1
                 }
             ],
             "team": [
@@ -1740,7 +1740,7 @@
                         "name": "DWEBBLE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DWEBBLE"
                     },
                     "slot": 0
                 },
@@ -1749,7 +1749,7 @@
                         "name": "SCYTHER"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SCYTHER"
                     },
                     "slot": 0
                 },
@@ -1758,7 +1758,7 @@
                         "name": "SHUCKLE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SHUCKLE"
                     },
                     "slot": 0
                 },
@@ -1767,7 +1767,7 @@
                         "name": "SHUCKLE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SHUCKLE"
                     },
                     "slot": 1
                 },
@@ -1776,7 +1776,7 @@
                         "name": "SKORUPI"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SKORUPI"
                     },
                     "slot": 1
                 },
@@ -1785,7 +1785,7 @@
                         "name": "ANORITH"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "ANORITH"
                     },
                     "slot": 1
                 },
@@ -1794,7 +1794,7 @@
                         "name": "SCIZOR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SCIZOR"
                     },
                     "slot": 2
                 },
@@ -1803,7 +1803,7 @@
                         "name": "FORRETRESS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "FORRETRESS"
                     },
                     "slot": 2
                 },
@@ -1812,7 +1812,7 @@
                         "name": "BEEDRILL"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "BEEDRILL"
                     },
                     "slot": 2
                 }
@@ -1828,7 +1828,7 @@
                         "name": "PIDGEY"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "PIDGEY"
                     },
                     "shinies": 0
                 },
@@ -1837,7 +1837,7 @@
                         "name": "ARCHEN"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "ARCHEN"
                     },
                     "shinies": 0
                 },
@@ -1846,7 +1846,7 @@
                         "name": "STARLY"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "STARLY"
                     },
                     "shinies": 0
                 },
@@ -1855,16 +1855,16 @@
                         "name": "GLIGAR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GLIGAR"
                     },
-                    "shinies": 0
+                    "shinies": 1
                 },
                 {
                     "pokemon": {
                         "name": "STARAVIA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "STARAVIA"
                     },
                     "shinies": 0
                 }
@@ -1875,7 +1875,7 @@
                         "name": "PIDGEY"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "PIDGEY"
                     },
                     "slot": 0
                 },
@@ -1884,7 +1884,7 @@
                         "name": "ARCHEN"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "ARCHEN"
                     },
                     "slot": 0
                 },
@@ -1893,7 +1893,7 @@
                         "name": "STARLY"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "STARLY"
                     },
                     "slot": 0
                 },
@@ -1902,7 +1902,7 @@
                         "name": "GLIGAR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GLIGAR"
                     },
                     "slot": 1
                 },
@@ -1911,7 +1911,7 @@
                         "name": "STARAVIA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "STARAVIA"
                     },
                     "slot": 1
                 },
@@ -1920,7 +1920,7 @@
                         "name": "DRAGONITE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DRAGONITE"
                     },
                     "slot": 2
                 },
@@ -1929,7 +1929,7 @@
                         "name": "PIDGEOT"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "PIDGEOT"
                     },
                     "slot": 2
                 },
@@ -1938,7 +1938,7 @@
                         "name": "ARCHEOPS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "ARCHEOPS"
                     },
                     "slot": 2
                 }
@@ -1954,16 +1954,16 @@
                         "name": "DRATINI"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DRATINI"
                     },
-                    "shinies": 0
+                    "shinies": 1
                 },
                 {
                     "pokemon": {
                         "name": "GIBLE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GIBLE"
                     },
                     "shinies": 0
                 }
@@ -1974,7 +1974,7 @@
                         "name": "DRATINI"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DRATINI"
                     },
                     "slot": 0
                 },
@@ -1983,7 +1983,7 @@
                         "name": "GIBLE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GIBLE"
                     },
                     "slot": 0
                 },
@@ -1992,7 +1992,7 @@
                         "name": "DRAGONAIR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DRAGONAIR"
                     },
                     "slot": 1
                 },
@@ -2010,7 +2010,7 @@
                         "name": "GABITE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GABITE"
                     },
                     "slot": 1
                 },
@@ -2019,7 +2019,7 @@
                         "name": "DRAGONITE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DRAGONITE"
                     },
                     "slot": 2
                 },
@@ -2028,7 +2028,7 @@
                         "name": "GARCHOMP"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GARCHOMP"
                     },
                     "slot": 2
                 },
@@ -2037,7 +2037,7 @@
                         "name": "SALAMENCE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SALAMENCE"
                     },
                     "slot": 2
                 }
@@ -2053,25 +2053,25 @@
                         "name": "TEDDIURSA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TEDDIURSA"
                     },
-                    "shinies": 0
+                    "shinies": 1
                 },
                 {
                     "pokemon": {
                         "name": "STANTLER"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "STANTLER"
                     },
-                    "shinies": 0
+                    "shinies": 1
                 },
                 {
                     "pokemon": {
                         "name": "GLAMEOW"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GLAMEOW"
                     },
                     "shinies": 0
                 },
@@ -2080,7 +2080,7 @@
                         "name": "RATTATA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "RATTATA"
                     },
                     "shinies": 0
                 },
@@ -2089,16 +2089,16 @@
                         "name": "MEOWTH"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MEOWTH"
                     },
-                    "shinies": 0
+                    "shinies": 1
                 },
                 {
                     "pokemon": {
                         "name": "PURUGLY"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "PURUGLY"
                     },
                     "shinies": 0
                 }
@@ -2109,7 +2109,7 @@
                         "name": "TEDDIURSA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TEDDIURSA"
                     },
                     "slot": 0
                 },
@@ -2118,7 +2118,7 @@
                         "name": "STANTLER"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "STANTLER"
                     },
                     "slot": 0
                 },
@@ -2127,7 +2127,7 @@
                         "name": "GLAMEOW"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GLAMEOW"
                     },
                     "slot": 0
                 },
@@ -2136,7 +2136,7 @@
                         "name": "RATTATA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "RATTATA"
                     },
                     "slot": 1
                 },
@@ -2145,7 +2145,7 @@
                         "name": "MEOWTH"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MEOWTH"
                     },
                     "slot": 1
                 },
@@ -2154,7 +2154,7 @@
                         "name": "PURUGLY"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "PURUGLY"
                     },
                     "slot": 1
                 },
@@ -2163,7 +2163,7 @@
                         "name": "URSARING"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "URSARING"
                     },
                     "slot": 2
                 },
@@ -2172,7 +2172,7 @@
                         "name": "STANTLER"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "STANTLER"
                     },
                     "slot": 2
                 },
@@ -2181,7 +2181,7 @@
                         "name": "EXPLOUD"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "EXPLOUD"
                     },
                     "slot": 2
                 }
@@ -2198,7 +2198,7 @@
                         "name": "CHIKORITA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "CHIKORITA"
                     },
                     "slot": 0
                 },
@@ -2207,7 +2207,7 @@
                         "name": "CYNDAQUIL"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "CYNDAQUIL"
                     },
                     "slot": 0
                 },
@@ -2216,7 +2216,7 @@
                         "name": "TOTODILE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TOTODILE"
                     },
                     "slot": 0
                 },
@@ -2225,7 +2225,7 @@
                         "name": "BAYLEEF"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "BAYLEEF"
                     },
                     "slot": 1
                 },
@@ -2234,7 +2234,7 @@
                         "name": "QUILAVA"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "QUILAVA"
                     },
                     "slot": 1
                 },
@@ -2243,7 +2243,7 @@
                         "name": "CROCONAW"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "CROCONAW"
                     },
                     "slot": 1
                 },
@@ -2252,7 +2252,7 @@
                         "name": "MEGANIUM"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "MEGANIUM"
                     },
                     "slot": 2
                 },
@@ -2261,7 +2261,7 @@
                         "name": "TYPHLOSION"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "TYPHLOSION"
                     },
                     "slot": 2
                 },
@@ -2270,7 +2270,7 @@
                         "name": "FERALIGATR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "FERALIGATR"
                     },
                     "slot": 2
                 }
@@ -2286,7 +2286,7 @@
                         "name": "SNORLAX"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SNORLAX"
                     },
                     "shinies": 0
                 }
@@ -2297,7 +2297,7 @@
                         "name": "SNORLAX"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SNORLAX"
                     },
                     "slot": 0
                 },
@@ -2306,7 +2306,7 @@
                         "name": "SNORLAX"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SNORLAX"
                     },
                     "slot": 1
                 },
@@ -2315,7 +2315,7 @@
                         "name": "POLIWRATH"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "POLIWRATH"
                     },
                     "slot": 1
                 },
@@ -2324,7 +2324,7 @@
                         "name": "GARDEVOIR"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GARDEVOIR"
                     },
                     "slot": 1
                 },
@@ -2333,7 +2333,7 @@
                         "name": "SNORLAX"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SNORLAX"
                     },
                     "slot": 2
                 },
@@ -2342,7 +2342,7 @@
                         "name": "GYARADOS"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "GYARADOS"
                     },
                     "slot": 2
                 },
@@ -2351,7 +2351,7 @@
                         "name": "DRAGONITE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "DRAGONITE"
                     },
                     "slot": 2
                 }
@@ -2367,9 +2367,9 @@
                         "name": "BELLSPROUT"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "BELLSPROUT"
                     },
-                    "shinies": 0
+                    "shinies": 1
                 }
             ],
             "team": [
@@ -2378,7 +2378,7 @@
                         "name": "BELLSPROUT"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "BELLSPROUT"
                     },
                     "slot": 0
                 },
@@ -2387,7 +2387,7 @@
                         "name": "VICTREEBEL"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "VICTREEBEL"
                     },
                     "slot": 1
                 },
@@ -2396,7 +2396,7 @@
                         "name": "RATICATE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "RATICATE"
                     },
                     "slot": 1
                 },
@@ -2405,7 +2405,7 @@
                         "name": "SNORLAX"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "SNORLAX"
                     },
                     "slot": 2
                 },
@@ -2414,7 +2414,7 @@
                         "name": "RATICATE"
                     },
                     "form": {
-                        "name": "FORM_UNSET"
+                        "name": "RATICATE"
                     },
                     "slot": 2
                 }
diff --git a/data.txt b/data.txt
index bdea64c..f9afe45 100644
--- a/data.txt
+++ b/data.txt
@@ -12,7 +12,7 @@ Fire Grunt (Female)
 
 Water Grunt (Female)
 
-1st: Omanyte, Totodile, Tirtouga (Encounter)
+1st: Omanyte (Shiny), Totodile, Tirtouga (Encounter)
 2nd: Croconaw, Crawdaunt
 3rd: Whiscash, Carracosta, Feraligatr
 
@@ -24,7 +24,7 @@ Water Grunt (Male)
 
 Electric Grunt (Female)
 
-1st: Joltik, Magnemite, Blitzle (Encounter)
+1st: Joltik, Magnemite (Shiny), Blitzle (Encounter)
 2nd: Voltorb, Alolan Geodude, Electabuzz (Encounter)
 3rd: Galvantula, Ampharos, Luxray
 
@@ -54,7 +54,7 @@ Steel Grunt (Male)
 
 Fighting Grunt (Female)
 
-1st: Machop, Timburr, Makuhita (Encounter)
+1st: Machop (Shiny), Timburr, Makuhita (Encounter)
 2nd: Hitmonlee, Hitmonchan, Gurdurr (Encounter)
 3rd: Toxicroak, Conkeldurr, Infernape
 
@@ -67,7 +67,7 @@ Psychic Grunt (Male)
 Ghost Grunt (Male)
 
 1st: Misdreavus, Golett, Drifloon (Encounter)
-2nd: Golett, Sableye, Dusclops (Encounter)
+2nd: Golett, Sableye (Shiny), Dusclops (Encounter)
 3rd: Gengar, Alolan Marowak, Froslass
 
 Dark Grunt (Female)
@@ -78,7 +78,7 @@ Dark Grunt (Female)
 
 Fairy Grunt (Female)
 
-1st: Mawile, Alolan Vulpix, Ralts (Encounter)
+1st: Mawile (Shiny), Alolan Vulpix, Ralts (Encounter)
 2nd: Kirlia, Snubbull, Granbull (Encounter)
 3rd: Granbull, Gardevoir, Alolan Ninetales
 
@@ -90,26 +90,26 @@ Poison Grunt (Female)
 
 Bug Grunt (Male)
 
-1st: Dwebble, Scyther, Shuckle (Encounter)
-2nd: Shuckle, Skorupi, Anorith (Encounter)
+1st: Dwebble, Scyther (Shiny), Shuckle (Encounter)
+2nd: Shuckle, Skorupi, Anorith (Shiny) (Encounter)
 3rd: Scizor, Forretress, Beedrill
 
 Flying Grunt (Female)
 
 1st: Pidgey, Archen, Starly (Encounter)
-2nd: Gligar, Staravia (Encounter)
+2nd: Gligar (Shiny), Staravia (Encounter)
 3rd: Dragonite, Pidgeot, Archeops
 
 Dragon Grunt (Female)
 
-1st: Dratini, Gible (Encounter)
+1st: Dratini (Shiny), Gible (Encounter)
 2nd: Dragonair, Alolan Exeggutor, Gabite
 3rd: Dragonite, Garchomp, Salamence
 
 Normal Grunt (Male)
 
-1st: Teddiursa, Stantler, Glameow (Encounter)
-2nd: Rattata, Meowth, Purugly (Encounter)
+1st: Teddiursa (Shiny), Stantler (Shiny), Glameow (Encounter)
+2nd: Rattata, Meowth (Shiny), Purugly (Encounter)
 3rd: Ursaring, Stantler, Exploud
 
 Grunt (Male)
@@ -126,6 +126,6 @@ Grunt (Female)
 
 Decoy Grunt (Female)
 
-1st: Bellsprout (Encounter)
+1st: Bellsprout (Shiny) (Encounter)
 2nd: Victreebel, Raticate
 3rd: Snorlax, Raticate
\ No newline at end of file
diff --git a/generate.py b/generate.py
index d56685e..651f357 100644
--- a/generate.py
+++ b/generate.py
@@ -5,17 +5,26 @@ def clean_pokemon_name(pokemon):
     """
     Clean the Pokémon name by removing any prefixes like "1st:", "2nd:", "3rd:" and extra spaces.
     """
-    return re.sub(r'^\d+(st|nd|rd|th):\s*', '', pokemon).strip().upper()
+    # Remove prefixes like "1st:", "2nd:", "3rd:" and any extra spaces
+    pokemon = re.sub(r'^\d+(st|nd|rd|th):\s*', '', pokemon).strip()
+    # Remove any "(Encounter)" or "(Shiny)" tags
+    pokemon = re.sub(r'\s*\(Encounter\)', '', pokemon).strip()
+    pokemon = re.sub(r'\s*\(Shiny\)', '', pokemon).strip()
+    return pokemon.upper()
 
 def parse_pokemon_line(line, slot):
     """
     Parse a line of Pokémon data and return the formatted dictionary for the team array.
     """
     pokemon_data = []
-    pokemons = re.split(r',\s*', line.replace("(Encounter)", ""))
+    pokemons = re.split(r',\s*', line)
+    
     for pokemon in pokemons:
+        is_shiny = "(Shiny)" in pokemon
         cleaned_name = clean_pokemon_name(pokemon)
         pokemon_lower = cleaned_name.lower()
+
+        # Determine the form and clean the name accordingly
         if "alolan" in pokemon_lower:
             form = "ALOLAN"
             name = cleaned_name.replace("ALOLAN", "").strip()
@@ -31,10 +40,14 @@ def parse_pokemon_line(line, slot):
         else:
             form = "FORM_UNSET"
             name = cleaned_name
+        
+        # Format the Pokémon name with form if applicable
+        pokemon_form_name = f"{name}_{form}" if form != "FORM_UNSET" else name
+        
         pokemon_data.append({
             "pokemon": {"name": name},
-            "form": {"name": f"{name}_{form}" if form != "FORM_UNSET" else "FORM_UNSET"},
-            "slot": slot
+            "form": {"name": pokemon_form_name},
+            "slot": slot,
         })
     return pokemon_data
 
@@ -43,10 +56,14 @@ def parse_rewards(line):
     Parse a line of Pokémon marked as encounter and return the formatted dictionary for the rewards array.
     """
     reward_data = []
-    pokemons = re.split(r',\s*', line.replace("(Encounter)", ""))
+    pokemons = re.split(r',\s*', line)
+    
     for pokemon in pokemons:
+        is_shiny = "(Shiny)" in pokemon
         cleaned_name = clean_pokemon_name(pokemon)
         pokemon_lower = cleaned_name.lower()
+
+        # Determine the form and clean the name accordingly
         if "alolan" in pokemon_lower:
             form = "ALOLAN"
             name = cleaned_name.replace("ALOLAN", "").strip()
@@ -62,10 +79,14 @@ def parse_rewards(line):
         else:
             form = "FORM_UNSET"
             name = cleaned_name
+        
+        # Format the Pokémon name with form if applicable
+        pokemon_form_name = f"{name}_{form}" if form != "FORM_UNSET" else name
+        
         reward_data.append({
             "pokemon": {"name": name},
-            "form": {"name": f"{name}_{form}" if form != "FORM_UNSET" else "FORM_UNSET"},
-            "shinies": 0
+            "form": {"name": pokemon_form_name},
+            "shinies": 1 if is_shiny else 0
         })
     return reward_data
 
@@ -76,7 +97,7 @@ def parse_character_data(character_name, lines):
     character_name = character_name.strip().upper().replace(" (FEMALE)", " FEMALE").replace(" (MALE)", " MALE")
     character_data = {
         "character": {
-            "name": f"CHARACTER_{character_name.replace(' ', '_')}"
+            "name": f"CHARACTER_{character_name.replace(' ', '_').replace('(', '').replace(')', '')}"
         },
         "rewards": [],
         "team": []