From 2e938a6ab28ef41b321ef56e3b9a8d128aebefc2 Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Fri, 2 Sep 2016 14:20:39 -0700
Subject: [PATCH] Initial (pretty broken) US SAV2 loading/viewing

---
 PKHeX/MainWindow/Main.cs                      |  51 +-
 PKHeX/MainWindow/MainPK2.cs                   | 133 ++++
 PKHeX/Misc/personal_gs                        | Bin 0 -> 8064 bytes
 PKHeX/PKHeX.csproj                            |  12 +
 PKHeX/PKM/PK2.cs                              |  85 ++-
 PKHeX/PKM/PKM.cs                              |   4 +-
 PKHeX/PKM/PKX.cs                              |   2 +
 PKHeX/PersonalInfo/PersonalInfoG2.cs          |  80 +++
 PKHeX/PersonalInfo/PersonalTable.cs           |   9 +
 PKHeX/Properties/Resources.Designer.cs        |  74 +++
 PKHeX/Properties/Resources.resx               |   9 +
 PKHeX/Resources/byte/personal_c               | Bin 0 -> 8064 bytes
 PKHeX/Resources/byte/personal_gs              | Bin 0 -> 8064 bytes
 PKHeX/Resources/text/gen3/text_ItemsG2_en.txt | 255 ++++++++
 PKHeX/Saves/SAV2.cs                           | 569 ++++++++++++++++++
 PKHeX/Saves/SaveFile.cs                       |   2 +
 PKHeX/Saves/SaveUtil.cs                       |  81 +++
 17 files changed, 1342 insertions(+), 24 deletions(-)
 create mode 100644 PKHeX/MainWindow/MainPK2.cs
 create mode 100644 PKHeX/Misc/personal_gs
 create mode 100644 PKHeX/PersonalInfo/PersonalInfoG2.cs
 create mode 100644 PKHeX/Resources/byte/personal_c
 create mode 100644 PKHeX/Resources/byte/personal_gs
 create mode 100644 PKHeX/Resources/text/gen3/text_ItemsG2_en.txt
 create mode 100644 PKHeX/Saves/SAV2.cs

diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs
index 09b2dcfc7..2785d802d 100644
--- a/PKHeX/MainWindow/Main.cs
+++ b/PKHeX/MainWindow/Main.cs
@@ -169,7 +169,7 @@ public Main()
         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, g1items = { };
+            encountertypelist, gamelanguages, balllist, gamelist, pokeblocks, g3items, g2items, 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 = { };
@@ -874,9 +874,10 @@ private void loadSAV(SaveFile sav, string path)
             GB_Markings.Visible = SAV.Generation > 2;
 
             Label_HeldItem.Visible = CB_HeldItem.Visible = SAV.Generation > 1;
-            Label_Total.Visible = TB_IVTotal.Visible = TB_EVTotal.Visible = L_Potential.Visible =
-                Label_HiddenPowerPrefix.Visible = CB_HPType.Visible = SAV.Generation > 1;
-            Label_CharacteristicPrefix.Visible = L_Characteristic.Visible = SAV.Generation > 1;
+            Label_Total.Visible = TB_IVTotal.Visible = TB_EVTotal.Visible = L_Potential.Visible = SAV.Generation > 2;
+            Label_HiddenPowerPrefix.Visible = CB_HPType.Visible = SAV.Generation > 1;
+            CB_HPType.Enabled = SAV.Generation > 2;
+            Label_CharacteristicPrefix.Visible = L_Characteristic.Visible = SAV.Generation > 2;
             Label_ContestStats.Visible = Label_Cool.Visible = Label_Tough.Visible = Label_Smart.Visible =
                 Label_Sheen.Visible = Label_Beauty.Visible = Label_Cute.Visible = TB_Cool.Visible = TB_Tough.Visible =
                     TB_Smart.Visible = TB_Sheen.Visible = TB_Beauty.Visible = TB_Cute.Visible = Label_Nature.Visible =
@@ -941,6 +942,11 @@ private void loadSAV(SaveFile sav, string path)
                     getPKMfromFields = preparePK1;
                     extraBytes = new byte[] {};
                     break;
+                case 2:
+                    getFieldsfromPKM = populateFieldsPK2;
+                    getPKMfromFields = preparePK2;
+                    extraBytes = new byte[] { };
+                    break;
                 case 3:
                     getFieldsfromPKM = populateFieldsPK3;
                     getPKMfromFields = preparePK3;
@@ -970,7 +976,7 @@ private void loadSAV(SaveFile sav, string path)
             bool init = fieldsInitialized;
             fieldsInitialized = false;
             populateFilteredDataSources();
-            populateFields((pkm.Format != SAV.Generation || SAV.Generation == 1) ? SAV.BlankPKM : pk);
+            populateFields((pkm.Format != SAV.Generation || SAV.Generation < 3) ? SAV.BlankPKM : pk);
             fieldsInitialized |= init;
 
             // SAV Specific Limits
@@ -1046,6 +1052,7 @@ private void InitializeStrings()
 
             // Past Generation strings
             g3items = Util.getStringList("ItemsG3", "en");
+            g2items = Util.getStringList("ItemsG2", "en");
             g1items = Util.getStringList("ItemsG1", "en");
             metRSEFRLG_00000 = Util.getStringList("rsefrlg_00000", "en");
             metGSC_00000 = Util.getStringList("gsc_00000", "en");
@@ -1271,6 +1278,8 @@ private void populateFilteredDataSources()
                 string[] items = itemlist;
                 if (SAV.Generation == 3)
                     items = g3items;
+                if (SAV.Generation == 2)
+                    items = g2items;
 
                 ItemDataSource = Util.getCBList(items, (HaX ? Enumerable.Range(0, SAV.MaxItemID) : SAV.HeldItems.Select(i => (int)i)).ToArray());
                 CB_HeldItem.DataSource = new BindingSource(ItemDataSource.Where(i => i.Value <= SAV.MaxItemID).ToList(), null);
@@ -1410,7 +1419,7 @@ private void setIsShiny(object sender)
             bool isShiny = pkm.IsShiny;
 
             // Set the Controls
-            BTN_Shinytize.Visible = BTN_Shinytize.Enabled = !isShiny && SAV.Generation > 2;
+            BTN_Shinytize.Visible = BTN_Shinytize.Enabled = !isShiny && SAV.Generation > 1;
             Label_IsShiny.Visible = isShiny && SAV.Generation > 1;
 
             // Refresh Markings (for Shiny Star if applicable)
@@ -1707,6 +1716,16 @@ private void updateIVs(object sender, EventArgs e)
             if (SAV.Generation < 3)
             {
                 TB_HPIV.Text = pkm.IV_HP.ToString("00");
+                if (SAV.Generation == 2)
+                {
+                    Label_Gender.Text = gendersymbols[pkm.Gender];
+                    Label_Gender.ForeColor = pkm.Gender == 2
+                        ? Label_Species.ForeColor
+                        : (pkm.Gender == 1 ? Color.Red : Color.Blue);
+                    CB_Form.SelectedIndex = pkm.AltForm;
+                    setIsShiny(null);
+                    getQuickFiller(dragout);
+                }
             }
                     
             CB_HPType.SelectedValue = pkm.HPType;
@@ -2260,6 +2279,8 @@ private void updateIsEgg(object sender, EventArgs e)
             {
                 CHK_Nicknamed.Checked = false;
                 TB_Friendship.Text = "1";
+                if (SAV.Generation == 2)
+                    pkm.IsEgg = true;
 
                 // If we are an egg, it won't have a met location.
                 CHK_AsEgg.Checked = true;
@@ -2273,6 +2294,9 @@ private void updateIsEgg(object sender, EventArgs e)
                 if (!CHK_Nicknamed.Checked)
                     updateNickname(null, null);
 
+                if (SAV.Generation == 2)
+                    pkm.IsEgg = false;
+
                 TB_Friendship.Text = SAV.Personal[Util.getIndex(CB_Species)].BaseFriendship.ToString();
 
                 if (CB_EggLocation.SelectedIndex == 0)
@@ -2284,7 +2308,7 @@ private void updateIsEgg(object sender, EventArgs e)
             }
             // Display hatch counter if it is an egg, Display Friendship if it is not.
             Label_HatchCounter.Visible = CHK_IsEgg.Checked && SAV.Generation > 1;
-            Label_Friendship.Visible = !CHK_IsEgg.Checked && SAV.Generation > 2;
+            Label_Friendship.Visible = !CHK_IsEgg.Checked && SAV.Generation > 1;
 
 
             // Update image to (not) show egg.
@@ -2313,7 +2337,16 @@ private void updateShinyPID(object sender, EventArgs e)
             pkm.AltForm = CB_Form.SelectedIndex;
             pkm.Version = Util.getIndex(CB_GameOrigin);
 
-            pkm.setShinyPID();
+            if (pkm.Format > 2)
+                pkm.setShinyPID();
+            else
+            {
+                TB_ATKIV.Text = "15";
+                TB_DEFIV.Text = "10";
+                TB_SPEIV.Text = "10";
+                TB_SPAIV.Text = "10";
+                updateIVs(null, null);
+            }
             TB_PID.Text = pkm.PID.ToString("X8");
 
             if (pkm.GenNumber < 6 && TB_EC.Visible)
@@ -3454,7 +3487,7 @@ private void B_OpenPokedex_Click(object sender, EventArgs e)
                 new SAV_PokedexORAS().ShowDialog();
             else if (SAV.XY)
                 new SAV_PokedexXY().ShowDialog();
-            else if (SAV.RBY)
+            else if (SAV.RBY || SAV.GSC)
                 new SAV_SimplePokedex().ShowDialog();
         }
         private void B_OUTPasserby_Click(object sender, EventArgs e)
diff --git a/PKHeX/MainWindow/MainPK2.cs b/PKHeX/MainWindow/MainPK2.cs
new file mode 100644
index 000000000..1e83a5109
--- /dev/null
+++ b/PKHeX/MainWindow/MainPK2.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Drawing;
+
+namespace PKHeX
+{
+    public partial class Main
+    {
+        private void populateFieldsPK2()
+        {
+            PK2 pk2 = pkm as PK2;
+            if (pk2 == null)
+                return;
+
+            // Do first
+            pk2.Stat_Level = PKX.getLevel(pk2.Species, pk2.EXP);
+            if (pk2.Stat_Level == 100)
+                pk2.EXP = PKX.getEXP(pk2.Stat_Level, pk2.Species);
+
+            CB_Species.SelectedValue = pk2.Species;
+            TB_Level.Text = pk2.Stat_Level.ToString();
+            TB_EXP.Text = pk2.EXP.ToString();
+            CB_HeldItem.SelectedValue = pk2.HeldItem;
+            CB_Form.SelectedIndex = pk2.AltForm;
+            CHK_IsEgg.Checked = pk2.IsEgg;
+
+            // Load rest
+            TB_TID.Text = pk2.TID.ToString("00000");
+            CHK_Nicknamed.Checked = pk2.IsNicknamed;
+            TB_Nickname.Text = pk2.Nickname;
+            TB_OT.Text = pk2.OT_Name;
+            GB_OT.BackgroundImage = null;
+
+            // Reset Label and ComboBox visibility, as well as non-data checked status.
+            Label_PKRS.Visible = false;
+            Label_PKRSdays.Visible = false;
+
+            TB_HPIV.Text = pk2.IV_HP.ToString();
+            TB_ATKIV.Text = pk2.IV_ATK.ToString();
+            TB_DEFIV.Text = pk2.IV_DEF.ToString();
+            TB_SPEIV.Text = pk2.IV_SPE.ToString();
+            TB_SPAIV.Text = pk2.IV_SPA.ToString();
+
+            TB_HPEV.Text = pk2.EV_HP.ToString();
+            TB_ATKEV.Text = pk2.EV_ATK.ToString();
+            TB_DEFEV.Text = pk2.EV_DEF.ToString();
+            TB_SPEEV.Text = pk2.EV_SPE.ToString();
+            TB_SPAEV.Text = pk2.EV_SPA.ToString();
+
+            CB_Move1.SelectedValue = pk2.Move1;
+            CB_Move2.SelectedValue = pk2.Move2;
+            CB_Move3.SelectedValue = pk2.Move3;
+            CB_Move4.SelectedValue = pk2.Move4;
+            CB_PPu1.SelectedIndex = pk2.Move1_PPUps;
+            CB_PPu2.SelectedIndex = pk2.Move2_PPUps;
+            CB_PPu3.SelectedIndex = pk2.Move3_PPUps;
+            CB_PPu4.SelectedIndex = pk2.Move4_PPUps;
+            TB_PP1.Text = pk2.Move1_PP.ToString();
+            TB_PP2.Text = pk2.Move2_PP.ToString();
+            TB_PP3.Text = pk2.Move3_PP.ToString();
+            TB_PP4.Text = pk2.Move4_PP.ToString();
+
+            CB_Language.SelectedIndex = pk2.Japanese ? 0 : 1;
+
+            updateStats();
+            setIsShiny(null);
+
+            Label_Gender.Text = gendersymbols[pk2.Gender];
+            Label_Gender.ForeColor = pk2.Gender == 2 ? Label_Species.ForeColor : (pk2.Gender == 1 ? Color.Red : Color.Blue);
+            TB_EXP.Text = pk2.EXP.ToString();
+        }
+        private PKM preparePK2()
+        {
+            PK2 pk2 = pkm as PK2;
+            if (pk2 == null)
+                return null;
+
+            pk2.Species = Util.getIndex(CB_Species);
+            pk2.TID = Util.ToInt32(TB_TID.Text);
+            pk2.EXP = Util.ToUInt32(TB_EXP.Text);
+            pk2.HeldItem = Util.getIndex(CB_HeldItem);
+            pk2.IsEgg = CHK_IsEgg.Checked;
+
+            pk2.EV_HP = Util.ToInt32(TB_HPEV.Text);
+            pk2.EV_ATK = Util.ToInt32(TB_ATKEV.Text);
+            pk2.EV_DEF = Util.ToInt32(TB_DEFEV.Text);
+            pk2.EV_SPE = Util.ToInt32(TB_SPEEV.Text);
+            pk2.EV_SPC = Util.ToInt32(TB_SPAEV.Text);
+
+            pk2.Nickname = TB_Nickname.Text;
+            pk2.Move1 = Util.getIndex(CB_Move1);
+            pk2.Move2 = Util.getIndex(CB_Move2);
+            pk2.Move3 = Util.getIndex(CB_Move3);
+            pk2.Move4 = Util.getIndex(CB_Move4);
+            pk2.Move1_PP = Util.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
+            pk2.Move2_PP = Util.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
+            pk2.Move3_PP = Util.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
+            pk2.Move4_PP = Util.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
+            pk2.Move1_PPUps = Util.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
+            pk2.Move2_PPUps = Util.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
+            pk2.Move3_PPUps = Util.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
+            pk2.Move4_PPUps = Util.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
+
+            pk2.IV_HP = Util.ToInt32(TB_HPIV.Text);
+            pk2.IV_ATK = Util.ToInt32(TB_ATKIV.Text);
+            pk2.IV_DEF = Util.ToInt32(TB_DEFIV.Text);
+            pk2.IV_SPE = Util.ToInt32(TB_SPEIV.Text);
+            pk2.IV_SPA = Util.ToInt32(TB_SPAIV.Text);
+
+            pk2.OT_Name = TB_OT.Text;
+
+            // Toss in Party Stats
+            Array.Resize(ref pk2.Data, pk2.SIZE_PARTY);
+            pk2.Stat_Level = Util.ToInt32(TB_Level.Text);
+            pk2.Stat_HPCurrent = Util.ToInt32(Stat_HP.Text);
+            pk2.Stat_HPMax = Util.ToInt32(Stat_HP.Text);
+            pk2.Stat_ATK = Util.ToInt32(Stat_ATK.Text);
+            pk2.Stat_DEF = Util.ToInt32(Stat_DEF.Text);
+            pk2.Stat_SPE = Util.ToInt32(Stat_SPE.Text);
+            pk2.Stat_SPA = Util.ToInt32(Stat_SPA.Text);
+            pk2.Stat_SPD = Util.ToInt32(Stat_SPD.Text);
+
+            if (HaX)
+            {
+                pk2.Stat_Level = (byte)Math.Min(Convert.ToInt32(MT_Level.Text), byte.MaxValue);
+            }
+
+            // Fix Moves if a slot is empty 
+            pk2.FixMoves();
+
+            return pk2;
+        }
+    }
+}
diff --git a/PKHeX/Misc/personal_gs b/PKHeX/Misc/personal_gs
new file mode 100644
index 0000000000000000000000000000000000000000..05130b80bd5e223b6cf75993482d10c16f8a033d
GIT binary patch
literal 8064
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

literal 0
HcmV?d00001

diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj
index ca856033b..b4231e5b5 100644
--- a/PKHeX/PKHeX.csproj
+++ b/PKHeX/PKHeX.csproj
@@ -73,6 +73,9 @@
     <Compile Include="Legality\Tables3.cs" />
     <Compile Include="Legality\Tables5.cs" />
     <Compile Include="Legality\Tables4.cs" />
+    <Compile Include="MainWindow\MainPK2.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="MainWindow\MainPK1.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -93,6 +96,7 @@
     <Compile Include="PersonalInfo\PersonalInfo.cs" />
     <Compile Include="PersonalInfo\PersonalInfoB2W2.cs" />
     <Compile Include="PersonalInfo\PersonalInfoBW.cs" />
+    <Compile Include="PersonalInfo\PersonalInfoG2.cs" />
     <Compile Include="PersonalInfo\PersonalInfoG1.cs" />
     <Compile Include="PersonalInfo\PersonalInfoG3.cs" />
     <Compile Include="PersonalInfo\PersonalInfoG4.cs" />
@@ -100,6 +104,7 @@
     <Compile Include="PersonalInfo\PersonalInfoXY.cs" />
     <Compile Include="PersonalInfo\PersonalTable.cs" />
     <Compile Include="PKM\PK1.cs" />
+    <Compile Include="PKM\PK2.cs" />
     <Compile Include="PKM\PKM.cs" />
     <Compile Include="PKM\PKMConverter.cs" />
     <Compile Include="PKM\ShowdownSet.cs" />
@@ -119,6 +124,7 @@
     <Compile Include="Saves\BlockInfo.cs" />
     <Compile Include="Saves\BoxWallpaper.cs" />
     <Compile Include="Saves\Inventory.cs" />
+    <Compile Include="Saves\SAV2.cs" />
     <Compile Include="Saves\SAV1.cs" />
     <Compile Include="Saves\SAV3.cs" />
     <Compile Include="Saves\SAV4.cs" />
@@ -422,6 +428,7 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="Misc\personal_gs" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -471,9 +478,11 @@
     <None Include="Resources\byte\lvlmove_xy.pkl" />
     <None Include="Resources\byte\personal_b2w2" />
     <None Include="Resources\byte\personal_bw" />
+    <None Include="Resources\byte\personal_c" />
     <None Include="Resources\byte\personal_dp" />
     <None Include="Resources\byte\personal_e" />
     <None Include="Resources\byte\personal_fr" />
+    <None Include="Resources\byte\personal_gs" />
     <None Include="Resources\byte\personal_hgss" />
     <None Include="Resources\byte\personal_lg" />
     <None Include="Resources\byte\personal_pt" />
@@ -2746,6 +2755,9 @@
   <ItemGroup>
     <None Include="Resources\text\gen3\text_ItemsG1_en.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Resources\text\gen3\text_ItemsG2_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/PK2.cs b/PKHeX/PKM/PK2.cs
index 8c64b899b..bb2c26df5 100644
--- a/PKHeX/PKM/PK2.cs
+++ b/PKHeX/PKM/PK2.cs
@@ -18,7 +18,7 @@ public class PK2 : PKM
         internal const int STRLEN_U = 11;
         private int StringLength => Japanese ? STRLEN_J : STRLEN_U;
 
-        public override int Format => 1;
+        public override int Format => 2;
 
         public bool Japanese => otname.Length == STRLEN_J;
 
@@ -92,8 +92,7 @@ public override byte[] Encrypt()
         {
             // Oh god this is such total abuse of what this method is meant to do
             // Please forgive me
-            return (byte[]) Data.Clone();
-            // return new PokemonList1(this).GetBytes();
+            return new PokemonList2(this).GetBytes();
         }
 
         // Please forgive me.
@@ -213,8 +212,7 @@ public override ushort[] getStats(PersonalInfo p)
 
         public override bool getGenderIsValid()
         {
-            return true;
-            int gv = PersonalTable.GSC[Species].Gender;
+            int gv = PersonalTable.C[Species].Gender;
 
             if (gv == 255)
                 return Gender == 2;
@@ -222,29 +220,90 @@ public override bool getGenderIsValid()
                 return Gender == 0;
             if (gv == 0)
                 return Gender == 1;
-            if (gv <= (PID & 0xFF))
-                return Gender == 0;
-            if ((PID & 0xFF) < gv)
-                return Gender == 1;
-
+            switch (gv)
+            {
+                case 191:
+                    return IV_ATK >= 2 ? Gender == 0 : Gender == 1;
+                case 127:
+                    return IV_ATK >= 5 ? Gender == 0 : Gender == 1;
+                case 63:
+                    return IV_ATK >= 7 ? Gender == 0 : Gender == 1;
+                case 31:
+                    return IV_ATK >= 12 ? Gender == 0 : Gender == 1;
+            }
             return false;
         }
 
         public override bool IsEgg { get; set; }
-        public override int Gender { get { return 0; } set { } }
+
+        public override int Gender
+        {
+            get
+            {
+                int gv = PersonalTable.C[Species].Gender;
+                if (gv == 255)
+                    return 2;
+                if (gv == 254)
+                    return 0;
+                if (gv == 0)
+                    return 1;
+                switch (gv)
+                {
+                    case 191:
+                        return IV_ATK >= 2 ? 0 : 1;
+                    case 127:
+                        return IV_ATK >= 5 ? 0 : 1;
+                    case 63:
+                        return IV_ATK >= 7 ? 0 : 1;
+                    case 31:
+                        return IV_ATK >= 12 ? 0 : 1;
+                }
+                Console.WriteLine("Unknown Gender value: " + gv);
+                return 0;
+            }
+            set { }
+        }
 
         public bool hasMetData => CaughtData != 0;
 
         public override bool CanHoldItem(ushort[] ValidArray)
         {
-            return false;
+            return ValidArray.Contains((ushort)HeldItem);
         }
 
         #region Future, Unused Attributes
         public override uint EncryptionConstant { get { return 0; } set { } }
         public override uint PID { get { return 0; } set { } }
         public override int Nature { get { return 0; } set { } }
-        public override int AltForm { get { return 0; } set { } }
+
+        public override int AltForm
+        {
+            get
+            {
+                if (Species != 201) // Unown
+                    return 0;
+                else
+                {
+                    uint formeVal = 0;
+                    formeVal |= (uint)((IV_ATK & 0x6) << 5);
+                    formeVal |= (uint)((IV_DEF & 0x6) << 3);
+                    formeVal |= (uint)((IV_SPE & 0x6) << 1);
+                    formeVal |= (uint)((IV_SPC & 0x6) >> 1);
+                    return (int)(formeVal / 10);
+                }
+            }
+            set{ }
+        }
+
+        public override int HPType
+        {
+            get { return 4 * (IV_ATK % 4) + (IV_DEF % 4); }
+            set
+            {
+
+            }
+        }
+        public override bool IsShiny => IV_DEF == 10 && IV_SPE == 10 && IV_SPC == 10 && (new[] { 2, 3, 6, 7, 10, 11, 14, 15 }).Contains(IV_ATK);
         public override ushort Sanity { get { return 0; } set { } }
         public override bool ChecksumValid => true;
         public override ushort Checksum { get { return 0; } set { } }
diff --git a/PKHeX/PKM/PKM.cs b/PKHeX/PKM/PKM.cs
index 273088a93..0bbb0f351 100644
--- a/PKHeX/PKM/PKM.cs
+++ b/PKHeX/PKM/PKM.cs
@@ -226,7 +226,7 @@ public byte[] Write()
         public abstract int CurrentHandler { get; set; }
 
         // Derived
-        public bool IsShiny => TSV == PSV;
+        public virtual bool IsShiny => TSV == PSV;
         public bool Gen6 => Version >= 24 && Version <= 29;
         public bool XY => Version == (int)GameVersion.X || Version == (int)GameVersion.Y;
         public bool AO => Version == (int)GameVersion.AS || Version == (int)GameVersion.OR;
@@ -335,7 +335,7 @@ public int[] CNTs
             get { return new[] { CNT_Cool, CNT_Beauty, CNT_Cute, CNT_Smart, CNT_Tough, CNT_Sheen }; }
             set { if (value?.Length != 6) return; CNT_Cool = value[0]; CNT_Beauty = value[1]; CNT_Cute = value[2]; CNT_Smart = value[3]; CNT_Tough = value[4]; CNT_Sheen = value[5]; }
         }
-        public int HPType
+        public virtual int HPType
         {
             get { return 15 * ((IV_HP & 1) + 2 * (IV_ATK & 1) + 4 * (IV_DEF & 1) + 8 * (IV_SPE & 1) + 16 * (IV_SPA & 1) + 32 * (IV_SPD & 1)) / 63; }
             set
diff --git a/PKHeX/PKM/PKX.cs b/PKHeX/PKM/PKX.cs
index 0ec3ce61a..df795d3b8 100644
--- a/PKHeX/PKM/PKX.cs
+++ b/PKHeX/PKM/PKX.cs
@@ -528,6 +528,8 @@ public static Image getSprite(int species, int form, int gender, int item, bool
                 Image itemimg = (Image)Resources.ResourceManager.GetObject("item_" + item) ?? Resources.helditem;
                 if ((generation == 3 || generation == 4) && 328 <= item && item <= 419) // gen3/4 TM
                     itemimg = Resources.item_tm;
+                if (generation == 2)
+                    itemimg = Resources.helditem; // Don't even try
 
                 // Redraw
                 baseImage = Util.LayerImage(baseImage, itemimg, 22 + (15 - itemimg.Width) / 2, 15 + (15 - itemimg.Height), 1);
diff --git a/PKHeX/PersonalInfo/PersonalInfoG2.cs b/PKHeX/PersonalInfo/PersonalInfoG2.cs
new file mode 100644
index 000000000..12aa02445
--- /dev/null
+++ b/PKHeX/PersonalInfo/PersonalInfoG2.cs
@@ -0,0 +1,80 @@
+using System.Linq;
+
+namespace PKHeX
+{
+    public class PersonalInfoG2 : PersonalInfo
+    {
+        protected PersonalInfoG2() { }
+        public const int SIZE = 0x20;
+        public PersonalInfoG2(byte[] data)
+        {
+            if (data.Length != SIZE)
+                return;
+
+            Data = data;
+            TMHM = getBits(Data.Skip(0x18).Take(0x8).ToArray());
+        }
+        public override byte[] Write()
+        {
+            setBits(TMHM).CopyTo(Data, 0x18);
+            return Data;
+        }
+
+        public int DEX_ID { get { return Data[0x00]; } set { Data[0x00] = (byte)value; } }
+        public override int HP { get { return Data[0x01]; } set { Data[0x01] = (byte)value; } }
+        public override int ATK { get { return Data[0x02]; } set { Data[0x02] = (byte)value; } }
+        public override int DEF { get { return Data[0x03]; } set { Data[0x03] = (byte)value; } }
+        public override int SPE { get { return Data[0x04]; } set { Data[0x04] = (byte)value; } }
+        public override int SPA { get { return Data[0x05]; } set { Data[0x05] = (byte)value; } }
+        public override int SPD { get { return Data[0x06]; } set { Data[0x06] = (byte)value; } }
+        public override int[] Types
+        {
+            get { return new int[] { Data[0x07], Data[0x08] }; }
+            set
+            {
+                if (value?.Length != 2) return;
+                Data[0x07] = (byte)value[0];
+                Data[0x08] = (byte)value[1];
+            }
+        }
+        public override int CatchRate { get { return Data[0x09]; } set { Data[0x09] = (byte)value; } }
+        public override int BaseEXP { get { return Data[0x0A]; } set { Data[0x0A] = (byte)value; } }
+
+        public override int[] Items
+        {
+            get { return new int[] { Data[0xB], Data[0xC] }; }
+            set
+            {
+                if (value?.Length != 2) return;
+                Data[0xB] = (byte) value[0];
+                Data[0xC] = (byte) value[1];
+            }
+        }
+        public override int Gender { get { return Data[0xD]; } set { Data[0xD] = (byte)value; } }
+        public override int HatchCycles { get { return Data[0xF]; } set { Data[0xF] = (byte)value; } }
+        public override int EXPGrowth { get { return Data[0x16]; } set { Data[0x16] = (byte)value; } }
+        public override int[] EggGroups
+        {
+            get { return new int[] { Data[0x17] >> 4, Data[0x17] & 0xF }; }
+            set
+            {
+                if (value?.Length != 2) return;
+                Data[0x17] = (byte)(((value[0] & 0xF) << 4) | (value[1] & 0xF));
+            }
+        }
+
+        // EV Yields are just aliases for base stats in Gen I
+        public override int EV_HP { get { return HP; } set { } }
+        public override int EV_ATK { get { return ATK; } set { } }
+        public override int EV_DEF { get { return DEF; } set { } }
+        public override int EV_SPE { get { return SPE; } set { } }
+        public override int EV_SPA { get { return SPA; } set { } }
+        public override int EV_SPD { get { return SPD; } set { } }
+
+        // Future game values, unused
+        public override int[] Abilities { get { return new[] { 0, 0 }; } set { } }
+        public override int BaseFriendship { get { return 0; } set { } }
+        public override int EscapeRate { get { return 0; } set { } }
+        public override int Color { get { return 0; } set { } }
+    }
+}
diff --git a/PKHeX/PersonalInfo/PersonalTable.cs b/PKHeX/PersonalInfo/PersonalTable.cs
index e0ce94205..c60fd8e62 100644
--- a/PKHeX/PersonalInfo/PersonalTable.cs
+++ b/PKHeX/PersonalInfo/PersonalTable.cs
@@ -15,6 +15,8 @@ public class PersonalTable
         internal static readonly PersonalTable FR = new PersonalTable(Properties.Resources.personal_fr, GameVersion.FR);
         internal static readonly PersonalTable E = new PersonalTable(Properties.Resources.personal_e, GameVersion.E);
         internal static readonly PersonalTable RS = new PersonalTable(Properties.Resources.personal_rs, GameVersion.RS);
+        internal static readonly PersonalTable C = new PersonalTable(Properties.Resources.personal_c, GameVersion.C);
+        internal static readonly PersonalTable GS = new PersonalTable(Properties.Resources.personal_c, GameVersion.GS);
         internal static readonly PersonalTable RBY = new PersonalTable(Properties.Resources.personal_rby, GameVersion.RBY);
 
         private static byte[][] splitBytes(byte[] data, int size)
@@ -33,6 +35,8 @@ private PersonalTable(byte[] data, GameVersion format)
             switch (format)
             {
                 case GameVersion.RBY: size = PersonalInfoG1.SIZE; break;
+                case GameVersion.GS:
+                case GameVersion.C: size = PersonalInfoG2.SIZE; break;
                 case GameVersion.RS:
                 case GameVersion.E:
                 case GameVersion.FR:
@@ -58,6 +62,11 @@ private PersonalTable(byte[] data, GameVersion format)
                     for (int i = 0; i < d.Length; i++)
                         d[i] = new PersonalInfoG1(entries[i]);
                     break;
+                case GameVersion.GS:
+                case GameVersion.C:
+                    for (int i = 0; i < d.Length; i++)
+                        d[i] = new PersonalInfoG2(entries[i]);
+                    break;
                 case GameVersion.RS:
                 case GameVersion.E:
                 case GameVersion.FR:
diff --git a/PKHeX/Properties/Resources.Designer.cs b/PKHeX/Properties/Resources.Designer.cs
index 50c0f84e6..5626ceee0 100644
--- a/PKHeX/Properties/Resources.Designer.cs
+++ b/PKHeX/Properties/Resources.Designer.cs
@@ -15495,6 +15495,16 @@ internal class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] personal_c {
+            get {
+                object obj = ResourceManager.GetObject("personal_c", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -15525,6 +15535,16 @@ internal class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] personal_gs {
+            get {
+                object obj = ResourceManager.GetObject("personal_gs", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -25209,6 +25229,60 @@ internal class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to (None)
+        ///Master Ball
+        ///Ultra Ball
+        ///BrightPowder
+        ///Great Ball
+        ///Poké Ball
+        ///Teru-sama (0)
+        ///Bicycle
+        ///Moon Stone
+        ///Antidote
+        ///Burn Heal
+        ///Ice Heal
+        ///Awakening
+        ///Parlyz Heal
+        ///Full Restore
+        ///Max Potion
+        ///Hyper Potion
+        ///Super Potion
+        ///Potion
+        ///Escape Rope
+        ///Repel
+        ///Max Elixer
+        ///Fire Stone
+        ///Thunder Stone
+        ///Water Stone
+        ///Teru-sama (1)
+        ///HP Up
+        ///Protein
+        ///Iron
+        ///Carbos
+        ///Lucky Punch
+        ///Calcium
+        ///Rare Candy
+        ///X Accuracy
+        ///Leaf Stone
+        ///Metal Powder
+        ///Nugget
+        ///Poké Doll
+        ///Full Heal
+        ///Revive
+        ///Max Revive
+        ///Guard Spec.
+        ///Super Repel
+        ///Max Repel
+        ///Dire Hit
+        ///Ter [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string text_ItemsG2_en {
+            get {
+                return ResourceManager.GetString("text_ItemsG2_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 c35a698b0..97833f6b5 100644
--- a/PKHeX/Properties/Resources.resx
+++ b/PKHeX/Properties/Resources.resx
@@ -6403,4 +6403,13 @@
   <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>
+  <data name="personal_c" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\byte\personal_c;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="personal_gs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\byte\personal_gs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="text_ItemsG2_en" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\text\gen3\text_itemsg2_en.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/PKHeX/Resources/byte/personal_c b/PKHeX/Resources/byte/personal_c
new file mode 100644
index 0000000000000000000000000000000000000000..a4c5debd2f2156d6a87df160232d780f5ef569c8
GIT binary patch
literal 8064
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

literal 0
HcmV?d00001

diff --git a/PKHeX/Resources/byte/personal_gs b/PKHeX/Resources/byte/personal_gs
new file mode 100644
index 0000000000000000000000000000000000000000..05130b80bd5e223b6cf75993482d10c16f8a033d
GIT binary patch
literal 8064
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

literal 0
HcmV?d00001

diff --git a/PKHeX/Resources/text/gen3/text_ItemsG2_en.txt b/PKHeX/Resources/text/gen3/text_ItemsG2_en.txt
new file mode 100644
index 000000000..c78641c8f
--- /dev/null
+++ b/PKHeX/Resources/text/gen3/text_ItemsG2_en.txt
@@ -0,0 +1,255 @@
+(None)
+Master Ball
+Ultra Ball
+BrightPowder
+Great Ball
+Poké Ball
+Teru-sama (0)
+Bicycle
+Moon Stone
+Antidote
+Burn Heal
+Ice Heal
+Awakening
+Parlyz Heal
+Full Restore
+Max Potion
+Hyper Potion
+Super Potion
+Potion
+Escape Rope
+Repel
+Max Elixer
+Fire Stone
+Thunder Stone
+Water Stone
+Teru-sama (1)
+HP Up
+Protein
+Iron
+Carbos
+Lucky Punch
+Calcium
+Rare Candy
+X Accuracy
+Leaf Stone
+Metal Powder
+Nugget
+Poké Doll
+Full Heal
+Revive
+Max Revive
+Guard Spec.
+Super Repel
+Max Repel
+Dire Hit
+Teru-sama (2)
+Fresh Water
+Soda Pop
+Lemonade
+X Attack
+Teru-sama (3)
+X Defend
+X Speed
+X Special
+Coin Case
+Itemfinder
+Teru-sama (4)
+Exp Share
+Old Rod
+Good Rod
+Silver Leaf
+Super Rod
+PP Up
+Ether
+Max Ether
+Elixer
+Red Scale
+SecretPotion
+S.S. Ticket
+Mystery Egg
+Clear Bell*
+Silver Wing
+Moomoo Milk
+Quick Claw
+PSNCureBerry
+Gold Leaf
+Soft Sand
+Sharp Beak
+PRZCureBerry
+Burnt Berry
+Ice Berry
+Poison Barb
+King's Rock
+Bitter Berry
+Mint Berry
+Red Apricorn
+TinyMushroom
+Big Mushroom
+SilverPowder
+Blu Apricorn
+Teru-sama (5)
+Amulet Coin
+Ylw Apricorn
+Grn Apricorn
+Cleanse Tag
+Mystic Water
+TwistedSpoon
+Wht Apricorn
+Black Belt
+Blk Apricorn
+Teru-sama (6)
+Pnk Apricorn
+BlackGlasses
+SlowpokeTail
+Pink Bow
+Stick
+Smoke Ball
+NeverMeltIce
+Magnet
+MiracleBerry
+Pearl
+Big Pearl
+Everstone
+Spell Tag
+RageCandyBar
+GS Ball*
+Blue Card*
+Miracle Seed
+Thick Club
+Focus Band
+Teru-sama (7)
+EnergyPowder
+Energy Root
+Heal Powder
+Revival Herb
+Hard Stone
+Lucky Egg
+Card Key
+Machine Part
+Egg Ticket*
+Lost Item
+Stardust
+Star Piece
+Basement Key
+Pass
+Teru-sama (8)
+Teru-sama (9)
+Teru-sama (10)
+Charcoal
+Berry Juice
+Scope Lens
+Teru-sama (11)
+Teru-sama (12)
+Metal Coat
+Dragon Fang
+Teru-sama (13)
+Leftovers
+Teru-sama (14)
+Teru-sama (15)
+Teru-sama (16)
+MysteryBerry
+Dragon Scale
+Berserk Gene
+Teru-sama (17)
+Teru-sama (18)
+Teru-sama (19)
+Sacred Ash
+Heavy Ball
+Flower Mail
+Level Ball
+Lure Ball
+Fast Ball
+Teru-sama (20)
+Light Ball
+Friend Ball
+Moon Ball
+Love Ball
+Normal Box
+Gorgeous Box
+Sun Stone
+Polkadot Bow
+Teru-sama (21)
+Up-Grade
+Berry
+Gold Berry
+SquirtBottle
+Teru-sama (22)
+Park Ball
+Rainbow Wing
+Teru-sama (23)
+Brick Piece
+Surf Mail
+Litebluemail
+Portraitmail
+Lovely Mail
+Eon Mail
+Morph Mail
+Bluesky Mail
+Music Mail
+Mirage Mail
+Teru-sama (24)
+TM01
+TM02
+TM03
+TM04
+TM04 (Unused)
+TM05
+TM06
+TM07
+TM08
+TM09
+TM10
+TM11
+TM12
+TM13
+TM14
+TM15
+TM16
+TM17
+TM18
+TM19
+TM20
+TM21
+TM22
+TM23
+TM24
+TM25
+TM26
+TM27
+TM28
+TM28 (Unused)
+TM29
+TM30
+TM31
+TM32
+TM33
+TM34
+TM35
+TM36
+TM37
+TM38
+TM39
+TM40
+TM41
+TM42
+TM43
+TM44
+TM45
+TM46
+TM47
+TM48
+TM49
+TM50
+HM01
+HM02
+HM03
+HM04
+HM05
+HM06
+HM07
+HM08 (Unused)
+HM09 (Unused)
+HM10 (Unused)
+HM11 (Unused)
+HM12 (Unused)
\ No newline at end of file
diff --git a/PKHeX/Saves/SAV2.cs b/PKHeX/Saves/SAV2.cs
new file mode 100644
index 000000000..c8fd56a96
--- /dev/null
+++ b/PKHeX/Saves/SAV2.cs
@@ -0,0 +1,569 @@
+using System;
+using System.Linq;
+
+namespace PKHeX
+{
+    public sealed class SAV2 : SaveFile
+    {
+        public override string BAKName => $"{FileName} [{OT} ({Version})" +/* - {LastSavedTime}*/ "].bak";
+        public override string Filter => "SAV File|*.sav";
+        public override string Extension => ".sav";
+
+        public SAV2(byte[] data = null)
+        {
+            Data = data == null ? new byte[SaveUtil.SIZE_G2RAW] : (byte[])data.Clone();
+            BAK = (byte[])Data.Clone();
+            Exportable = !Data.SequenceEqual(new byte[Data.Length]);
+
+            Version = data == null ? GameVersion.GSC : SaveUtil.getIsG2SAV(Data);
+            if (Version == GameVersion.Invalid)
+                return;
+
+            Box = Data.Length;
+            Array.Resize(ref Data, Data.Length + SIZE_RESERVED);
+            Party = getPartyOffset(0);
+
+            Japanese = false;
+            Personal = Version == GameVersion.GS ? PersonalTable.GS : PersonalTable.C;
+
+            OptionsOffset = 0x2000;
+            Trainer1 = 0x2009;
+            switch (Version)
+            {
+                case GameVersion.GS:
+                    DaylightSavingsOffset = Japanese ? -1 : 0x2037;
+                    TimePlayedOffset = Japanese ? -1 : 0x2053;
+                    PaletteOffset = Japanese ? -1 : 0x206B;
+                    MoneyOffset = Japanese ? -1 : 0x23DB;
+                    JohtoBadgesOffset = Japanese ? -1 : 0xD57C;
+                    CurrentBoxIndexOffset = Japanese ? -1 : 0x2724;
+                    BoxNamesOffset = Japanese ? -1 : 0x2727;
+                    PartyOffset = Japanese ? 0x283E : 0x288A;
+                    PokedexCaughtOffset = Japanese ? -1 : 0x2A4C;
+                    PokedexSeenOffset = Japanese ? -1 : 0x2A6C;
+                    CurrentBoxOffset = Japanese ? -1 : 0x2D6C;
+                    GenderOffset = -1; // No gender in GSC
+                    break;
+                case GameVersion.C:
+                    DaylightSavingsOffset = Japanese ? -1 : 0x2037;
+                    TimePlayedOffset = Japanese ? -1 : 0x2054;
+                    PaletteOffset = Japanese ? -1 : 0x206A;
+                    MoneyOffset = Japanese ? -1 : 0x23DC;
+                    JohtoBadgesOffset = Japanese ? -1 : 0x23E5;
+                    CurrentBoxIndexOffset = Japanese ? -1 : 0x2700;
+                    BoxNamesOffset = Japanese ? 0x2708 : 0x2703;
+                    PartyOffset = Japanese ? 0x281A : 0x2865;
+                    PokedexCaughtOffset = Japanese ? -1 : 0x2A27;
+                    PokedexSeenOffset = Japanese ? -1 : 0x2A47;
+                    CurrentBoxOffset = 0x2D10;
+                    GenderOffset = Japanese ? -1 : 0x3E3D;
+                    break;
+            }
+            LegalItems = new ushort[] { 3, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 46, 47, 48, 49, 51, 52, 53, 57, 60, 62, 63, 64, 65, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 91, 92, 93, 94, 95, 96, 97, 98, 99, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 117, 118, 119, 121, 122, 123, 124, 125, 126, 131, 132, 138, 139, 140, 143, 144, 146, 150, 151, 152, 156, 158, 163, 168, 169, 170, 172, 173, 174, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189 };
+            LegalBalls = new ushort[] { 1, 2, 4, 5, 157, 159, 160, 161, 164, 165, 166, 167};
+            HeldItems = new ushort[] {0}.Concat(LegalItems).Concat(LegalBalls).ToArray();
+            Array.Sort(HeldItems);
+            
+            // Stash boxes after the save file's end.
+            byte[] TempBox = new byte[SIZE_STOREDBOX];
+            for (int i = 0; i < BoxCount; i++)
+            {
+                if (i < (Japanese ? 6 : 7))
+                    Array.Copy(Data, 0x4000 + i * (TempBox.Length + 2), TempBox, 0, TempBox.Length);
+                else
+                    Array.Copy(Data, 0x6000 + (i - (Japanese ? 6 : 7)) * (TempBox.Length + 2), TempBox, 0, TempBox.Length);
+                PokemonList2 PL2 = new PokemonList2(TempBox, Japanese ? PokemonList2.CapacityType.StoredJP : PokemonList2.CapacityType.Stored, Japanese);
+                for (int j = 0; j < PL2.Pokemon.Length; j++)
+                {
+                    if (j < PL2.Count)
+                    {
+                        byte[] pkDat = new PokemonList2(PL2[j]).GetBytes();
+                        pkDat.CopyTo(Data, Data.Length - SIZE_RESERVED + i * SIZE_BOX + j * SIZE_STORED);
+                    }
+                    else
+                    {
+                        byte[] pkDat = new byte[PokemonList2.GetDataLength(PokemonList2.CapacityType.Single, Japanese)];
+                        pkDat.CopyTo(Data, Data.Length - SIZE_RESERVED + i * SIZE_BOX + j * SIZE_STORED);
+                    }
+                }
+            }
+
+            Array.Copy(Data, CurrentBoxOffset, TempBox, 0, TempBox.Length);
+            PokemonList2 curBoxPL = new PokemonList2(TempBox, Japanese ? PokemonList2.CapacityType.StoredJP : PokemonList2.CapacityType.Stored, Japanese);
+            for (int i = 0; i < curBoxPL.Pokemon.Length; i++)
+            {
+                if (i < curBoxPL.Count)
+                {
+                    byte[] pkDat = new PokemonList2(curBoxPL[i]).GetBytes();
+                    pkDat.CopyTo(Data, Data.Length - SIZE_RESERVED + CurrentBox * SIZE_BOX + i * SIZE_STORED);
+                }
+                else
+                {
+                    byte[] pkDat = new byte[PokemonList2.GetDataLength(PokemonList2.CapacityType.Single, Japanese)];
+                    pkDat.CopyTo(Data, Data.Length - SIZE_RESERVED + CurrentBox * SIZE_BOX + i * SIZE_STORED);
+                }
+            }
+
+            byte[] TempParty = new byte[PokemonList2.GetDataLength(PokemonList2.CapacityType.Party, Japanese)];
+            Array.Copy(Data, PartyOffset, TempParty, 0, TempParty.Length);
+            PokemonList2 partyList = new PokemonList2(TempParty, PokemonList2.CapacityType.Party, Japanese);
+            for (int i = 0; i < partyList.Pokemon.Length; i++)
+            {
+                if (i < partyList.Count)
+                {
+                    byte[] pkDat = new PokemonList2(partyList[i]).GetBytes();
+                    pkDat.CopyTo(Data, getPartyOffset(i));
+                }
+                else
+                {
+                    byte[] pkDat = new byte[PokemonList2.GetDataLength(PokemonList2.CapacityType.Single, Japanese)];
+                    pkDat.CopyTo(Data, getPartyOffset(i));
+                }
+            }
+            /*
+            byte[] rawDC = new byte[0x38];
+            Array.Copy(Data, Japanese ? 0x2CA7 : 0x2CF4, rawDC, 0, rawDC.Length);
+            byte[] TempDaycare = new byte[PokemonList1.GetDataLength(PokemonList1.CapacityType.Single, Japanese)];
+            TempDaycare[0] = rawDC[0];
+            Array.Copy(rawDC, 1, TempDaycare, 2 + 1 + PKX.SIZE_1PARTY + StringLength, StringLength);
+            Array.Copy(rawDC, 1 + StringLength, TempDaycare, 2 + 1 + PKX.SIZE_1PARTY, StringLength);
+            Array.Copy(rawDC, 1 + 2 * StringLength, TempDaycare, 2 + 1, PKX.SIZE_1STORED);
+            PokemonList1 daycareList = new PokemonList1(TempDaycare, PokemonList1.CapacityType.Single, Japanese);
+            daycareList.GetBytes().CopyTo(Data, getPartyOffset(7));
+            Daycare = getPartyOffset(7); 
+            */
+            // Enable Pokedex editing
+            Console.WriteLine(SIZE_STOREDBOX.ToString("X"));
+            PokeDex = 0;
+
+            if (!Exportable)
+                resetBoxes();
+        }
+
+        private const int SIZE_RESERVED = 0x8000; // unpacked box data
+        public override byte[] Write(bool DSV)
+        {
+            for (int i = 0; i < BoxCount; i++)
+            {
+                PokemonList1 boxPL = new PokemonList1(Japanese ? PokemonList1.CapacityType.StoredJP : PokemonList1.CapacityType.Stored, Japanese);
+                int slot = 0;
+                for (int j = 0; j < boxPL.Pokemon.Length; j++)
+                {
+                    PK1 boxPK = (PK1) getPKM(getData(getBoxOffset(i) + j*SIZE_STORED, SIZE_STORED));
+                    if (boxPK.Species > 0)
+                        boxPL[slot++] = boxPK;
+                }
+                if (i < BoxCount / 2)
+                    boxPL.GetBytes().CopyTo(Data, 0x4000 + i * SIZE_STOREDBOX);
+                else
+                    boxPL.GetBytes().CopyTo(Data, 0x6000 + (i - BoxCount / 2) * SIZE_STOREDBOX);
+                if (i == CurrentBox)
+                    boxPL.GetBytes().CopyTo(Data, Japanese ? 0x302D : 0x30C0);
+            }
+
+            PokemonList1 partyPL = new PokemonList1(PokemonList1.CapacityType.Party, Japanese);
+            int pSlot = 0;
+            for (int i = 0; i < 6; i++)
+            {
+                PK1 partyPK = (PK1)getPKM(getData(getPartyOffset(i), SIZE_STORED));
+                if (partyPK.Species > 0)
+                    partyPL[pSlot++] = partyPK;
+            }
+            partyPL.GetBytes().CopyTo(Data, Japanese ? 0x2ED5 : 0x2F2C);
+
+            // Daycare is read-only, but in case it ever becomes editable, copy it back in.
+            byte[] rawDC = getData(getDaycareSlotOffset(loc: 0, slot: 0), SIZE_STORED);
+            byte[] dc = new byte[1 + 2*StringLength + PKX.SIZE_1STORED];
+            dc[0] = rawDC[0];
+            Array.Copy(rawDC, 2 + 1 + PKX.SIZE_1PARTY + StringLength, dc, 1, StringLength);
+            Array.Copy(rawDC, 2 + 1 + PKX.SIZE_1PARTY, dc, 1 + StringLength, StringLength);
+            Array.Copy(rawDC, 2 + 1, dc, 1 + 2*StringLength, PKX.SIZE_1STORED);
+            dc.CopyTo(Data, Japanese ? 0x2CA7 : 0x2CF4);
+
+            setChecksums();
+            byte[] outData = new byte[Data.Length - SIZE_RESERVED];
+            Array.Copy(Data, outData, outData.Length);
+            return outData;
+        }
+
+
+        // Configuration
+        public override SaveFile Clone() { return new SAV2(Data.Take(Data.Length - SIZE_RESERVED).ToArray()); }
+
+        public override int SIZE_STORED => Japanese ? PKX.SIZE_2JLIST : PKX.SIZE_2ULIST;
+        public override int SIZE_PARTY => Japanese ? PKX.SIZE_2JLIST : PKX.SIZE_2ULIST;
+
+        public int SIZE_BOX => BoxSlotCount*SIZE_STORED;
+
+        public int SIZE_STOREDBOX => PokemonList2.GetDataLength(Japanese ? PokemonList2.CapacityType.StoredJP : PokemonList2.CapacityType.Stored, Japanese);
+
+        public override PKM BlankPKM => new PK2(null, null, Japanese);
+        protected override Type PKMType => typeof(PK2);
+
+        public override int MaxMoveID => 251;
+        public override int MaxSpeciesID => 251;
+        public override int MaxAbilityID => 0;
+        public override int MaxItemID => 255;
+        public override int MaxBallID => 0;
+        public override int MaxGameID => 99; // What do I set this to...?
+
+        public override int BoxCount => Japanese ? 9 : 14;
+        public override int MaxEV => 65535;
+        public override int MaxIV => 15;
+        public override int Generation => 2;
+        protected override int GiftCountMax => 0;
+        public override int OTLength => Japanese ? 5 : 7;
+        public override int NickLength => Japanese ? 5 : 10;
+        public override int BoxSlotCount => Japanese ? 30 : 20;
+
+        public override bool HasParty => true;
+        private int StringLength => Japanese ? PK2.STRLEN_J : PK2.STRLEN_U;
+
+
+        // Offsets
+        protected int OptionsOffset { get; set; } = int.MinValue;
+        protected int DaylightSavingsOffset { get; set; } = int.MinValue;
+        protected int TimePlayedOffset { get; set; } = int.MinValue;
+        protected int PaletteOffset { get; set; } = int.MinValue;
+        protected int MoneyOffset { get; set; } = int.MinValue;
+        protected int JohtoBadgesOffset { get; set; } = int.MinValue;
+        protected int CurrentBoxIndexOffset { get; set; } = int.MinValue;
+        protected int BoxNamesOffset { get; set; } = int.MinValue;
+        protected int PartyOffset { get; set; } = int.MinValue;
+        protected int PokedexSeenOffset { get; set; } = int.MinValue;
+        protected int PokedexCaughtOffset { get; set; } = int.MinValue;
+        protected int CurrentBoxOffset { get; set; } = int.MinValue;
+        protected int GenderOffset { get; set; } = int.MinValue;
+
+        // Checksums
+        protected override void setChecksums()
+        {
+            ushort accum = 0;
+            for (int i = 0x2009; i <= 0x2B3A; i++)
+                accum += Data[i];
+            if (Version == GameVersion.C && Japanese)
+                BitConverter.GetBytes(Util.SwapEndianness(accum)).CopyTo(Data, 0x2D0D);
+
+            for (int i = 0x2B3B; i <= 0x2B82; i++)
+                accum += Data[i];
+            if (Version == GameVersion.C && !Japanese)
+                BitConverter.GetBytes(Util.SwapEndianness(accum)).CopyTo(Data, 0x2D0D);
+
+            /* TODO: Find Japanese GS Checksum region */
+
+            for (int i = 0x2B83; i <= 0x2D68; i++)
+                accum += Data[i];
+            if (Version == GameVersion.GS && !Japanese)
+                BitConverter.GetBytes(Util.SwapEndianness(accum)).CopyTo(Data, 0x2D69);
+            
+        }
+        public override bool ChecksumsValid
+        {
+            get
+            {
+                ushort accum = 0;
+                for (int i = 0x2009; i <= 0x2B3A; i++)
+                    accum += Data[i];
+                if (Version == GameVersion.C && Japanese)
+                    return accum == Util.SwapEndianness(BitConverter.ToUInt16(Data, 0x2D0D)); // Japanese Crystal
+
+                for (int i = 0x2B3B; i <= 0x2B82; i++)
+                    accum += Data[i];
+                if (Version == GameVersion.C && !Japanese)
+                    return accum == Util.SwapEndianness(BitConverter.ToUInt16(Data, 0x2D0D)); // Japanese Crystal
+
+                /* TODO: Find Japanese GS Checksum region */
+
+                for (int i = 0x2B83; i <= 0x2D68; i++)
+                    accum += Data[i];
+                if (Version == GameVersion.GS && !Japanese)
+                    return accum == Util.SwapEndianness(BitConverter.ToUInt16(Data, 0x2D69)); // US Gold/Silver
+
+                return false;
+            }
+        }
+        public override string ChecksumInfo => ChecksumsValid ? "Checksum valid." : "Checksum invalid";
+
+        // Trainer Info
+        public override GameVersion Version { get; protected set; }
+
+        public override string OT
+        {
+            get { return PKX.getG1Str(Data.Skip(0x200B).Take(StringLength).ToArray(), Japanese); }
+            set
+            {
+                byte[] strdata = PKX.setG1Str(value, Japanese);
+                if (strdata.Length > StringLength)
+                    throw new ArgumentException("OT Name too long for given save file.");
+                strdata.CopyTo(Data, 0x200B);
+            }
+        }
+        public override int Gender
+        {
+            get { return 0; }
+            set { }
+        }
+        public override ushort TID
+        {
+            get { return Util.SwapEndianness(BitConverter.ToUInt16(Data, 0x2009)); }
+            set { BitConverter.GetBytes(Util.SwapEndianness(value)).CopyTo(Data, 0x2009); }
+        }
+        public override ushort SID
+        {
+            get { return 0; }
+            set { }
+        }
+        public override int PlayedHours
+        {
+            get { return BitConverter.ToUInt16(Data, Japanese ? 0x2CA0 : 0x2CED); }
+            set { BitConverter.GetBytes((ushort)value).CopyTo(Data, Japanese ? 0x2CA0 : 0x2CED); }
+        }
+        public override int PlayedMinutes
+        {
+            get { return Data[Japanese ? 0x2CA2 : 0x2CEF]; }
+            set { Data[Japanese ? 0x2CA2 : 0x2CEF] = (byte)value; }
+        }
+        public override int PlayedSeconds
+        {
+            get { return Data[Japanese ? 0x2CA3 : 0x2CF0]; }
+            set { Data[Japanese ? 0x2CA3 : 0x2CF0] = (byte)value; }
+        }
+
+        public int Badges
+        {
+            get { return Data[Japanese ? 0x25F8 : 0x2602]; }
+            set { if (value < 0) return; Data[Japanese ? 0x25F8 : 0x2602] = (byte)value; }
+        }
+        private byte Options
+        {
+            get { return Data[Japanese ? 0x25F7 : 0x2601]; }
+            set { Data[Japanese ? 0x25F7 : 0x2601] = value; }
+        }
+        public bool BattleEffects
+        {
+            get { return (Options & 0x80) == 0; }
+            set { Options = (byte)((Options & 0x7F) | (value ? 0 : 0x80)); }
+        }
+        public bool BattleStyleSwitch
+        {
+            get { return (Options & 0x40) == 0; }
+            set { Options = (byte)((Options & 0xBF) | (value ? 0 : 0x40)); }
+        }
+        public int Sound
+        {
+            get { return (Options & 0x30) >> 4; }
+            set
+            {
+                var new_sound = value;
+                if (new_sound > 3)
+                    new_sound = 3;
+                if (new_sound < 0)
+                    new_sound = 0;
+                Options = (byte)((Options & 0xCF) | (new_sound << 4));
+            }
+        }
+        public int TextSpeed
+        {
+            get { return Options & 0x7; }
+            set
+            {
+                var new_speed = value;
+                if (new_speed > 7)
+                    new_speed = 7;
+                if (new_speed < 0)
+                    new_speed = 0;
+                Options = (byte)((Options & 0xF8) | new_speed);
+            }
+        }
+        public override uint Money
+        {
+            get { return uint.Parse((Util.SwapEndianness(BitConverter.ToUInt32(Data, Japanese ? 0x25EE : 0x25F3)) >> 8).ToString("X6")); }
+            set
+            {
+                BitConverter.GetBytes(Util.SwapEndianness(Convert.ToUInt32(value.ToString("000000"), 16))).Skip(1).ToArray().CopyTo(Data, Japanese ? 0x25EE : 0x25F3);
+            }
+        }
+        public uint Coin
+        {
+            get
+            {
+                return uint.Parse(Util.SwapEndianness(BitConverter.ToUInt16(Data, Japanese ? 0x2846 : 0x2850)).ToString("X4"));
+            }
+            set
+            {
+                BitConverter.GetBytes(Util.SwapEndianness(Convert.ToUInt16(value.ToString("0000"), 16))).ToArray().CopyTo(Data, Japanese ? 0x2846 : 0x2850);
+            }
+        }
+
+        private readonly ushort[] LegalItems, LegalKeyItems, LegalBalls, LegalTMHMs, LegalBerries;
+        public override InventoryPouch[] Inventory
+        {
+            get
+            {
+                ushort[] legalItems = LegalItems;
+                InventoryPouch[] pouch =
+                {
+                    new InventoryPouch(InventoryType.Items, legalItems, 99, Japanese ? 0x25C4 : 0x25C9, 20),
+                    new InventoryPouch(InventoryType.MailItems, legalItems, 99, Japanese ? 0x27DC : 0x27E6, 50)
+                };
+                foreach (var p in pouch)
+                {
+                    p.getPouchG1(ref Data);
+                }
+                return pouch;
+            }
+            set
+            {
+                foreach (var p in value)
+                {
+                    int ofs = 0;
+                    for (int i = 0; i < p.Count; i++)
+                    {
+                        while (p.Items[ofs].Count == 0)
+                            ofs++;
+                        p.Items[i] = p.Items[ofs++];
+                    }
+                    while (ofs < p.Items.Length)
+                        p.Items[ofs++] = new InventoryItem { Count = 0, Index = 0 };
+                    p.setPouchG1(ref Data);
+                }
+            }
+        }
+        public override int getDaycareSlotOffset(int loc, int slot)
+        {
+            return Daycare;
+        }
+        public override ulong? getDaycareRNGSeed(int loc)
+        {
+            return null;
+        }
+        public override uint? getDaycareEXP(int loc, int slot)
+        {
+            return null;
+        }
+        public override bool? getDaycareOccupied(int loc, int slot)
+        {
+            return null;
+        }
+        public override void setDaycareEXP(int loc, int slot, uint EXP)
+        {
+
+        }
+        public override void setDaycareOccupied(int loc, int slot, bool occupied)
+        {
+
+        }
+
+        // Storage
+        public override int PartyCount
+        {
+            get { return Data[PartyOffset]; }
+            protected set
+            {
+                Data[PartyOffset] = (byte)value; 
+            }
+        }
+        public override int getBoxOffset(int box)
+        {
+            return Data.Length - SIZE_RESERVED + box * SIZE_BOX;
+        }
+        public override int getPartyOffset(int slot)
+        {
+            return Data.Length - SIZE_RESERVED + BoxCount * SIZE_BOX + slot * SIZE_STORED;
+        }
+        public override int CurrentBox
+        {
+            get { return Data[CurrentBoxIndexOffset] & 0x7F; }
+            set { Data[CurrentBoxIndexOffset] = (byte)((Data[Japanese ? 0x2842 : 0x284C] & 0x80) | (value & 0x7F)); }
+        }
+        public override int getBoxWallpaper(int box)
+        {
+            return 0;
+        }
+        public override string getBoxName(int box)
+        {
+            return PKX.getG1Str(Data.Skip(BoxNamesOffset + box*9).Take(9).ToArray(), Japanese);
+        }
+        public override void setBoxName(int box, string value)
+        {
+            // Don't allow for custom box names
+        }
+
+        public override PKM getPKM(byte[] data)
+        {
+            if (data.Length == SIZE_STORED)
+                return new PokemonList2(data, PokemonList2.CapacityType.Single, Japanese)[0];
+            return new PK2(data);
+        }
+        public override byte[] decryptPKM(byte[] data)
+        {
+            return data;
+        }
+
+        // Pokédex
+        public override bool getSeen(PKM pkm)
+        {
+            if (pkm.Species == 0)
+                return false;
+            if (pkm.Species > MaxSpeciesID)
+                return false;
+            if (Version == GameVersion.Unknown)
+                return false;
+
+            int bit = pkm.Species - 1;
+            int ofs = bit >> 3;
+            byte bitval = (byte)(1 << (bit & 7));
+            // Get the Seen Flag
+            return (Data[PokedexSeenOffset + ofs] & bitval) != 0;
+        }
+        public override bool getCaught(PKM pkm)
+        {
+            if (pkm.Species == 0)
+                return false;
+            if (pkm.Species > MaxSpeciesID)
+                return false;
+            if (Version == GameVersion.Unknown)
+                return false;
+
+            int bit = pkm.Species - 1;
+            int ofs = bit >> 3;
+            byte bitval = (byte)(1 << (bit & 7));
+            // Get the Caught Flag
+            return (Data[PokedexCaughtOffset + ofs] & bitval) != 0;
+        }
+        protected internal override void setSeen(PKM pkm, bool seen = true)
+        {
+            if (pkm.Species == 0)
+                return;
+            if (pkm.Species > MaxSpeciesID)
+                return;
+            if (Version == GameVersion.Unknown)
+                return;
+
+            int bit = pkm.Species - 1;
+            int ofs = bit >> 3;
+            byte bitval = (byte)(1 << (bit & 7));
+            // Set the Seen Flag
+            Data[PokedexSeenOffset + ofs] &= (byte)(~bitval);
+            if (seen)
+                Data[PokedexSeenOffset + ofs] |= bitval;
+        }
+        protected internal override void setCaught(PKM pkm, bool caught = true)
+        {
+            if (pkm.Species == 0)
+                return;
+            if (pkm.Species > MaxSpeciesID)
+                return;
+            if (Version == GameVersion.Unknown)
+                return;
+
+            int bit = pkm.Species - 1;
+            int ofs = bit >> 3;
+            byte bitval = (byte)(1 << (bit & 7));
+            // Set the Captured Flag
+            Data[PokedexCaughtOffset + ofs] &= (byte)(~bitval);
+            if (caught)
+                Data[PokedexCaughtOffset + ofs] |= bitval;
+        }
+    }
+}
diff --git a/PKHeX/Saves/SaveFile.cs b/PKHeX/Saves/SaveFile.cs
index 1d672eb03..a6fac64af 100644
--- a/PKHeX/Saves/SaveFile.cs
+++ b/PKHeX/Saves/SaveFile.cs
@@ -63,6 +63,8 @@ public virtual byte[] Write(bool DSV)
         public bool RS => Version == GameVersion.RS;
         public bool RBY => Version == GameVersion.RBY;
 
+        public bool GSC => Version == GameVersion.GS || Version == GameVersion.C;
+
         public virtual int MaxMoveID => int.MaxValue;
         public virtual int MaxSpeciesID => int.MaxValue;
         public virtual int MaxAbilityID => int.MaxValue;
diff --git a/PKHeX/Saves/SaveUtil.cs b/PKHeX/Saves/SaveUtil.cs
index 9102c5627..e9029363f 100644
--- a/PKHeX/Saves/SaveUtil.cs
+++ b/PKHeX/Saves/SaveUtil.cs
@@ -3,11 +3,15 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Windows.Forms;
 
 namespace PKHeX
 {
     public enum GameVersion
     {
+        /* I don't want to assign Gen I/II... */
+        GS = -4,
+        C = -3,
         Invalid = -2,
         Any = -1,
         Unknown = 0,
@@ -45,6 +49,10 @@ public static class SaveUtil
         internal const int SIZE_G4RAW = 0x80000;
         internal const int SIZE_G3RAW = 0x20000;
         internal const int SIZE_G3RAWHALF = 0x10000;
+        internal const int SIZE_G2RAW = 0x8000;
+        internal const int SIZE_G2BAT = 0x802C;
+        internal const int SIZE_G2EMU = 0x10000;
+        internal const int SIZE_G2EMUBAT = 0x1002C;
         internal const int SIZE_G1RAW = 0x8000;
         internal const int SIZE_G1BAT = 0x802C;
 
@@ -57,6 +65,8 @@ public static int getSAVGeneration(byte[] data)
         {
             if (getIsG1SAV(data) != GameVersion.Invalid)
                 return 1;
+            if (getIsG2SAV(data) != GameVersion.Invalid)
+                return 2;
             if (getIsG3SAV(data) != GameVersion.Invalid)
                 return 3;
             if (getIsG4SAV(data) != GameVersion.Invalid)
@@ -108,6 +118,71 @@ public static bool getIsG1SAVJ(byte[] data)
             }
             return true;
         }
+        /// <summary>Determines the type of 2nd gen save</summary>
+        /// <param name="data">Save data of which to determine the type</param>
+        /// <returns>Version Identifier or Invalid if type cannot be determined.</returns>
+        public static GameVersion getIsG2SAV(byte[] data)
+        {
+            if (data.Length != SIZE_G2RAW && data.Length != SIZE_G2BAT && data.Length != SIZE_G2EMU && data.Length != SIZE_G2EMUBAT)
+                return GameVersion.Invalid;
+
+            // Check if it's not an american save or a japanese save
+            if (getIsG2SAVU(data) != GameVersion.Invalid)
+                return getIsG2SAVU(data);
+            if (getIsG2SAVJ(data) != GameVersion.Invalid)
+                return getIsG2SAVJ(data);
+            return GameVersion.Invalid;
+        }
+        /// <summary>Determines if 2nd gen save is non-japanese</summary>
+        /// <param name="data">Save data of which to determine the region</param>
+        /// <returns>True if a valid non-japanese save, False otherwise.</returns>
+        public static GameVersion getIsG2SAVU(byte[] data)
+        {
+            bool gs = true;
+            bool c = true;
+            foreach (int ofs in new[] { 0x288A, 0x2D6C })
+            {
+                byte num_entries = data[ofs];
+                if (num_entries > 20 || data[ofs + 1 + num_entries] != 0xFF)
+                    gs = false;
+            }
+            foreach (int ofs in new[] { 0x2865, 0x2D10 })
+            {
+                byte num_entries = data[ofs];
+                if (num_entries > 20 || data[ofs + 1 + num_entries] != 0xFF)
+                    c = false;
+            }
+            if (gs)
+                return GameVersion.GS;
+            if (c)
+                return GameVersion.C;
+            return GameVersion.Invalid;
+        }
+        /// <summary>Determines if 2nd gen save is japanese</summary>
+        /// <param name="data">Save data of which to determine the region</param>
+        /// <returns>True if a valid japanese save, False otherwise.</returns>
+        public static GameVersion getIsG2SAVJ(byte[] data)
+        {
+            bool gs = true;
+            bool c = true;
+            foreach (int ofs in new[] { 0x283E, 0x2D10 })
+            {
+                byte num_entries = data[ofs];
+                if (num_entries > 30 || data[ofs + 1 + num_entries] != 0xFF)
+                    gs = false;
+            }
+            foreach (int ofs in new[] { 0x281A, 0x2D10 })
+            {
+                byte num_entries = data[ofs];
+                if (num_entries > 30 || data[ofs + 1 + num_entries] != 0xFF)
+                    c = false;
+            }
+            if (gs)
+                return GameVersion.GS;
+            if (c)
+                return GameVersion.C;
+            return GameVersion.Invalid;
+        }
         /// <summary>Determines the type of 3th gen save</summary>
         /// <param name="data">Save data of which to determine the type</param>
         /// <returns>Version Identifier or Invalid if type cannot be determined.</returns>
@@ -218,6 +293,10 @@ public static GameVersion getVersionGroup(GameVersion Version)
                 case GameVersion.RBY:
                     return GameVersion.RBY;
 
+                case GameVersion.GS:
+                case GameVersion.C:
+                    return GameVersion.GSC;
+
                 case GameVersion.R:
                 case GameVersion.S:
                     return GameVersion.RS;
@@ -270,6 +349,8 @@ public static SaveFile getVariantSAV(byte[] data)
             {
                 case 1:
                     return new SAV1(data);
+                case 2:
+                    return new SAV2(data);
                 case 3:
                     return new SAV3(data);
                 case 4: