- Fix issue with Ho-Oh subscriptions.

versx · Dec 20, 2019 · 2974981 · 2974981
1 parent dce736d
commit 2974981
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/masterfile.json b/masterfile.json
@@ -12137,7 +12137,7 @@
 			"buddy_distance_evolve": ""
 		},
 		"250": {
-			"name": "Ho oh",
+			"name": "Ho-Oh",
 			"forms": {},
 			"default_form": "",
 			"evolutions": [],

diff --git a/src/Extensions/PokemonExtensions.cs b/src/Extensions/PokemonExtensions.cs
@@ -1311,22 +1311,25 @@ public static PokemonValidation ValidatePokemon(this IEnumerable<string> pokemon
             {
                 string form = null;
                 var pokeIdStr = poke;
-                if (poke.Contains("-"))
-                {
-                    //Has form
-                    var formSplit = poke.Split('-');
-                    if (formSplit.Length != 2)
-                        continue;
-
-                    pokeIdStr = formSplit[0];
-                    form = formSplit[1];
-                }
-
                 var pokeId = pokeIdStr.PokemonIdFromName();
                 if (pokeId == 0)
                 {
-                    invalid.Add(poke);
-                    continue;
+                    if (poke.Contains("-"))
+                    {
+                        //Has form
+                        var formSplit = poke.Split('-');
+                        if (formSplit.Length != 2)
+                            continue;
+
+                        pokeIdStr = formSplit[0];
+                        pokeId = pokeIdStr.PokemonIdFromName();
+                        form = formSplit[1];
+                    }
+                    else
+                    {
+                        invalid.Add(poke);
+                        continue;
+                    }
                 }
 
                 if (!MasterFile.Instance.Pokedex.ContainsKey(pokeId))