Merge pull request #4 from kwsch/master

Update

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 = { };
+            encountertypelist, gamelanguages, balllist, gamelist, pokeblocks, g3items, g1items = { };
-        public static string[] metRSEFRLG_00000 = { };
+        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());
+                var met_list = Util.getCBList(metGSC_00000, Enumerable.Range(0, 0x5F).ToArray());
-                met_list = Util.getOffsetCBList(met_list, metRSEFRLG_00000, 00000, new[] { 253, 254, 255 });
+                met_list = Util.getOffsetCBList(met_list, metGSC_00000, 00000, new[] { 0x7E, 0x7F });
-                metGen2 = null;
+                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;

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.

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

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

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>

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: