From 18b081c1e3df49b5e6b4e16fa80c537df76660c8 Mon Sep 17 00:00:00 2001
From: Kaphotics <kaphotics@gmail.com>
Date: Wed, 31 Aug 2016 08:54:56 -0700
Subject: [PATCH] Move gen1item string to resource

Add gsc met locations
---
 PKHeX/MainWindow/Main.cs                      |  17 ++-
 PKHeX/PKHeX.csproj                            |   6 +
 PKHeX/PKM/PKX.cs                              |   7 --
 PKHeX/Properties/Resources.Designer.cs        | 111 ++++++++++++++++++
 PKHeX/Properties/Resources.resx               |   6 +
 PKHeX/Resources/text/gen3/text_ItemsG1_en.txt | Bin 0 -> 2530 bytes
 .../Resources/text/gen3/text_gsc_00000_en.txt | Bin 0 -> 2194 bytes
 PKHeX/Subforms/Save Editors/SAV_Inventory.cs  |   2 +-
 8 files changed, 136 insertions(+), 13 deletions(-)
 create mode 100644 PKHeX/Resources/text/gen3/text_ItemsG1_en.txt
 create mode 100644 PKHeX/Resources/text/gen3/text_gsc_00000_en.txt

diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs
index eaadc2bc3..09b2dcfc7 100644
--- a/PKHeX/MainWindow/Main.cs
+++ b/PKHeX/MainWindow/Main.cs
@@ -169,8 +169,8 @@ namespace PKHeX
         public static string[] gendersymbols = { "♂", "♀", "-" };
         public static string[] specieslist, movelist, itemlist, abilitylist, types, natures, forms,
             memories, genloc, trainingbags, trainingstage, characteristics,
-            encountertypelist, gamelanguages, balllist, gamelist, pokeblocks, g3items = { };
-        public static string[] metRSEFRLG_00000 = { };
+            encountertypelist, gamelanguages, balllist, gamelist, pokeblocks, g3items, g1items = { };
+        public static string[] metGSC_00000, metRSEFRLG_00000 = { };
         public static string[] metHGSS_00000, metHGSS_02000, metHGSS_03000 = { };
         public static string[] metBW2_00000, metBW2_30000, metBW2_40000, metBW2_60000 = { };
         public static string[] metXY_00000, metXY_30000, metXY_40000, metXY_60000 = { };
@@ -1046,7 +1046,9 @@ namespace PKHeX
 
             // Past Generation strings
             g3items = Util.getStringList("ItemsG3", "en");
+            g1items = Util.getStringList("ItemsG1", "en");
             metRSEFRLG_00000 = Util.getStringList("rsefrlg_00000", "en");
+            metGSC_00000 = Util.getStringList("gsc_00000", "en");
 
             // Current Generation strings
             string l = curlanguage;
