From 74d2852ab6d5ab0769a2946f83ad8b413106c096 Mon Sep 17 00:00:00 2001
From: udnp <udnp@sawdagger.nagoya>
Date: Mon, 26 Feb 2018 19:45:26 +0900
Subject: [PATCH 1/2] [C] moved pokemon type names from pokemons.xml to
 types.xml

---
 .../res/values-es/{pokemons.xml => types.xml} |  0
 .../res/values-it/{pokemons.xml => types.xml} |  0
 app/src/main/res/values/pokemons.xml          | 20 ----------------
 app/src/main/res/values/types.xml             | 23 +++++++++++++++++++
 4 files changed, 23 insertions(+), 20 deletions(-)
 rename app/src/main/res/values-es/{pokemons.xml => types.xml} (100%)
 rename app/src/main/res/values-it/{pokemons.xml => types.xml} (100%)
 create mode 100644 app/src/main/res/values/types.xml

diff --git a/app/src/main/res/values-es/pokemons.xml b/app/src/main/res/values-es/types.xml
similarity index 100%
rename from app/src/main/res/values-es/pokemons.xml
rename to app/src/main/res/values-es/types.xml
diff --git a/app/src/main/res/values-it/pokemons.xml b/app/src/main/res/values-it/types.xml
similarity index 100%
rename from app/src/main/res/values-it/pokemons.xml
rename to app/src/main/res/values-it/types.xml
diff --git a/app/src/main/res/values/pokemons.xml b/app/src/main/res/values/pokemons.xml
index 820ef7a4b..c3860c2c7 100644
--- a/app/src/main/res/values/pokemons.xml
+++ b/app/src/main/res/values/pokemons.xml
@@ -394,24 +394,4 @@
         <item>Deoxys_Speed</item>
         <item>Deoxys</item>
     </string-array>
-    <string-array name="typeName">
-        <!--  0   normal --> <item>NORMAL</item>
-        <!--  1     fire --> <item>FIRE</item>
-        <!--  2    water --> <item>WATER</item>
-        <!--  3 electric --> <item>ELECTRIC</item>
-        <!--  4    grass --> <item>GRASS</item>
-        <!--  5      ice --> <item>ICE</item>
-        <!--  6 fighting --> <item>FIGHTING</item>
-        <!--  7   poison --> <item>POISON</item>
-        <!--  8   ground --> <item>GROUND</item>
-        <!--  9   flying --> <item>FLYING</item>
-        <!-- 10  psychic --> <item>PSYCHIC</item>
-        <!-- 11      bug --> <item>BUG</item>
-        <!-- 12     rock --> <item>ROCK</item>
-        <!-- 13    ghost --> <item>GHOST</item>
-        <!-- 14   dragon --> <item>DRAGON</item>
-        <!-- 15     dark --> <item>DARK</item>
-        <!-- 16    steel --> <item>STEEL</item>
-        <!-- 17    fairy --> <item>FAIRY</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values/types.xml b/app/src/main/res/values/types.xml
new file mode 100644
index 000000000..9c0aa6267
--- /dev/null
+++ b/app/src/main/res/values/types.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="typeName">
+        <!--  0   normal --> <item>NORMAL</item>
+        <!--  1     fire --> <item>FIRE</item>
+        <!--  2    water --> <item>WATER</item>
+        <!--  3 electric --> <item>ELECTRIC</item>
+        <!--  4    grass --> <item>GRASS</item>
+        <!--  5      ice --> <item>ICE</item>
+        <!--  6 fighting --> <item>FIGHTING</item>
+        <!--  7   poison --> <item>POISON</item>
+        <!--  8   ground --> <item>GROUND</item>
+        <!--  9   flying --> <item>FLYING</item>
+        <!-- 10  psychic --> <item>PSYCHIC</item>
+        <!-- 11      bug --> <item>BUG</item>
+        <!-- 12     rock --> <item>ROCK</item>
+        <!-- 13    ghost --> <item>GHOST</item>
+        <!-- 14   dragon --> <item>DRAGON</item>
+        <!-- 15     dark --> <item>DARK</item>
+        <!-- 16    steel --> <item>STEEL</item>
+        <!-- 17    fairy --> <item>FAIRY</item>
+    </string-array>
+</resources>
\ No newline at end of file

From 164783d109cd7a6fbf837f91e432585cbe31575a Mon Sep 17 00:00:00 2001
From: udnp <udnp@sawdagger.nagoya>
Date: Mon, 26 Feb 2018 19:39:01 +0900
Subject: [PATCH 2/2] [C] changed pokemon type index according to Pokemon
 Official pokedex.

---
 .../com/kamron/pogoiv/scanlogic/PokemonNameCorrector.java     | 4 ++--
 app/src/main/res/values-es/types.xml                          | 4 ++--
 app/src/main/res/values-it/types.xml                          | 4 ++--
 app/src/main/res/values/types.xml                             | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

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 91cb96020..fe242d49d 100644
--- a/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonNameCorrector.java
+++ b/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonNameCorrector.java
@@ -68,7 +68,7 @@ public PokeDist getPossiblePokemon(String poketext, String candytext, Optional<I
             HashMap<String, String> eeveelutionCorrection = new HashMap<>();
             eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(2), //WATER
                     pokeInfoCalculator.get(133).name); //Vaporeon
-            eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(3), //ELECTRIC
+            eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(4), //ELECTRIC
                     pokeInfoCalculator.get(134).name); //Jolteon
             eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(1), //FIRE
                     pokeInfoCalculator.get(135).name); //Flareon
@@ -77,7 +77,7 @@ public PokeDist getPossiblePokemon(String poketext, String candytext, Optional<I
             eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(15), //DARK
                     pokeInfoCalculator.get(196).name); //Umbreon
             // Preparing for the future....
-            // eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(4), //GRASS
+            // eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(3), //GRASS
             //         pokeInfoCalculator.get(469).name); //Leafeon
             // eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(5), //ICE
             //         pokeInfoCalculator.get(470).name); //Glaceon
diff --git a/app/src/main/res/values-es/types.xml b/app/src/main/res/values-es/types.xml
index 7e2739c59..b9eb855a0 100644
--- a/app/src/main/res/values-es/types.xml
+++ b/app/src/main/res/values-es/types.xml
@@ -4,8 +4,8 @@
         <!--  0   normal --> <item>NORMAL</item>
         <!--  1     fire --> <item>FUEGO</item>
         <!--  2    water --> <item>AGUA</item>
-        <!--  3 electric --> <item>ELÉCTRICO</item>
-        <!--  4    grass --> <item>PLANTA</item>
+        <!--  3    grass --> <item>PLANTA</item>
+        <!--  4 electric --> <item>ELÉCTRICO</item>
         <!--  5      ice --> <item>HIELO</item>
         <!--  6 fighting --> <item>LUCHA</item>
         <!--  7   poison --> <item>VENENO</item>
diff --git a/app/src/main/res/values-it/types.xml b/app/src/main/res/values-it/types.xml
index c626562a4..b4f4b9f3a 100644
--- a/app/src/main/res/values-it/types.xml
+++ b/app/src/main/res/values-it/types.xml
@@ -4,8 +4,8 @@
         <!--  0   normal --> <item>NORMALE</item>
         <!--  1     fire --> <item>FUOCO</item>
         <!--  2    water --> <item>ACQUA</item>
-        <!--  3 electric --> <item>ELETTRO</item>
-        <!--  4    grass --> <item>ERBA</item>
+        <!--  3    grass --> <item>ERBA</item>
+        <!--  4 electric --> <item>ELETTRO</item>
         <!--  5      ice --> <item>GHIACCIO</item>
         <!--  6 fighting --> <item>LOTTA</item>
         <!--  7   poison --> <item>VELENO</item>
diff --git a/app/src/main/res/values/types.xml b/app/src/main/res/values/types.xml
index 9c0aa6267..a089cf746 100644
--- a/app/src/main/res/values/types.xml
+++ b/app/src/main/res/values/types.xml
@@ -4,8 +4,8 @@
         <!--  0   normal --> <item>NORMAL</item>
         <!--  1     fire --> <item>FIRE</item>
         <!--  2    water --> <item>WATER</item>
-        <!--  3 electric --> <item>ELECTRIC</item>
-        <!--  4    grass --> <item>GRASS</item>
+        <!--  3    grass --> <item>GRASS</item>
+        <!--  4 electric --> <item>ELECTRIC</item>
         <!--  5      ice --> <item>ICE</item>
         <!--  6 fighting --> <item>FIGHTING</item>
         <!--  7   poison --> <item>POISON</item>