diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs
index 9c89e9192..418cec663 100644
--- a/PKX/f1-Main.cs
+++ b/PKX/f1-Main.cs
@@ -3989,7 +3989,8 @@ public bool verifiedpkx()
                              };
             for (int i = 0; i < cba.Length; i++)
             {
-				if (cba[i].BackColor != System.Drawing.SystemColors.Control && cba[i].BackColor != Color.Empty)
+                int back = cba[i].BackColor.ToArgb();
+                if (back != System.Drawing.SystemColors.Control.ToArgb() && back != 0 && back != -1)
                 {
                     if (i < 6)      // Main Tab
                         tabMain.SelectedIndex = 0;
diff --git a/PKX/f3-MemoryAmie.cs b/PKX/f3-MemoryAmie.cs
index 792862695..7333e2da4 100644
--- a/PKX/f3-MemoryAmie.cs
+++ b/PKX/f3-MemoryAmie.cs
@@ -505,9 +505,10 @@ private void getCountries()
         private void getLangStrings()
         {
             // Memory Chooser
-            string[] memories = new string[64];
-            int[] allowed = new int[64];
-            for (int i = 0; i < 64; i++)
+            int memorycount = Form1.memories.Length - 39;
+            string[] memories = new string[memorycount];
+            int[] allowed = new int[memorycount];
+            for (int i = 0; i < memorycount; i++)
             {
                 memories[i] = Form1.memories[39 + i];
                 allowed[i] = i+1;
@@ -551,11 +552,11 @@ private void getMemoryArguments(string ARG, ComboBox sender)
             #region General Locations
             // add general locations
             int[] allowed = { };
-            allowed = new int[62];
-            for (int i = 0; i < 62; i++)
-            {
-                allowed[i] = i;
-            }
+
+            allowed = new int[Form1.genloc.Length];
+            for (int i = 0; i < Form1.genloc.Length; i++)
+                allowed[i] = i; // Allow everything.
+
             List<cbItem> genloc = getComboBoxItems(Form1.genloc, allowed);
             #endregion
             #region Items
@@ -583,8 +584,10 @@ private void getMemoryArguments(string ARG, ComboBox sender)
 
             // Met Locations for Pokecenters healing
             allowed = new int[] {
-                2,6,8,10,12,14,16,17,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,66,68,70,72,74,76,78,82,84,86,88,90,92,94,96,98,100,102,104,106,108,110,112,114,116,118,120,122,124,126,128,130,132,134,136,138,140,142,144,146,148,150,152,154,156,158,160,162,164,166,168,
-            };
+                        2,6,8,10,12,14,16,17,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,66,68,70,72,74,76,78,82,84,86,88,90,92,94,96,98,100,102,104,106,108,110,112,114,116,118,120,122,124,126,128,130,132,134,136,138,140,142,144,146,148,150,152,154,156,158,160,162,164,166,168,
+                        // ORAS
+                        170,172,174,176,178,180,182,184,186,188,190,192,194,196,198,200,202,204,206,208,210,212,214,216,218,220,222,224,226,228,230,232,234,236,238,240,242,244,246,248,250,252,254,256,258,260,262,264,266,268,270,272,274,276,278,280,282,284,286,288,290,292,294,296,298,300,302,304,306,308,310,312,314,316,318,320,322,324,326,328,330,332,334,336,338,340,342,344,346,348,350,352,354,
+            };  // Be sure the legal list matches the one in the main form for Location Selection
             List<cbItem> locationXY = getComboBoxItems(Form1.metXY_00000, allowed);
             #region Moves
             
@@ -803,7 +806,7 @@ private void changeMemory(object sender, EventArgs e)
                     case 62: getMemoryArguments("NONE", m); break;
                     case 63: getMemoryArguments("NONE", m); break;
                     case 64: getMemoryArguments("NONE", m); break;
-                    default: m.SelectedIndex = 0; break;
+                    default: getMemoryArguments("NONE", m); break;
                 };
             }
 
diff --git a/Resources/text/changelog.txt b/Resources/text/changelog.txt
index eaaeb9547..35ae3acfb 100644
--- a/Resources/text/changelog.txt
+++ b/Resources/text/changelog.txt
@@ -349,4 +349,7 @@ http://projectpokemon.org/forums/showthread.php?36986
  - Added: Basic ORAS Support
 
 11/22/14 - New Update:
- - Improved ORAS support
\ No newline at end of file
+ - Improved ORAS support
+
+11/26/14 - New Update
+ - Improved ORAS support with more features.
\ No newline at end of file
diff --git a/Resources/text/de/text_ItemPouch_de.txt b/Resources/text/de/text_ItemPouch_de.txt
index f4795656c..b1d15662c 100644
--- a/Resources/text/de/text_ItemPouch_de.txt
+++ b/Resources/text/de/text_ItemPouch_de.txt
@@ -2,4 +2,4 @@ Items
 Medizin
 TM & VM
 Beeren
-Basis-Items
+Basis-Items
\ No newline at end of file
diff --git a/Resources/text/de/text_Puff_de.txt b/Resources/text/de/text_Puff_de.txt
index 07a19ecda..e9df7140b 100644
--- a/Resources/text/de/text_Puff_de.txt
+++ b/Resources/text/de/text_Puff_de.txt
@@ -23,4 +23,4 @@ Ehrungsdeko-Pofflé
 Frühlingsdeko-Pofflé
 Sommerdeko-Pofflé
 Herbstdeko-Pofflé
-Winterdeko-Pofflé
+Winterdeko-Pofflé
\ No newline at end of file
diff --git a/Resources/text/de/text_TrainingBag_de.txt b/Resources/text/de/text_TrainingBag_de.txt
index dfb339698..d64a4665b 100644
--- a/Resources/text/de/text_TrainingBag_de.txt
+++ b/Resources/text/de/text_TrainingBag_de.txt
@@ -24,4 +24,4 @@ Expander-Sack
 Dopplungs-Sack
 Flare-Sack
 Tabula Ra-Sack
-Relax-Sack
+Relax-Sack
\ No newline at end of file
diff --git a/Resources/text/de/text_xy_00000_de.txt b/Resources/text/de/text_xy_00000_de.txt
index b5ce419fa..3521732a7 100644
--- a/Resources/text/de/text_xy_00000_de.txt
+++ b/Resources/text/de/text_xy_00000_de.txt
@@ -352,4 +352,4 @@ Geheime Küste
 
 Geheime Blumenwiese
 
-Geheimbasis
+Geheimbasis
\ No newline at end of file
diff --git a/Resources/text/de/text_xy_30000_de.txt b/Resources/text/de/text_xy_30000_de.txt
index a8c085c19..7fb5a229e 100644
--- a/Resources/text/de/text_xy_30000_de.txt
+++ b/Resources/text/de/text_xy_30000_de.txt
@@ -8,4 +8,4 @@ Entferntes Land
 －－－－－－－－－－
 Einall-Region
 Kalos-Region
-Pokémon-Link
+Pokémon-Link
\ No newline at end of file
diff --git a/Resources/text/de/text_xy_40000_de.txt b/Resources/text/de/text_xy_40000_de.txt
index 2a97dab1c..cd40f538a 100644
--- a/Resources/text/de/text_xy_40000_de.txt
+++ b/Resources/text/de/text_xy_40000_de.txt
@@ -76,4 +76,4 @@ VGC 2014
 VGC 2015
 VGC 2016
 VGC 2017
-VGC 2018
+VGC 2018
\ No newline at end of file
diff --git a/Resources/text/en/text_ItemPouch_en.txt b/Resources/text/en/text_ItemPouch_en.txt
index 87f76ca8f..eba41057e 100644
--- a/Resources/text/en/text_ItemPouch_en.txt
+++ b/Resources/text/en/text_ItemPouch_en.txt
@@ -2,4 +2,4 @@ ITEMS
 MEDICINE
 TMs & HMs
 BERRIES
-KEY ITEMS
+KEY ITEMS
\ No newline at end of file
diff --git a/Resources/text/en/text_Puff_en.txt b/Resources/text/en/text_Puff_en.txt
index 7323aba21..8d83af31b 100644
--- a/Resources/text/en/text_Puff_en.txt
+++ b/Resources/text/en/text_Puff_en.txt
@@ -23,4 +23,4 @@ Supreme Honor Poké Puff
 Supreme Spring Poké Puff
 Supreme Summer Poké Puff
 Supreme Autumn Poké Puff
-Supreme Winter Poké Puff
+Supreme Winter Poké Puff
\ No newline at end of file
diff --git a/Resources/text/en/text_TrainingBag_en.txt b/Resources/text/en/text_TrainingBag_en.txt
index 4d1e4b5ef..4b291eb93 100644
--- a/Resources/text/en/text_TrainingBag_en.txt
+++ b/Resources/text/en/text_TrainingBag_en.txt
@@ -24,4 +24,4 @@ Big-Shot Bag
 Double-Up Bag
 Team Flare Bag
 Reset Bag
-Soothing Bag
+Soothing Bag
\ No newline at end of file
diff --git a/Resources/text/en/text_xy_00000_en.txt b/Resources/text/en/text_xy_00000_en.txt
index d19d31b9c..8d2dd6f94 100644
--- a/Resources/text/en/text_xy_00000_en.txt
+++ b/Resources/text/en/text_xy_00000_en.txt
@@ -352,4 +352,4 @@ Secret Shore
 
 Secret Meadow
 
-Secret Base
+Secret Base
\ No newline at end of file
diff --git a/Resources/text/en/text_xy_30000_en.txt b/Resources/text/en/text_xy_30000_en.txt
index e49bf99e1..a994345e3 100644
--- a/Resources/text/en/text_xy_30000_en.txt
+++ b/Resources/text/en/text_xy_30000_en.txt
@@ -8,4 +8,4 @@ a distant land
 ----------
 the Unova region
 the Kalos region
-Pokémon Link
+Pokémon Link
\ No newline at end of file
diff --git a/Resources/text/en/text_xy_40000_en.txt b/Resources/text/en/text_xy_40000_en.txt
index 66556fd36..685d29218 100644
--- a/Resources/text/en/text_xy_40000_en.txt
+++ b/Resources/text/en/text_xy_40000_en.txt
@@ -76,4 +76,4 @@ the VGC 2014
 the VGC 2015
 the VGC 2016
 the VGC 2017
-the VGC 2018
+the VGC 2018
\ No newline at end of file
diff --git a/Resources/text/es/text_ItemPouch_es.txt b/Resources/text/es/text_ItemPouch_es.txt
index 7acfdc8f1..733b4122f 100644
--- a/Resources/text/es/text_ItemPouch_es.txt
+++ b/Resources/text/es/text_ItemPouch_es.txt
@@ -2,4 +2,4 @@ Objetos
 Botiquín
 MT/MO
 Bayas
-Objetos Clave
+Objetos Clave
\ No newline at end of file
diff --git a/Resources/text/es/text_Puff_es.txt b/Resources/text/es/text_Puff_es.txt
index ce33d3a8d..3e3889cb8 100644
--- a/Resources/text/es/text_Puff_es.txt
+++ b/Resources/text/es/text_Puff_es.txt
@@ -23,4 +23,4 @@ Pokélito de Celebración
 Pokélito Primaveral
 Pokélito Estival
 Pokélito Otoñal
-Pokélito Invernal
+Pokélito Invernal
\ No newline at end of file
diff --git a/Resources/text/es/text_TrainingBag_es.txt b/Resources/text/es/text_TrainingBag_es.txt
index 3abf6894c..6408b426b 100644
--- a/Resources/text/es/text_TrainingBag_es.txt
+++ b/Resources/text/es/text_TrainingBag_es.txt
@@ -24,4 +24,4 @@ Saco Tamaño ↑
 Saco Mejora x2
 Saco Team Flare
 Saco Reinicio
-Saco Relax
+Saco Relax
\ No newline at end of file
diff --git a/Resources/text/es/text_xy_00000_es.txt b/Resources/text/es/text_xy_00000_es.txt
index 000704a39..4a3901587 100644
--- a/Resources/text/es/text_xy_00000_es.txt
+++ b/Resources/text/es/text_xy_00000_es.txt
@@ -352,4 +352,4 @@ Costa Secreta
 
 Prado Secreto
 
-Base Secreta
+Base Secreta
\ No newline at end of file
diff --git a/Resources/text/es/text_xy_30000_es.txt b/Resources/text/es/text_xy_30000_es.txt
index 2a44f6ac5..6441ce746 100644
--- a/Resources/text/es/text_xy_30000_es.txt
+++ b/Resources/text/es/text_xy_30000_es.txt
@@ -8,4 +8,4 @@ Tierra lejana
 －－－－－－－－－－
 Teselia
 Kalos
-Nexo Pokémon
+Nexo Pokémon
\ No newline at end of file
diff --git a/Resources/text/es/text_xy_40000_es.txt b/Resources/text/es/text_xy_40000_es.txt
index bfd4d46ed..2fdb56510 100644
--- a/Resources/text/es/text_xy_40000_es.txt
+++ b/Resources/text/es/text_xy_40000_es.txt
@@ -76,4 +76,4 @@ Camp. de Videojuegos 2014
 Camp. de Videojuegos 2015
 Camp. de Videojuegos 2016
 Camp. de Videojuegos 2017
-Camp. de Videojuegos 2018
+Camp. de Videojuegos 2018
\ No newline at end of file
diff --git a/Resources/text/fr/text_ItemPouch_fr.txt b/Resources/text/fr/text_ItemPouch_fr.txt
index ea27bf68e..fb37b17e7 100644
--- a/Resources/text/fr/text_ItemPouch_fr.txt
+++ b/Resources/text/fr/text_ItemPouch_fr.txt
@@ -2,4 +2,4 @@ OBJETS
 PV/PP
 CT & CS
 BAIES
-OBJETS RARES
+OBJETS RARES
\ No newline at end of file
diff --git a/Resources/text/fr/text_Puff_fr.txt b/Resources/text/fr/text_Puff_fr.txt
index b0a4eb5b2..1284229bc 100644
--- a/Resources/text/fr/text_Puff_fr.txt
+++ b/Resources/text/fr/text_Puff_fr.txt
@@ -23,4 +23,4 @@ Pofiterole Célébration
 Pofiterole Printemps
 Pofiterole Été
 Pofiterole Automne
-Pofiterole Hiver
+Pofiterole Hiver
\ No newline at end of file
diff --git a/Resources/text/fr/text_TrainingBag_fr.txt b/Resources/text/fr/text_TrainingBag_fr.txt
index b1c44e312..3293f5793 100644
--- a/Resources/text/fr/text_TrainingBag_fr.txt
+++ b/Resources/text/fr/text_TrainingBag_fr.txt
@@ -24,4 +24,4 @@ Sac Taille↑
 Sac Gain↑
 Sac Team Flare
 Sac Renouveau
-Sac Relax
+Sac Relax
\ No newline at end of file
diff --git a/Resources/text/fr/text_xy_00000_fr.txt b/Resources/text/fr/text_xy_00000_fr.txt
index 7a9af4586..77c2219c5 100644
--- a/Resources/text/fr/text_xy_00000_fr.txt
+++ b/Resources/text/fr/text_xy_00000_fr.txt
@@ -352,4 +352,4 @@ Plage Secrète
 
 Champ Fleuri Secret
 
-Base Secrète
+Base Secrète
\ No newline at end of file
diff --git a/Resources/text/fr/text_xy_30000_fr.txt b/Resources/text/fr/text_xy_30000_fr.txt
index 22551d8f5..3a61bbf69 100644
--- a/Resources/text/fr/text_xy_30000_fr.txt
+++ b/Resources/text/fr/text_xy_30000_fr.txt
@@ -8,4 +8,4 @@ Pays lointain
 －－－－－－－－－－
 Unys
 Kalos
-Poké Lien
+Poké Lien
\ No newline at end of file
diff --git a/Resources/text/fr/text_xy_40000_fr.txt b/Resources/text/fr/text_xy_40000_fr.txt
index 81016c362..8ae935c82 100644
--- a/Resources/text/fr/text_xy_40000_fr.txt
+++ b/Resources/text/fr/text_xy_40000_fr.txt
@@ -76,4 +76,4 @@ Championnat de JV 2014
 Championnat de JV 2015
 Championnat de JV 2016
 Championnat de JV 2017
-Championnat de JV 2018
+Championnat de JV 2018
\ No newline at end of file
diff --git a/Resources/text/it/text_ItemPouch_it.txt b/Resources/text/it/text_ItemPouch_it.txt
index fcc5d2c7c..18f18a32f 100644
--- a/Resources/text/it/text_ItemPouch_it.txt
+++ b/Resources/text/it/text_ItemPouch_it.txt
@@ -2,4 +2,4 @@ Strumenti
 Rimedi
 MT e MN
 Bacche
-Strumenti Base
+Strumenti Base
\ No newline at end of file
diff --git a/Resources/text/it/text_Puff_it.txt b/Resources/text/it/text_Puff_it.txt
index dcf3d0d87..8054f7ee5 100644
--- a/Resources/text/it/text_Puff_it.txt
+++ b/Resources/text/it/text_Puff_it.txt
@@ -23,4 +23,4 @@ Pokébignè celebrativo
 Pokébignè primavera
 Pokébignè estate
 Pokébignè autunno
-Pokébignè inverno
+Pokébignè inverno
\ No newline at end of file
diff --git a/Resources/text/it/text_TrainingBag_it.txt b/Resources/text/it/text_TrainingBag_it.txt
index aa77babd6..5adb8ef3f 100644
--- a/Resources/text/it/text_TrainingBag_it.txt
+++ b/Resources/text/it/text_TrainingBag_it.txt
@@ -24,4 +24,4 @@ Sacco Calibro↑
 Sacco Raddoppio
 Sacco Team Flare
 Sacco Ripristino
-Sacco Relax
+Sacco Relax
\ No newline at end of file
diff --git a/Resources/text/it/text_xy_00000_it.txt b/Resources/text/it/text_xy_00000_it.txt
index b4de7474a..8abfadad1 100644
--- a/Resources/text/it/text_xy_00000_it.txt
+++ b/Resources/text/it/text_xy_00000_it.txt
@@ -352,4 +352,4 @@ Baia Segreta
 
 Valle Segreta
 
-Base Segreta
+Base Segreta
\ No newline at end of file
diff --git a/Resources/text/it/text_xy_30000_it.txt b/Resources/text/it/text_xy_30000_it.txt
index 0e62e151e..6b1e3181d 100644
--- a/Resources/text/it/text_xy_30000_it.txt
+++ b/Resources/text/it/text_xy_30000_it.txt
@@ -8,4 +8,4 @@ Terra Lontana
 ----------
 Unima
 Kalos
-Pokémon Link
+Pokémon Link
\ No newline at end of file
diff --git a/Resources/text/it/text_xy_40000_it.txt b/Resources/text/it/text_xy_40000_it.txt
index f51eb8ad1..780e656e8 100644
--- a/Resources/text/it/text_xy_40000_it.txt
+++ b/Resources/text/it/text_xy_40000_it.txt
@@ -76,4 +76,4 @@ Campionati 2014
 Campionati 2015
 Campionati 2016
 Campionati 2017
-Campionati 2018
+Campionati 2018
\ No newline at end of file
diff --git a/Resources/text/ja/text_ItemPouch_ja.txt b/Resources/text/ja/text_ItemPouch_ja.txt
index 2a6b89bd2..4ee406559 100644
--- a/Resources/text/ja/text_ItemPouch_ja.txt
+++ b/Resources/text/ja/text_ItemPouch_ja.txt
@@ -2,4 +2,4 @@
 かいふく
 わざマシン
 きのみ
-たいせつなもの
+たいせつなもの
\ No newline at end of file
diff --git a/Resources/text/ja/text_Puff_ja.txt b/Resources/text/ja/text_Puff_ja.txt
index 4b93faa71..37680e9f4 100644
--- a/Resources/text/ja/text_Puff_ja.txt
+++ b/Resources/text/ja/text_Puff_ja.txt
@@ -23,4 +23,4 @@
 フルデコはるポフレ
 フルデコなつポフレ
 フルデコあきポフレ
-フルデコふゆポフレ
+フルデコふゆポフレ
\ No newline at end of file
diff --git a/Resources/text/ja/text_TrainingBag_ja.txt b/Resources/text/ja/text_TrainingBag_ja.txt
index 7e8335dac..2b41b1570 100644
--- a/Resources/text/ja/text_TrainingBag_ja.txt
+++ b/Resources/text/ja/text_TrainingBag_ja.txt
@@ -24,4 +24,4 @@ HPバッグL
 ダブルUPバッグ
 フレアだんバッグ
 まっさらバッグ
-リラックスバッグ
+リラックスバッグ
\ No newline at end of file
diff --git a/Resources/text/ja/text_xy_00000_ja.txt b/Resources/text/ja/text_xy_00000_ja.txt
index cd6d8ff35..7add6d2ca 100644
--- a/Resources/text/ja/text_xy_00000_ja.txt
+++ b/Resources/text/ja/text_xy_00000_ja.txt
@@ -352,4 +352,4 @@
 
 ひみつのはなばたけ
 
-ひみつきち
+ひみつきち
\ No newline at end of file
diff --git a/Resources/text/ja/text_xy_30000_ja.txt b/Resources/text/ja/text_xy_30000_ja.txt
index a36b2fa61..c6fda3ada 100644
--- a/Resources/text/ja/text_xy_30000_ja.txt
+++ b/Resources/text/ja/text_xy_30000_ja.txt
@@ -8,4 +8,4 @@
 －－－－－－－－－－
 イッシュちほう
 カロスちほう
-ポケモンリンク
+ポケモンリンク
\ No newline at end of file
diff --git a/Resources/text/ja/text_xy_40000_ja.txt b/Resources/text/ja/text_xy_40000_ja.txt
index 6623a1e1a..bab72dd33 100644
--- a/Resources/text/ja/text_xy_40000_ja.txt
+++ b/Resources/text/ja/text_xy_40000_ja.txt
@@ -76,4 +76,4 @@ VGC２０１４
 VGC２０１５
 VGC２０１６
 VGC２０１７
-VGC２０１８
+VGC２０１８
\ No newline at end of file
diff --git a/Resources/text/ko/text_ItemPouch_ko.txt b/Resources/text/ko/text_ItemPouch_ko.txt
index c25ea59cc..5c892ad9c 100644
--- a/Resources/text/ko/text_ItemPouch_ko.txt
+++ b/Resources/text/ko/text_ItemPouch_ko.txt
@@ -2,4 +2,4 @@
 회복
 기술머신
 나무열매
-중요한 물건
+중요한 물건
\ No newline at end of file
diff --git a/Resources/text/ko/text_Puff_ko.txt b/Resources/text/ko/text_Puff_ko.txt
index e6e8fb787..5d95ab8a1 100644
--- a/Resources/text/ko/text_Puff_ko.txt
+++ b/Resources/text/ko/text_Puff_ko.txt
@@ -23,4 +23,4 @@
 풀데코봄포플레
 풀데코여름포플레
 풀데코가을포플레
-풀데코겨울포플레
+풀데코겨울포플레
\ No newline at end of file
diff --git a/Resources/text/ko/text_TrainingBag_ko.txt b/Resources/text/ko/text_TrainingBag_ko.txt
index c934a94e7..18b360145 100644
--- a/Resources/text/ko/text_TrainingBag_ko.txt
+++ b/Resources/text/ko/text_TrainingBag_ko.txt
@@ -24,4 +24,4 @@ HP백L
 더블UP백
 플레어단백
 신품백
-릴랙스백
+릴랙스백
\ No newline at end of file
diff --git a/Resources/text/ko/text_xy_00000_ko.txt b/Resources/text/ko/text_xy_00000_ko.txt
index fda6b250b..f1f2eb176 100644
--- a/Resources/text/ko/text_xy_00000_ko.txt
+++ b/Resources/text/ko/text_xy_00000_ko.txt
@@ -352,4 +352,4 @@
 
 비밀의 꽃밭
 
-비밀기지
+비밀기지
\ No newline at end of file
diff --git a/Resources/text/ko/text_xy_30000_ko.txt b/Resources/text/ko/text_xy_30000_ko.txt
index 814077350..318b5649c 100644
--- a/Resources/text/ko/text_xy_30000_ko.txt
+++ b/Resources/text/ko/text_xy_30000_ko.txt
@@ -8,4 +8,4 @@
 －－－－－－－－－－
 하나지방
 칼로스지방
-포켓몬링크
+포켓몬링크
\ No newline at end of file
diff --git a/Resources/text/ko/text_xy_40000_ko.txt b/Resources/text/ko/text_xy_40000_ko.txt
index be187c868..e1c8b3a92 100644
--- a/Resources/text/ko/text_xy_40000_ko.txt
+++ b/Resources/text/ko/text_xy_40000_ko.txt
@@ -76,4 +76,4 @@ VGC2014
 VGC2015
 VGC2016
 VGC2017
-VGC2018
+VGC2018
\ No newline at end of file
diff --git a/SAV/SAV_Pokepuff.cs b/SAV/SAV_Pokepuff.cs
index 7291b1f68..514794983 100644
--- a/SAV/SAV_Pokepuff.cs
+++ b/SAV/SAV_Pokepuff.cs
@@ -90,12 +90,12 @@ private void B_Cancel_Click(object sender, EventArgs e)
         }
         private void B_All_Click(object sender, EventArgs e)
         {
-            int basepuff = 21;
+            int basepuff = 20;
             int basemod = 6;
             if (ModifierKeys == Keys.Control)
             {
-                basepuff = 16;
-                basemod = 5;
+                basepuff = 1;
+                basemod = 0x19;
             }
             byte[] newpuffs = new Byte[100];
             for (int i = 0; i < 100; i++)