diff --git a/app/src/main/java/com/kamron/pogoiv/scanlogic/PokeInfoCalculator.java b/app/src/main/java/com/kamron/pogoiv/scanlogic/PokeInfoCalculator.java
index 6feded1e2..797e7d7dc 100644
--- a/app/src/main/java/com/kamron/pogoiv/scanlogic/PokeInfoCalculator.java
+++ b/app/src/main/java/com/kamron/pogoiv/scanlogic/PokeInfoCalculator.java
@@ -27,6 +27,12 @@ public class PokeInfoCalculator {
     private List<Pokemon> formVariantPokemons;
     private String[] pokeNamesWithForm = {};
 
+    public static final int MELTAN_INDEX_OFFSET = 5;
+    public static final int MELMETAL_INDEX_OFFSET = 4;
+    public static final int OBSTAGOON_INDEX_OFFSET = 3;
+    public static final int PERRSERKER_INDEX_OFFSET = 2;
+    public static final int SIRFETCHD_INDEX_OFFSET = 1;
+
     /**
      * Pokemons who's name appears as a type of candy.
      * For most, this is the basePokemon (ie: Pidgey candies)
@@ -177,13 +183,18 @@ private void populatePokemon(@NonNull GoIVSettings settings, @NonNull Resources
         int pokeListSize = names.length;
         ArrayList<Pokemon> formVariantPokemons = new ArrayList<>();
 
-        // quick hardcoded patch for Meltan and Melmetal
-        // Tentatively use pokedex list size until supporting discontinuous pokedex numbers,
-        // like as #493 Arceus, #808 Meltan, #809 Melmetal.
-        candyNamesArray[pokeListSize - 2] = pokeListSize - 2;
-        candyNamesArray[pokeListSize - 1] = pokeListSize - 2;
-        devolution[pokeListSize - 1] = pokeListSize - 2;
-        // END patch for Meltan and Melmetal
+        // quick hardcoded patch for supporting discontinuous pokedex number pokemons followings
+        //   #808 Meltan
+        //   #809 Melmetal
+        //   #862 Obstagoon,
+        //   #863 Perrserker,
+        //   #865 Sirfetch'd
+        // currently GoIV logic expects that pokedex numbers are continuous and less than pokeListSize.
+        // so this patch shifts these to dummy indexes, with pokeListSize offset.
+        candyNamesArray[pokeListSize - MELTAN_INDEX_OFFSET] = pokeListSize - MELTAN_INDEX_OFFSET;
+        candyNamesArray[pokeListSize - MELMETAL_INDEX_OFFSET] = pokeListSize - MELTAN_INDEX_OFFSET;
+        devolution[pokeListSize - MELMETAL_INDEX_OFFSET] = pokeListSize - MELTAN_INDEX_OFFSET;
+        // END patch for supporting discontinuous pokedex number pokemons
 
         for (int i = 0; i < pokeListSize; i++) {
             PokemonBase p = new PokemonBase(names[i], displayNames[i], i, devolution[i], evolutionCandyCost[i]);
diff --git a/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonBase.java b/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonBase.java
index afb61f42d..bb6da7e12 100644
--- a/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonBase.java
+++ b/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonBase.java
@@ -70,6 +70,99 @@ public Pokemon getForm(@NonNull Pokemon otherForm) {
         // In that case return the first one, which can be done in any case if this base has multiple forms (because
         // then we know that the other form is the single one). But if the other form has multiple forms it also needs
         // to verify that the other form is actually the first one.
+
+        final int pokeListSize = PokeInfoCalculator.getInstance().getPokedex().size();
+
+        if (number == 51) { // #52 Meowth
+            // check #863 Perrserker with its index number in pokemons.xml
+            if (otherForm.number == pokeListSize - PokeInfoCalculator.PERRSERKER_INDEX_OFFSET) {
+                // return Galarian forms
+                return forms.get(2);
+            } else {
+                return getForm(otherForm.formName);
+            }
+        }
+        if (number == 52) { // #53 Persian
+            return getForm(otherForm.formName);
+        }
+        if (number == 82) { // #83 Farfetch'd
+            // check #865 Sirfetch'd with its index number in pokemons.xml
+            if (otherForm.number == pokeListSize - PokeInfoCalculator.SIRFETCHD_INDEX_OFFSET) {
+                // return Galarian forms
+                return forms.get(1);
+            } else {
+                return getForm(otherForm.formName);
+            }
+        }
+        if (number == 262 || number == 263) { // #263 ZIGZAGOON or #264 LINOONE
+            // check #862 OBSTAGOON with its index number in pokemons.xml
+            if (otherForm.number == pokeListSize - PokeInfoCalculator.OBSTAGOON_INDEX_OFFSET) {
+                // return Galarian forms
+                return forms.get(1);
+            } else {
+                return getForm(otherForm.formName);
+            }
+        }
+        if (number == 553) { // #554 Darumaka
+            // check #555 Darmanitan
+            if (otherForm.number == 554 && otherForm.base.forms.get(0) == otherForm) {
+                // return Normal Form
+                return forms.get(0);
+            }
+            // check #555 Darmanitan Galarian
+            if (otherForm.number == 554 && otherForm.base.forms.get(2) == otherForm) {
+                // return Galarian Form
+                return forms.get(1);
+            } else {
+                return getForm(otherForm.formName);
+            }
+        }
+        if (number == 554) { // #555 Darmanitan
+            // check #554 Darumaka Normal
+            if (otherForm.number == 553 && otherForm.base.forms.get(0) == otherForm) {
+                // return Standard Form
+                return forms.get(0);
+            }
+            // check #554 Darumaka Galarian
+            if (otherForm.number == 553 && otherForm.base.forms.get(1) == otherForm) {
+                // return Galarian Standard Form
+                return forms.get(2);
+            } else {
+                return getForm(otherForm.formName);
+            }
+        }
+        if (number == pokeListSize
+                - PokeInfoCalculator.OBSTAGOON_INDEX_OFFSET) { // #862 OBSTAGOON index number in pokemons.xml
+            // check #263 ZIGZAGOON Galarian
+            if (otherForm.number == 262 && otherForm.base.forms.get(1) == otherForm) {
+                return forms.get(0);
+            }
+            // check #264 LINOONE Galarian
+            if (otherForm.number == 263 && otherForm.base.forms.get(1) == otherForm) {
+                return forms.get(0);
+            } else {
+                return getForm(otherForm.formName);
+            }
+        }
+        if (number == pokeListSize
+                - PokeInfoCalculator.PERRSERKER_INDEX_OFFSET) { // #863 Perrserker index number in pokemons.xml
+            // check #52 Meowth Galarian
+            if (otherForm.number == 51 && otherForm.base.forms.get(2) == otherForm) {
+                return forms.get(0);
+            } else {
+                return getForm(otherForm.formName);
+            }
+        }
+        if (number == pokeListSize
+                - PokeInfoCalculator.SIRFETCHD_INDEX_OFFSET) { // #865 Sirfetch'd index number in pokemons.xml
+            // check #83 Farfetch'd Galarian
+            if (otherForm.number == 82 && otherForm.base.forms.get(1) == otherForm) {
+                return forms.get(0);
+            } else {
+                return getForm(otherForm.formName);
+            }
+        }
+
         if ((otherForm.base.forms.size() == 1 && forms.size() > 1)
                 || (forms.size() == 1 && otherForm.base.forms.size() > 1 && otherForm.base.forms.get(0) == otherForm)) {
             return forms.get(0);
diff --git a/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonNameCorrector.java b/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonNameCorrector.java
index 73f231c3b..b16d429a1 100644
--- a/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonNameCorrector.java
+++ b/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonNameCorrector.java
@@ -181,11 +181,11 @@ public PokeDist getPossiblePokemon(@NonNull ScanData scanData) {
         }
 
 
-        //6. Check if the found pokemon should be alolan variant or not.
+        //6. Check if the found pokemon should be its variant(e.g. Alolan, Galarian, or its specific form) or not.
         if (scanData != null && scanData.getPokemonType() != null) {
-            PokeDist alolanGuess = checkAlolanVariant(guess, scanData);
-            if (alolanGuess != null) {
-                guess = alolanGuess;
+            PokeDist variantGuess = checkVariant(guess, scanData);
+            if (variantGuess != null) {
+                guess = variantGuess;
             }
 
         }
@@ -289,7 +289,7 @@ private PokeDist createFormPokeDistances(PokeDist guess, ScanData scanData, Type
         return null;
     }
 
-    private PokeDist checkAlolanVariant(PokeDist guess, ScanData scanData) {
+    private PokeDist checkVariant(PokeDist guess, ScanData scanData) {
         try {
             switch (guess.pokemon.number) {
                 case (102): // Exeggutor (dex 103)
@@ -323,8 +323,7 @@ private PokeDist checkAlolanVariant(PokeDist guess, ScanData scanData) {
                     // check types including steel
                     return createFormPokeDist(guess, scanData, Type.STEEL, 1);
                 case (51): // Meowth
-                    // check types including dark
-                    return createFormPokeDist(guess, scanData, Type.DARK, 1);
+                    return createFormPokeDistances(guess, scanData, Type.NORMAL, Type.DARK, Type.STEEL);
                 case (52): // Persian
                     // check types including dark
                     return createFormPokeDist(guess, scanData, Type.DARK, 1);
@@ -337,6 +336,8 @@ private PokeDist checkAlolanVariant(PokeDist guess, ScanData scanData) {
                 case (75): // Golem
                     // check types including electric
                     return createFormPokeDist(guess, scanData, Type.ELECTRIC, 1);
+                case (82): // Farfetch'd
+                    return createFormPokeDist(guess, scanData, Type.FIGHTING, 1);
                 case (87): // Grimer
                     // check types including dark
                     return createFormPokeDist(guess, scanData, Type.DARK, 1);
@@ -346,6 +347,12 @@ private PokeDist checkAlolanVariant(PokeDist guess, ScanData scanData) {
                 case (104): // Marowak
                     // check types including fire
                     return createFormPokeDist(guess, scanData, Type.FIRE, 1);
+                case (109): // Weezing
+                    return createFormPokeDist(guess, scanData, Type.FAIRY, 1);
+                case (262): // Zigzagoon
+                    return createFormPokeDist(guess, scanData, Type.DARK, 1);
+                case (263): // Linoone
+                    return createFormPokeDist(guess, scanData, Type.DARK, 1);
                 case (412): // Wormadam
                     return createFormPokeDistances(guess, scanData, Type.DARK, Type.GROUND, Type.STEEL);
                 case (478): // Rotom
@@ -357,10 +364,33 @@ private PokeDist checkAlolanVariant(PokeDist guess, ScanData scanData) {
                         dist = new PokeDist(guess.pokemon.base.forms.get(0), 0);
                     }
                     return dist;
-                case (492): // Rotom
+                case (492): // Arceus
                     return createFormPokeDistances(guess, scanData, Type.NORMAL, Type.FIGHTING, Type.FLYING, Type.POISON,
                             Type.GROUND, Type.ROCK, Type.BUG, Type.GHOST, Type.STEEL, Type.FIRE, Type.WATER, Type.GRASS,
                             Type.ELECTRIC, Type.PSYCHIC, Type.ICE, Type.DRAGON, Type.DARK, Type.FAIRY);
+                case (553): // Darumaka
+                    return createFormPokeDist(guess, scanData, Type.ICE, 1);
+                case (554): // Darmanitan
+                    dist = createFormPokeDist(guess, scanData, Type.PSYCHIC, 1);
+                    // check Zen Form
+                    if (dist == null) {
+                        // check Standard Form
+                        if (createFormPokeDist(guess, scanData, Type.ICE, 1) == null) {
+                            dist = createFormPokeDist(guess, scanData, Type.FIRE, 0);
+                        }
+                        // check Galarian Standard Form
+                        else if (createFormPokeDist(guess, scanData, Type.FIRE, 1) == null) {
+                            dist = createFormPokeDist(guess, scanData, Type.ICE, 2);
+                        }
+                        // Galarian Zen Form
+                        else {
+                            dist = createFormPokeDist(guess, scanData, Type.ICE, 3);
+                        }
+                    }
+                    return dist;
+                case (617): // Stunfisk
+                    return createFormPokeDist(guess, scanData, Type.STEEL, 1);
+
                 default:
                     // do nothing
 
diff --git a/app/src/main/res/values-de/pokemons.xml b/app/src/main/res/values-de/pokemons.xml
index 999a5d63c..7a5750e60 100644
--- a/app/src/main/res/values-de/pokemons.xml
+++ b/app/src/main/res/values-de/pokemons.xml
@@ -656,6 +656,9 @@
         <item>Genesect</item>
         <item>Meltan</item>
         <item>Melmetal</item>
+        <item>Barrikadax</item>
+        <item>Mauzinger</item>
+        <item>Lauchzelot</item>
     </string-array>
     <string-array name="typeName">
         <!--  0   normal -->
diff --git a/app/src/main/res/values-fr/pokemons.xml b/app/src/main/res/values-fr/pokemons.xml
index 20c3808f5..e579e8402 100644
--- a/app/src/main/res/values-fr/pokemons.xml
+++ b/app/src/main/res/values-fr/pokemons.xml
@@ -656,6 +656,9 @@
         <item>Genesect</item>
         <item>Meltan</item>
         <item>Melmetal</item>
+        <item>Ixon</item>
+        <item>Berserkatt</item>
+        <item>Palarticho</item>
     </string-array>
     <string-array name="typeName">
         <!--  0   normal -->
diff --git a/app/src/main/res/values-zh-rTW/pokemons.xml b/app/src/main/res/values-zh-rTW/pokemons.xml
index ae85b629f..8706db79c 100644
--- a/app/src/main/res/values-zh-rTW/pokemons.xml
+++ b/app/src/main/res/values-zh-rTW/pokemons.xml
@@ -654,5 +654,8 @@
         <item>蓋諾賽克特</item>
         <item>美錄坦</item>
         <item>美錄梅塔</item>
+        <item>堵攔熊</item>
+        <item>喵頭目</item>
+        <item>蔥遊兵</item>
     </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/forms.xml b/app/src/main/res/values/forms.xml
index 8b323985a..4f81f5030 100644
--- a/app/src/main/res/values/forms.xml
+++ b/app/src/main/res/values/forms.xml
@@ -10,18 +10,22 @@
  <item>2</item> <!--Ninetales-->
  <item>2</item> <!--Diglett-->
  <item>2</item> <!--Dugtrio-->
- <item>2</item> <!--Meowth-->
+ <item>3</item> <!--Meowth-->
  <item>2</item> <!--Persian-->
  <item>2</item> <!--Geodude-->
  <item>2</item> <!--Graveler-->
  <item>2</item> <!--Golem-->
+ <item>2</item> <!--Farfetchd-->
  <item>2</item> <!--Grimer-->
  <item>2</item> <!--Muk-->
  <item>2</item> <!--Exeggutor-->
  <item>2</item> <!--Marowak-->
+ <item>2</item> <!--Weezing-->
  <item>2</item> <!--Mewtwo-->
  <item>28</item> <!--Unown-->
- <item>9</item> <!--Spinda-->
+ <item>2</item> <!--Zigzagoon-->
+ <item>2</item> <!--Linoone-->
+ <item>20</item> <!--Spinda-->
  <item>4</item> <!--Castform-->
  <item>4</item> <!--Deoxys-->
  <item>3</item> <!--Burmy-->
@@ -34,9 +38,13 @@
  <item>2</item> <!--Shaymin-->
  <item>18</item> <!--Arceus-->
  <item>2</item> <!--Basculin-->
- <item>2</item> <!--Darmanitan-->
+ <item>2</item> <!--Darumaka-->
+ <item>4</item> <!--Darmanitan-->
  <item>4</item> <!--Deerling-->
  <item>4</item> <!--Sawsbuck-->
+ <item>2</item> <!--Frillish-->
+ <item>2</item> <!--Jellicent-->
+ <item>2</item> <!--Stunfisk-->
  <item>2</item> <!--Tornadus-->
  <item>2</item> <!--Thundurus-->
  <item>2</item> <!--Landorus-->
@@ -44,7 +52,7 @@
  <item>2</item> <!--Keldeo-->
  <item>2</item> <!--Meloetta-->
  <item>5</item> <!--Genesect-->
-</integer-array>
+ </integer-array>
 <string-array name="formNames">
   <!--Rattata-->
   <item>Normal Form</item>
@@ -76,6 +84,7 @@
   <!--Meowth-->
   <item>Normal Form</item>
   <item>Alola Form</item>
+  <item>Galarian Form</item>
   <!--Persian-->
   <item>Normal Form</item>
   <item>Alola Form</item>
@@ -88,6 +97,9 @@
   <!--Golem-->
   <item>Normal Form</item>
   <item>Alola Form</item>
+  <!--Farfetchd-->
+  <item>Normal Form</item>
+  <item>Galarian Form</item>
   <!--Grimer-->
   <item>Normal Form</item>
   <item>Alola Form</item>
@@ -100,6 +112,9 @@
   <!--Marowak-->
   <item>Normal Form</item>
   <item>Alola Form</item>
+  <!--Weezing-->
+  <item>Normal Form</item>
+  <item>Galarian Form</item>
   <!--Mewtwo-->
   <item>Normal Form</item>
   <item>Armored Form</item>
@@ -132,6 +147,12 @@
   <item>Z Form</item>
   <item>Exclamation Point Form</item>
   <item>Question Mark Form</item>
+  <!--Zigzagoon-->
+  <item>Normal Form</item>
+  <item>Galarian Form</item>
+  <!--Linoone-->
+  <item>Normal Form</item>
+  <item>Galarian Form</item>
   <!--Spinda-->
   <item>00 Form</item>
   <item>01 Form</item>
@@ -142,6 +163,17 @@
   <item>06 Form</item>
   <item>07 Form</item>
   <item>08 Form</item>
+  <item>09 Form</item>
+  <item>10 Form</item>
+  <item>11 Form</item>
+  <item>12 Form</item>
+  <item>13 Form</item>
+  <item>14 Form</item>
+  <item>15 Form</item>
+  <item>16 Form</item>
+  <item>17 Form</item>
+  <item>18 Form</item>
+  <item>19 Form</item>
   <!--Castform-->
   <item>Normal Form</item>
   <item>Sunny Form</item>
@@ -201,47 +233,61 @@
   <item>Dragon Form</item>
   <item>Dark Form</item>
   <item>Fairy Form</item>
-  <!-- Basculin -->
+  <!--Basculin-->
   <item>Red Striped Form</item>
   <item>Blue Striped Form</item>
-  <!-- Darmanitan -->
+  <!--Darumaka-->
+  <item>Normal Form</item>
+  <item>Galarian Form</item>
+  <!--Darmanitan-->
   <item>Standard Form</item>
   <item>Zen Form</item>
-  <!-- Deerling -->
+  <item>Galarian Standard Form</item>
+  <item>Galarian Zen Form</item>
+  <!--Deerling-->
   <item>Spring Form</item>
   <item>Summer Form</item>
   <item>Autumn Form</item>
   <item>Winter Form</item>
-  <!-- Sawsbuck -->
+  <!--Sawsbuck-->
   <item>Spring Form</item>
   <item>Summer Form</item>
   <item>Autumn Form</item>
   <item>Winter Form</item>
-  <!-- Tornadus -->
+  <!--Frillish-->
+  <item>Normal Form</item>
+  <item>Female Form</item>
+  <!--Jellicent-->
+  <item>Normal Form</item>
+  <item>Female Form</item>
+  <!--Stunfisk-->
+  <item>Normal Form</item>
+  <item>Galarian Form</item>
+  <!--Tornadus-->
   <item>Incarnate Form</item>
   <item>Therian Form</item>
-  <!-- Thundurus -->
+  <!--Thundurus-->
   <item>Incarnate Form</item>
   <item>Therian Form</item>
-  <!-- Landorus -->
+  <!--Landorus-->
   <item>Incarnate Form</item>
   <item>Therian Form</item>
-  <!-- Kyurem -->
+  <!--Kyurem-->
   <item>Normal Form</item>
-  <item>Black Form</item>
   <item>White Form</item>
-  <!-- Keldeo -->
+  <item>Black Form</item>
+  <!--Keldeo-->
   <item>Ordinary Form</item>
   <item>Resolute Form</item>
-  <!-- Meloetta -->
+  <!--Meloetta-->
   <item>Aria Form</item>
   <item>Pirouette Form</item>
-  <!-- Genesect -->
+  <!--Genesect-->
   <item>Normal Form</item>
+  <item>Douse Form</item>
   <item>Shock Form</item>
   <item>Burn Form</item>
   <item>Chill Form</item>
-  <item>Douse Form</item>
  </string-array>
 <integer-array name="formAttack">
   <!--Rattata-->
@@ -274,6 +320,7 @@
   <!--Meowth-->
   <item>92</item> <!-- Normal Form -->
   <item>99</item> <!-- Alola Form -->
+  <item>115</item> <!-- Galarian Form -->
   <!--Persian-->
   <item>150</item> <!-- Normal Form -->
   <item>158</item> <!-- Alola Form -->
@@ -286,6 +333,9 @@
   <!--Golem-->
   <item>211</item> <!-- Normal Form -->
   <item>211</item> <!-- Alola Form -->
+  <!--Farfetchd-->
+  <item>124</item> <!-- Normal Form -->
+  <item>174</item> <!-- Galarian Form -->
   <!--Grimer-->
   <item>135</item> <!-- Normal Form -->
   <item>135</item> <!-- Alola Form -->
@@ -298,6 +348,9 @@
   <!--Marowak-->
   <item>144</item> <!-- Normal Form -->
   <item>144</item> <!-- Alola Form -->
+  <!--Weezing-->
+  <item>174</item> <!-- Normal Form -->
+  <item>174</item> <!-- Galarian Form -->
   <!--Mewtwo-->
   <item>300</item> <!-- Normal Form -->
   <item>182</item> <!-- Armored Form -->
@@ -330,6 +383,12 @@
   <item>136</item> <!-- Z Form -->
   <item>136</item> <!-- Exclamation Point Form -->
   <item>136</item> <!-- Question Mark Form -->
+  <!--Zigzagoon-->
+  <item>58</item> <!-- Normal Form -->
+  <item>58</item> <!-- Galarian Form -->
+  <!--Linoone-->
+  <item>142</item> <!-- Normal Form -->
+  <item>142</item> <!-- Galarian Form -->
   <!--Spinda-->
   <item>116</item> <!-- 00 Form -->
   <item>116</item> <!-- 01 Form -->
@@ -340,6 +399,17 @@
   <item>116</item> <!-- 06 Form -->
   <item>116</item> <!-- 07 Form -->
   <item>116</item> <!-- 08 Form -->
+  <item>116</item> <!-- 09 Form -->
+  <item>116</item> <!-- 10 Form -->
+  <item>116</item> <!-- 11 Form -->
+  <item>116</item> <!-- 12 Form -->
+  <item>116</item> <!-- 13 Form -->
+  <item>116</item> <!-- 14 Form -->
+  <item>116</item> <!-- 15 Form -->
+  <item>116</item> <!-- 16 Form -->
+  <item>116</item> <!-- 17 Form -->
+  <item>116</item> <!-- 18 Form -->
+  <item>116</item> <!-- 19 Form -->
   <!--Castform-->
   <item>139</item> <!-- Normal Form -->
   <item>139</item> <!-- Sunny Form -->
@@ -399,48 +469,62 @@
   <item>238</item> <!-- Dragon Form -->
   <item>238</item> <!-- Dark Form -->
   <item>238</item> <!-- Fairy Form -->
-  <!-- Basculin -->
+  <!--Basculin-->
   <item>189</item> <!-- Red Striped Form -->
   <item>189</item> <!-- Blue Striped Form -->
-  <!-- Darmanitan -->
+  <!--Darumaka-->
+  <item>153</item> <!-- Normal Form -->
+  <item>153</item> <!-- Galarian Form -->
+  <!--Darmanitan-->
   <item>263</item> <!-- Standard Form -->
   <item>243</item> <!-- Zen Form -->
-  <!-- Deerling -->
+  <item>263</item> <!-- Galarian Standard Form -->
+  <item>323</item> <!-- Galarian Zen Form -->
+  <!--Deerling-->
   <item>115</item> <!-- Spring Form -->
   <item>115</item> <!-- Summer Form -->
   <item>115</item> <!-- Autumn Form -->
   <item>115</item> <!-- Winter Form -->
-  <!-- Sawsbuck -->
+  <!--Sawsbuck-->
   <item>198</item> <!-- Spring Form -->
   <item>198</item> <!-- Summer Form -->
   <item>198</item> <!-- Autumn Form -->
   <item>198</item> <!-- Winter Form -->
-  <!-- Tornadus -->
+  <!--Frillish-->
+  <item>115</item> <!-- Normal Form -->
+  <item>115</item> <!-- Female Form -->
+  <!--Jellicent-->
+  <item>159</item> <!-- Normal Form -->
+  <item>159</item> <!-- Female Form -->
+  <!--Stunfisk-->
+  <item>144</item> <!-- Normal Form -->
+  <item>144</item> <!-- Galarian Form -->
+  <!--Tornadus-->
   <item>266</item> <!-- Incarnate Form -->
   <item>238</item> <!-- Therian Form -->
-  <!-- Thundurus -->
+  <!--Thundurus-->
   <item>266</item> <!-- Incarnate Form -->
   <item>295</item> <!-- Therian Form -->
-  <!-- Landorus -->
+  <!--Landorus-->
   <item>261</item> <!-- Incarnate Form -->
   <item>289</item> <!-- Therian Form -->
-  <!-- Kyurem -->
+  <!--Kyurem-->
   <item>246</item> <!-- Normal Form -->
-  <item>310</item> <!-- Black Form -->
   <item>310</item> <!-- White Form -->
-  <!-- Keldeo -->
+  <item>310</item> <!-- Black Form -->
+  <!--Keldeo-->
   <item>260</item> <!-- Ordinary Form -->
   <item>260</item> <!-- Resolute Form -->
-  <!-- Meloetta -->
+  <!--Meloetta-->
   <item>250</item> <!-- Aria Form -->
   <item>269</item> <!-- Pirouette Form -->
-  <!-- Genesect -->
+  <!--Genesect-->
   <item>252</item> <!-- Normal Form -->
+  <item>252</item> <!-- Douse Form -->
   <item>252</item> <!-- Shock Form -->
   <item>252</item> <!-- Burn Form -->
   <item>252</item> <!-- Chill Form -->
-  <item>252</item> <!-- Douse Form -->
-</integer-array>
+ </integer-array>
 <integer-array name="formDefense">
   <!--Rattata-->
   <item>70</item> <!-- Normal Form -->
@@ -472,6 +556,7 @@
   <!--Meowth-->
   <item>78</item> <!-- Normal Form -->
   <item>78</item> <!-- Alola Form -->
+  <item>92</item> <!-- Galarian Form -->
   <!--Persian-->
   <item>136</item> <!-- Normal Form -->
   <item>136</item> <!-- Alola Form -->
@@ -484,6 +569,9 @@
   <!--Golem-->
   <item>198</item> <!-- Normal Form -->
   <item>198</item> <!-- Alola Form -->
+  <!--Farfetchd-->
+  <item>115</item> <!-- Normal Form -->
+  <item>114</item> <!-- Galarian Form -->
   <!--Grimer-->
   <item>90</item> <!-- Normal Form -->
   <item>90</item> <!-- Alola Form -->
@@ -496,6 +584,9 @@
   <!--Marowak-->
   <item>186</item> <!-- Normal Form -->
   <item>186</item> <!-- Alola Form -->
+  <!--Weezing-->
+  <item>197</item> <!-- Normal Form -->
+  <item>197</item> <!-- Galarian Form -->
   <!--Mewtwo-->
   <item>182</item> <!-- Normal Form -->
   <item>278</item> <!-- Armored Form -->
@@ -528,6 +619,12 @@
   <item>91</item> <!-- Z Form -->
   <item>91</item> <!-- Exclamation Point Form -->
   <item>91</item> <!-- Question Mark Form -->
+  <!--Zigzagoon-->
+  <item>80</item> <!-- Normal Form -->
+  <item>80</item> <!-- Galarian Form -->
+  <!--Linoone-->
+  <item>128</item> <!-- Normal Form -->
+  <item>128</item> <!-- Galarian Form -->
   <!--Spinda-->
   <item>116</item> <!-- 00 Form -->
   <item>116</item> <!-- 01 Form -->
@@ -538,6 +635,17 @@
   <item>116</item> <!-- 06 Form -->
   <item>116</item> <!-- 07 Form -->
   <item>116</item> <!-- 08 Form -->
+  <item>116</item> <!-- 09 Form -->
+  <item>116</item> <!-- 10 Form -->
+  <item>116</item> <!-- 11 Form -->
+  <item>116</item> <!-- 12 Form -->
+  <item>116</item> <!-- 13 Form -->
+  <item>116</item> <!-- 14 Form -->
+  <item>116</item> <!-- 15 Form -->
+  <item>116</item> <!-- 16 Form -->
+  <item>116</item> <!-- 17 Form -->
+  <item>116</item> <!-- 18 Form -->
+  <item>116</item> <!-- 19 Form -->
   <!--Castform-->
   <item>139</item> <!-- Normal Form -->
   <item>139</item> <!-- Sunny Form -->
@@ -597,47 +705,61 @@
   <item>238</item> <!-- Dragon Form -->
   <item>238</item> <!-- Dark Form -->
   <item>238</item> <!-- Fairy Form -->
-  <!-- Basculin -->
+  <!--Basculin-->
   <item>129</item> <!-- Red Striped Form -->
   <item>129</item> <!-- Blue Striped Form -->
-  <!-- Darmanitan -->
+  <!--Darumaka-->
+  <item>86</item> <!-- Normal Form -->
+  <item>86</item> <!-- Galarian Form -->
+  <!--Darmanitan-->
   <item>114</item> <!-- Standard Form -->
   <item>202</item> <!-- Zen Form -->
-  <!-- Deerling -->
+  <item>114</item> <!-- Galarian Standard Form -->
+  <item>123</item> <!-- Galarian Zen Form -->
+  <!--Deerling-->
   <item>100</item> <!-- Spring Form -->
   <item>100</item> <!-- Summer Form -->
   <item>100</item> <!-- Autumn Form -->
   <item>100</item> <!-- Winter Form -->
-  <!-- Sawsbuck -->
+  <!--Sawsbuck-->
   <item>146</item> <!-- Spring Form -->
   <item>146</item> <!-- Summer Form -->
   <item>146</item> <!-- Autumn Form -->
   <item>146</item> <!-- Winter Form -->
-  <!-- Tornadus -->
+  <!--Frillish-->
+  <item>134</item> <!-- Normal Form -->
+  <item>134</item> <!-- Female Form -->
+  <!--Jellicent-->
+  <item>178</item> <!-- Normal Form -->
+  <item>178</item> <!-- Female Form -->
+  <!--Stunfisk-->
+  <item>171</item> <!-- Normal Form -->
+  <item>171</item> <!-- Galarian Form -->
+  <!--Tornadus-->
   <item>164</item> <!-- Incarnate Form -->
   <item>189</item> <!-- Therian Form -->
-  <!-- Thundurus -->
+  <!--Thundurus-->
   <item>164</item> <!-- Incarnate Form -->
   <item>161</item> <!-- Therian Form -->
-  <!-- Landorus -->
+  <!--Landorus-->
   <item>182</item> <!-- Incarnate Form -->
   <item>179</item> <!-- Therian Form -->
-  <!-- Kyurem -->
+  <!--Kyurem-->
   <item>170</item> <!-- Normal Form -->
-  <item>183</item> <!-- Black Form -->
   <item>183</item> <!-- White Form -->
-  <!-- Keldeo -->
+  <item>183</item> <!-- Black Form -->
+  <!--Keldeo-->
   <item>192</item> <!-- Ordinary Form -->
   <item>192</item> <!-- Resolute Form -->
-  <!-- Meloetta -->
+  <!--Meloetta-->
   <item>225</item> <!-- Aria Form -->
   <item>188</item> <!-- Pirouette Form -->
-  <!-- Genesect -->
+  <!--Genesect-->
   <item>199</item> <!-- Normal Form -->
+  <item>199</item> <!-- Douse Form -->
   <item>199</item> <!-- Shock Form -->
   <item>199</item> <!-- Burn Form -->
   <item>199</item> <!-- Chill Form -->
-  <item>199</item> <!-- Douse Form -->
  </integer-array>
 <integer-array name="formStamina">
   <!--Rattata-->
@@ -670,6 +792,7 @@
   <!--Meowth-->
   <item>120</item> <!-- Normal Form -->
   <item>120</item> <!-- Alola Form -->
+  <item>137</item> <!-- Galarian Form -->
   <!--Persian-->
   <item>163</item> <!-- Normal Form -->
   <item>163</item> <!-- Alola Form -->
@@ -682,6 +805,9 @@
   <!--Golem-->
   <item>190</item> <!-- Normal Form -->
   <item>190</item> <!-- Alola Form -->
+  <!--Farfetchd-->
+  <item>141</item> <!-- Normal Form -->
+  <item>141</item> <!-- Galarian Form -->
   <!--Grimer-->
   <item>190</item> <!-- Normal Form -->
   <item>190</item> <!-- Alola Form -->
@@ -694,6 +820,9 @@
   <!--Marowak-->
   <item>155</item> <!-- Normal Form -->
   <item>155</item> <!-- Alola Form -->
+  <!--Weezing-->
+  <item>163</item> <!-- Normal Form -->
+  <item>163</item> <!-- Galarian Form -->
   <!--Mewtwo-->
   <item>214</item> <!-- Normal Form -->
   <item>214</item> <!-- Armored Form -->
@@ -726,6 +855,12 @@
   <item>134</item> <!-- Z Form -->
   <item>134</item> <!-- Exclamation Point Form -->
   <item>134</item> <!-- Question Mark Form -->
+  <!--Zigzagoon-->
+  <item>116</item> <!-- Normal Form -->
+  <item>116</item> <!-- Galarian Form -->
+  <!--Linoone-->
+  <item>186</item> <!-- Normal Form -->
+  <item>186</item> <!-- Galarian Form -->
   <!--Spinda-->
   <item>155</item> <!-- 00 Form -->
   <item>155</item> <!-- 01 Form -->
@@ -736,6 +871,17 @@
   <item>155</item> <!-- 06 Form -->
   <item>155</item> <!-- 07 Form -->
   <item>155</item> <!-- 08 Form -->
+  <item>155</item> <!-- 09 Form -->
+  <item>155</item> <!-- 10 Form -->
+  <item>155</item> <!-- 11 Form -->
+  <item>155</item> <!-- 12 Form -->
+  <item>155</item> <!-- 13 Form -->
+  <item>155</item> <!-- 14 Form -->
+  <item>155</item> <!-- 15 Form -->
+  <item>155</item> <!-- 16 Form -->
+  <item>155</item> <!-- 17 Form -->
+  <item>155</item> <!-- 18 Form -->
+  <item>155</item> <!-- 19 Form -->
   <!--Castform-->
   <item>172</item> <!-- Normal Form -->
   <item>172</item> <!-- Sunny Form -->
@@ -795,46 +941,60 @@
   <item>237</item> <!-- Dragon Form -->
   <item>237</item> <!-- Dark Form -->
   <item>237</item> <!-- Fairy Form -->
-  <!-- Basculin -->
+  <!--Basculin-->
   <item>172</item> <!-- Red Striped Form -->
   <item>172</item> <!-- Blue Striped Form -->
-  <!-- Darmanitan -->
+  <!--Darumaka-->
+  <item>172</item> <!-- Normal Form -->
+  <item>172</item> <!-- Galarian Form -->
+  <!--Darmanitan-->
   <item>233</item> <!-- Standard Form -->
   <item>233</item> <!-- Zen Form -->
-  <!-- Deerling -->
+  <item>233</item> <!-- Galarian Standard Form -->
+  <item>233</item> <!-- Galarian Zen Form -->
+  <!--Deerling-->
   <item>155</item> <!-- Spring Form -->
   <item>155</item> <!-- Summer Form -->
   <item>155</item> <!-- Autumn Form -->
   <item>155</item> <!-- Winter Form -->
-  <!-- Sawsbuck -->
+  <!--Sawsbuck-->
   <item>190</item> <!-- Spring Form -->
   <item>190</item> <!-- Summer Form -->
   <item>190</item> <!-- Autumn Form -->
   <item>190</item> <!-- Winter Form -->
-  <!-- Tornadus -->
+  <!--Frillish-->
+  <item>146</item> <!-- Normal Form -->
+  <item>146</item> <!-- Female Form -->
+  <!--Jellicent-->
+  <item>225</item> <!-- Normal Form -->
+  <item>225</item> <!-- Female Form -->
+  <!--Stunfisk-->
+  <item>240</item> <!-- Normal Form -->
+  <item>240</item> <!-- Galarian Form -->
+  <!--Tornadus-->
   <item>188</item> <!-- Incarnate Form -->
   <item>188</item> <!-- Therian Form -->
-  <!-- Thundurus -->
+  <!--Thundurus-->
   <item>188</item> <!-- Incarnate Form -->
   <item>188</item> <!-- Therian Form -->
-  <!-- Landorus -->
+  <!--Landorus-->
   <item>205</item> <!-- Incarnate Form -->
   <item>205</item> <!-- Therian Form -->
-  <!-- Kyurem -->
+  <!--Kyurem-->
   <item>245</item> <!-- Normal Form -->
-  <item>245</item> <!-- Black Form -->
   <item>245</item> <!-- White Form -->
-  <!-- Keldeo -->
+  <item>245</item> <!-- Black Form -->
+  <!--Keldeo-->
   <item>209</item> <!-- Ordinary Form -->
   <item>209</item> <!-- Resolute Form -->
-  <!-- Meloetta -->
+  <!--Meloetta-->
   <item>225</item> <!-- Aria Form -->
   <item>225</item> <!-- Pirouette Form -->
-  <!-- Genesect -->
+  <!--Genesect-->
   <item>174</item> <!-- Normal Form -->
+  <item>174</item> <!-- Douse Form -->
   <item>174</item> <!-- Shock Form -->
   <item>174</item> <!-- Burn Form -->
   <item>174</item> <!-- Chill Form -->
-  <item>174</item> <!-- Douse Form -->
  </integer-array>
 </resources>
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
index 17f268655..d5212f5b6 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -652,7 +652,10 @@
  <item>252</item> <!--Genesect-->
  <item>118</item> <!--Meltan-->
  <item>226</item> <!--Melmetal-->
-</integer-array>
+ <item>180</item> <!--Obstagoon-->
+ <item>195</item> <!--Perrserker-->
+ <item>248</item> <!--Sirfetchd-->
+ </integer-array>
 <integer-array name="defense">
  <item>111</item> <!--Bulbasaur-->
  <item>143</item> <!--Ivysaur-->
@@ -1305,7 +1308,10 @@
  <item>199</item> <!--Genesect-->
  <item>99</item> <!--Meltan-->
  <item>190</item> <!--Melmetal-->
-</integer-array>
+ <item>194</item> <!--Obstagoon-->
+ <item>162</item> <!--Perrserker-->
+ <item>176</item> <!--Sirfetchd-->
+ </integer-array>
 <integer-array name="stamina">
  <item>128</item> <!--Bulbasaur-->
  <item>155</item> <!--Ivysaur-->
@@ -1958,7 +1964,10 @@
  <item>174</item> <!--Genesect-->
  <item>130</item> <!--Meltan-->
  <item>264</item> <!--Melmetal-->
-</integer-array>
+ <item>212</item> <!--Obstagoon-->
+ <item>172</item> <!--Perrserker-->
+ <item>158</item> <!--Sirfetchd-->
+ </integer-array>
 <integer-array name="devolutionNumber">
  <item>-1</item> <!--Bulbasaur-->
  <item>0</item> <!--Ivysaur-->
@@ -2545,7 +2554,7 @@
  <item>581</item> <!--Vanillish-->
  <item>582</item> <!--Vanilluxe-->
  <item>-1</item> <!--Deerling-->
- <item>585</item> <!--Sawsbuck-->
+ <item>584</item> <!--Sawsbuck-->
  <item>-1</item> <!--Emolga-->
  <item>-1</item> <!--Karrablast-->
  <item>587</item> <!--Escavalier-->
@@ -2611,7 +2620,10 @@
  <item>-1</item> <!--Genesect-->
  <item>-1</item> <!--Meltan-->
  <item>807</item> <!--Melmetal-->
-</integer-array>
+ <item>262</item> <!--Obstagoon-->
+ <item>51</item> <!--Perrserker-->
+ <item>82</item> <!--Sirfetchd-->
+ </integer-array>
 <integer-array name="evolutionCandyCost">
  <item>25</item> <!--Bulbasaur-->
  <item>100</item> <!--Ivysaur-->
@@ -3136,16 +3148,16 @@
  <item>-1</item> <!--Unfezant-->
  <item>50</item> <!--Blitzle-->
  <item>-1</item> <!--Zebstrika-->
- <item>25</item> <!--Roggenrola-->
- <item>100</item> <!--Boldore-->
+ <item>50</item> <!--Roggenrola-->
+ <item>200</item> <!--Boldore-->
  <item>-1</item> <!--Gigalith-->
  <item>50</item> <!--Woobat-->
  <item>-1</item> <!--Swoobat-->
  <item>50</item> <!--Drilbur-->
  <item>-1</item> <!--Excadrill-->
  <item>-1</item> <!--Audino-->
- <item>25</item> <!--Timburr-->
- <item>100</item> <!--Gurdurr-->
+ <item>50</item> <!--Timburr-->
+ <item>200</item> <!--Gurdurr-->
  <item>-1</item> <!--Conkeldurr-->
  <item>25</item> <!--Tympole-->
  <item>100</item> <!--Palpitoad-->
@@ -3167,7 +3179,7 @@
  <item>50</item> <!--Krokorok-->
  <item>-1</item> <!--Krookodile-->
  <item>50</item> <!--Darumaka-->
- <item>50</item> <!--Darmanitan-->
+ <item>-1</item> <!--Darmanitan-->
  <item>-1</item> <!--Maractus-->
  <item>50</item> <!--Dwebble-->
  <item>-1</item> <!--Crustle-->
@@ -3197,10 +3209,10 @@
  <item>25</item> <!--Vanillite-->
  <item>100</item> <!--Vanillish-->
  <item>-1</item> <!--Vanilluxe-->
- <item>50</item> <!--Deerling-->
+ <item>-1</item> <!--Deerling-->
  <item>-1</item> <!--Sawsbuck-->
  <item>-1</item> <!--Emolga-->
- <item>50</item> <!--Karrablast-->
+ <item>200</item> <!--Karrablast-->
  <item>-1</item> <!--Escavalier-->
  <item>50</item> <!--Foongus-->
  <item>-1</item> <!--Amoonguss-->
@@ -3228,7 +3240,7 @@
  <item>50</item> <!--Cubchoo-->
  <item>-1</item> <!--Beartic-->
  <item>-1</item> <!--Cryogonal-->
- <item>50</item> <!--Shelmet-->
+ <item>200</item> <!--Shelmet-->
  <item>-1</item> <!--Accelgor-->
  <item>-1</item> <!--Stunfisk-->
  <item>50</item> <!--Mienfoo-->
@@ -3264,7 +3276,10 @@
  <item>-1</item> <!--Genesect-->
  <item>400</item> <!--Meltan-->
  <item>-1</item> <!--Melmetal-->
-</integer-array>
+ <item>-1</item> <!--Obstagoon-->
+ <item>-1</item> <!--Perrserker-->
+ <item>-1</item> <!--Sirfetchd-->
+ </integer-array>
 <integer-array name="candyNames">
  <item>0</item> <!--Bulbasaur-->
  <item>0</item> <!--Ivysaur-->
@@ -3917,6 +3932,9 @@
  <item>648</item> <!--Genesect-->
  <item>807</item> <!--Meltan-->
  <item>807</item> <!--Melmetal-->
+ <item>262</item> <!--Obstagoon-->
+ <item>51</item> <!--Perrserker-->
+ <item>82</item> <!--Sirfetchd-->
  </integer-array>
 <integer-array name="formsCountIndex">
  <item>-1</item> <!--Bulbasaur-->
@@ -4001,13 +4019,13 @@
  <item>-1</item> <!--Slowbro-->
  <item>-1</item> <!--Magnemite-->
  <item>-1</item> <!--Magneton-->
- <item>-1</item> <!--Farfetchd-->
+ <item>14</item> <!--Farfetchd-->
  <item>-1</item> <!--Doduo-->
  <item>-1</item> <!--Dodrio-->
  <item>-1</item> <!--Seel-->
  <item>-1</item> <!--Dewgong-->
- <item>14</item> <!--Grimer-->
- <item>15</item> <!--Muk-->
+ <item>15</item> <!--Grimer-->
+ <item>16</item> <!--Muk-->
  <item>-1</item> <!--Shellder-->
  <item>-1</item> <!--Cloyster-->
  <item>-1</item> <!--Gastly-->
@@ -4021,14 +4039,14 @@
  <item>-1</item> <!--Voltorb-->
  <item>-1</item> <!--Electrode-->
  <item>-1</item> <!--Exeggcute-->
- <item>16</item> <!--Exeggutor-->
+ <item>17</item> <!--Exeggutor-->
  <item>-1</item> <!--Cubone-->
- <item>17</item> <!--Marowak-->
+ <item>18</item> <!--Marowak-->
  <item>-1</item> <!--Hitmonlee-->
  <item>-1</item> <!--Hitmonchan-->
  <item>-1</item> <!--Lickitung-->
  <item>-1</item> <!--Koffing-->
- <item>-1</item> <!--Weezing-->
+ <item>19</item> <!--Weezing-->
  <item>-1</item> <!--Rhyhorn-->
  <item>-1</item> <!--Rhydon-->
  <item>-1</item> <!--Chansey-->
@@ -4068,7 +4086,7 @@
  <item>-1</item> <!--Dratini-->
  <item>-1</item> <!--Dragonair-->
  <item>-1</item> <!--Dragonite-->
- <item>18</item> <!--Mewtwo-->
+ <item>20</item> <!--Mewtwo-->
  <item>-1</item> <!--Mew-->
  <item>-1</item> <!--Chikorita-->
  <item>-1</item> <!--Bayleef-->
@@ -4119,7 +4137,7 @@
  <item>-1</item> <!--Murkrow-->
  <item>-1</item> <!--Slowking-->
  <item>-1</item> <!--Misdreavus-->
- <item>19</item> <!--Unown-->
+ <item>21</item> <!--Unown-->
  <item>-1</item> <!--Wobbuffet-->
  <item>-1</item> <!--Girafarig-->
  <item>-1</item> <!--Pineco-->
@@ -4181,8 +4199,8 @@
  <item>-1</item> <!--Swampert-->
  <item>-1</item> <!--Poochyena-->
  <item>-1</item> <!--Mightyena-->
- <item>-1</item> <!--Zigzagoon-->
- <item>-1</item> <!--Linoone-->
+ <item>22</item> <!--Zigzagoon-->
+ <item>23</item> <!--Linoone-->
  <item>-1</item> <!--Wurmple-->
  <item>-1</item> <!--Silcoon-->
  <item>-1</item> <!--Beautifly-->
@@ -4245,7 +4263,7 @@
  <item>-1</item> <!--Torkoal-->
  <item>-1</item> <!--Spoink-->
  <item>-1</item> <!--Grumpig-->
- <item>20</item> <!--Spinda-->
+ <item>24</item> <!--Spinda-->
  <item>-1</item> <!--Trapinch-->
  <item>-1</item> <!--Vibrava-->
  <item>-1</item> <!--Flygon-->
@@ -4269,7 +4287,7 @@
  <item>-1</item> <!--Armaldo-->
  <item>-1</item> <!--Feebas-->
  <item>-1</item> <!--Milotic-->
- <item>21</item> <!--Castform-->
+ <item>25</item> <!--Castform-->
  <item>-1</item> <!--Kecleon-->
  <item>-1</item> <!--Shuppet-->
  <item>-1</item> <!--Banette-->
@@ -4304,7 +4322,7 @@
  <item>-1</item> <!--Groudon-->
  <item>-1</item> <!--Rayquaza-->
  <item>-1</item> <!--Jirachi-->
- <item>22</item> <!--Deoxys-->
+ <item>26</item> <!--Deoxys-->
  <item>-1</item> <!--Turtwig-->
  <item>-1</item> <!--Grotle-->
  <item>-1</item> <!--Torterra-->
@@ -4330,8 +4348,8 @@
  <item>-1</item> <!--Rampardos-->
  <item>-1</item> <!--Shieldon-->
  <item>-1</item> <!--Bastiodon-->
- <item>23</item> <!--Burmy-->
- <item>24</item> <!--Wormadam-->
+ <item>27</item> <!--Burmy-->
+ <item>28</item> <!--Wormadam-->
  <item>-1</item> <!--Mothim-->
  <item>-1</item> <!--Combee-->
  <item>-1</item> <!--Vespiquen-->
@@ -4339,9 +4357,9 @@
  <item>-1</item> <!--Buizel-->
  <item>-1</item> <!--Floatzel-->
  <item>-1</item> <!--Cherubi-->
- <item>25</item> <!--Cherrim-->
- <item>26</item> <!--Shellos-->
- <item>27</item> <!--Gastrodon-->
+ <item>29</item> <!--Cherrim-->
+ <item>30</item> <!--Shellos-->
+ <item>31</item> <!--Gastrodon-->
  <item>-1</item> <!--Ambipom-->
  <item>-1</item> <!--Drifloon-->
  <item>-1</item> <!--Drifblim-->
@@ -4397,7 +4415,7 @@
  <item>-1</item> <!--Probopass-->
  <item>-1</item> <!--Dusknoir-->
  <item>-1</item> <!--Froslass-->
- <item>28</item> <!--Rotom-->
+ <item>32</item> <!--Rotom-->
  <item>-1</item> <!--Uxie-->
  <item>-1</item> <!--Mesprit-->
  <item>-1</item> <!--Azelf-->
@@ -4405,13 +4423,13 @@
  <item>-1</item> <!--Palkia-->
  <item>-1</item> <!--Heatran-->
  <item>-1</item> <!--Regigigas-->
- <item>29</item> <!--Giratina-->
+ <item>33</item> <!--Giratina-->
  <item>-1</item> <!--Cresselia-->
  <item>-1</item> <!--Phione-->
  <item>-1</item> <!--Manaphy-->
  <item>-1</item> <!--Darkrai-->
- <item>30</item> <!--Shaymin-->
- <item>31</item> <!--Arceus-->
+ <item>34</item> <!--Shaymin-->
+ <item>35</item> <!--Arceus-->
  <item>-1</item> <!--Victini-->
  <item>-1</item> <!--Snivy-->
  <item>-1</item> <!--Servine-->
@@ -4468,12 +4486,12 @@
  <item>-1</item> <!--Whimsicott-->
  <item>-1</item> <!--Petilil-->
  <item>-1</item> <!--Lilligant-->
- <item>32</item> <!--Basculin-->
+ <item>36</item> <!--Basculin-->
  <item>-1</item> <!--Sandile-->
  <item>-1</item> <!--Krokorok-->
  <item>-1</item> <!--Krookodile-->
- <item>-1</item> <!--Darumaka-->
- <item>33</item> <!--Darmanitan-->
+ <item>37</item> <!--Darumaka-->
+ <item>38</item> <!--Darmanitan-->
  <item>-1</item> <!--Maractus-->
  <item>-1</item> <!--Dwebble-->
  <item>-1</item> <!--Crustle-->
@@ -4503,15 +4521,15 @@
  <item>-1</item> <!--Vanillite-->
  <item>-1</item> <!--Vanillish-->
  <item>-1</item> <!--Vanilluxe-->
- <item>34</item> <!--Deerling-->
- <item>35</item> <!--Sawsbuck-->
+ <item>39</item> <!--Deerling-->
+ <item>40</item> <!--Sawsbuck-->
  <item>-1</item> <!--Emolga-->
  <item>-1</item> <!--Karrablast-->
  <item>-1</item> <!--Escavalier-->
  <item>-1</item> <!--Foongus-->
  <item>-1</item> <!--Amoonguss-->
- <item>-1</item> <!--Frillish-->
- <item>-1</item> <!--Jellicent-->
+ <item>41</item> <!--Frillish-->
+ <item>42</item> <!--Jellicent-->
  <item>-1</item> <!--Alomomola-->
  <item>-1</item> <!--Joltik-->
  <item>-1</item> <!--Galvantula-->
@@ -4536,7 +4554,7 @@
  <item>-1</item> <!--Cryogonal-->
  <item>-1</item> <!--Shelmet-->
  <item>-1</item> <!--Accelgor-->
- <item>-1</item> <!--Stunfisk-->
+ <item>43</item> <!--Stunfisk-->
  <item>-1</item> <!--Mienfoo-->
  <item>-1</item> <!--Mienshao-->
  <item>-1</item> <!--Druddigon-->
@@ -4559,16 +4577,19 @@
  <item>-1</item> <!--Cobalion-->
  <item>-1</item> <!--Terrakion-->
  <item>-1</item> <!--Virizion-->
- <item>36</item> <!--Tornadus-->
- <item>37</item> <!--Thundurus-->
+ <item>44</item> <!--Tornadus-->
+ <item>45</item> <!--Thundurus-->
  <item>-1</item> <!--Reshiram-->
  <item>-1</item> <!--Zekrom-->
- <item>38</item> <!--Landorus-->
- <item>39</item> <!--Kyurem-->
- <item>40</item> <!--Keldeo-->
- <item>41</item> <!--Meloetta-->
- <item>42</item> <!--Genesect-->
+ <item>46</item> <!--Landorus-->
+ <item>47</item> <!--Kyurem-->
+ <item>48</item> <!--Keldeo-->
+ <item>49</item> <!--Meloetta-->
+ <item>50</item> <!--Genesect-->
  <item>-1</item> <!--Meltan-->
  <item>-1</item> <!--Melmetal-->
-</integer-array>
+ <item>-1</item> <!--Obstagoon-->
+ <item>-1</item> <!--Perrserker-->
+ <item>-1</item> <!--Sirfetchd-->
+ </integer-array>
 </resources>
diff --git a/app/src/main/res/values/pokemons.xml b/app/src/main/res/values/pokemons.xml
index 05d7dc427..1c7bf4c55 100644
--- a/app/src/main/res/values/pokemons.xml
+++ b/app/src/main/res/values/pokemons.xml
@@ -655,6 +655,9 @@
         <item>Genesect</item>
         <item>Meltan</item>
         <item>Melmetal</item>
+        <item>Obstagoon</item>
+        <item>Perrserker</item>
+        <item>Sirfetch\'d</item>
     </string-array>
     <string-array name="typeName">
         <!--  0   normal --> <item>NORMAL</item>