@@ -1211,9 +1213,9 @@ namespace PKHeX
             #region Met Locations
             // Gen 2
             {
-                var met_list = Util.getCBList(metRSEFRLG_00000, Enumerable.Range(0, 0x5F).ToArray());
-                met_list = Util.getOffsetCBList(met_list, metRSEFRLG_00000, 00000, new[] { 253, 254, 255 });
-                metGen2 = null;
+                var met_list = Util.getCBList(metGSC_00000, Enumerable.Range(0, 0x5F).ToArray());
+                met_list = Util.getOffsetCBList(met_list, metGSC_00000, 00000, new[] { 0x7E, 0x7F });
+                metGen2 = met_list;
             }
             // Gen 3
             {
@@ -2053,6 +2055,11 @@ namespace PKHeX
 
             switch (Version)
             {
+                case GameVersion.GSC:
+                    if (SaveFormat == 2)
+                        return metGen2;
+                    break;
+
                 case GameVersion.CXD:
                     if (SaveFormat == 3)
                         return metGen3;
diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj
index 3e73dbbef..ca856033b 100644
--- a/PKHeX/PKHeX.csproj
+++ b/PKHeX/PKHeX.csproj
@@ -2740,6 +2740,12 @@
   <ItemGroup>
     <None Include="Resources\text\version.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\text\gen3\text_gsc_00000_en.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\text\gen3\text_ItemsG1_en.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/PKHeX/PKM/PKX.cs b/PKHeX/PKM/PKX.cs
index b05a66509..e6c426290 100644
--- a/PKHeX/PKM/PKX.cs
+++ b/PKHeX/PKM/PKX.cs
@@ -2121,13 +2121,6 @@ namespace PKHeX
         };
         #endregion
 
-        #region Gen 1 Item Table
-        public static string[] getG1ItemList()
-        {
-            return new[] { "(None)", "Master Ball", "Ultra Ball", "Great Ball", "Poké Ball", "Town Map", "Bicycle", "????? (7)", "Safari Ball", "Pokédex", "Moon Stone", "Antidote", "Burn Heal", "Ice Heal", "Awakening", "Parlyz Heal", "Full Restore", "Max Potion", "Hyper Potion", "Super Potion", "Potion", "BoulderBadge", "CascadeBadge", "ThunderBadge", "RainbowBadge", "SoulBadge", "MarshBadge", "VolcanoBadge", "EarthBadge", "Escape Rope", "Repel", "Old Amber", "Fire Stone", "Thunder Stone", "Water Stone", "HP Up", "Protein", "Iron", "Carbos", "Calcium", "Rare Candy", "Dome Fossil", "Helix Fossil", "Secret Key", "????? (44)", "Bike Voucher", "X Accuracy", "Leaf Stone", "Card Key", "Nugget", "PP Up (Unused)", "Poké Doll", "Full Heal", "Revive", "Max Revive", "Guard Spec.", "Super Repel", "Max Repel", "Dire Hit", "Coin", "Fresh Water", "Soda Pop", "Lemonade", "S.S. Ticket", "Gold Teeth", "X Attack", "X Defend", "X Speed", "X Special", "Coin Case", "Oak's Parcel", "Itemfinder", "Silph Scope", "Poké Flute", "Lift Key", "Exp. All", "Old Rod", "Good Rod", "Super Rod", "PP Up", "Ether", "Max Ether", "Elixer", "Max Elixer", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "HM01", "HM02", "HM03", "HM04", "HM05", "TM01", "TM02", "TM03", "TM04", "TM05", "TM06", "TM07", "TM08", "TM09", "TM10", "TM11", "TM12", "TM13", "TM14", "TM15", "TM16", "TM17", "TM18", "TM19", "TM20", "TM21", "TM22", "TM23", "TM24", "TM25", "TM26", "TM27", "TM28", "TM29", "TM30", "TM31", "TM32", "TM33", "TM34", "TM35", "TM36", "TM37", "TM38", "TM39", "TM40", "TM41", "TM42", "TM43", "TM44", "TM45", "TM46", "TM47", "TM48", "TM49", "TM50", "TM51", "TM52", "TM53", "TM54", "TM55" };
-        }
-
-        #endregion
         public static int[] getG1LegalItems()
         {
             return Enumerable.Range(0, 7)     // 0-6
diff --git a/PKHeX/Properties/Resources.Designer.cs b/PKHeX/Properties/Resources.Designer.cs
index b30d06eb5..50c0f84e6 100644
--- a/PKHeX/Properties/Resources.Designer.cs
+++ b/PKHeX/Properties/Resources.Designer.cs
@@ -23523,6 +23523,60 @@ namespace PKHeX.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to (None)
+        ///New Bark Town
+        ///Route 29
+        ///Cherrygrove City
+        ///Route 30
+        ///Route 31
+        ///Violet City
+        ///Sprout Tower
+        ///Route 32
+        ///Ruins of Alph
+        ///Union Cave
+        ///Route 33
+        ///Azalea Town
+        ///Slowpoke Well
+        ///Ilex Forest
+        ///Route 34
+        ///Goldenrod City
+        ///Radio Tower
+        ///Route 35
+        ///National Park
+        ///Route 36
+        ///Route 37
+        ///Ecruteak City
+        ///Tin Tower
+        ///Burned Tower
+        ///Route 38
+        ///Route 39
+        ///Olivine City
+        ///Lighthouse
+        ///Battle Tower
+        ///Route 40
+        ///Whirl Islands
+        ///Route 41
+        ///Cianwood City
+        ///Route 42
+        ///Mt. Mortar
+        ///Mahogany Town
+        ///Route 43
+        ///Lake of Rage
+        ///Route 44
+        ///Ice Path
+        ///Blackthorn City
+        ///Dragon&apos;s Den
+        ///Route 45
+        ///Dark Cave
+        ///Rout [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string text_gsc_00000_en {
+            get {
+                return ResourceManager.GetString("text_gsc_00000_en", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Mysteriöser Ort
         ///Zweiblattdorf
@@ -25098,6 +25152,63 @@ namespace PKHeX.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to (None)
+        ///Master Ball
+        ///Ultra Ball
+        ///Great Ball
+        ///Poké Ball
+        ///Town Map
+        ///Bicycle
+        ///????? (7)
+        ///Safari Ball
+        ///Pokédex
+        ///Moon Stone
+        ///Antidote
+        ///Burn Heal
+        ///Ice Heal
+        ///Awakening
+        ///Parlyz Heal
+        ///Full Restore
+        ///Max Potion
+        ///Hyper Potion
+        ///Super Potion
+        ///Potion
+        ///BoulderBadge
+        ///CascadeBadge
+        ///ThunderBadge
+        ///RainbowBadge
+        ///SoulBadge
+        ///MarshBadge
+        ///VolcanoBadge
+        ///EarthBadge
+        ///Escape Rope
+        ///Repel
+        ///Old Amber
+        ///Fire Stone
+        ///Thunder Stone
+        ///Water Stone
+        ///HP Up
+        ///Protein
+        ///Iron
+        ///Carbos
+        ///Calcium
+        ///Rare Candy
+        ///Dome Fossil
+        ///Helix Fossil
+        ///Secret Key
+        ///????? (44)
+        ///Bike Voucher
+        ///X Accuracy
+        ///Leaf Stone
+        ///Card Ke [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string text_ItemsG1_en {
+            get {
+                return ResourceManager.GetString("text_ItemsG1_en", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to (None)
         ///Master Ball
diff --git a/PKHeX/Properties/Resources.resx b/PKHeX/Properties/Resources.resx
index 17d88927d..c35a698b0 100644
--- a/PKHeX/Properties/Resources.resx
+++ b/PKHeX/Properties/Resources.resx
@@ -6397,4 +6397,10 @@
   <data name="personal_rby" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\byte\personal_rby;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="text_gsc_00000_en" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\text\gen3\text_gsc_00000_en.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+  <data name="text_ItemsG1_en" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\text\gen3\text_ItemsG1_en.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/PKHeX/Resources/text/gen3/text_ItemsG1_en.txt b/PKHeX/Resources/text/gen3/text_ItemsG1_en.txt
new file mode 100644
index 0000000000000000000000000000000000000000..11753da3d53dfc006269d407adb3d6993f320079
GIT binary patch
literal 2530
zcmds2$#N4x4AptQVs3;>irEO9C>w7Skhn4qa5c6QyS$b?&i2Rr1n{2Pt(m6s1=Lh0
zYPF;%y_VX4exJ#uY-J-ec`cEAm9ZS8!fr3Iw6R;^i{u7>E9l07whzq=x+>5P5pOBK
z0^JC@2cX1?utUVQEMy{2SS!Sc<b!>&oXLe|QzG^))*iOaY&^mgo{yUKR%?i*L@utH
zNLs+F;5mhc6%q4@Sj=Led9$)l$Y2&|TF7*a3TCieVBNuLs9CI#?{i?=LqswZ%QfuD
z+*UbpOg=)-T$u&4ih%nhJ6Mw4@T5efmrp{wHX;#|weR(YrpS=heMF82R5R8y-km=g
z$s9hL7ksW^#TtJi>O&B%JmECsusim^m<N{MV7XG<4Wy=hSM95R?7OEdSuJ_nYTc1C
zNF8tGN-K<Uhil}<N+anZQ}$bU%VBNd*>~XkUT${A0NlsuY4+g|F<pO<2lfN^l*s2^
znK_(xta1S+*VvOemksU6?Gv;e_^vg_9;5@lh1SD<TR~<=geN6VCK`!T^cg$G38x{K
zT<3u^!@i7#oFCyg$Bx|mfUbr81X@lhCo7UKIOPO|thl<S4YW&m-Dww9@ERIBoWvW{
zc0?UBRLB>?&t9yxy4Rtef_knv5BJFT9{=lU2(^7gCX39a)GnCFIjozrKo8#)>_0Nt
z)OCQdhYe?Xf!pT2Z6WandwRltjiv4d#@_;yZyBp$7m%qn<PEf(EZUswie-do6Xl)J
z`>^8lQ9r}S?)Lmw*pd6?Nz=jkEf%}O*|;jnWpmH2;!9iS9-pR}nOxy)DX(w`%$I!e
z#d2>KyL$}`*6UsbX3n15Y1Jic{e0Co*TeZyCxewQ;NR@ME;!zydUlk%Uq6kURc1~O
zD7opSCcH6cRrgUOUFFI3s=vjit_vhi2k)}(mQWkv<bVDK_-%Y632JmwYEouWZc+hh
zWFAhUhm+{xBzich_IPW$3zOcN^!_9z$j135niZoY;xQ8O7zth{Z|5-*@fZny%l)ax
zNW^2LhLIXZY8a_uq=u1-$4Ct$HH=g|Mrs(DVPuAp8AfIpnPFsxkr_s27@1*YhLIaa
oZWy^?<c7hQ+_8}xMs66nVdRF98%ALmg<%wiQ5Z&H7zHr?0!M*ko&W#<

literal 0
HcmV?d00001

diff --git a/PKHeX/Resources/text/gen3/text_gsc_00000_en.txt b/PKHeX/Resources/text/gen3/text_gsc_00000_en.txt
new file mode 100644
index 0000000000000000000000000000000000000000..752afca75c79433b73b180268edfd6170684bfc1
GIT binary patch
literal 2194
zcmbuAOH<oW428A!ugI?Lrqew7S^|MiW`Ht;!rBcGQbNKwPE-2h+kQv3@x3>|rjv=s
zmUN|~qsRUG=d~T%(iV1QZ!F{e$~M-qUCXVoTi(vlZqR3T%G=sXEIQV+&q(&{hOdI(
zgH3rZ?Wb$^Y=+%Ka;9(Zwj^C7=U6Xo&dCzb?b)&2yHCYza41@gqz@KJ)_7Ui3d^Nk
z^W4GXJ@_*FhFlRA?mc&msgFK(JNBEbg(H8Ar@Y6=#KAq!ThH%;=bT?=Be(yB{Q=qn
z`3khD_W_bG=;wBc#lo|?bTlnbIXa<yDbx4(IR;%>=OeToJE?1xM*Xmb<0F!Nn-IUM
zW9}7h89#FlV+6a{7GS;tU#toHp>LnIqNzi^f^Y`os*U=ljdh4@N_|TH>Z=v{%=@lH
zrYbxiZQz}B!O0oe#KDO3b9h*Qa+M$%n7T}nrQZ;3>AAF6!b}F<Pe)*Qi{B$`3*I#i
z8DF`how}!oM}+Bg3{3rWh*i}uRY#ukJ@qW(c<PQ3RZ+&Or5F(t%4dRyiXqh?<ZlQf
z`BPuNBIk|`@vx0VJu}3zn&v&;G^25^3{1T;hM~D@3y;)T3X{6Mn$M^AK{Lk%KGerz
zIz$_0ta&}b+lI_E&(GP3!>|s@G{vpD%E#LAy&P3M$2i1IDABjJg{HKqH`?02V>_{R
z?lyPMS-V}Dc^)F4)|{1feV*oCGZ|t?=SWi|y*fb?Av~HTZJ+R5*Jt7c%Z(#bFI5wv
zeWYGg-J9H+*%G6bu7kIycaRvCr%Ug(uv%lJ*ZhhtO^i(45lgC_-QFi%pP1MttykC5
zdUd^T<5MZ0UEfRx@HSztR^FRo4)N)R?e?D2oi&C5WxC{fM-|d-qfMf!<o2DvIy$t7
zbMN^!3ZwRX<LDNgFcI1}+AOjV=jmxp#mMWZ4%2;6)mgKYlVxh3-U2-nLz?0n`{Cyg
nIH&ne_hzqVE=Qvqc+80zw_x^PKTUx)R&}R0_vn7zou&N)4Xj`C

literal 0
HcmV?d00001

diff --git a/PKHeX/Subforms/Save Editors/SAV_Inventory.cs b/PKHeX/Subforms/Save Editors/SAV_Inventory.cs
index c997680e7..7af4b06b4 100644
--- a/PKHeX/Subforms/Save Editors/SAV_Inventory.cs	
+++ b/PKHeX/Subforms/Save Editors/SAV_Inventory.cs	
@@ -13,7 +13,7 @@ namespace PKHeX
             switch (SAV.Generation)
             {
                 case 1:
-                    itemlist = PKX.getG1ItemList();
+                    itemlist = Main.g1items;
                     B_GiveAll.Visible = false; // Can't give all, not enough room
                     break;
                 case 3: