diff --git a/PKHeX.sln b/PKHeX.sln index ebf4a3433..e4bd67805 100644 --- a/PKHeX.sln +++ b/PKHeX.sln @@ -1,7 +1,13 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C# Express 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PKHeX", "PKHeX.csproj", "{B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PKHeX", "PKHeX\PKHeX.csproj", "{B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PKHeX.Tests", "Tests\PKHeX.Tests\PKHeX.Tests.csproj", "{8E2499BC-C11A-4809-8737-66D35A625425}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{7C0598C9-DDF3-4ACC-B15D-6A626ADB7530}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,8 +19,15 @@ Global {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Debug|x86.Build.0 = Debug|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Release|x86.ActiveCfg = Release|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Release|x86.Build.0 = Release|x86 + {8E2499BC-C11A-4809-8737-66D35A625425}.Debug|x86.ActiveCfg = Debug|x86 + {8E2499BC-C11A-4809-8737-66D35A625425}.Debug|x86.Build.0 = Debug|x86 + {8E2499BC-C11A-4809-8737-66D35A625425}.Release|x86.ActiveCfg = Release|x86 + {8E2499BC-C11A-4809-8737-66D35A625425}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {8E2499BC-C11A-4809-8737-66D35A625425} = {7C0598C9-DDF3-4ACC-B15D-6A626ADB7530} + EndGlobalSection EndGlobal diff --git a/Legality/Analysis.cs b/PKHeX/Legality/Analysis.cs similarity index 100% rename from Legality/Analysis.cs rename to PKHeX/Legality/Analysis.cs diff --git a/Legality/Checks.cs b/PKHeX/Legality/Checks.cs similarity index 100% rename from Legality/Checks.cs rename to PKHeX/Legality/Checks.cs diff --git a/Legality/Core.cs b/PKHeX/Legality/Core.cs similarity index 100% rename from Legality/Core.cs rename to PKHeX/Legality/Core.cs diff --git a/Legality/Data.cs b/PKHeX/Legality/Data.cs similarity index 100% rename from Legality/Data.cs rename to PKHeX/Legality/Data.cs diff --git a/Legality/Tables.cs b/PKHeX/Legality/Tables.cs similarity index 99% rename from Legality/Tables.cs rename to PKHeX/Legality/Tables.cs index 8bb92c9bb..6d9a2a1f6 100644 --- a/Legality/Tables.cs +++ b/PKHeX/Legality/Tables.cs @@ -399,6 +399,7 @@ public static partial class Legal 386, // Deoxys 487, // Giratina 492, // Shaymin + 720, // Hoopa }; internal static readonly int[] BreedMaleOnly = { diff --git a/Legality/Tables3.cs b/PKHeX/Legality/Tables3.cs similarity index 100% rename from Legality/Tables3.cs rename to PKHeX/Legality/Tables3.cs diff --git a/Legality/Tables4.cs b/PKHeX/Legality/Tables4.cs similarity index 100% rename from Legality/Tables4.cs rename to PKHeX/Legality/Tables4.cs diff --git a/Legality/Tables5.cs b/PKHeX/Legality/Tables5.cs similarity index 100% rename from Legality/Tables5.cs rename to PKHeX/Legality/Tables5.cs diff --git a/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs similarity index 100% rename from MainWindow/Main.Designer.cs rename to PKHeX/MainWindow/Main.Designer.cs diff --git a/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs similarity index 98% rename from MainWindow/Main.cs rename to PKHeX/MainWindow/Main.cs index cdd1fdf45..0cee4f438 100644 --- a/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Deployment.Application; using System.Diagnostics; using System.Drawing; using System.IO; @@ -119,7 +118,7 @@ public Main() if (path != null && File.Exists(path)) openQuick(path, force: true); else - GB_SAVtools.Visible = false; + loadSAV(SAV, null); } // Splash Screen closes on its own. @@ -177,7 +176,7 @@ public Main() #region Path Variables - public static string WorkingDirectory => ApplicationDeployment.IsNetworkDeployed ? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "PKHeX") : Environment.CurrentDirectory; + public static string WorkingDirectory => Environment.CurrentDirectory; public static string DatabasePath => Path.Combine(WorkingDirectory, "db"); private static string WC6DatabasePath => Path.Combine(WorkingDirectory, "wc6"); private static string BackupPath => Path.Combine(WorkingDirectory, "bak"); @@ -264,7 +263,7 @@ private void mainMenuSave(object sender, EventArgs e) } private void mainMenuExit(object sender, EventArgs e) { - if (ModifierKeys == (Keys.Control | Keys.Q)) // Hotkey Triggered + if (ModifierKeys == Keys.Control) // Hotkey Triggered if (DialogResult.Yes != Util.Prompt(MessageBoxButtons.YesNo, "Quit PKHeX?")) return; Close(); } @@ -290,11 +289,11 @@ private void mainMenuDatabase(object sender, EventArgs e) if (z != null) { Util.CenterToForm(z, this); z.BringToFront(); return; } - if (Directory.Exists("db")) + if (Directory.Exists(DatabasePath)) new SAV_Database(this).Show(); else - Util.Alert("PKHeX's database was not found", - "Please dump all boxes from a save file, then ensure the 'db' folder exists."); + Util.Alert("PKHeX's database was not found.", + $"Please dump all boxes from a save file, then ensure the '{DatabasePath}' folder exists."); } private void mainMenuUnicode(object sender, EventArgs e) { @@ -740,53 +739,76 @@ private void openSAV(byte[] input, string path) sav.Personal = drFRLG == DialogResult.Yes ? PersonalTable.FR : PersonalTable.LG; } } + loadSAV(sav, path); + } + private void loadSAV(SaveFile sav, string path) + { PKM pk = preparePKM(); SAV = sav; - SAV.FilePath = Path.GetDirectoryName(path); - SAV.FileName = Path.GetExtension(path) == ".bak" - ? Path.GetFileName(path)?.Split(new[] {" ["}, StringSplitOptions.None)[0] - : Path.GetFileName(path); - L_Save.Text = $"SAV{SAV.Generation}: {Path.GetFileNameWithoutExtension(Util.CleanFileName(SAV.BAKName))}"; // more descriptive - + if (path != null) // Actual save file + { + SAV.FilePath = Path.GetDirectoryName(path); + SAV.FileName = Path.GetExtension(path) == ".bak" + ? Path.GetFileName(path).Split(new[] { " [" }, StringSplitOptions.None)[0] + : Path.GetFileName(path); + L_Save.Text = $"SAV{SAV.Generation}: {Path.GetFileNameWithoutExtension(Util.CleanFileName(SAV.BAKName))}"; // more descriptive + + // If backup folder exists, save a backup. + string backupName = Path.Combine(BackupPath, Util.CleanFileName(SAV.BAKName)); + if (SAV.Exportable && Directory.Exists(BackupPath) && !File.Exists(backupName)) + File.WriteAllBytes(backupName, SAV.BAK); + + GB_SAVtools.Visible = true; + } + else // Blank save file + { + SAV.FilePath = null; + SAV.FileName = "Blank Save File"; + L_Save.Text = $"SAV{SAV.Generation}: {SAV.FileName} [{SAV.OT} ({SAV.Version})]"; + + GB_SAVtools.Visible = false; + } Menu_ExportSAV.Enabled = B_VerifyCHK.Enabled = SAV.Exportable; setBoxNames(); // Display the Box Names if (SAV.HasBox) { - int startBox = SAV.CurrentBox; // FF if BattleBox + int startBox = path == null ? 0 : SAV.CurrentBox; // FF if BattleBox if (startBox > SAV.BoxCount - 1) { tabBoxMulti.SelectedIndex = 1; CB_BoxSelect.SelectedIndex = 0; } else { tabBoxMulti.SelectedIndex = 0; CB_BoxSelect.SelectedIndex = startBox; } } setPKXBoxes(); // Reload all of the PKX Windows // Hide content if not present in game. - GB_SAVtools.Visible = true; GB_SUBE.Visible = SAV.HasSUBE; PB_Locked.Visible = SAV.HasBattleBox && SAV.BattleBoxLocked; PAN_Box.Visible = CB_BoxSelect.Visible = B_BoxLeft.Visible = B_BoxRight.Visible = SAV.HasBox; Menu_LoadBoxes.Enabled = Menu_DumpBoxes.Enabled = Menu_Report.Enabled = Menu_Modify.Enabled = B_SaveBoxBin.Enabled = SAV.HasBox; - PAN_BattleBox.Visible = L_BattleBox.Visible = L_ReadOnlyPBB.Visible = SAV.HasBattleBox; - GB_Daycare.Visible = SAV.HasDaycare; - GB_Fused.Visible = SAV.HasFused; - GB_GTS.Visible = SAV.HasGTS; - B_OpenSecretBase.Visible = SAV.HasSecretBase; - B_OpenPokepuffs.Visible = SAV.HasPuff; - B_OUTPasserby.Visible = SAV.HasPSS; - B_OpenBoxLayout.Visible = SAV.HasBoxWallpapers; - B_OpenWondercards.Visible = SAV.HasWondercards; - B_OpenSuperTraining.Visible = SAV.HasSuperTrain; - B_OpenHallofFame.Visible = SAV.HasHoF; - B_OpenOPowers.Visible = SAV.HasOPower; - B_OpenPokedex.Visible = SAV.HasPokeDex; - B_OpenBerryField.Visible = SAV.HasBerryField; - B_Pokeblocks.Visible = SAV.HasPokeBlock; - B_JPEG.Visible = SAV.HasJPEG; - B_OpenEventFlags.Visible = SAV.HasEvents; - B_LinkInfo.Visible = SAV.HasLink; - B_CGearSkin.Visible = SAV.Generation == 5; + if (GB_SAVtools.Visible) + { + PAN_BattleBox.Visible = L_BattleBox.Visible = L_ReadOnlyPBB.Visible = SAV.HasBattleBox; + GB_Daycare.Visible = SAV.HasDaycare; + GB_Fused.Visible = SAV.HasFused; + GB_GTS.Visible = SAV.HasGTS; + B_OpenSecretBase.Visible = SAV.HasSecretBase; + B_OpenPokepuffs.Visible = SAV.HasPuff; + B_OUTPasserby.Visible = SAV.HasPSS; + B_OpenBoxLayout.Visible = SAV.HasBoxWallpapers; + B_OpenWondercards.Visible = SAV.HasWondercards; + B_OpenSuperTraining.Visible = SAV.HasSuperTrain; + B_OpenHallofFame.Visible = SAV.HasHoF; + B_OpenOPowers.Visible = SAV.HasOPower; + B_OpenPokedex.Visible = SAV.HasPokeDex; + B_OpenBerryField.Visible = SAV.HasBerryField; + B_Pokeblocks.Visible = SAV.HasPokeBlock; + B_JPEG.Visible = SAV.HasJPEG; + B_OpenEventFlags.Visible = SAV.HasEvents; + B_LinkInfo.Visible = SAV.HasLink; + B_CGearSkin.Visible = SAV.Generation == 5; + } // Generational Interface byte[] extraBytes = new byte[1]; @@ -800,7 +822,7 @@ private void openSAV(byte[] input, string path) PB_MarkPentagon.Visible = SAV.Generation == 6; PB_Legal.Visible = PB_WarnMove1.Visible = PB_WarnMove2.Visible = PB_WarnMove3.Visible = PB_WarnMove4.Visible = SAV.Generation == 6; - TB_GameSync.Visible = TB_Secure1.Visible = TB_Secure2.Visible = L_GameSync.Visible = L_Secure1.Visible = L_Secure2.Visible = SAV.Generation == 6; + TB_GameSync.Visible = TB_Secure1.Visible = TB_Secure2.Visible = L_GameSync.Visible = L_Secure1.Visible = L_Secure2.Visible = SAV.Exportable && SAV.Generation == 6; CB_Form.Visible = Label_Form.Visible = CHK_AsEgg.Visible = GB_EggConditions.Visible = Label_MetDate.Visible = CAL_MetDate.Visible = PB_Mark5.Visible = PB_Mark6.Visible = SAV.Generation >= 4; @@ -866,11 +888,6 @@ private void openSAV(byte[] input, string path) // Refresh PK#->PK6 conversion info PKMConverter.updateConfig(SAV.SubRegion, SAV.Country, SAV.ConsoleRegion, SAV.OT, SAV.Gender); - // If backup folder exists, save a backup. - string backupName = Path.Combine(BackupPath, Util.CleanFileName(SAV.BAKName)); - if (SAV.Exportable && Directory.Exists(BackupPath) && !File.Exists(backupName)) - File.WriteAllBytes(backupName, SAV.BAK); - // Indicate audibly the save is loaded SystemSounds.Beep.Play(); } diff --git a/MainWindow/Main.resx b/PKHeX/MainWindow/Main.resx similarity index 100% rename from MainWindow/Main.resx rename to PKHeX/MainWindow/Main.resx diff --git a/MainWindow/MainPK3.cs b/PKHeX/MainWindow/MainPK3.cs similarity index 100% rename from MainWindow/MainPK3.cs rename to PKHeX/MainWindow/MainPK3.cs diff --git a/MainWindow/MainPK4.cs b/PKHeX/MainWindow/MainPK4.cs similarity index 90% rename from MainWindow/MainPK4.cs rename to PKHeX/MainWindow/MainPK4.cs index 697193b01..4e27d2d69 100644 --- a/MainWindow/MainPK4.cs +++ b/PKHeX/MainWindow/MainPK4.cs @@ -41,10 +41,14 @@ private void populateFieldsPK4() CB_EncounterType.SelectedValue = pk4.Gen4 ? pk4.EncounterType : 0; CB_Ball.SelectedValue = pk4.Ball; - if (pk4.Met_Month == 0) { pk4.Met_Month = 1; } - if (pk4.Met_Day == 0) { pk4.Met_Day = 1; } - try { CAL_MetDate.Value = new DateTime(pk4.Met_Year + 2000, pk4.Met_Month, pk4.Met_Day); } - catch { CAL_MetDate.Value = new DateTime(2000, 1, 1); } + if (pk4.MetDate.HasValue) + { + CAL_MetDate.Value = pk4.MetDate.Value; + } + else + { + CAL_MetDate.Value = new DateTime(2000, 1, 1); + } if (pk4.Egg_Location != 0) { @@ -53,8 +57,14 @@ private void populateFieldsPK4() GB_EggConditions.Enabled = true; CB_EggLocation.SelectedValue = pk4.Egg_Location; - try { CAL_EggDate.Value = new DateTime(pk4.Egg_Year + 2000, pk4.Egg_Month, pk4.Egg_Day); } - catch { CAL_MetDate.Value = new DateTime(2000, 1, 1); } + if (pk4.EggMetDate.HasValue) + { + CAL_EggDate.Value = pk4.EggMetDate.Value; + } + else + { + CAL_EggDate.Value = new DateTime(2000, 1, 1); + } } else { CAL_EggDate.Value = new DateTime(2000, 01, 01); CHK_AsEgg.Checked = GB_EggConditions.Enabled = false; CB_EggLocation.SelectedValue = 0; } @@ -194,30 +204,22 @@ private PKM preparePK4() pk4.Language = Util.getIndex(CB_Language); // Default Dates - int egg_year = 2000; - int egg_month = 0; - int egg_day = 0; + DateTime? egg_date = null; int egg_location = 0; if (CHK_AsEgg.Checked) // If encountered as an egg, load the Egg Met data from fields. { - egg_year = CAL_EggDate.Value.Year; - egg_month = CAL_EggDate.Value.Month; - egg_day = CAL_EggDate.Value.Day; + egg_date = CAL_EggDate.Value; egg_location = Util.getIndex(CB_EggLocation); } // Egg Met Data - pk4.Egg_Year = egg_year - 2000; - pk4.Egg_Month = egg_month; - pk4.Egg_Day = egg_day; + pk4.EggMetDate = egg_date; pk4.Egg_Location = egg_location; // Met Data - pk4.Met_Year = CAL_MetDate.Value.Year - 2000; - pk4.Met_Month = CAL_MetDate.Value.Month; - pk4.Met_Day = CAL_MetDate.Value.Day; + pk4.MetDate = CAL_MetDate.Value; pk4.Met_Location = Util.getIndex(CB_MetLocation); if (pk4.IsEgg && pk4.Met_Location == 0) // If still an egg, it has no hatch location/date. Zero it! - pk4.Met_Year = pk4.Met_Month = pk4.Met_Day = 0; + pk4.MetDate = null; // Toss in Party Stats Array.Resize(ref pk4.Data, pk4.SIZE_PARTY); diff --git a/MainWindow/MainPK5.cs b/PKHeX/MainWindow/MainPK5.cs similarity index 90% rename from MainWindow/MainPK5.cs rename to PKHeX/MainWindow/MainPK5.cs index 15f674aab..469fed01d 100644 --- a/MainWindow/MainPK5.cs +++ b/PKHeX/MainWindow/MainPK5.cs @@ -50,10 +50,14 @@ private void populateFieldsPK5() CB_EncounterType.SelectedValue = pk5.Gen4 ? pk5.EncounterType : 0; CB_Ball.SelectedValue = pk5.Ball; - if (pk5.Met_Month == 0) { pk5.Met_Month = 1; } - if (pk5.Met_Day == 0) { pk5.Met_Day = 1; } - try { CAL_MetDate.Value = new DateTime(pk5.Met_Year + 2000, pk5.Met_Month, pk5.Met_Day); } - catch { CAL_MetDate.Value = new DateTime(2000, 1, 1); } + if (pk5.MetDate.HasValue) + { + CAL_MetDate.Value = pk5.MetDate.Value; + } + else + { + CAL_MetDate.Value = new DateTime(2000, 1, 1); + } if (pk5.Egg_Location != 0) { @@ -62,8 +66,14 @@ private void populateFieldsPK5() GB_EggConditions.Enabled = true; CB_EggLocation.SelectedValue = pk5.Egg_Location; - try { CAL_EggDate.Value = new DateTime(pk5.Egg_Year + 2000, pk5.Egg_Month, pk5.Egg_Day); } - catch { CAL_MetDate.Value = new DateTime(2000, 1, 1); } + if (pk5.EggMetDate.HasValue) + { + CAL_EggDate.Value = pk5.EggMetDate.Value; + } + else + { + CAL_EggDate.Value = new DateTime(2000, 1, 1); + } } else { CAL_EggDate.Value = new DateTime(2000, 01, 01); CHK_AsEgg.Checked = GB_EggConditions.Enabled = false; CB_EggLocation.SelectedValue = 0; } @@ -200,30 +210,22 @@ private PKM preparePK5() pk5.CurrentFriendship = Util.ToInt32(TB_Friendship.Text); // Default Dates - int egg_year = 2000; - int egg_month = 0; - int egg_day = 0; + DateTime? egg_date = null; int egg_location = 0; - if (CHK_AsEgg.Checked) // If encountered as an egg, load the Egg Met data from fields. + if (CHK_AsEgg.Checked) // If encountered as an egg, load the Egg Met data from fields. { - egg_year = CAL_EggDate.Value.Year; - egg_month = CAL_EggDate.Value.Month; - egg_day = CAL_EggDate.Value.Day; + egg_date = CAL_EggDate.Value; egg_location = Util.getIndex(CB_EggLocation); } // Egg Met Data - pk5.Egg_Year = egg_year - 2000; - pk5.Egg_Month = egg_month; - pk5.Egg_Day = egg_day; + pk5.EggMetDate = egg_date; pk5.Egg_Location = egg_location; // Met Data - pk5.Met_Year = CAL_MetDate.Value.Year - 2000; - pk5.Met_Month = CAL_MetDate.Value.Month; - pk5.Met_Day = CAL_MetDate.Value.Day; + pk5.MetDate = CAL_MetDate.Value; pk5.Met_Location = Util.getIndex(CB_MetLocation); if (pk5.IsEgg && pk5.Met_Location == 0) // If still an egg, it has no hatch location/date. Zero it! - pk5.Met_Year = pk5.Met_Month = pk5.Met_Day = 0; + pk5.MetDate = null; pk5.Ball = Util.getIndex(CB_Ball); pk5.Met_Level = Util.ToInt32(TB_MetLevel.Text); diff --git a/MainWindow/MainPK6.cs b/PKHeX/MainWindow/MainPK6.cs similarity index 92% rename from MainWindow/MainPK6.cs rename to PKHeX/MainWindow/MainPK6.cs index ced541a41..534dbd8db 100644 --- a/MainWindow/MainPK6.cs +++ b/PKHeX/MainWindow/MainPK6.cs @@ -57,10 +57,14 @@ private void populateFieldsPK6() CB_EncounterType.SelectedValue = pk6.Gen4 ? pk6.EncounterType : 0; CB_Ball.SelectedValue = pk6.Ball; - if (pk6.Met_Month == 0) { pk6.Met_Month = 1; } - if (pk6.Met_Day == 0) { pk6.Met_Day = 1; } - try { CAL_MetDate.Value = new DateTime(pk6.Met_Year + 2000, pk6.Met_Month, pk6.Met_Day); } - catch { CAL_MetDate.Value = new DateTime(2000, 1, 1); } + if (pk6.MetDate.HasValue) + { + CAL_MetDate.Value = pk6.MetDate.Value; + } + else + { + CAL_MetDate.Value = new DateTime(2000, 1, 1); + } if (pk6.Egg_Location != 0) { @@ -69,8 +73,14 @@ private void populateFieldsPK6() GB_EggConditions.Enabled = true; CB_EggLocation.SelectedValue = pk6.Egg_Location; - try { CAL_EggDate.Value = new DateTime(pk6.Egg_Year + 2000, pk6.Egg_Month, pk6.Egg_Day); } - catch { CAL_MetDate.Value = new DateTime(2000, 1, 1); } + if (pk6.EggMetDate.HasValue) + { + CAL_EggDate.Value = pk6.EggMetDate.Value; + } + else + { + CAL_EggDate.Value = new DateTime(2000, 1, 1); + } } else { CAL_EggDate.Value = new DateTime(2000, 01, 01); CHK_AsEgg.Checked = GB_EggConditions.Enabled = false; CB_EggLocation.SelectedValue = 0; } @@ -263,30 +273,22 @@ private PKM preparePK6() pk6.OT_Name = TB_OT.Text; pk6.CurrentFriendship = Util.ToInt32(TB_Friendship.Text); - int egg_year = 2000; // Default Dates - int egg_month = 0; - int egg_day = 0; + DateTime? egg_date = null; int egg_location = 0; if (CHK_AsEgg.Checked) // If encountered as an egg, load the Egg Met data from fields. { - egg_year = CAL_EggDate.Value.Year; - egg_month = CAL_EggDate.Value.Month; - egg_day = CAL_EggDate.Value.Day; + egg_date = CAL_EggDate.Value; egg_location = Util.getIndex(CB_EggLocation); } // Egg Met Data - pk6.Egg_Year = egg_year - 2000; - pk6.Egg_Month = egg_month; - pk6.Egg_Day = egg_day; + pk6.EggMetDate = egg_date; pk6.Egg_Location = egg_location; // Met Data - pk6.Met_Year = CAL_MetDate.Value.Year - 2000; - pk6.Met_Month = CAL_MetDate.Value.Month; - pk6.Met_Day = CAL_MetDate.Value.Day; + pk6.MetDate = CAL_MetDate.Value; pk6.Met_Location = Util.getIndex(CB_MetLocation); if (pk6.IsEgg && pk6.Met_Location == 0) // If still an egg, it has no hatch location/date. Zero it! - pk6.Met_Year = pk6.Met_Month = pk6.Met_Day = 0; + pk6.MetDate = null; // 0xD7 Unknown diff --git a/Misc/About.Designer.cs b/PKHeX/Misc/About.Designer.cs similarity index 100% rename from Misc/About.Designer.cs rename to PKHeX/Misc/About.Designer.cs diff --git a/Misc/About.cs b/PKHeX/Misc/About.cs similarity index 100% rename from Misc/About.cs rename to PKHeX/Misc/About.cs diff --git a/Misc/About.resx b/PKHeX/Misc/About.resx similarity index 100% rename from Misc/About.resx rename to PKHeX/Misc/About.resx diff --git a/Misc/ComboItem.cs b/PKHeX/Misc/ComboItem.cs similarity index 100% rename from Misc/ComboItem.cs rename to PKHeX/Misc/ComboItem.cs diff --git a/Misc/QR.Designer.cs b/PKHeX/Misc/QR.Designer.cs similarity index 100% rename from Misc/QR.Designer.cs rename to PKHeX/Misc/QR.Designer.cs diff --git a/Misc/QR.cs b/PKHeX/Misc/QR.cs similarity index 100% rename from Misc/QR.cs rename to PKHeX/Misc/QR.cs diff --git a/Misc/QR.resx b/PKHeX/Misc/QR.resx similarity index 100% rename from Misc/QR.resx rename to PKHeX/Misc/QR.resx diff --git a/Misc/SplashScreen.Designer.cs b/PKHeX/Misc/SplashScreen.Designer.cs similarity index 100% rename from Misc/SplashScreen.Designer.cs rename to PKHeX/Misc/SplashScreen.Designer.cs diff --git a/Misc/SplashScreen.cs b/PKHeX/Misc/SplashScreen.cs similarity index 100% rename from Misc/SplashScreen.cs rename to PKHeX/Misc/SplashScreen.cs diff --git a/Misc/SplashScreen.resx b/PKHeX/Misc/SplashScreen.resx similarity index 100% rename from Misc/SplashScreen.resx rename to PKHeX/Misc/SplashScreen.resx diff --git a/MysteryGifts/MysteryGift.cs b/PKHeX/MysteryGifts/MysteryGift.cs similarity index 100% rename from MysteryGifts/MysteryGift.cs rename to PKHeX/MysteryGifts/MysteryGift.cs diff --git a/MysteryGifts/PGF.cs b/PKHeX/MysteryGifts/PGF.cs similarity index 90% rename from MysteryGifts/PGF.cs rename to PKHeX/MysteryGifts/PGF.cs index b4cf94520..7645a89bc 100644 --- a/MysteryGifts/PGF.cs +++ b/PKHeX/MysteryGifts/PGF.cs @@ -90,9 +90,48 @@ public override string CardTitle // Card Attributes public override int Item { get { return BitConverter.ToUInt16(Data, 0x00); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x00); } } - public ushort Year { get { return BitConverter.ToUInt16(Data, 0xAE); } set { BitConverter.GetBytes(value).CopyTo(Data, 0xAE); } } - public byte Month { get { return Data[0xAD]; } set { Data[0xAD] = value; } } - public byte Day { get { return Data[0xAC]; } set { Data[0xAC] = value; } } + private ushort Year { get { return BitConverter.ToUInt16(Data, 0xAE); } set { BitConverter.GetBytes(value).CopyTo(Data, 0xAE); } } + private byte Month { get { return Data[0xAD]; } set { Data[0xAD] = value; } } + private byte Day { get { return Data[0xAC]; } set { Data[0xAC] = value; } } + + /// + /// Gets or sets the date of the card. + /// + public DateTime? Date + { + get + { + // Check to see if date is valid + if (!Util.IsDateValid(2000 + Year, Month, Day)) + { + return null; + } + else + { + return new DateTime(2000 + Year, Month, Day); + } + } + set + { + if (value.HasValue) + { + // Only update the properties if a value is provided. + Year = (ushort)(value.Value.Year - 2000); + Month = (byte)value.Value.Month; + Day = (byte)value.Value.Day; + } + else + { + // Clear the Met Date. + // If code tries to access MetDate again, null will be returned. + Year = 0; + Month = 0; + Day = 0; + } + } + } + + public override int CardID { get { return BitConverter.ToUInt16(Data, 0xB0); } @@ -151,9 +190,7 @@ public override PKM convertToPKM(SaveFile SAV) Move3 = Move3, Move4 = Move4, Met_Location = MetLocation, - Met_Day = Day, - Met_Month = Month, - Met_Year = Year - 2000, + MetDate = Date, Egg_Location = EggLocation, CNT_Cool = CNT_Cool, CNT_Beauty = CNT_Beauty, @@ -255,9 +292,7 @@ public override PKM convertToPKM(SaveFile SAV) if (IsEgg) { // pk.IsEgg = true; - pk.Egg_Day = Day; - pk.Egg_Month = Month; - pk.Egg_Year = Year - 2000; + pk.EggMetDate = Date; // Force hatch pk.IsEgg = false; pk.Met_Location = 4; // Nuvema Town diff --git a/MysteryGifts/PGT.cs b/PKHeX/MysteryGifts/PGT.cs similarity index 96% rename from MysteryGifts/PGT.cs rename to PKHeX/MysteryGifts/PGT.cs index 9eeebbfea..911754cf9 100644 --- a/MysteryGifts/PGT.cs +++ b/PKHeX/MysteryGifts/PGT.cs @@ -181,22 +181,17 @@ public override PKM convertToPKM(SaveFile SAV) } // Generate Met Info - DateTime dt = DateTime.Now; if (IsPokémon) { pk4.Met_Location = pk4.Egg_Location + 3000; pk4.Egg_Location = 0; - pk4.Met_Day = dt.Day; - pk4.Met_Month = dt.Month; - pk4.Met_Year = dt.Year - 2000; + pk4.MetDate = DateTime.Now; pk4.IsEgg = false; } else { pk4.Egg_Location = pk4.Egg_Location + 3000; - pk4.Egg_Day = dt.Day; - pk4.Egg_Month = dt.Month; - pk4.Egg_Year = dt.Year - 2000; + pk4.MetDate = DateTime.Now; pk4.IsEgg = false; // Met Location is modified when transferred to pk5; don't worry about it. } diff --git a/MysteryGifts/PL6.cs b/PKHeX/MysteryGifts/PL6.cs similarity index 100% rename from MysteryGifts/PL6.cs rename to PKHeX/MysteryGifts/PL6.cs diff --git a/MysteryGifts/WC6.cs b/PKHeX/MysteryGifts/WC6.cs similarity index 91% rename from MysteryGifts/WC6.cs rename to PKHeX/MysteryGifts/WC6.cs index 26f8a186c..3774d5d78 100644 --- a/MysteryGifts/WC6.cs +++ b/PKHeX/MysteryGifts/WC6.cs @@ -31,18 +31,56 @@ public WC6(byte[] data = null) public override string CardTitle { // Max len 36 char, followed by null terminator get { return Util.TrimFromZero(Encoding.Unicode.GetString(Data, 2, 72)); } set { Encoding.Unicode.GetBytes(value.PadRight(36, '\0')).CopyTo(Data, 2); } } - private uint Date { + private uint RawDate { get { return BitConverter.ToUInt32(Data, 0x4C); } set { BitConverter.GetBytes(value).CopyTo(Data, 0x4C); } } - public uint Year { - get { return Date/10000; } - set { Date = value*10000 + Date%10000; } } - public uint Month { - get { return Date%10000/100; } - set { Date = Year*10000 + value*100 + Date%100; } } - public uint Day { - get { return Date%100; } - set { Date = Year*10000 + Month*100 + value; } } + private uint Year { + get { return RawDate/10000; } + set { RawDate = value*10000 + RawDate%10000; } } + private uint Month { + get { return RawDate%10000/100; } + set { RawDate = Year*10000 + value*100 + RawDate%100; } } + private uint Day { + get { return RawDate%100; } + set { RawDate = Year*10000 + Month*100 + value; } } + + /// + /// Gets or sets the date of the card. + /// + public DateTime? Date + { + get + { + // Check to see if date is valid + if (!Util.IsDateValid(2000 + Year, Month, Day)) + { + return null; + } + else + { + return new DateTime(2000 + (int)Year, (int)Month, (int)Day); + } + } + set + { + if (value.HasValue) + { + // Only update the properties if a value is provided. + Year = (ushort)(value.Value.Year - 2000); + Month = (byte)value.Value.Month; + Day = (byte)value.Value.Day; + } + else + { + // Clear the Met Date. + // If code tries to access MetDate again, null will be returned. + Year = 0; + Month = 0; + Day = 0; + } + } + } + public int CardLocation { get { return Data[0x50]; } set { Data[0x50] = (byte)value; } } public int CardType { get { return Data[0x51]; } set { Data[0x51] = (byte)value; } } @@ -281,18 +319,15 @@ public override PKM convertToPKM(SaveFile SAV) pk.Move3_PP = pk.getMovePP(Move3, 0); pk.Move4_PP = pk.getMovePP(Move4, 0); - if (Day + Month + Year == 0) // No datetime set, typical for wc6full + if (Date.HasValue) { - DateTime dt = DateTime.Now; - pk.Met_Day = dt.Day; - pk.Met_Month = dt.Month; - pk.Met_Year = dt.Year - 2000; + pk.MetDate = Date.Value; } else { - pk.Met_Day = (int)Day; - pk.Met_Month = (int)Month; - pk.Met_Year = (int)(Year - 2000); + // No datetime set, typical for wc6full + // Set it to now, instead of zeroing it out. + pk.MetDate = DateTime.Now; } if (pk.CurrentHandler == 0) // OT @@ -375,9 +410,7 @@ public override PKM convertToPKM(SaveFile SAV) if (IsEgg) { pk.IsEgg = true; - pk.Egg_Day = (int) Day; - pk.Egg_Month = (int) Month; - pk.Egg_Year = (int) Year; + pk.EggMetDate = Date; } pk.RefreshChecksum(); diff --git a/PKHeX.csproj b/PKHeX/PKHeX.csproj similarity index 99% rename from PKHeX.csproj rename to PKHeX/PKHeX.csproj index 14445871e..a0a1c2b8b 100644 --- a/PKHeX.csproj +++ b/PKHeX/PKHeX.csproj @@ -61,12 +61,9 @@ - - - @@ -298,6 +295,7 @@ + diff --git a/PKHeX.userprefs b/PKHeX/PKHeX.userprefs similarity index 100% rename from PKHeX.userprefs rename to PKHeX/PKHeX.userprefs diff --git a/PKM/PK3.cs b/PKHeX/PKM/PK3.cs similarity index 99% rename from PKM/PK3.cs rename to PKHeX/PKM/PK3.cs index a6f20bc4c..7dc83b479 100644 --- a/PKM/PK3.cs +++ b/PKHeX/PKM/PK3.cs @@ -238,9 +238,7 @@ public PK4 convertToPK4() PKRS_Strain = PKRS_Strain, PKRS_Days = PKRS_Days, OT_Gender = OT_Gender, - Met_Year = moment.Year - 2000, - Met_Month = moment.Month, - Met_Day = moment.Day, + MetDate = moment, Met_Location = 0x37, // Pal Park RibbonChampionG3Hoenn = RibbonChampionG3Hoenn, diff --git a/PKM/PK4.cs b/PKHeX/PKM/PK4.cs similarity index 97% rename from PKM/PK4.cs rename to PKHeX/PKM/PK4.cs index f5a73b823..535382a52 100644 --- a/PKM/PK4.cs +++ b/PKHeX/PKM/PK4.cs @@ -243,12 +243,12 @@ public override string OT_Name PKX.str2arrayG4(TempNick).CopyTo(Data, 0x68); } } - public override int Egg_Year { get { return Data[0x78]; } set { Data[0x78] = (byte)value; } } - public override int Egg_Month { get { return Data[0x79]; } set { Data[0x79] = (byte)value; } } - public override int Egg_Day { get { return Data[0x7A]; } set { Data[0x7A] = (byte)value; } } - public override int Met_Year { get { return Data[0x7B]; } set { Data[0x7B] = (byte)value; } } - public override int Met_Month { get { return Data[0x7C]; } set { Data[0x7C] = (byte)value; } } - public override int Met_Day { get { return Data[0x7D]; } set { Data[0x7D] = (byte)value; } } + protected override int Egg_Year { get { return Data[0x78]; } set { Data[0x78] = (byte)value; } } + protected override int Egg_Month { get { return Data[0x79]; } set { Data[0x79] = (byte)value; } } + protected override int Egg_Day { get { return Data[0x7A]; } set { Data[0x7A] = (byte)value; } } + protected override int Met_Year { get { return Data[0x7B]; } set { Data[0x7B] = (byte)value; } } + protected override int Met_Month { get { return Data[0x7C]; } set { Data[0x7C] = (byte)value; } } + protected override int Met_Day { get { return Data[0x7D]; } set { Data[0x7D] = (byte)value; } } public override int Egg_Location { @@ -411,9 +411,7 @@ public PK5 convertToPK5() HeldItem = 0, OT_Friendship = 70, // Apply new met date - Met_Year = moment.Year - 2000, - Met_Month = moment.Month, - Met_Day = moment.Day + MetDate = moment }; // Fix PP diff --git a/PKM/PK5.cs b/PKHeX/PKM/PK5.cs similarity index 98% rename from PKM/PK5.cs rename to PKHeX/PKM/PK5.cs index d8a302b1a..65772c052 100644 --- a/PKM/PK5.cs +++ b/PKHeX/PKM/PK5.cs @@ -248,12 +248,12 @@ public override string OT_Name Encoding.Unicode.GetBytes(TempNick).CopyTo(Data, 0x68); } } - public override int Egg_Year { get { return Data[0x78]; } set { Data[0x78] = (byte)value; } } - public override int Egg_Month { get { return Data[0x79]; } set { Data[0x79] = (byte)value; } } - public override int Egg_Day { get { return Data[0x7A]; } set { Data[0x7A] = (byte)value; } } - public override int Met_Year { get { return Data[0x7B]; } set { Data[0x7B] = (byte)value; } } - public override int Met_Month { get { return Data[0x7C]; } set { Data[0x7C] = (byte)value; } } - public override int Met_Day { get { return Data[0x7D]; } set { Data[0x7D] = (byte)value; } } + protected override int Egg_Year { get { return Data[0x78]; } set { Data[0x78] = (byte)value; } } + protected override int Egg_Month { get { return Data[0x79]; } set { Data[0x79] = (byte)value; } } + protected override int Egg_Day { get { return Data[0x7A]; } set { Data[0x7A] = (byte)value; } } + protected override int Met_Year { get { return Data[0x7B]; } set { Data[0x7B] = (byte)value; } } + protected override int Met_Month { get { return Data[0x7C]; } set { Data[0x7C] = (byte)value; } } + protected override int Met_Day { get { return Data[0x7D]; } set { Data[0x7D] = (byte)value; } } public override int Egg_Location { get { return BitConverter.ToUInt16(Data, 0x7E); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x7E); } } public override int Met_Location { get { return BitConverter.ToUInt16(Data, 0x80); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x80); } } private byte PKRS { get { return Data[0x82]; } set { Data[0x82] = value; } } @@ -403,12 +403,8 @@ public PK6 convertToPK6() pk6.OT_Name = OT_Name; // Dates are kept upon transfer - pk6.Met_Year = Met_Year; - pk6.Met_Month = Met_Month; - pk6.Met_Day = Met_Day; - pk6.Egg_Year = Egg_Year; - pk6.Egg_Month = Egg_Month; - pk6.Egg_Day = Egg_Day; + pk6.MetDate = MetDate; + pk6.EggMetDate = EggMetDate; // Locations are kept upon transfer pk6.Met_Location = Met_Location; diff --git a/PKM/PK6.cs b/PKHeX/PKM/PK6.cs similarity index 98% rename from PKM/PK6.cs rename to PKHeX/PKM/PK6.cs index ca81c2eb2..b731d2b26 100644 --- a/PKM/PK6.cs +++ b/PKHeX/PKM/PK6.cs @@ -365,12 +365,12 @@ public override string OT_Name public int OT_Memory { get { return Data[0xCD]; } set { Data[0xCD] = (byte)value; } } public int OT_TextVar { get { return BitConverter.ToUInt16(Data, 0xCE); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xCE); } } public int OT_Feeling { get { return Data[0xD0]; } set { Data[0xD0] = (byte)value; } } - public override int Egg_Year { get { return Data[0xD1]; } set { Data[0xD1] = (byte)value; } } - public override int Egg_Month { get { return Data[0xD2]; } set { Data[0xD2] = (byte)value; } } - public override int Egg_Day { get { return Data[0xD3]; } set { Data[0xD3] = (byte)value; } } - public override int Met_Year { get { return Data[0xD4]; } set { Data[0xD4] = (byte)value; } } - public override int Met_Month { get { return Data[0xD5]; } set { Data[0xD5] = (byte)value; } } - public override int Met_Day { get { return Data[0xD6]; } set { Data[0xD6] = (byte)value; } } + protected override int Egg_Year { get { return Data[0xD1]; } set { Data[0xD1] = (byte)value; } } + protected override int Egg_Month { get { return Data[0xD2]; } set { Data[0xD2] = (byte)value; } } + protected override int Egg_Day { get { return Data[0xD3]; } set { Data[0xD3] = (byte)value; } } + protected override int Met_Year { get { return Data[0xD4]; } set { Data[0xD4] = (byte)value; } } + protected override int Met_Month { get { return Data[0xD5]; } set { Data[0xD5] = (byte)value; } } + protected override int Met_Day { get { return Data[0xD6]; } set { Data[0xD6] = (byte)value; } } public byte _0xD7 { get { return Data[0xD7]; } set { Data[0xD7] = value; } } public override int Egg_Location { get { return BitConverter.ToUInt16(Data, 0xD8); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xD8); } } public override int Met_Location { get { return BitConverter.ToUInt16(Data, 0xDA); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xDA); } } diff --git a/PKM/PKM.cs b/PKHeX/PKM/PKM.cs similarity index 80% rename from PKM/PKM.cs rename to PKHeX/PKM/PKM.cs index 1d3134d82..3008f6e80 100644 --- a/PKM/PKM.cs +++ b/PKHeX/PKM/PKM.cs @@ -125,12 +125,96 @@ public byte[] Write() public abstract int OT_Friendship { get; set; } // Future Properties - public virtual int Met_Year { get { return 0; } set { } } - public virtual int Met_Month { get { return 0; } set { } } - public virtual int Met_Day { get { return 0; } set { } } - public virtual int Egg_Year { get { return 0; } set { } } - public virtual int Egg_Month { get { return 0; } set { } } - public virtual int Egg_Day { get { return 0; } set { } } + protected virtual int Met_Year { get { return 0; } set { } } + protected virtual int Met_Month { get { return 0; } set { } } + protected virtual int Met_Day { get { return 0; } set { } } + + /// + /// The date the Pokémon was met. + /// + /// A DateTime representing the date the Pokémon was met, or null if either the format does not support dates or the stored date is invalid. + /// Not all types support the property. In these cases, this property will return null. + /// + /// If null is assigned to this property, it will be cleared. + public virtual DateTime? MetDate + { + get + { + // Check to see if date is valid + if (!Util.IsDateValid(2000 + Met_Year, Met_Month, Met_Day)) + { + return null; + } + else + { + return new DateTime(2000 + Met_Year, Met_Month, Met_Day); + } + } + set + { + if (value.HasValue) + { + // Only update the properties if a value is provided. + Met_Year = value.Value.Year - 2000; + Met_Month = value.Value.Month; + Met_Day = value.Value.Day; + } + else + { + // Clear the Met Date. + // If code tries to access MetDate again, null will be returned. + Met_Year = 0; + Met_Month = 0; + Met_Day = 0; + } + } + } + + protected virtual int Egg_Year { get { return 0; } set { } } + protected virtual int Egg_Month { get { return 0; } set { } } + protected virtual int Egg_Day { get { return 0; } set { } } + + /// + /// The date a Pokémon was met as an egg. + /// + /// A DateTime representing the date the Pokémon was met as an egg, or null if the format does not support dates. + /// Not all types support the property. In these cases, this property will return null. + /// + /// If null is assigned to this property, it will be cleared. + public virtual DateTime? EggMetDate + { + get + { + // Check to see if date is valid + if (!Util.IsDateValid(2000 + Egg_Year, Egg_Month, Egg_Day)) + { + return null; + } + else + { + return new DateTime(2000 + Egg_Year, Egg_Month, Egg_Day); + } + } + set + { + if (value.HasValue) + { + // Only update the properties if a value is provided. + Egg_Year = value.Value.Year - 2000; + Egg_Month = value.Value.Month; + Egg_Day = value.Value.Day; + } + else + { + // Clear the Met Date. + // If code tries to access MetDate again, null will be returned. + Egg_Year = 0; + Egg_Month = 0; + Egg_Day = 0; + } + } + } + public virtual int OT_Affection { get { return 0; } set { } } public virtual int RelearnMove1 { get { return 0; } set { } } public virtual int RelearnMove2 { get { return 0; } set { } } diff --git a/PKM/PKMConverter.cs b/PKHeX/PKM/PKMConverter.cs similarity index 100% rename from PKM/PKMConverter.cs rename to PKHeX/PKM/PKMConverter.cs diff --git a/PKM/PKX.cs b/PKHeX/PKM/PKX.cs similarity index 100% rename from PKM/PKX.cs rename to PKHeX/PKM/PKX.cs diff --git a/PKM/ShowdownSet.cs b/PKHeX/PKM/ShowdownSet.cs similarity index 99% rename from PKM/ShowdownSet.cs rename to PKHeX/PKM/ShowdownSet.cs index 4cc9df962..736bb93ec 100644 --- a/PKM/ShowdownSet.cs +++ b/PKHeX/PKM/ShowdownSet.cs @@ -96,7 +96,7 @@ public ShowdownSet(string input = null) string[] tmp = spec.Split(new[] { "-" }, StringSplitOptions.None); if (tmp.Length < 2) return; Species = Array.IndexOf(species, tmp[0].Replace(" ", "")); - Form = tmp[1].Replace(" ", ""); + Form = tmp[1].Trim(); if (tmp.Length > 2) Form += " " + tmp[2]; } @@ -186,7 +186,7 @@ public ShowdownSet(string input = null) { string[] tmp = spec.Split(new[] { "-" }, StringSplitOptions.None); Species = Array.IndexOf(species, tmp[0].Replace(" ", "")); - Form = tmp[1].Replace(" ", ""); + Form = tmp[1].Trim(); if (tmp.Length > 2) Form += " " + tmp[2]; } diff --git a/PersonalInfo/PersonalInfo.cs b/PKHeX/PersonalInfo/PersonalInfo.cs similarity index 100% rename from PersonalInfo/PersonalInfo.cs rename to PKHeX/PersonalInfo/PersonalInfo.cs diff --git a/PersonalInfo/PersonalInfoB2W2.cs b/PKHeX/PersonalInfo/PersonalInfoB2W2.cs similarity index 100% rename from PersonalInfo/PersonalInfoB2W2.cs rename to PKHeX/PersonalInfo/PersonalInfoB2W2.cs diff --git a/PersonalInfo/PersonalInfoBW.cs b/PKHeX/PersonalInfo/PersonalInfoBW.cs similarity index 100% rename from PersonalInfo/PersonalInfoBW.cs rename to PKHeX/PersonalInfo/PersonalInfoBW.cs diff --git a/PersonalInfo/PersonalInfoG3.cs b/PKHeX/PersonalInfo/PersonalInfoG3.cs similarity index 100% rename from PersonalInfo/PersonalInfoG3.cs rename to PKHeX/PersonalInfo/PersonalInfoG3.cs diff --git a/PersonalInfo/PersonalInfoG4.cs b/PKHeX/PersonalInfo/PersonalInfoG4.cs similarity index 100% rename from PersonalInfo/PersonalInfoG4.cs rename to PKHeX/PersonalInfo/PersonalInfoG4.cs diff --git a/PersonalInfo/PersonalInfoORAS.cs b/PKHeX/PersonalInfo/PersonalInfoORAS.cs similarity index 100% rename from PersonalInfo/PersonalInfoORAS.cs rename to PKHeX/PersonalInfo/PersonalInfoORAS.cs diff --git a/PersonalInfo/PersonalInfoXY.cs b/PKHeX/PersonalInfo/PersonalInfoXY.cs similarity index 100% rename from PersonalInfo/PersonalInfoXY.cs rename to PKHeX/PersonalInfo/PersonalInfoXY.cs diff --git a/PersonalInfo/PersonalTable.cs b/PKHeX/PersonalInfo/PersonalTable.cs similarity index 100% rename from PersonalInfo/PersonalTable.cs rename to PKHeX/PersonalInfo/PersonalTable.cs diff --git a/Program.cs b/PKHeX/Program.cs similarity index 100% rename from Program.cs rename to PKHeX/Program.cs diff --git a/Properties/AssemblyInfo.cs b/PKHeX/Properties/AssemblyInfo.cs similarity index 100% rename from Properties/AssemblyInfo.cs rename to PKHeX/Properties/AssemblyInfo.cs diff --git a/Properties/Resources.Designer.cs b/PKHeX/Properties/Resources.Designer.cs similarity index 100% rename from Properties/Resources.Designer.cs rename to PKHeX/Properties/Resources.Designer.cs diff --git a/Properties/Resources.resx b/PKHeX/Properties/Resources.resx similarity index 100% rename from Properties/Resources.resx rename to PKHeX/Properties/Resources.resx diff --git a/Properties/Settings.Designer.cs b/PKHeX/Properties/Settings.Designer.cs similarity index 100% rename from Properties/Settings.Designer.cs rename to PKHeX/Properties/Settings.Designer.cs diff --git a/Properties/Settings.settings b/PKHeX/Properties/Settings.settings similarity index 100% rename from Properties/Settings.settings rename to PKHeX/Properties/Settings.settings diff --git a/Resources/byte/PGLDings-NormalRegular.ttf b/PKHeX/Resources/byte/PGLDings-NormalRegular.ttf similarity index 100% rename from Resources/byte/PGLDings-NormalRegular.ttf rename to PKHeX/Resources/byte/PGLDings-NormalRegular.ttf diff --git a/Resources/byte/eggmove_ao.pkl b/PKHeX/Resources/byte/eggmove_ao.pkl similarity index 100% rename from Resources/byte/eggmove_ao.pkl rename to PKHeX/Resources/byte/eggmove_ao.pkl diff --git a/Resources/byte/eggmove_xy.pkl b/PKHeX/Resources/byte/eggmove_xy.pkl similarity index 100% rename from Resources/byte/eggmove_xy.pkl rename to PKHeX/Resources/byte/eggmove_xy.pkl diff --git a/Resources/byte/encounter_a.pkl b/PKHeX/Resources/byte/encounter_a.pkl similarity index 100% rename from Resources/byte/encounter_a.pkl rename to PKHeX/Resources/byte/encounter_a.pkl diff --git a/Resources/byte/encounter_o.pkl b/PKHeX/Resources/byte/encounter_o.pkl similarity index 100% rename from Resources/byte/encounter_o.pkl rename to PKHeX/Resources/byte/encounter_o.pkl diff --git a/Resources/byte/encounter_x.pkl b/PKHeX/Resources/byte/encounter_x.pkl similarity index 100% rename from Resources/byte/encounter_x.pkl rename to PKHeX/Resources/byte/encounter_x.pkl diff --git a/Resources/byte/encounter_y.pkl b/PKHeX/Resources/byte/encounter_y.pkl similarity index 100% rename from Resources/byte/encounter_y.pkl rename to PKHeX/Resources/byte/encounter_y.pkl diff --git a/Resources/byte/evos_ao.pkl b/PKHeX/Resources/byte/evos_ao.pkl similarity index 100% rename from Resources/byte/evos_ao.pkl rename to PKHeX/Resources/byte/evos_ao.pkl diff --git a/Resources/byte/lvlmove_ao.pkl b/PKHeX/Resources/byte/lvlmove_ao.pkl similarity index 100% rename from Resources/byte/lvlmove_ao.pkl rename to PKHeX/Resources/byte/lvlmove_ao.pkl diff --git a/Resources/byte/lvlmove_xy.pkl b/PKHeX/Resources/byte/lvlmove_xy.pkl similarity index 100% rename from Resources/byte/lvlmove_xy.pkl rename to PKHeX/Resources/byte/lvlmove_xy.pkl diff --git a/Resources/byte/personal_ao b/PKHeX/Resources/byte/personal_ao similarity index 100% rename from Resources/byte/personal_ao rename to PKHeX/Resources/byte/personal_ao diff --git a/Resources/byte/personal_b2w2 b/PKHeX/Resources/byte/personal_b2w2 similarity index 100% rename from Resources/byte/personal_b2w2 rename to PKHeX/Resources/byte/personal_b2w2 diff --git a/Resources/byte/personal_bw b/PKHeX/Resources/byte/personal_bw similarity index 100% rename from Resources/byte/personal_bw rename to PKHeX/Resources/byte/personal_bw diff --git a/Resources/byte/personal_dp b/PKHeX/Resources/byte/personal_dp similarity index 100% rename from Resources/byte/personal_dp rename to PKHeX/Resources/byte/personal_dp diff --git a/Resources/byte/personal_e b/PKHeX/Resources/byte/personal_e similarity index 100% rename from Resources/byte/personal_e rename to PKHeX/Resources/byte/personal_e diff --git a/Resources/byte/personal_fr b/PKHeX/Resources/byte/personal_fr similarity index 100% rename from Resources/byte/personal_fr rename to PKHeX/Resources/byte/personal_fr diff --git a/Resources/byte/personal_hgss b/PKHeX/Resources/byte/personal_hgss similarity index 100% rename from Resources/byte/personal_hgss rename to PKHeX/Resources/byte/personal_hgss diff --git a/Resources/byte/personal_lg b/PKHeX/Resources/byte/personal_lg similarity index 100% rename from Resources/byte/personal_lg rename to PKHeX/Resources/byte/personal_lg diff --git a/Resources/byte/personal_pt b/PKHeX/Resources/byte/personal_pt similarity index 100% rename from Resources/byte/personal_pt rename to PKHeX/Resources/byte/personal_pt diff --git a/Resources/byte/personal_rs b/PKHeX/Resources/byte/personal_rs similarity index 100% rename from Resources/byte/personal_rs rename to PKHeX/Resources/byte/personal_rs diff --git a/Resources/byte/personal_xy b/PKHeX/Resources/byte/personal_xy similarity index 100% rename from Resources/byte/personal_xy rename to PKHeX/Resources/byte/personal_xy diff --git a/Resources/byte/wc6.pkl b/PKHeX/Resources/byte/wc6.pkl similarity index 100% rename from Resources/byte/wc6.pkl rename to PKHeX/Resources/byte/wc6.pkl diff --git a/Resources/byte/wc6full.pkl b/PKHeX/Resources/byte/wc6full.pkl similarity index 100% rename from Resources/byte/wc6full.pkl rename to PKHeX/Resources/byte/wc6full.pkl diff --git a/Resources/icon.ico b/PKHeX/Resources/icon.ico similarity index 100% rename from Resources/icon.ico rename to PKHeX/Resources/icon.ico diff --git a/Resources/img/Bag/Bag_Balls.png b/PKHeX/Resources/img/Bag/Bag_Balls.png similarity index 100% rename from Resources/img/Bag/Bag_Balls.png rename to PKHeX/Resources/img/Bag/Bag_Balls.png diff --git a/Resources/img/Bag/Bag_Battle.png b/PKHeX/Resources/img/Bag/Bag_Battle.png similarity index 100% rename from Resources/img/Bag/Bag_Battle.png rename to PKHeX/Resources/img/Bag/Bag_Battle.png diff --git a/Resources/img/Bag/Bag_Berries.png b/PKHeX/Resources/img/Bag/Bag_Berries.png similarity index 100% rename from Resources/img/Bag/Bag_Berries.png rename to PKHeX/Resources/img/Bag/Bag_Berries.png diff --git a/Resources/img/Bag/Bag_Items.png b/PKHeX/Resources/img/Bag/Bag_Items.png similarity index 100% rename from Resources/img/Bag/Bag_Items.png rename to PKHeX/Resources/img/Bag/Bag_Items.png diff --git a/Resources/img/Bag/Bag_Key.png b/PKHeX/Resources/img/Bag/Bag_Key.png similarity index 100% rename from Resources/img/Bag/Bag_Key.png rename to PKHeX/Resources/img/Bag/Bag_Key.png diff --git a/Resources/img/Bag/Bag_Mail.png b/PKHeX/Resources/img/Bag/Bag_Mail.png similarity index 100% rename from Resources/img/Bag/Bag_Mail.png rename to PKHeX/Resources/img/Bag/Bag_Mail.png diff --git a/Resources/img/Bag/Bag_Medicine.png b/PKHeX/Resources/img/Bag/Bag_Medicine.png similarity index 100% rename from Resources/img/Bag/Bag_Medicine.png rename to PKHeX/Resources/img/Bag/Bag_Medicine.png diff --git a/Resources/img/Bag/Bag_TMHM.png b/PKHeX/Resources/img/Bag/Bag_TMHM.png similarity index 100% rename from Resources/img/Bag/Bag_TMHM.png rename to PKHeX/Resources/img/Bag/Bag_TMHM.png diff --git a/Resources/img/Pokemon Sprites/0.png b/PKHeX/Resources/img/Pokemon Sprites/0.png similarity index 100% rename from Resources/img/Pokemon Sprites/0.png rename to PKHeX/Resources/img/Pokemon Sprites/0.png diff --git a/Resources/img/Pokemon Sprites/1.png b/PKHeX/Resources/img/Pokemon Sprites/1.png similarity index 100% rename from Resources/img/Pokemon Sprites/1.png rename to PKHeX/Resources/img/Pokemon Sprites/1.png diff --git a/Resources/img/Pokemon Sprites/10.png b/PKHeX/Resources/img/Pokemon Sprites/10.png similarity index 100% rename from Resources/img/Pokemon Sprites/10.png rename to PKHeX/Resources/img/Pokemon Sprites/10.png diff --git a/Resources/img/Pokemon Sprites/100.png b/PKHeX/Resources/img/Pokemon Sprites/100.png similarity index 100% rename from Resources/img/Pokemon Sprites/100.png rename to PKHeX/Resources/img/Pokemon Sprites/100.png diff --git a/Resources/img/Pokemon Sprites/101.png b/PKHeX/Resources/img/Pokemon Sprites/101.png similarity index 100% rename from Resources/img/Pokemon Sprites/101.png rename to PKHeX/Resources/img/Pokemon Sprites/101.png diff --git a/Resources/img/Pokemon Sprites/102.png b/PKHeX/Resources/img/Pokemon Sprites/102.png similarity index 100% rename from Resources/img/Pokemon Sprites/102.png rename to PKHeX/Resources/img/Pokemon Sprites/102.png diff --git a/Resources/img/Pokemon Sprites/103.png b/PKHeX/Resources/img/Pokemon Sprites/103.png similarity index 100% rename from Resources/img/Pokemon Sprites/103.png rename to PKHeX/Resources/img/Pokemon Sprites/103.png diff --git a/Resources/img/Pokemon Sprites/104.png b/PKHeX/Resources/img/Pokemon Sprites/104.png similarity index 100% rename from Resources/img/Pokemon Sprites/104.png rename to PKHeX/Resources/img/Pokemon Sprites/104.png diff --git a/Resources/img/Pokemon Sprites/105.png b/PKHeX/Resources/img/Pokemon Sprites/105.png similarity index 100% rename from Resources/img/Pokemon Sprites/105.png rename to PKHeX/Resources/img/Pokemon Sprites/105.png diff --git a/Resources/img/Pokemon Sprites/106.png b/PKHeX/Resources/img/Pokemon Sprites/106.png similarity index 100% rename from Resources/img/Pokemon Sprites/106.png rename to PKHeX/Resources/img/Pokemon Sprites/106.png diff --git a/Resources/img/Pokemon Sprites/107.png b/PKHeX/Resources/img/Pokemon Sprites/107.png similarity index 100% rename from Resources/img/Pokemon Sprites/107.png rename to PKHeX/Resources/img/Pokemon Sprites/107.png diff --git a/Resources/img/Pokemon Sprites/108.png b/PKHeX/Resources/img/Pokemon Sprites/108.png similarity index 100% rename from Resources/img/Pokemon Sprites/108.png rename to PKHeX/Resources/img/Pokemon Sprites/108.png diff --git a/Resources/img/Pokemon Sprites/109.png b/PKHeX/Resources/img/Pokemon Sprites/109.png similarity index 100% rename from Resources/img/Pokemon Sprites/109.png rename to PKHeX/Resources/img/Pokemon Sprites/109.png diff --git a/Resources/img/Pokemon Sprites/11.png b/PKHeX/Resources/img/Pokemon Sprites/11.png similarity index 100% rename from Resources/img/Pokemon Sprites/11.png rename to PKHeX/Resources/img/Pokemon Sprites/11.png diff --git a/Resources/img/Pokemon Sprites/110.png b/PKHeX/Resources/img/Pokemon Sprites/110.png similarity index 100% rename from Resources/img/Pokemon Sprites/110.png rename to PKHeX/Resources/img/Pokemon Sprites/110.png diff --git a/Resources/img/Pokemon Sprites/111.png b/PKHeX/Resources/img/Pokemon Sprites/111.png similarity index 100% rename from Resources/img/Pokemon Sprites/111.png rename to PKHeX/Resources/img/Pokemon Sprites/111.png diff --git a/Resources/img/Pokemon Sprites/112.png b/PKHeX/Resources/img/Pokemon Sprites/112.png similarity index 100% rename from Resources/img/Pokemon Sprites/112.png rename to PKHeX/Resources/img/Pokemon Sprites/112.png diff --git a/Resources/img/Pokemon Sprites/113.png b/PKHeX/Resources/img/Pokemon Sprites/113.png similarity index 100% rename from Resources/img/Pokemon Sprites/113.png rename to PKHeX/Resources/img/Pokemon Sprites/113.png diff --git a/Resources/img/Pokemon Sprites/114.png b/PKHeX/Resources/img/Pokemon Sprites/114.png similarity index 100% rename from Resources/img/Pokemon Sprites/114.png rename to PKHeX/Resources/img/Pokemon Sprites/114.png diff --git a/Resources/img/Pokemon Sprites/115-1.png b/PKHeX/Resources/img/Pokemon Sprites/115-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/115-1.png rename to PKHeX/Resources/img/Pokemon Sprites/115-1.png diff --git a/Resources/img/Pokemon Sprites/115.png b/PKHeX/Resources/img/Pokemon Sprites/115.png similarity index 100% rename from Resources/img/Pokemon Sprites/115.png rename to PKHeX/Resources/img/Pokemon Sprites/115.png diff --git a/Resources/img/Pokemon Sprites/116.png b/PKHeX/Resources/img/Pokemon Sprites/116.png similarity index 100% rename from Resources/img/Pokemon Sprites/116.png rename to PKHeX/Resources/img/Pokemon Sprites/116.png diff --git a/Resources/img/Pokemon Sprites/117.png b/PKHeX/Resources/img/Pokemon Sprites/117.png similarity index 100% rename from Resources/img/Pokemon Sprites/117.png rename to PKHeX/Resources/img/Pokemon Sprites/117.png diff --git a/Resources/img/Pokemon Sprites/118.png b/PKHeX/Resources/img/Pokemon Sprites/118.png similarity index 100% rename from Resources/img/Pokemon Sprites/118.png rename to PKHeX/Resources/img/Pokemon Sprites/118.png diff --git a/Resources/img/Pokemon Sprites/119.png b/PKHeX/Resources/img/Pokemon Sprites/119.png similarity index 100% rename from Resources/img/Pokemon Sprites/119.png rename to PKHeX/Resources/img/Pokemon Sprites/119.png diff --git a/Resources/img/Pokemon Sprites/12.png b/PKHeX/Resources/img/Pokemon Sprites/12.png similarity index 100% rename from Resources/img/Pokemon Sprites/12.png rename to PKHeX/Resources/img/Pokemon Sprites/12.png diff --git a/Resources/img/Pokemon Sprites/120.png b/PKHeX/Resources/img/Pokemon Sprites/120.png similarity index 100% rename from Resources/img/Pokemon Sprites/120.png rename to PKHeX/Resources/img/Pokemon Sprites/120.png diff --git a/Resources/img/Pokemon Sprites/121.png b/PKHeX/Resources/img/Pokemon Sprites/121.png similarity index 100% rename from Resources/img/Pokemon Sprites/121.png rename to PKHeX/Resources/img/Pokemon Sprites/121.png diff --git a/Resources/img/Pokemon Sprites/122.png b/PKHeX/Resources/img/Pokemon Sprites/122.png similarity index 100% rename from Resources/img/Pokemon Sprites/122.png rename to PKHeX/Resources/img/Pokemon Sprites/122.png diff --git a/Resources/img/Pokemon Sprites/123.png b/PKHeX/Resources/img/Pokemon Sprites/123.png similarity index 100% rename from Resources/img/Pokemon Sprites/123.png rename to PKHeX/Resources/img/Pokemon Sprites/123.png diff --git a/Resources/img/Pokemon Sprites/124.png b/PKHeX/Resources/img/Pokemon Sprites/124.png similarity index 100% rename from Resources/img/Pokemon Sprites/124.png rename to PKHeX/Resources/img/Pokemon Sprites/124.png diff --git a/Resources/img/Pokemon Sprites/125.png b/PKHeX/Resources/img/Pokemon Sprites/125.png similarity index 100% rename from Resources/img/Pokemon Sprites/125.png rename to PKHeX/Resources/img/Pokemon Sprites/125.png diff --git a/Resources/img/Pokemon Sprites/126.png b/PKHeX/Resources/img/Pokemon Sprites/126.png similarity index 100% rename from Resources/img/Pokemon Sprites/126.png rename to PKHeX/Resources/img/Pokemon Sprites/126.png diff --git a/Resources/img/Pokemon Sprites/127-1.png b/PKHeX/Resources/img/Pokemon Sprites/127-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/127-1.png rename to PKHeX/Resources/img/Pokemon Sprites/127-1.png diff --git a/Resources/img/Pokemon Sprites/127.png b/PKHeX/Resources/img/Pokemon Sprites/127.png similarity index 100% rename from Resources/img/Pokemon Sprites/127.png rename to PKHeX/Resources/img/Pokemon Sprites/127.png diff --git a/Resources/img/Pokemon Sprites/128.png b/PKHeX/Resources/img/Pokemon Sprites/128.png similarity index 100% rename from Resources/img/Pokemon Sprites/128.png rename to PKHeX/Resources/img/Pokemon Sprites/128.png diff --git a/Resources/img/Pokemon Sprites/129.png b/PKHeX/Resources/img/Pokemon Sprites/129.png similarity index 100% rename from Resources/img/Pokemon Sprites/129.png rename to PKHeX/Resources/img/Pokemon Sprites/129.png diff --git a/Resources/img/Pokemon Sprites/13.png b/PKHeX/Resources/img/Pokemon Sprites/13.png similarity index 100% rename from Resources/img/Pokemon Sprites/13.png rename to PKHeX/Resources/img/Pokemon Sprites/13.png diff --git a/Resources/img/Pokemon Sprites/130-1.png b/PKHeX/Resources/img/Pokemon Sprites/130-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/130-1.png rename to PKHeX/Resources/img/Pokemon Sprites/130-1.png diff --git a/Resources/img/Pokemon Sprites/130.png b/PKHeX/Resources/img/Pokemon Sprites/130.png similarity index 100% rename from Resources/img/Pokemon Sprites/130.png rename to PKHeX/Resources/img/Pokemon Sprites/130.png diff --git a/Resources/img/Pokemon Sprites/131.png b/PKHeX/Resources/img/Pokemon Sprites/131.png similarity index 100% rename from Resources/img/Pokemon Sprites/131.png rename to PKHeX/Resources/img/Pokemon Sprites/131.png diff --git a/Resources/img/Pokemon Sprites/132.png b/PKHeX/Resources/img/Pokemon Sprites/132.png similarity index 100% rename from Resources/img/Pokemon Sprites/132.png rename to PKHeX/Resources/img/Pokemon Sprites/132.png diff --git a/Resources/img/Pokemon Sprites/133.png b/PKHeX/Resources/img/Pokemon Sprites/133.png similarity index 100% rename from Resources/img/Pokemon Sprites/133.png rename to PKHeX/Resources/img/Pokemon Sprites/133.png diff --git a/Resources/img/Pokemon Sprites/134.png b/PKHeX/Resources/img/Pokemon Sprites/134.png similarity index 100% rename from Resources/img/Pokemon Sprites/134.png rename to PKHeX/Resources/img/Pokemon Sprites/134.png diff --git a/Resources/img/Pokemon Sprites/135.png b/PKHeX/Resources/img/Pokemon Sprites/135.png similarity index 100% rename from Resources/img/Pokemon Sprites/135.png rename to PKHeX/Resources/img/Pokemon Sprites/135.png diff --git a/Resources/img/Pokemon Sprites/136.png b/PKHeX/Resources/img/Pokemon Sprites/136.png similarity index 100% rename from Resources/img/Pokemon Sprites/136.png rename to PKHeX/Resources/img/Pokemon Sprites/136.png diff --git a/Resources/img/Pokemon Sprites/137.png b/PKHeX/Resources/img/Pokemon Sprites/137.png similarity index 100% rename from Resources/img/Pokemon Sprites/137.png rename to PKHeX/Resources/img/Pokemon Sprites/137.png diff --git a/Resources/img/Pokemon Sprites/138.png b/PKHeX/Resources/img/Pokemon Sprites/138.png similarity index 100% rename from Resources/img/Pokemon Sprites/138.png rename to PKHeX/Resources/img/Pokemon Sprites/138.png diff --git a/Resources/img/Pokemon Sprites/139.png b/PKHeX/Resources/img/Pokemon Sprites/139.png similarity index 100% rename from Resources/img/Pokemon Sprites/139.png rename to PKHeX/Resources/img/Pokemon Sprites/139.png diff --git a/Resources/img/Pokemon Sprites/14.png b/PKHeX/Resources/img/Pokemon Sprites/14.png similarity index 100% rename from Resources/img/Pokemon Sprites/14.png rename to PKHeX/Resources/img/Pokemon Sprites/14.png diff --git a/Resources/img/Pokemon Sprites/140.png b/PKHeX/Resources/img/Pokemon Sprites/140.png similarity index 100% rename from Resources/img/Pokemon Sprites/140.png rename to PKHeX/Resources/img/Pokemon Sprites/140.png diff --git a/Resources/img/Pokemon Sprites/141.png b/PKHeX/Resources/img/Pokemon Sprites/141.png similarity index 100% rename from Resources/img/Pokemon Sprites/141.png rename to PKHeX/Resources/img/Pokemon Sprites/141.png diff --git a/Resources/img/Pokemon Sprites/142-1.png b/PKHeX/Resources/img/Pokemon Sprites/142-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/142-1.png rename to PKHeX/Resources/img/Pokemon Sprites/142-1.png diff --git a/Resources/img/Pokemon Sprites/142.png b/PKHeX/Resources/img/Pokemon Sprites/142.png similarity index 100% rename from Resources/img/Pokemon Sprites/142.png rename to PKHeX/Resources/img/Pokemon Sprites/142.png diff --git a/Resources/img/Pokemon Sprites/143.png b/PKHeX/Resources/img/Pokemon Sprites/143.png similarity index 100% rename from Resources/img/Pokemon Sprites/143.png rename to PKHeX/Resources/img/Pokemon Sprites/143.png diff --git a/Resources/img/Pokemon Sprites/144.png b/PKHeX/Resources/img/Pokemon Sprites/144.png similarity index 100% rename from Resources/img/Pokemon Sprites/144.png rename to PKHeX/Resources/img/Pokemon Sprites/144.png diff --git a/Resources/img/Pokemon Sprites/145.png b/PKHeX/Resources/img/Pokemon Sprites/145.png similarity index 100% rename from Resources/img/Pokemon Sprites/145.png rename to PKHeX/Resources/img/Pokemon Sprites/145.png diff --git a/Resources/img/Pokemon Sprites/146.png b/PKHeX/Resources/img/Pokemon Sprites/146.png similarity index 100% rename from Resources/img/Pokemon Sprites/146.png rename to PKHeX/Resources/img/Pokemon Sprites/146.png diff --git a/Resources/img/Pokemon Sprites/147.png b/PKHeX/Resources/img/Pokemon Sprites/147.png similarity index 100% rename from Resources/img/Pokemon Sprites/147.png rename to PKHeX/Resources/img/Pokemon Sprites/147.png diff --git a/Resources/img/Pokemon Sprites/148.png b/PKHeX/Resources/img/Pokemon Sprites/148.png similarity index 100% rename from Resources/img/Pokemon Sprites/148.png rename to PKHeX/Resources/img/Pokemon Sprites/148.png diff --git a/Resources/img/Pokemon Sprites/149.png b/PKHeX/Resources/img/Pokemon Sprites/149.png similarity index 100% rename from Resources/img/Pokemon Sprites/149.png rename to PKHeX/Resources/img/Pokemon Sprites/149.png diff --git a/Resources/img/Pokemon Sprites/15-1.png b/PKHeX/Resources/img/Pokemon Sprites/15-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/15-1.png rename to PKHeX/Resources/img/Pokemon Sprites/15-1.png diff --git a/Resources/img/Pokemon Sprites/15.png b/PKHeX/Resources/img/Pokemon Sprites/15.png similarity index 100% rename from Resources/img/Pokemon Sprites/15.png rename to PKHeX/Resources/img/Pokemon Sprites/15.png diff --git a/Resources/img/Pokemon Sprites/150-1.png b/PKHeX/Resources/img/Pokemon Sprites/150-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/150-1.png rename to PKHeX/Resources/img/Pokemon Sprites/150-1.png diff --git a/Resources/img/Pokemon Sprites/150-2.png b/PKHeX/Resources/img/Pokemon Sprites/150-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/150-2.png rename to PKHeX/Resources/img/Pokemon Sprites/150-2.png diff --git a/Resources/img/Pokemon Sprites/150.png b/PKHeX/Resources/img/Pokemon Sprites/150.png similarity index 100% rename from Resources/img/Pokemon Sprites/150.png rename to PKHeX/Resources/img/Pokemon Sprites/150.png diff --git a/Resources/img/Pokemon Sprites/151.png b/PKHeX/Resources/img/Pokemon Sprites/151.png similarity index 100% rename from Resources/img/Pokemon Sprites/151.png rename to PKHeX/Resources/img/Pokemon Sprites/151.png diff --git a/Resources/img/Pokemon Sprites/152.png b/PKHeX/Resources/img/Pokemon Sprites/152.png similarity index 100% rename from Resources/img/Pokemon Sprites/152.png rename to PKHeX/Resources/img/Pokemon Sprites/152.png diff --git a/Resources/img/Pokemon Sprites/153.png b/PKHeX/Resources/img/Pokemon Sprites/153.png similarity index 100% rename from Resources/img/Pokemon Sprites/153.png rename to PKHeX/Resources/img/Pokemon Sprites/153.png diff --git a/Resources/img/Pokemon Sprites/154.png b/PKHeX/Resources/img/Pokemon Sprites/154.png similarity index 100% rename from Resources/img/Pokemon Sprites/154.png rename to PKHeX/Resources/img/Pokemon Sprites/154.png diff --git a/Resources/img/Pokemon Sprites/155.png b/PKHeX/Resources/img/Pokemon Sprites/155.png similarity index 100% rename from Resources/img/Pokemon Sprites/155.png rename to PKHeX/Resources/img/Pokemon Sprites/155.png diff --git a/Resources/img/Pokemon Sprites/156.png b/PKHeX/Resources/img/Pokemon Sprites/156.png similarity index 100% rename from Resources/img/Pokemon Sprites/156.png rename to PKHeX/Resources/img/Pokemon Sprites/156.png diff --git a/Resources/img/Pokemon Sprites/157.png b/PKHeX/Resources/img/Pokemon Sprites/157.png similarity index 100% rename from Resources/img/Pokemon Sprites/157.png rename to PKHeX/Resources/img/Pokemon Sprites/157.png diff --git a/Resources/img/Pokemon Sprites/158.png b/PKHeX/Resources/img/Pokemon Sprites/158.png similarity index 100% rename from Resources/img/Pokemon Sprites/158.png rename to PKHeX/Resources/img/Pokemon Sprites/158.png diff --git a/Resources/img/Pokemon Sprites/159.png b/PKHeX/Resources/img/Pokemon Sprites/159.png similarity index 100% rename from Resources/img/Pokemon Sprites/159.png rename to PKHeX/Resources/img/Pokemon Sprites/159.png diff --git a/Resources/img/Pokemon Sprites/16.png b/PKHeX/Resources/img/Pokemon Sprites/16.png similarity index 100% rename from Resources/img/Pokemon Sprites/16.png rename to PKHeX/Resources/img/Pokemon Sprites/16.png diff --git a/Resources/img/Pokemon Sprites/160.png b/PKHeX/Resources/img/Pokemon Sprites/160.png similarity index 100% rename from Resources/img/Pokemon Sprites/160.png rename to PKHeX/Resources/img/Pokemon Sprites/160.png diff --git a/Resources/img/Pokemon Sprites/161.png b/PKHeX/Resources/img/Pokemon Sprites/161.png similarity index 100% rename from Resources/img/Pokemon Sprites/161.png rename to PKHeX/Resources/img/Pokemon Sprites/161.png diff --git a/Resources/img/Pokemon Sprites/162.png b/PKHeX/Resources/img/Pokemon Sprites/162.png similarity index 100% rename from Resources/img/Pokemon Sprites/162.png rename to PKHeX/Resources/img/Pokemon Sprites/162.png diff --git a/Resources/img/Pokemon Sprites/163.png b/PKHeX/Resources/img/Pokemon Sprites/163.png similarity index 100% rename from Resources/img/Pokemon Sprites/163.png rename to PKHeX/Resources/img/Pokemon Sprites/163.png diff --git a/Resources/img/Pokemon Sprites/164.png b/PKHeX/Resources/img/Pokemon Sprites/164.png similarity index 100% rename from Resources/img/Pokemon Sprites/164.png rename to PKHeX/Resources/img/Pokemon Sprites/164.png diff --git a/Resources/img/Pokemon Sprites/165.png b/PKHeX/Resources/img/Pokemon Sprites/165.png similarity index 100% rename from Resources/img/Pokemon Sprites/165.png rename to PKHeX/Resources/img/Pokemon Sprites/165.png diff --git a/Resources/img/Pokemon Sprites/166.png b/PKHeX/Resources/img/Pokemon Sprites/166.png similarity index 100% rename from Resources/img/Pokemon Sprites/166.png rename to PKHeX/Resources/img/Pokemon Sprites/166.png diff --git a/Resources/img/Pokemon Sprites/167.png b/PKHeX/Resources/img/Pokemon Sprites/167.png similarity index 100% rename from Resources/img/Pokemon Sprites/167.png rename to PKHeX/Resources/img/Pokemon Sprites/167.png diff --git a/Resources/img/Pokemon Sprites/168.png b/PKHeX/Resources/img/Pokemon Sprites/168.png similarity index 100% rename from Resources/img/Pokemon Sprites/168.png rename to PKHeX/Resources/img/Pokemon Sprites/168.png diff --git a/Resources/img/Pokemon Sprites/169.png b/PKHeX/Resources/img/Pokemon Sprites/169.png similarity index 100% rename from Resources/img/Pokemon Sprites/169.png rename to PKHeX/Resources/img/Pokemon Sprites/169.png diff --git a/Resources/img/Pokemon Sprites/17.png b/PKHeX/Resources/img/Pokemon Sprites/17.png similarity index 100% rename from Resources/img/Pokemon Sprites/17.png rename to PKHeX/Resources/img/Pokemon Sprites/17.png diff --git a/Resources/img/Pokemon Sprites/170.png b/PKHeX/Resources/img/Pokemon Sprites/170.png similarity index 100% rename from Resources/img/Pokemon Sprites/170.png rename to PKHeX/Resources/img/Pokemon Sprites/170.png diff --git a/Resources/img/Pokemon Sprites/171.png b/PKHeX/Resources/img/Pokemon Sprites/171.png similarity index 100% rename from Resources/img/Pokemon Sprites/171.png rename to PKHeX/Resources/img/Pokemon Sprites/171.png diff --git a/Resources/img/Pokemon Sprites/172.png b/PKHeX/Resources/img/Pokemon Sprites/172.png similarity index 100% rename from Resources/img/Pokemon Sprites/172.png rename to PKHeX/Resources/img/Pokemon Sprites/172.png diff --git a/Resources/img/Pokemon Sprites/173.png b/PKHeX/Resources/img/Pokemon Sprites/173.png similarity index 100% rename from Resources/img/Pokemon Sprites/173.png rename to PKHeX/Resources/img/Pokemon Sprites/173.png diff --git a/Resources/img/Pokemon Sprites/174.png b/PKHeX/Resources/img/Pokemon Sprites/174.png similarity index 100% rename from Resources/img/Pokemon Sprites/174.png rename to PKHeX/Resources/img/Pokemon Sprites/174.png diff --git a/Resources/img/Pokemon Sprites/175.png b/PKHeX/Resources/img/Pokemon Sprites/175.png similarity index 100% rename from Resources/img/Pokemon Sprites/175.png rename to PKHeX/Resources/img/Pokemon Sprites/175.png diff --git a/Resources/img/Pokemon Sprites/176.png b/PKHeX/Resources/img/Pokemon Sprites/176.png similarity index 100% rename from Resources/img/Pokemon Sprites/176.png rename to PKHeX/Resources/img/Pokemon Sprites/176.png diff --git a/Resources/img/Pokemon Sprites/177.png b/PKHeX/Resources/img/Pokemon Sprites/177.png similarity index 100% rename from Resources/img/Pokemon Sprites/177.png rename to PKHeX/Resources/img/Pokemon Sprites/177.png diff --git a/Resources/img/Pokemon Sprites/178.png b/PKHeX/Resources/img/Pokemon Sprites/178.png similarity index 100% rename from Resources/img/Pokemon Sprites/178.png rename to PKHeX/Resources/img/Pokemon Sprites/178.png diff --git a/Resources/img/Pokemon Sprites/179.png b/PKHeX/Resources/img/Pokemon Sprites/179.png similarity index 100% rename from Resources/img/Pokemon Sprites/179.png rename to PKHeX/Resources/img/Pokemon Sprites/179.png diff --git a/Resources/img/Pokemon Sprites/18-1.png b/PKHeX/Resources/img/Pokemon Sprites/18-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/18-1.png rename to PKHeX/Resources/img/Pokemon Sprites/18-1.png diff --git a/Resources/img/Pokemon Sprites/18.png b/PKHeX/Resources/img/Pokemon Sprites/18.png similarity index 100% rename from Resources/img/Pokemon Sprites/18.png rename to PKHeX/Resources/img/Pokemon Sprites/18.png diff --git a/Resources/img/Pokemon Sprites/180.png b/PKHeX/Resources/img/Pokemon Sprites/180.png similarity index 100% rename from Resources/img/Pokemon Sprites/180.png rename to PKHeX/Resources/img/Pokemon Sprites/180.png diff --git a/Resources/img/Pokemon Sprites/181-1.png b/PKHeX/Resources/img/Pokemon Sprites/181-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/181-1.png rename to PKHeX/Resources/img/Pokemon Sprites/181-1.png diff --git a/Resources/img/Pokemon Sprites/181.png b/PKHeX/Resources/img/Pokemon Sprites/181.png similarity index 100% rename from Resources/img/Pokemon Sprites/181.png rename to PKHeX/Resources/img/Pokemon Sprites/181.png diff --git a/Resources/img/Pokemon Sprites/182.png b/PKHeX/Resources/img/Pokemon Sprites/182.png similarity index 100% rename from Resources/img/Pokemon Sprites/182.png rename to PKHeX/Resources/img/Pokemon Sprites/182.png diff --git a/Resources/img/Pokemon Sprites/183.png b/PKHeX/Resources/img/Pokemon Sprites/183.png similarity index 100% rename from Resources/img/Pokemon Sprites/183.png rename to PKHeX/Resources/img/Pokemon Sprites/183.png diff --git a/Resources/img/Pokemon Sprites/184.png b/PKHeX/Resources/img/Pokemon Sprites/184.png similarity index 100% rename from Resources/img/Pokemon Sprites/184.png rename to PKHeX/Resources/img/Pokemon Sprites/184.png diff --git a/Resources/img/Pokemon Sprites/185.png b/PKHeX/Resources/img/Pokemon Sprites/185.png similarity index 100% rename from Resources/img/Pokemon Sprites/185.png rename to PKHeX/Resources/img/Pokemon Sprites/185.png diff --git a/Resources/img/Pokemon Sprites/186.png b/PKHeX/Resources/img/Pokemon Sprites/186.png similarity index 100% rename from Resources/img/Pokemon Sprites/186.png rename to PKHeX/Resources/img/Pokemon Sprites/186.png diff --git a/Resources/img/Pokemon Sprites/187.png b/PKHeX/Resources/img/Pokemon Sprites/187.png similarity index 100% rename from Resources/img/Pokemon Sprites/187.png rename to PKHeX/Resources/img/Pokemon Sprites/187.png diff --git a/Resources/img/Pokemon Sprites/188.png b/PKHeX/Resources/img/Pokemon Sprites/188.png similarity index 100% rename from Resources/img/Pokemon Sprites/188.png rename to PKHeX/Resources/img/Pokemon Sprites/188.png diff --git a/Resources/img/Pokemon Sprites/189.png b/PKHeX/Resources/img/Pokemon Sprites/189.png similarity index 100% rename from Resources/img/Pokemon Sprites/189.png rename to PKHeX/Resources/img/Pokemon Sprites/189.png diff --git a/Resources/img/Pokemon Sprites/19.png b/PKHeX/Resources/img/Pokemon Sprites/19.png similarity index 100% rename from Resources/img/Pokemon Sprites/19.png rename to PKHeX/Resources/img/Pokemon Sprites/19.png diff --git a/Resources/img/Pokemon Sprites/190.png b/PKHeX/Resources/img/Pokemon Sprites/190.png similarity index 100% rename from Resources/img/Pokemon Sprites/190.png rename to PKHeX/Resources/img/Pokemon Sprites/190.png diff --git a/Resources/img/Pokemon Sprites/191.png b/PKHeX/Resources/img/Pokemon Sprites/191.png similarity index 100% rename from Resources/img/Pokemon Sprites/191.png rename to PKHeX/Resources/img/Pokemon Sprites/191.png diff --git a/Resources/img/Pokemon Sprites/192.png b/PKHeX/Resources/img/Pokemon Sprites/192.png similarity index 100% rename from Resources/img/Pokemon Sprites/192.png rename to PKHeX/Resources/img/Pokemon Sprites/192.png diff --git a/Resources/img/Pokemon Sprites/193.png b/PKHeX/Resources/img/Pokemon Sprites/193.png similarity index 100% rename from Resources/img/Pokemon Sprites/193.png rename to PKHeX/Resources/img/Pokemon Sprites/193.png diff --git a/Resources/img/Pokemon Sprites/194.png b/PKHeX/Resources/img/Pokemon Sprites/194.png similarity index 100% rename from Resources/img/Pokemon Sprites/194.png rename to PKHeX/Resources/img/Pokemon Sprites/194.png diff --git a/Resources/img/Pokemon Sprites/195.png b/PKHeX/Resources/img/Pokemon Sprites/195.png similarity index 100% rename from Resources/img/Pokemon Sprites/195.png rename to PKHeX/Resources/img/Pokemon Sprites/195.png diff --git a/Resources/img/Pokemon Sprites/196.png b/PKHeX/Resources/img/Pokemon Sprites/196.png similarity index 100% rename from Resources/img/Pokemon Sprites/196.png rename to PKHeX/Resources/img/Pokemon Sprites/196.png diff --git a/Resources/img/Pokemon Sprites/197.png b/PKHeX/Resources/img/Pokemon Sprites/197.png similarity index 100% rename from Resources/img/Pokemon Sprites/197.png rename to PKHeX/Resources/img/Pokemon Sprites/197.png diff --git a/Resources/img/Pokemon Sprites/198.png b/PKHeX/Resources/img/Pokemon Sprites/198.png similarity index 100% rename from Resources/img/Pokemon Sprites/198.png rename to PKHeX/Resources/img/Pokemon Sprites/198.png diff --git a/Resources/img/Pokemon Sprites/199.png b/PKHeX/Resources/img/Pokemon Sprites/199.png similarity index 100% rename from Resources/img/Pokemon Sprites/199.png rename to PKHeX/Resources/img/Pokemon Sprites/199.png diff --git a/Resources/img/Pokemon Sprites/2.png b/PKHeX/Resources/img/Pokemon Sprites/2.png similarity index 100% rename from Resources/img/Pokemon Sprites/2.png rename to PKHeX/Resources/img/Pokemon Sprites/2.png diff --git a/Resources/img/Pokemon Sprites/20.png b/PKHeX/Resources/img/Pokemon Sprites/20.png similarity index 100% rename from Resources/img/Pokemon Sprites/20.png rename to PKHeX/Resources/img/Pokemon Sprites/20.png diff --git a/Resources/img/Pokemon Sprites/200.png b/PKHeX/Resources/img/Pokemon Sprites/200.png similarity index 100% rename from Resources/img/Pokemon Sprites/200.png rename to PKHeX/Resources/img/Pokemon Sprites/200.png diff --git a/Resources/img/Pokemon Sprites/201-1.png b/PKHeX/Resources/img/Pokemon Sprites/201-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-1.png rename to PKHeX/Resources/img/Pokemon Sprites/201-1.png diff --git a/Resources/img/Pokemon Sprites/201-10.png b/PKHeX/Resources/img/Pokemon Sprites/201-10.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-10.png rename to PKHeX/Resources/img/Pokemon Sprites/201-10.png diff --git a/Resources/img/Pokemon Sprites/201-11.png b/PKHeX/Resources/img/Pokemon Sprites/201-11.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-11.png rename to PKHeX/Resources/img/Pokemon Sprites/201-11.png diff --git a/Resources/img/Pokemon Sprites/201-12.png b/PKHeX/Resources/img/Pokemon Sprites/201-12.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-12.png rename to PKHeX/Resources/img/Pokemon Sprites/201-12.png diff --git a/Resources/img/Pokemon Sprites/201-13.png b/PKHeX/Resources/img/Pokemon Sprites/201-13.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-13.png rename to PKHeX/Resources/img/Pokemon Sprites/201-13.png diff --git a/Resources/img/Pokemon Sprites/201-14.png b/PKHeX/Resources/img/Pokemon Sprites/201-14.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-14.png rename to PKHeX/Resources/img/Pokemon Sprites/201-14.png diff --git a/Resources/img/Pokemon Sprites/201-15.png b/PKHeX/Resources/img/Pokemon Sprites/201-15.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-15.png rename to PKHeX/Resources/img/Pokemon Sprites/201-15.png diff --git a/Resources/img/Pokemon Sprites/201-16.png b/PKHeX/Resources/img/Pokemon Sprites/201-16.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-16.png rename to PKHeX/Resources/img/Pokemon Sprites/201-16.png diff --git a/Resources/img/Pokemon Sprites/201-17.png b/PKHeX/Resources/img/Pokemon Sprites/201-17.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-17.png rename to PKHeX/Resources/img/Pokemon Sprites/201-17.png diff --git a/Resources/img/Pokemon Sprites/201-18.png b/PKHeX/Resources/img/Pokemon Sprites/201-18.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-18.png rename to PKHeX/Resources/img/Pokemon Sprites/201-18.png diff --git a/Resources/img/Pokemon Sprites/201-19.png b/PKHeX/Resources/img/Pokemon Sprites/201-19.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-19.png rename to PKHeX/Resources/img/Pokemon Sprites/201-19.png diff --git a/Resources/img/Pokemon Sprites/201-2.png b/PKHeX/Resources/img/Pokemon Sprites/201-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-2.png rename to PKHeX/Resources/img/Pokemon Sprites/201-2.png diff --git a/Resources/img/Pokemon Sprites/201-20.png b/PKHeX/Resources/img/Pokemon Sprites/201-20.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-20.png rename to PKHeX/Resources/img/Pokemon Sprites/201-20.png diff --git a/Resources/img/Pokemon Sprites/201-21.png b/PKHeX/Resources/img/Pokemon Sprites/201-21.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-21.png rename to PKHeX/Resources/img/Pokemon Sprites/201-21.png diff --git a/Resources/img/Pokemon Sprites/201-22.png b/PKHeX/Resources/img/Pokemon Sprites/201-22.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-22.png rename to PKHeX/Resources/img/Pokemon Sprites/201-22.png diff --git a/Resources/img/Pokemon Sprites/201-23.png b/PKHeX/Resources/img/Pokemon Sprites/201-23.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-23.png rename to PKHeX/Resources/img/Pokemon Sprites/201-23.png diff --git a/Resources/img/Pokemon Sprites/201-24.png b/PKHeX/Resources/img/Pokemon Sprites/201-24.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-24.png rename to PKHeX/Resources/img/Pokemon Sprites/201-24.png diff --git a/Resources/img/Pokemon Sprites/201-25.png b/PKHeX/Resources/img/Pokemon Sprites/201-25.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-25.png rename to PKHeX/Resources/img/Pokemon Sprites/201-25.png diff --git a/Resources/img/Pokemon Sprites/201-26.png b/PKHeX/Resources/img/Pokemon Sprites/201-26.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-26.png rename to PKHeX/Resources/img/Pokemon Sprites/201-26.png diff --git a/Resources/img/Pokemon Sprites/201-27.png b/PKHeX/Resources/img/Pokemon Sprites/201-27.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-27.png rename to PKHeX/Resources/img/Pokemon Sprites/201-27.png diff --git a/Resources/img/Pokemon Sprites/201-3.png b/PKHeX/Resources/img/Pokemon Sprites/201-3.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-3.png rename to PKHeX/Resources/img/Pokemon Sprites/201-3.png diff --git a/Resources/img/Pokemon Sprites/201-4.png b/PKHeX/Resources/img/Pokemon Sprites/201-4.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-4.png rename to PKHeX/Resources/img/Pokemon Sprites/201-4.png diff --git a/Resources/img/Pokemon Sprites/201-5.png b/PKHeX/Resources/img/Pokemon Sprites/201-5.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-5.png rename to PKHeX/Resources/img/Pokemon Sprites/201-5.png diff --git a/Resources/img/Pokemon Sprites/201-6.png b/PKHeX/Resources/img/Pokemon Sprites/201-6.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-6.png rename to PKHeX/Resources/img/Pokemon Sprites/201-6.png diff --git a/Resources/img/Pokemon Sprites/201-7.png b/PKHeX/Resources/img/Pokemon Sprites/201-7.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-7.png rename to PKHeX/Resources/img/Pokemon Sprites/201-7.png diff --git a/Resources/img/Pokemon Sprites/201-8.png b/PKHeX/Resources/img/Pokemon Sprites/201-8.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-8.png rename to PKHeX/Resources/img/Pokemon Sprites/201-8.png diff --git a/Resources/img/Pokemon Sprites/201-9.png b/PKHeX/Resources/img/Pokemon Sprites/201-9.png similarity index 100% rename from Resources/img/Pokemon Sprites/201-9.png rename to PKHeX/Resources/img/Pokemon Sprites/201-9.png diff --git a/Resources/img/Pokemon Sprites/201.png b/PKHeX/Resources/img/Pokemon Sprites/201.png similarity index 100% rename from Resources/img/Pokemon Sprites/201.png rename to PKHeX/Resources/img/Pokemon Sprites/201.png diff --git a/Resources/img/Pokemon Sprites/202.png b/PKHeX/Resources/img/Pokemon Sprites/202.png similarity index 100% rename from Resources/img/Pokemon Sprites/202.png rename to PKHeX/Resources/img/Pokemon Sprites/202.png diff --git a/Resources/img/Pokemon Sprites/203.png b/PKHeX/Resources/img/Pokemon Sprites/203.png similarity index 100% rename from Resources/img/Pokemon Sprites/203.png rename to PKHeX/Resources/img/Pokemon Sprites/203.png diff --git a/Resources/img/Pokemon Sprites/204.png b/PKHeX/Resources/img/Pokemon Sprites/204.png similarity index 100% rename from Resources/img/Pokemon Sprites/204.png rename to PKHeX/Resources/img/Pokemon Sprites/204.png diff --git a/Resources/img/Pokemon Sprites/205.png b/PKHeX/Resources/img/Pokemon Sprites/205.png similarity index 100% rename from Resources/img/Pokemon Sprites/205.png rename to PKHeX/Resources/img/Pokemon Sprites/205.png diff --git a/Resources/img/Pokemon Sprites/206.png b/PKHeX/Resources/img/Pokemon Sprites/206.png similarity index 100% rename from Resources/img/Pokemon Sprites/206.png rename to PKHeX/Resources/img/Pokemon Sprites/206.png diff --git a/Resources/img/Pokemon Sprites/207.png b/PKHeX/Resources/img/Pokemon Sprites/207.png similarity index 100% rename from Resources/img/Pokemon Sprites/207.png rename to PKHeX/Resources/img/Pokemon Sprites/207.png diff --git a/Resources/img/Pokemon Sprites/208-1.png b/PKHeX/Resources/img/Pokemon Sprites/208-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/208-1.png rename to PKHeX/Resources/img/Pokemon Sprites/208-1.png diff --git a/Resources/img/Pokemon Sprites/208.png b/PKHeX/Resources/img/Pokemon Sprites/208.png similarity index 100% rename from Resources/img/Pokemon Sprites/208.png rename to PKHeX/Resources/img/Pokemon Sprites/208.png diff --git a/Resources/img/Pokemon Sprites/209.png b/PKHeX/Resources/img/Pokemon Sprites/209.png similarity index 100% rename from Resources/img/Pokemon Sprites/209.png rename to PKHeX/Resources/img/Pokemon Sprites/209.png diff --git a/Resources/img/Pokemon Sprites/21.png b/PKHeX/Resources/img/Pokemon Sprites/21.png similarity index 100% rename from Resources/img/Pokemon Sprites/21.png rename to PKHeX/Resources/img/Pokemon Sprites/21.png diff --git a/Resources/img/Pokemon Sprites/210.png b/PKHeX/Resources/img/Pokemon Sprites/210.png similarity index 100% rename from Resources/img/Pokemon Sprites/210.png rename to PKHeX/Resources/img/Pokemon Sprites/210.png diff --git a/Resources/img/Pokemon Sprites/211.png b/PKHeX/Resources/img/Pokemon Sprites/211.png similarity index 100% rename from Resources/img/Pokemon Sprites/211.png rename to PKHeX/Resources/img/Pokemon Sprites/211.png diff --git a/Resources/img/Pokemon Sprites/212-1.png b/PKHeX/Resources/img/Pokemon Sprites/212-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/212-1.png rename to PKHeX/Resources/img/Pokemon Sprites/212-1.png diff --git a/Resources/img/Pokemon Sprites/212.png b/PKHeX/Resources/img/Pokemon Sprites/212.png similarity index 100% rename from Resources/img/Pokemon Sprites/212.png rename to PKHeX/Resources/img/Pokemon Sprites/212.png diff --git a/Resources/img/Pokemon Sprites/213.png b/PKHeX/Resources/img/Pokemon Sprites/213.png similarity index 100% rename from Resources/img/Pokemon Sprites/213.png rename to PKHeX/Resources/img/Pokemon Sprites/213.png diff --git a/Resources/img/Pokemon Sprites/214-1.png b/PKHeX/Resources/img/Pokemon Sprites/214-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/214-1.png rename to PKHeX/Resources/img/Pokemon Sprites/214-1.png diff --git a/Resources/img/Pokemon Sprites/214.png b/PKHeX/Resources/img/Pokemon Sprites/214.png similarity index 100% rename from Resources/img/Pokemon Sprites/214.png rename to PKHeX/Resources/img/Pokemon Sprites/214.png diff --git a/Resources/img/Pokemon Sprites/215.png b/PKHeX/Resources/img/Pokemon Sprites/215.png similarity index 100% rename from Resources/img/Pokemon Sprites/215.png rename to PKHeX/Resources/img/Pokemon Sprites/215.png diff --git a/Resources/img/Pokemon Sprites/216.png b/PKHeX/Resources/img/Pokemon Sprites/216.png similarity index 100% rename from Resources/img/Pokemon Sprites/216.png rename to PKHeX/Resources/img/Pokemon Sprites/216.png diff --git a/Resources/img/Pokemon Sprites/217.png b/PKHeX/Resources/img/Pokemon Sprites/217.png similarity index 100% rename from Resources/img/Pokemon Sprites/217.png rename to PKHeX/Resources/img/Pokemon Sprites/217.png diff --git a/Resources/img/Pokemon Sprites/218.png b/PKHeX/Resources/img/Pokemon Sprites/218.png similarity index 100% rename from Resources/img/Pokemon Sprites/218.png rename to PKHeX/Resources/img/Pokemon Sprites/218.png diff --git a/Resources/img/Pokemon Sprites/219.png b/PKHeX/Resources/img/Pokemon Sprites/219.png similarity index 100% rename from Resources/img/Pokemon Sprites/219.png rename to PKHeX/Resources/img/Pokemon Sprites/219.png diff --git a/Resources/img/Pokemon Sprites/22.png b/PKHeX/Resources/img/Pokemon Sprites/22.png similarity index 100% rename from Resources/img/Pokemon Sprites/22.png rename to PKHeX/Resources/img/Pokemon Sprites/22.png diff --git a/Resources/img/Pokemon Sprites/220.png b/PKHeX/Resources/img/Pokemon Sprites/220.png similarity index 100% rename from Resources/img/Pokemon Sprites/220.png rename to PKHeX/Resources/img/Pokemon Sprites/220.png diff --git a/Resources/img/Pokemon Sprites/221.png b/PKHeX/Resources/img/Pokemon Sprites/221.png similarity index 100% rename from Resources/img/Pokemon Sprites/221.png rename to PKHeX/Resources/img/Pokemon Sprites/221.png diff --git a/Resources/img/Pokemon Sprites/222.png b/PKHeX/Resources/img/Pokemon Sprites/222.png similarity index 100% rename from Resources/img/Pokemon Sprites/222.png rename to PKHeX/Resources/img/Pokemon Sprites/222.png diff --git a/Resources/img/Pokemon Sprites/223.png b/PKHeX/Resources/img/Pokemon Sprites/223.png similarity index 100% rename from Resources/img/Pokemon Sprites/223.png rename to PKHeX/Resources/img/Pokemon Sprites/223.png diff --git a/Resources/img/Pokemon Sprites/224.png b/PKHeX/Resources/img/Pokemon Sprites/224.png similarity index 100% rename from Resources/img/Pokemon Sprites/224.png rename to PKHeX/Resources/img/Pokemon Sprites/224.png diff --git a/Resources/img/Pokemon Sprites/225.png b/PKHeX/Resources/img/Pokemon Sprites/225.png similarity index 100% rename from Resources/img/Pokemon Sprites/225.png rename to PKHeX/Resources/img/Pokemon Sprites/225.png diff --git a/Resources/img/Pokemon Sprites/226.png b/PKHeX/Resources/img/Pokemon Sprites/226.png similarity index 100% rename from Resources/img/Pokemon Sprites/226.png rename to PKHeX/Resources/img/Pokemon Sprites/226.png diff --git a/Resources/img/Pokemon Sprites/227.png b/PKHeX/Resources/img/Pokemon Sprites/227.png similarity index 100% rename from Resources/img/Pokemon Sprites/227.png rename to PKHeX/Resources/img/Pokemon Sprites/227.png diff --git a/Resources/img/Pokemon Sprites/228.png b/PKHeX/Resources/img/Pokemon Sprites/228.png similarity index 100% rename from Resources/img/Pokemon Sprites/228.png rename to PKHeX/Resources/img/Pokemon Sprites/228.png diff --git a/Resources/img/Pokemon Sprites/229-1.png b/PKHeX/Resources/img/Pokemon Sprites/229-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/229-1.png rename to PKHeX/Resources/img/Pokemon Sprites/229-1.png diff --git a/Resources/img/Pokemon Sprites/229.png b/PKHeX/Resources/img/Pokemon Sprites/229.png similarity index 100% rename from Resources/img/Pokemon Sprites/229.png rename to PKHeX/Resources/img/Pokemon Sprites/229.png diff --git a/Resources/img/Pokemon Sprites/23.png b/PKHeX/Resources/img/Pokemon Sprites/23.png similarity index 100% rename from Resources/img/Pokemon Sprites/23.png rename to PKHeX/Resources/img/Pokemon Sprites/23.png diff --git a/Resources/img/Pokemon Sprites/230.png b/PKHeX/Resources/img/Pokemon Sprites/230.png similarity index 100% rename from Resources/img/Pokemon Sprites/230.png rename to PKHeX/Resources/img/Pokemon Sprites/230.png diff --git a/Resources/img/Pokemon Sprites/231.png b/PKHeX/Resources/img/Pokemon Sprites/231.png similarity index 100% rename from Resources/img/Pokemon Sprites/231.png rename to PKHeX/Resources/img/Pokemon Sprites/231.png diff --git a/Resources/img/Pokemon Sprites/232.png b/PKHeX/Resources/img/Pokemon Sprites/232.png similarity index 100% rename from Resources/img/Pokemon Sprites/232.png rename to PKHeX/Resources/img/Pokemon Sprites/232.png diff --git a/Resources/img/Pokemon Sprites/233.png b/PKHeX/Resources/img/Pokemon Sprites/233.png similarity index 100% rename from Resources/img/Pokemon Sprites/233.png rename to PKHeX/Resources/img/Pokemon Sprites/233.png diff --git a/Resources/img/Pokemon Sprites/234.png b/PKHeX/Resources/img/Pokemon Sprites/234.png similarity index 100% rename from Resources/img/Pokemon Sprites/234.png rename to PKHeX/Resources/img/Pokemon Sprites/234.png diff --git a/Resources/img/Pokemon Sprites/235.png b/PKHeX/Resources/img/Pokemon Sprites/235.png similarity index 100% rename from Resources/img/Pokemon Sprites/235.png rename to PKHeX/Resources/img/Pokemon Sprites/235.png diff --git a/Resources/img/Pokemon Sprites/236.png b/PKHeX/Resources/img/Pokemon Sprites/236.png similarity index 100% rename from Resources/img/Pokemon Sprites/236.png rename to PKHeX/Resources/img/Pokemon Sprites/236.png diff --git a/Resources/img/Pokemon Sprites/237.png b/PKHeX/Resources/img/Pokemon Sprites/237.png similarity index 100% rename from Resources/img/Pokemon Sprites/237.png rename to PKHeX/Resources/img/Pokemon Sprites/237.png diff --git a/Resources/img/Pokemon Sprites/238.png b/PKHeX/Resources/img/Pokemon Sprites/238.png similarity index 100% rename from Resources/img/Pokemon Sprites/238.png rename to PKHeX/Resources/img/Pokemon Sprites/238.png diff --git a/Resources/img/Pokemon Sprites/239.png b/PKHeX/Resources/img/Pokemon Sprites/239.png similarity index 100% rename from Resources/img/Pokemon Sprites/239.png rename to PKHeX/Resources/img/Pokemon Sprites/239.png diff --git a/Resources/img/Pokemon Sprites/24.png b/PKHeX/Resources/img/Pokemon Sprites/24.png similarity index 100% rename from Resources/img/Pokemon Sprites/24.png rename to PKHeX/Resources/img/Pokemon Sprites/24.png diff --git a/Resources/img/Pokemon Sprites/240.png b/PKHeX/Resources/img/Pokemon Sprites/240.png similarity index 100% rename from Resources/img/Pokemon Sprites/240.png rename to PKHeX/Resources/img/Pokemon Sprites/240.png diff --git a/Resources/img/Pokemon Sprites/241.png b/PKHeX/Resources/img/Pokemon Sprites/241.png similarity index 100% rename from Resources/img/Pokemon Sprites/241.png rename to PKHeX/Resources/img/Pokemon Sprites/241.png diff --git a/Resources/img/Pokemon Sprites/242.png b/PKHeX/Resources/img/Pokemon Sprites/242.png similarity index 100% rename from Resources/img/Pokemon Sprites/242.png rename to PKHeX/Resources/img/Pokemon Sprites/242.png diff --git a/Resources/img/Pokemon Sprites/243.png b/PKHeX/Resources/img/Pokemon Sprites/243.png similarity index 100% rename from Resources/img/Pokemon Sprites/243.png rename to PKHeX/Resources/img/Pokemon Sprites/243.png diff --git a/Resources/img/Pokemon Sprites/244.png b/PKHeX/Resources/img/Pokemon Sprites/244.png similarity index 100% rename from Resources/img/Pokemon Sprites/244.png rename to PKHeX/Resources/img/Pokemon Sprites/244.png diff --git a/Resources/img/Pokemon Sprites/245.png b/PKHeX/Resources/img/Pokemon Sprites/245.png similarity index 100% rename from Resources/img/Pokemon Sprites/245.png rename to PKHeX/Resources/img/Pokemon Sprites/245.png diff --git a/Resources/img/Pokemon Sprites/246.png b/PKHeX/Resources/img/Pokemon Sprites/246.png similarity index 100% rename from Resources/img/Pokemon Sprites/246.png rename to PKHeX/Resources/img/Pokemon Sprites/246.png diff --git a/Resources/img/Pokemon Sprites/247.png b/PKHeX/Resources/img/Pokemon Sprites/247.png similarity index 100% rename from Resources/img/Pokemon Sprites/247.png rename to PKHeX/Resources/img/Pokemon Sprites/247.png diff --git a/Resources/img/Pokemon Sprites/248-1.png b/PKHeX/Resources/img/Pokemon Sprites/248-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/248-1.png rename to PKHeX/Resources/img/Pokemon Sprites/248-1.png diff --git a/Resources/img/Pokemon Sprites/248.png b/PKHeX/Resources/img/Pokemon Sprites/248.png similarity index 100% rename from Resources/img/Pokemon Sprites/248.png rename to PKHeX/Resources/img/Pokemon Sprites/248.png diff --git a/Resources/img/Pokemon Sprites/249.png b/PKHeX/Resources/img/Pokemon Sprites/249.png similarity index 100% rename from Resources/img/Pokemon Sprites/249.png rename to PKHeX/Resources/img/Pokemon Sprites/249.png diff --git a/Resources/img/Pokemon Sprites/25-1.png b/PKHeX/Resources/img/Pokemon Sprites/25-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/25-1.png rename to PKHeX/Resources/img/Pokemon Sprites/25-1.png diff --git a/Resources/img/Pokemon Sprites/25-2.png b/PKHeX/Resources/img/Pokemon Sprites/25-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/25-2.png rename to PKHeX/Resources/img/Pokemon Sprites/25-2.png diff --git a/Resources/img/Pokemon Sprites/25-3.png b/PKHeX/Resources/img/Pokemon Sprites/25-3.png similarity index 100% rename from Resources/img/Pokemon Sprites/25-3.png rename to PKHeX/Resources/img/Pokemon Sprites/25-3.png diff --git a/Resources/img/Pokemon Sprites/25-4.png b/PKHeX/Resources/img/Pokemon Sprites/25-4.png similarity index 100% rename from Resources/img/Pokemon Sprites/25-4.png rename to PKHeX/Resources/img/Pokemon Sprites/25-4.png diff --git a/Resources/img/Pokemon Sprites/25-5.png b/PKHeX/Resources/img/Pokemon Sprites/25-5.png similarity index 100% rename from Resources/img/Pokemon Sprites/25-5.png rename to PKHeX/Resources/img/Pokemon Sprites/25-5.png diff --git a/Resources/img/Pokemon Sprites/25-6.png b/PKHeX/Resources/img/Pokemon Sprites/25-6.png similarity index 100% rename from Resources/img/Pokemon Sprites/25-6.png rename to PKHeX/Resources/img/Pokemon Sprites/25-6.png diff --git a/Resources/img/Pokemon Sprites/25.png b/PKHeX/Resources/img/Pokemon Sprites/25.png similarity index 100% rename from Resources/img/Pokemon Sprites/25.png rename to PKHeX/Resources/img/Pokemon Sprites/25.png diff --git a/Resources/img/Pokemon Sprites/250.png b/PKHeX/Resources/img/Pokemon Sprites/250.png similarity index 100% rename from Resources/img/Pokemon Sprites/250.png rename to PKHeX/Resources/img/Pokemon Sprites/250.png diff --git a/Resources/img/Pokemon Sprites/251.png b/PKHeX/Resources/img/Pokemon Sprites/251.png similarity index 100% rename from Resources/img/Pokemon Sprites/251.png rename to PKHeX/Resources/img/Pokemon Sprites/251.png diff --git a/Resources/img/Pokemon Sprites/252.png b/PKHeX/Resources/img/Pokemon Sprites/252.png similarity index 100% rename from Resources/img/Pokemon Sprites/252.png rename to PKHeX/Resources/img/Pokemon Sprites/252.png diff --git a/Resources/img/Pokemon Sprites/253.png b/PKHeX/Resources/img/Pokemon Sprites/253.png similarity index 100% rename from Resources/img/Pokemon Sprites/253.png rename to PKHeX/Resources/img/Pokemon Sprites/253.png diff --git a/Resources/img/Pokemon Sprites/254-1.png b/PKHeX/Resources/img/Pokemon Sprites/254-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/254-1.png rename to PKHeX/Resources/img/Pokemon Sprites/254-1.png diff --git a/Resources/img/Pokemon Sprites/254.png b/PKHeX/Resources/img/Pokemon Sprites/254.png similarity index 100% rename from Resources/img/Pokemon Sprites/254.png rename to PKHeX/Resources/img/Pokemon Sprites/254.png diff --git a/Resources/img/Pokemon Sprites/255.png b/PKHeX/Resources/img/Pokemon Sprites/255.png similarity index 100% rename from Resources/img/Pokemon Sprites/255.png rename to PKHeX/Resources/img/Pokemon Sprites/255.png diff --git a/Resources/img/Pokemon Sprites/256.png b/PKHeX/Resources/img/Pokemon Sprites/256.png similarity index 100% rename from Resources/img/Pokemon Sprites/256.png rename to PKHeX/Resources/img/Pokemon Sprites/256.png diff --git a/Resources/img/Pokemon Sprites/257-1.png b/PKHeX/Resources/img/Pokemon Sprites/257-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/257-1.png rename to PKHeX/Resources/img/Pokemon Sprites/257-1.png diff --git a/Resources/img/Pokemon Sprites/257.png b/PKHeX/Resources/img/Pokemon Sprites/257.png similarity index 100% rename from Resources/img/Pokemon Sprites/257.png rename to PKHeX/Resources/img/Pokemon Sprites/257.png diff --git a/Resources/img/Pokemon Sprites/258.png b/PKHeX/Resources/img/Pokemon Sprites/258.png similarity index 100% rename from Resources/img/Pokemon Sprites/258.png rename to PKHeX/Resources/img/Pokemon Sprites/258.png diff --git a/Resources/img/Pokemon Sprites/259.png b/PKHeX/Resources/img/Pokemon Sprites/259.png similarity index 100% rename from Resources/img/Pokemon Sprites/259.png rename to PKHeX/Resources/img/Pokemon Sprites/259.png diff --git a/Resources/img/Pokemon Sprites/26.png b/PKHeX/Resources/img/Pokemon Sprites/26.png similarity index 100% rename from Resources/img/Pokemon Sprites/26.png rename to PKHeX/Resources/img/Pokemon Sprites/26.png diff --git a/Resources/img/Pokemon Sprites/260-1.png b/PKHeX/Resources/img/Pokemon Sprites/260-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/260-1.png rename to PKHeX/Resources/img/Pokemon Sprites/260-1.png diff --git a/Resources/img/Pokemon Sprites/260.png b/PKHeX/Resources/img/Pokemon Sprites/260.png similarity index 100% rename from Resources/img/Pokemon Sprites/260.png rename to PKHeX/Resources/img/Pokemon Sprites/260.png diff --git a/Resources/img/Pokemon Sprites/261.png b/PKHeX/Resources/img/Pokemon Sprites/261.png similarity index 100% rename from Resources/img/Pokemon Sprites/261.png rename to PKHeX/Resources/img/Pokemon Sprites/261.png diff --git a/Resources/img/Pokemon Sprites/262.png b/PKHeX/Resources/img/Pokemon Sprites/262.png similarity index 100% rename from Resources/img/Pokemon Sprites/262.png rename to PKHeX/Resources/img/Pokemon Sprites/262.png diff --git a/Resources/img/Pokemon Sprites/263.png b/PKHeX/Resources/img/Pokemon Sprites/263.png similarity index 100% rename from Resources/img/Pokemon Sprites/263.png rename to PKHeX/Resources/img/Pokemon Sprites/263.png diff --git a/Resources/img/Pokemon Sprites/264.png b/PKHeX/Resources/img/Pokemon Sprites/264.png similarity index 100% rename from Resources/img/Pokemon Sprites/264.png rename to PKHeX/Resources/img/Pokemon Sprites/264.png diff --git a/Resources/img/Pokemon Sprites/265.png b/PKHeX/Resources/img/Pokemon Sprites/265.png similarity index 100% rename from Resources/img/Pokemon Sprites/265.png rename to PKHeX/Resources/img/Pokemon Sprites/265.png diff --git a/Resources/img/Pokemon Sprites/266.png b/PKHeX/Resources/img/Pokemon Sprites/266.png similarity index 100% rename from Resources/img/Pokemon Sprites/266.png rename to PKHeX/Resources/img/Pokemon Sprites/266.png diff --git a/Resources/img/Pokemon Sprites/267.png b/PKHeX/Resources/img/Pokemon Sprites/267.png similarity index 100% rename from Resources/img/Pokemon Sprites/267.png rename to PKHeX/Resources/img/Pokemon Sprites/267.png diff --git a/Resources/img/Pokemon Sprites/268.png b/PKHeX/Resources/img/Pokemon Sprites/268.png similarity index 100% rename from Resources/img/Pokemon Sprites/268.png rename to PKHeX/Resources/img/Pokemon Sprites/268.png diff --git a/Resources/img/Pokemon Sprites/269.png b/PKHeX/Resources/img/Pokemon Sprites/269.png similarity index 100% rename from Resources/img/Pokemon Sprites/269.png rename to PKHeX/Resources/img/Pokemon Sprites/269.png diff --git a/Resources/img/Pokemon Sprites/27.png b/PKHeX/Resources/img/Pokemon Sprites/27.png similarity index 100% rename from Resources/img/Pokemon Sprites/27.png rename to PKHeX/Resources/img/Pokemon Sprites/27.png diff --git a/Resources/img/Pokemon Sprites/270.png b/PKHeX/Resources/img/Pokemon Sprites/270.png similarity index 100% rename from Resources/img/Pokemon Sprites/270.png rename to PKHeX/Resources/img/Pokemon Sprites/270.png diff --git a/Resources/img/Pokemon Sprites/271.png b/PKHeX/Resources/img/Pokemon Sprites/271.png similarity index 100% rename from Resources/img/Pokemon Sprites/271.png rename to PKHeX/Resources/img/Pokemon Sprites/271.png diff --git a/Resources/img/Pokemon Sprites/272.png b/PKHeX/Resources/img/Pokemon Sprites/272.png similarity index 100% rename from Resources/img/Pokemon Sprites/272.png rename to PKHeX/Resources/img/Pokemon Sprites/272.png diff --git a/Resources/img/Pokemon Sprites/273.png b/PKHeX/Resources/img/Pokemon Sprites/273.png similarity index 100% rename from Resources/img/Pokemon Sprites/273.png rename to PKHeX/Resources/img/Pokemon Sprites/273.png diff --git a/Resources/img/Pokemon Sprites/274.png b/PKHeX/Resources/img/Pokemon Sprites/274.png similarity index 100% rename from Resources/img/Pokemon Sprites/274.png rename to PKHeX/Resources/img/Pokemon Sprites/274.png diff --git a/Resources/img/Pokemon Sprites/275.png b/PKHeX/Resources/img/Pokemon Sprites/275.png similarity index 100% rename from Resources/img/Pokemon Sprites/275.png rename to PKHeX/Resources/img/Pokemon Sprites/275.png diff --git a/Resources/img/Pokemon Sprites/276.png b/PKHeX/Resources/img/Pokemon Sprites/276.png similarity index 100% rename from Resources/img/Pokemon Sprites/276.png rename to PKHeX/Resources/img/Pokemon Sprites/276.png diff --git a/Resources/img/Pokemon Sprites/277.png b/PKHeX/Resources/img/Pokemon Sprites/277.png similarity index 100% rename from Resources/img/Pokemon Sprites/277.png rename to PKHeX/Resources/img/Pokemon Sprites/277.png diff --git a/Resources/img/Pokemon Sprites/278.png b/PKHeX/Resources/img/Pokemon Sprites/278.png similarity index 100% rename from Resources/img/Pokemon Sprites/278.png rename to PKHeX/Resources/img/Pokemon Sprites/278.png diff --git a/Resources/img/Pokemon Sprites/279.png b/PKHeX/Resources/img/Pokemon Sprites/279.png similarity index 100% rename from Resources/img/Pokemon Sprites/279.png rename to PKHeX/Resources/img/Pokemon Sprites/279.png diff --git a/Resources/img/Pokemon Sprites/28.png b/PKHeX/Resources/img/Pokemon Sprites/28.png similarity index 100% rename from Resources/img/Pokemon Sprites/28.png rename to PKHeX/Resources/img/Pokemon Sprites/28.png diff --git a/Resources/img/Pokemon Sprites/280.png b/PKHeX/Resources/img/Pokemon Sprites/280.png similarity index 100% rename from Resources/img/Pokemon Sprites/280.png rename to PKHeX/Resources/img/Pokemon Sprites/280.png diff --git a/Resources/img/Pokemon Sprites/281.png b/PKHeX/Resources/img/Pokemon Sprites/281.png similarity index 100% rename from Resources/img/Pokemon Sprites/281.png rename to PKHeX/Resources/img/Pokemon Sprites/281.png diff --git a/Resources/img/Pokemon Sprites/282-1.png b/PKHeX/Resources/img/Pokemon Sprites/282-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/282-1.png rename to PKHeX/Resources/img/Pokemon Sprites/282-1.png diff --git a/Resources/img/Pokemon Sprites/282.png b/PKHeX/Resources/img/Pokemon Sprites/282.png similarity index 100% rename from Resources/img/Pokemon Sprites/282.png rename to PKHeX/Resources/img/Pokemon Sprites/282.png diff --git a/Resources/img/Pokemon Sprites/283.png b/PKHeX/Resources/img/Pokemon Sprites/283.png similarity index 100% rename from Resources/img/Pokemon Sprites/283.png rename to PKHeX/Resources/img/Pokemon Sprites/283.png diff --git a/Resources/img/Pokemon Sprites/284.png b/PKHeX/Resources/img/Pokemon Sprites/284.png similarity index 100% rename from Resources/img/Pokemon Sprites/284.png rename to PKHeX/Resources/img/Pokemon Sprites/284.png diff --git a/Resources/img/Pokemon Sprites/285.png b/PKHeX/Resources/img/Pokemon Sprites/285.png similarity index 100% rename from Resources/img/Pokemon Sprites/285.png rename to PKHeX/Resources/img/Pokemon Sprites/285.png diff --git a/Resources/img/Pokemon Sprites/286.png b/PKHeX/Resources/img/Pokemon Sprites/286.png similarity index 100% rename from Resources/img/Pokemon Sprites/286.png rename to PKHeX/Resources/img/Pokemon Sprites/286.png diff --git a/Resources/img/Pokemon Sprites/287.png b/PKHeX/Resources/img/Pokemon Sprites/287.png similarity index 100% rename from Resources/img/Pokemon Sprites/287.png rename to PKHeX/Resources/img/Pokemon Sprites/287.png diff --git a/Resources/img/Pokemon Sprites/288.png b/PKHeX/Resources/img/Pokemon Sprites/288.png similarity index 100% rename from Resources/img/Pokemon Sprites/288.png rename to PKHeX/Resources/img/Pokemon Sprites/288.png diff --git a/Resources/img/Pokemon Sprites/289.png b/PKHeX/Resources/img/Pokemon Sprites/289.png similarity index 100% rename from Resources/img/Pokemon Sprites/289.png rename to PKHeX/Resources/img/Pokemon Sprites/289.png diff --git a/Resources/img/Pokemon Sprites/29.png b/PKHeX/Resources/img/Pokemon Sprites/29.png similarity index 100% rename from Resources/img/Pokemon Sprites/29.png rename to PKHeX/Resources/img/Pokemon Sprites/29.png diff --git a/Resources/img/Pokemon Sprites/290.png b/PKHeX/Resources/img/Pokemon Sprites/290.png similarity index 100% rename from Resources/img/Pokemon Sprites/290.png rename to PKHeX/Resources/img/Pokemon Sprites/290.png diff --git a/Resources/img/Pokemon Sprites/291.png b/PKHeX/Resources/img/Pokemon Sprites/291.png similarity index 100% rename from Resources/img/Pokemon Sprites/291.png rename to PKHeX/Resources/img/Pokemon Sprites/291.png diff --git a/Resources/img/Pokemon Sprites/292.png b/PKHeX/Resources/img/Pokemon Sprites/292.png similarity index 100% rename from Resources/img/Pokemon Sprites/292.png rename to PKHeX/Resources/img/Pokemon Sprites/292.png diff --git a/Resources/img/Pokemon Sprites/293.png b/PKHeX/Resources/img/Pokemon Sprites/293.png similarity index 100% rename from Resources/img/Pokemon Sprites/293.png rename to PKHeX/Resources/img/Pokemon Sprites/293.png diff --git a/Resources/img/Pokemon Sprites/294.png b/PKHeX/Resources/img/Pokemon Sprites/294.png similarity index 100% rename from Resources/img/Pokemon Sprites/294.png rename to PKHeX/Resources/img/Pokemon Sprites/294.png diff --git a/Resources/img/Pokemon Sprites/295.png b/PKHeX/Resources/img/Pokemon Sprites/295.png similarity index 100% rename from Resources/img/Pokemon Sprites/295.png rename to PKHeX/Resources/img/Pokemon Sprites/295.png diff --git a/Resources/img/Pokemon Sprites/296.png b/PKHeX/Resources/img/Pokemon Sprites/296.png similarity index 100% rename from Resources/img/Pokemon Sprites/296.png rename to PKHeX/Resources/img/Pokemon Sprites/296.png diff --git a/Resources/img/Pokemon Sprites/297.png b/PKHeX/Resources/img/Pokemon Sprites/297.png similarity index 100% rename from Resources/img/Pokemon Sprites/297.png rename to PKHeX/Resources/img/Pokemon Sprites/297.png diff --git a/Resources/img/Pokemon Sprites/298.png b/PKHeX/Resources/img/Pokemon Sprites/298.png similarity index 100% rename from Resources/img/Pokemon Sprites/298.png rename to PKHeX/Resources/img/Pokemon Sprites/298.png diff --git a/Resources/img/Pokemon Sprites/299.png b/PKHeX/Resources/img/Pokemon Sprites/299.png similarity index 100% rename from Resources/img/Pokemon Sprites/299.png rename to PKHeX/Resources/img/Pokemon Sprites/299.png diff --git a/Resources/img/Pokemon Sprites/3-1.png b/PKHeX/Resources/img/Pokemon Sprites/3-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/3-1.png rename to PKHeX/Resources/img/Pokemon Sprites/3-1.png diff --git a/Resources/img/Pokemon Sprites/3.png b/PKHeX/Resources/img/Pokemon Sprites/3.png similarity index 100% rename from Resources/img/Pokemon Sprites/3.png rename to PKHeX/Resources/img/Pokemon Sprites/3.png diff --git a/Resources/img/Pokemon Sprites/30.png b/PKHeX/Resources/img/Pokemon Sprites/30.png similarity index 100% rename from Resources/img/Pokemon Sprites/30.png rename to PKHeX/Resources/img/Pokemon Sprites/30.png diff --git a/Resources/img/Pokemon Sprites/300.png b/PKHeX/Resources/img/Pokemon Sprites/300.png similarity index 100% rename from Resources/img/Pokemon Sprites/300.png rename to PKHeX/Resources/img/Pokemon Sprites/300.png diff --git a/Resources/img/Pokemon Sprites/301.png b/PKHeX/Resources/img/Pokemon Sprites/301.png similarity index 100% rename from Resources/img/Pokemon Sprites/301.png rename to PKHeX/Resources/img/Pokemon Sprites/301.png diff --git a/Resources/img/Pokemon Sprites/302-1.png b/PKHeX/Resources/img/Pokemon Sprites/302-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/302-1.png rename to PKHeX/Resources/img/Pokemon Sprites/302-1.png diff --git a/Resources/img/Pokemon Sprites/302.png b/PKHeX/Resources/img/Pokemon Sprites/302.png similarity index 100% rename from Resources/img/Pokemon Sprites/302.png rename to PKHeX/Resources/img/Pokemon Sprites/302.png diff --git a/Resources/img/Pokemon Sprites/303-1.png b/PKHeX/Resources/img/Pokemon Sprites/303-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/303-1.png rename to PKHeX/Resources/img/Pokemon Sprites/303-1.png diff --git a/Resources/img/Pokemon Sprites/303.png b/PKHeX/Resources/img/Pokemon Sprites/303.png similarity index 100% rename from Resources/img/Pokemon Sprites/303.png rename to PKHeX/Resources/img/Pokemon Sprites/303.png diff --git a/Resources/img/Pokemon Sprites/304.png b/PKHeX/Resources/img/Pokemon Sprites/304.png similarity index 100% rename from Resources/img/Pokemon Sprites/304.png rename to PKHeX/Resources/img/Pokemon Sprites/304.png diff --git a/Resources/img/Pokemon Sprites/305.png b/PKHeX/Resources/img/Pokemon Sprites/305.png similarity index 100% rename from Resources/img/Pokemon Sprites/305.png rename to PKHeX/Resources/img/Pokemon Sprites/305.png diff --git a/Resources/img/Pokemon Sprites/306-1.png b/PKHeX/Resources/img/Pokemon Sprites/306-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/306-1.png rename to PKHeX/Resources/img/Pokemon Sprites/306-1.png diff --git a/Resources/img/Pokemon Sprites/306.png b/PKHeX/Resources/img/Pokemon Sprites/306.png similarity index 100% rename from Resources/img/Pokemon Sprites/306.png rename to PKHeX/Resources/img/Pokemon Sprites/306.png diff --git a/Resources/img/Pokemon Sprites/307.png b/PKHeX/Resources/img/Pokemon Sprites/307.png similarity index 100% rename from Resources/img/Pokemon Sprites/307.png rename to PKHeX/Resources/img/Pokemon Sprites/307.png diff --git a/Resources/img/Pokemon Sprites/308-1.png b/PKHeX/Resources/img/Pokemon Sprites/308-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/308-1.png rename to PKHeX/Resources/img/Pokemon Sprites/308-1.png diff --git a/Resources/img/Pokemon Sprites/308.png b/PKHeX/Resources/img/Pokemon Sprites/308.png similarity index 100% rename from Resources/img/Pokemon Sprites/308.png rename to PKHeX/Resources/img/Pokemon Sprites/308.png diff --git a/Resources/img/Pokemon Sprites/309.png b/PKHeX/Resources/img/Pokemon Sprites/309.png similarity index 100% rename from Resources/img/Pokemon Sprites/309.png rename to PKHeX/Resources/img/Pokemon Sprites/309.png diff --git a/Resources/img/Pokemon Sprites/31.png b/PKHeX/Resources/img/Pokemon Sprites/31.png similarity index 100% rename from Resources/img/Pokemon Sprites/31.png rename to PKHeX/Resources/img/Pokemon Sprites/31.png diff --git a/Resources/img/Pokemon Sprites/310-1.png b/PKHeX/Resources/img/Pokemon Sprites/310-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/310-1.png rename to PKHeX/Resources/img/Pokemon Sprites/310-1.png diff --git a/Resources/img/Pokemon Sprites/310.png b/PKHeX/Resources/img/Pokemon Sprites/310.png similarity index 100% rename from Resources/img/Pokemon Sprites/310.png rename to PKHeX/Resources/img/Pokemon Sprites/310.png diff --git a/Resources/img/Pokemon Sprites/311.png b/PKHeX/Resources/img/Pokemon Sprites/311.png similarity index 100% rename from Resources/img/Pokemon Sprites/311.png rename to PKHeX/Resources/img/Pokemon Sprites/311.png diff --git a/Resources/img/Pokemon Sprites/312.png b/PKHeX/Resources/img/Pokemon Sprites/312.png similarity index 100% rename from Resources/img/Pokemon Sprites/312.png rename to PKHeX/Resources/img/Pokemon Sprites/312.png diff --git a/Resources/img/Pokemon Sprites/313.png b/PKHeX/Resources/img/Pokemon Sprites/313.png similarity index 100% rename from Resources/img/Pokemon Sprites/313.png rename to PKHeX/Resources/img/Pokemon Sprites/313.png diff --git a/Resources/img/Pokemon Sprites/314.png b/PKHeX/Resources/img/Pokemon Sprites/314.png similarity index 100% rename from Resources/img/Pokemon Sprites/314.png rename to PKHeX/Resources/img/Pokemon Sprites/314.png diff --git a/Resources/img/Pokemon Sprites/315.png b/PKHeX/Resources/img/Pokemon Sprites/315.png similarity index 100% rename from Resources/img/Pokemon Sprites/315.png rename to PKHeX/Resources/img/Pokemon Sprites/315.png diff --git a/Resources/img/Pokemon Sprites/316.png b/PKHeX/Resources/img/Pokemon Sprites/316.png similarity index 100% rename from Resources/img/Pokemon Sprites/316.png rename to PKHeX/Resources/img/Pokemon Sprites/316.png diff --git a/Resources/img/Pokemon Sprites/317.png b/PKHeX/Resources/img/Pokemon Sprites/317.png similarity index 100% rename from Resources/img/Pokemon Sprites/317.png rename to PKHeX/Resources/img/Pokemon Sprites/317.png diff --git a/Resources/img/Pokemon Sprites/318.png b/PKHeX/Resources/img/Pokemon Sprites/318.png similarity index 100% rename from Resources/img/Pokemon Sprites/318.png rename to PKHeX/Resources/img/Pokemon Sprites/318.png diff --git a/Resources/img/Pokemon Sprites/319-1.png b/PKHeX/Resources/img/Pokemon Sprites/319-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/319-1.png rename to PKHeX/Resources/img/Pokemon Sprites/319-1.png diff --git a/Resources/img/Pokemon Sprites/319.png b/PKHeX/Resources/img/Pokemon Sprites/319.png similarity index 100% rename from Resources/img/Pokemon Sprites/319.png rename to PKHeX/Resources/img/Pokemon Sprites/319.png diff --git a/Resources/img/Pokemon Sprites/32.png b/PKHeX/Resources/img/Pokemon Sprites/32.png similarity index 100% rename from Resources/img/Pokemon Sprites/32.png rename to PKHeX/Resources/img/Pokemon Sprites/32.png diff --git a/Resources/img/Pokemon Sprites/320.png b/PKHeX/Resources/img/Pokemon Sprites/320.png similarity index 100% rename from Resources/img/Pokemon Sprites/320.png rename to PKHeX/Resources/img/Pokemon Sprites/320.png diff --git a/Resources/img/Pokemon Sprites/321.png b/PKHeX/Resources/img/Pokemon Sprites/321.png similarity index 100% rename from Resources/img/Pokemon Sprites/321.png rename to PKHeX/Resources/img/Pokemon Sprites/321.png diff --git a/Resources/img/Pokemon Sprites/322.png b/PKHeX/Resources/img/Pokemon Sprites/322.png similarity index 100% rename from Resources/img/Pokemon Sprites/322.png rename to PKHeX/Resources/img/Pokemon Sprites/322.png diff --git a/Resources/img/Pokemon Sprites/323-1.png b/PKHeX/Resources/img/Pokemon Sprites/323-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/323-1.png rename to PKHeX/Resources/img/Pokemon Sprites/323-1.png diff --git a/Resources/img/Pokemon Sprites/323.png b/PKHeX/Resources/img/Pokemon Sprites/323.png similarity index 100% rename from Resources/img/Pokemon Sprites/323.png rename to PKHeX/Resources/img/Pokemon Sprites/323.png diff --git a/Resources/img/Pokemon Sprites/324.png b/PKHeX/Resources/img/Pokemon Sprites/324.png similarity index 100% rename from Resources/img/Pokemon Sprites/324.png rename to PKHeX/Resources/img/Pokemon Sprites/324.png diff --git a/Resources/img/Pokemon Sprites/325.png b/PKHeX/Resources/img/Pokemon Sprites/325.png similarity index 100% rename from Resources/img/Pokemon Sprites/325.png rename to PKHeX/Resources/img/Pokemon Sprites/325.png diff --git a/Resources/img/Pokemon Sprites/326.png b/PKHeX/Resources/img/Pokemon Sprites/326.png similarity index 100% rename from Resources/img/Pokemon Sprites/326.png rename to PKHeX/Resources/img/Pokemon Sprites/326.png diff --git a/Resources/img/Pokemon Sprites/327.png b/PKHeX/Resources/img/Pokemon Sprites/327.png similarity index 100% rename from Resources/img/Pokemon Sprites/327.png rename to PKHeX/Resources/img/Pokemon Sprites/327.png diff --git a/Resources/img/Pokemon Sprites/328.png b/PKHeX/Resources/img/Pokemon Sprites/328.png similarity index 100% rename from Resources/img/Pokemon Sprites/328.png rename to PKHeX/Resources/img/Pokemon Sprites/328.png diff --git a/Resources/img/Pokemon Sprites/329.png b/PKHeX/Resources/img/Pokemon Sprites/329.png similarity index 100% rename from Resources/img/Pokemon Sprites/329.png rename to PKHeX/Resources/img/Pokemon Sprites/329.png diff --git a/Resources/img/Pokemon Sprites/33.png b/PKHeX/Resources/img/Pokemon Sprites/33.png similarity index 100% rename from Resources/img/Pokemon Sprites/33.png rename to PKHeX/Resources/img/Pokemon Sprites/33.png diff --git a/Resources/img/Pokemon Sprites/330.png b/PKHeX/Resources/img/Pokemon Sprites/330.png similarity index 100% rename from Resources/img/Pokemon Sprites/330.png rename to PKHeX/Resources/img/Pokemon Sprites/330.png diff --git a/Resources/img/Pokemon Sprites/331.png b/PKHeX/Resources/img/Pokemon Sprites/331.png similarity index 100% rename from Resources/img/Pokemon Sprites/331.png rename to PKHeX/Resources/img/Pokemon Sprites/331.png diff --git a/Resources/img/Pokemon Sprites/332.png b/PKHeX/Resources/img/Pokemon Sprites/332.png similarity index 100% rename from Resources/img/Pokemon Sprites/332.png rename to PKHeX/Resources/img/Pokemon Sprites/332.png diff --git a/Resources/img/Pokemon Sprites/333.png b/PKHeX/Resources/img/Pokemon Sprites/333.png similarity index 100% rename from Resources/img/Pokemon Sprites/333.png rename to PKHeX/Resources/img/Pokemon Sprites/333.png diff --git a/Resources/img/Pokemon Sprites/334-1.png b/PKHeX/Resources/img/Pokemon Sprites/334-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/334-1.png rename to PKHeX/Resources/img/Pokemon Sprites/334-1.png diff --git a/Resources/img/Pokemon Sprites/334.png b/PKHeX/Resources/img/Pokemon Sprites/334.png similarity index 100% rename from Resources/img/Pokemon Sprites/334.png rename to PKHeX/Resources/img/Pokemon Sprites/334.png diff --git a/Resources/img/Pokemon Sprites/335.png b/PKHeX/Resources/img/Pokemon Sprites/335.png similarity index 100% rename from Resources/img/Pokemon Sprites/335.png rename to PKHeX/Resources/img/Pokemon Sprites/335.png diff --git a/Resources/img/Pokemon Sprites/336.png b/PKHeX/Resources/img/Pokemon Sprites/336.png similarity index 100% rename from Resources/img/Pokemon Sprites/336.png rename to PKHeX/Resources/img/Pokemon Sprites/336.png diff --git a/Resources/img/Pokemon Sprites/337.png b/PKHeX/Resources/img/Pokemon Sprites/337.png similarity index 100% rename from Resources/img/Pokemon Sprites/337.png rename to PKHeX/Resources/img/Pokemon Sprites/337.png diff --git a/Resources/img/Pokemon Sprites/338.png b/PKHeX/Resources/img/Pokemon Sprites/338.png similarity index 100% rename from Resources/img/Pokemon Sprites/338.png rename to PKHeX/Resources/img/Pokemon Sprites/338.png diff --git a/Resources/img/Pokemon Sprites/339.png b/PKHeX/Resources/img/Pokemon Sprites/339.png similarity index 100% rename from Resources/img/Pokemon Sprites/339.png rename to PKHeX/Resources/img/Pokemon Sprites/339.png diff --git a/Resources/img/Pokemon Sprites/34.png b/PKHeX/Resources/img/Pokemon Sprites/34.png similarity index 100% rename from Resources/img/Pokemon Sprites/34.png rename to PKHeX/Resources/img/Pokemon Sprites/34.png diff --git a/Resources/img/Pokemon Sprites/340.png b/PKHeX/Resources/img/Pokemon Sprites/340.png similarity index 100% rename from Resources/img/Pokemon Sprites/340.png rename to PKHeX/Resources/img/Pokemon Sprites/340.png diff --git a/Resources/img/Pokemon Sprites/341.png b/PKHeX/Resources/img/Pokemon Sprites/341.png similarity index 100% rename from Resources/img/Pokemon Sprites/341.png rename to PKHeX/Resources/img/Pokemon Sprites/341.png diff --git a/Resources/img/Pokemon Sprites/342.png b/PKHeX/Resources/img/Pokemon Sprites/342.png similarity index 100% rename from Resources/img/Pokemon Sprites/342.png rename to PKHeX/Resources/img/Pokemon Sprites/342.png diff --git a/Resources/img/Pokemon Sprites/343.png b/PKHeX/Resources/img/Pokemon Sprites/343.png similarity index 100% rename from Resources/img/Pokemon Sprites/343.png rename to PKHeX/Resources/img/Pokemon Sprites/343.png diff --git a/Resources/img/Pokemon Sprites/344.png b/PKHeX/Resources/img/Pokemon Sprites/344.png similarity index 100% rename from Resources/img/Pokemon Sprites/344.png rename to PKHeX/Resources/img/Pokemon Sprites/344.png diff --git a/Resources/img/Pokemon Sprites/345.png b/PKHeX/Resources/img/Pokemon Sprites/345.png similarity index 100% rename from Resources/img/Pokemon Sprites/345.png rename to PKHeX/Resources/img/Pokemon Sprites/345.png diff --git a/Resources/img/Pokemon Sprites/346.png b/PKHeX/Resources/img/Pokemon Sprites/346.png similarity index 100% rename from Resources/img/Pokemon Sprites/346.png rename to PKHeX/Resources/img/Pokemon Sprites/346.png diff --git a/Resources/img/Pokemon Sprites/347.png b/PKHeX/Resources/img/Pokemon Sprites/347.png similarity index 100% rename from Resources/img/Pokemon Sprites/347.png rename to PKHeX/Resources/img/Pokemon Sprites/347.png diff --git a/Resources/img/Pokemon Sprites/348.png b/PKHeX/Resources/img/Pokemon Sprites/348.png similarity index 100% rename from Resources/img/Pokemon Sprites/348.png rename to PKHeX/Resources/img/Pokemon Sprites/348.png diff --git a/Resources/img/Pokemon Sprites/349.png b/PKHeX/Resources/img/Pokemon Sprites/349.png similarity index 100% rename from Resources/img/Pokemon Sprites/349.png rename to PKHeX/Resources/img/Pokemon Sprites/349.png diff --git a/Resources/img/Pokemon Sprites/35.png b/PKHeX/Resources/img/Pokemon Sprites/35.png similarity index 100% rename from Resources/img/Pokemon Sprites/35.png rename to PKHeX/Resources/img/Pokemon Sprites/35.png diff --git a/Resources/img/Pokemon Sprites/350.png b/PKHeX/Resources/img/Pokemon Sprites/350.png similarity index 100% rename from Resources/img/Pokemon Sprites/350.png rename to PKHeX/Resources/img/Pokemon Sprites/350.png diff --git a/Resources/img/Pokemon Sprites/351-1.png b/PKHeX/Resources/img/Pokemon Sprites/351-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/351-1.png rename to PKHeX/Resources/img/Pokemon Sprites/351-1.png diff --git a/Resources/img/Pokemon Sprites/351-2.png b/PKHeX/Resources/img/Pokemon Sprites/351-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/351-2.png rename to PKHeX/Resources/img/Pokemon Sprites/351-2.png diff --git a/Resources/img/Pokemon Sprites/351-3.png b/PKHeX/Resources/img/Pokemon Sprites/351-3.png similarity index 100% rename from Resources/img/Pokemon Sprites/351-3.png rename to PKHeX/Resources/img/Pokemon Sprites/351-3.png diff --git a/Resources/img/Pokemon Sprites/351.png b/PKHeX/Resources/img/Pokemon Sprites/351.png similarity index 100% rename from Resources/img/Pokemon Sprites/351.png rename to PKHeX/Resources/img/Pokemon Sprites/351.png diff --git a/Resources/img/Pokemon Sprites/352.png b/PKHeX/Resources/img/Pokemon Sprites/352.png similarity index 100% rename from Resources/img/Pokemon Sprites/352.png rename to PKHeX/Resources/img/Pokemon Sprites/352.png diff --git a/Resources/img/Pokemon Sprites/353.png b/PKHeX/Resources/img/Pokemon Sprites/353.png similarity index 100% rename from Resources/img/Pokemon Sprites/353.png rename to PKHeX/Resources/img/Pokemon Sprites/353.png diff --git a/Resources/img/Pokemon Sprites/354-1.png b/PKHeX/Resources/img/Pokemon Sprites/354-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/354-1.png rename to PKHeX/Resources/img/Pokemon Sprites/354-1.png diff --git a/Resources/img/Pokemon Sprites/354.png b/PKHeX/Resources/img/Pokemon Sprites/354.png similarity index 100% rename from Resources/img/Pokemon Sprites/354.png rename to PKHeX/Resources/img/Pokemon Sprites/354.png diff --git a/Resources/img/Pokemon Sprites/355.png b/PKHeX/Resources/img/Pokemon Sprites/355.png similarity index 100% rename from Resources/img/Pokemon Sprites/355.png rename to PKHeX/Resources/img/Pokemon Sprites/355.png diff --git a/Resources/img/Pokemon Sprites/356.png b/PKHeX/Resources/img/Pokemon Sprites/356.png similarity index 100% rename from Resources/img/Pokemon Sprites/356.png rename to PKHeX/Resources/img/Pokemon Sprites/356.png diff --git a/Resources/img/Pokemon Sprites/357.png b/PKHeX/Resources/img/Pokemon Sprites/357.png similarity index 100% rename from Resources/img/Pokemon Sprites/357.png rename to PKHeX/Resources/img/Pokemon Sprites/357.png diff --git a/Resources/img/Pokemon Sprites/358.png b/PKHeX/Resources/img/Pokemon Sprites/358.png similarity index 100% rename from Resources/img/Pokemon Sprites/358.png rename to PKHeX/Resources/img/Pokemon Sprites/358.png diff --git a/Resources/img/Pokemon Sprites/359-1.png b/PKHeX/Resources/img/Pokemon Sprites/359-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/359-1.png rename to PKHeX/Resources/img/Pokemon Sprites/359-1.png diff --git a/Resources/img/Pokemon Sprites/359.png b/PKHeX/Resources/img/Pokemon Sprites/359.png similarity index 100% rename from Resources/img/Pokemon Sprites/359.png rename to PKHeX/Resources/img/Pokemon Sprites/359.png diff --git a/Resources/img/Pokemon Sprites/36.png b/PKHeX/Resources/img/Pokemon Sprites/36.png similarity index 100% rename from Resources/img/Pokemon Sprites/36.png rename to PKHeX/Resources/img/Pokemon Sprites/36.png diff --git a/Resources/img/Pokemon Sprites/360.png b/PKHeX/Resources/img/Pokemon Sprites/360.png similarity index 100% rename from Resources/img/Pokemon Sprites/360.png rename to PKHeX/Resources/img/Pokemon Sprites/360.png diff --git a/Resources/img/Pokemon Sprites/361.png b/PKHeX/Resources/img/Pokemon Sprites/361.png similarity index 100% rename from Resources/img/Pokemon Sprites/361.png rename to PKHeX/Resources/img/Pokemon Sprites/361.png diff --git a/Resources/img/Pokemon Sprites/362-1.png b/PKHeX/Resources/img/Pokemon Sprites/362-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/362-1.png rename to PKHeX/Resources/img/Pokemon Sprites/362-1.png diff --git a/Resources/img/Pokemon Sprites/362.png b/PKHeX/Resources/img/Pokemon Sprites/362.png similarity index 100% rename from Resources/img/Pokemon Sprites/362.png rename to PKHeX/Resources/img/Pokemon Sprites/362.png diff --git a/Resources/img/Pokemon Sprites/363.png b/PKHeX/Resources/img/Pokemon Sprites/363.png similarity index 100% rename from Resources/img/Pokemon Sprites/363.png rename to PKHeX/Resources/img/Pokemon Sprites/363.png diff --git a/Resources/img/Pokemon Sprites/364.png b/PKHeX/Resources/img/Pokemon Sprites/364.png similarity index 100% rename from Resources/img/Pokemon Sprites/364.png rename to PKHeX/Resources/img/Pokemon Sprites/364.png diff --git a/Resources/img/Pokemon Sprites/365.png b/PKHeX/Resources/img/Pokemon Sprites/365.png similarity index 100% rename from Resources/img/Pokemon Sprites/365.png rename to PKHeX/Resources/img/Pokemon Sprites/365.png diff --git a/Resources/img/Pokemon Sprites/366.png b/PKHeX/Resources/img/Pokemon Sprites/366.png similarity index 100% rename from Resources/img/Pokemon Sprites/366.png rename to PKHeX/Resources/img/Pokemon Sprites/366.png diff --git a/Resources/img/Pokemon Sprites/367.png b/PKHeX/Resources/img/Pokemon Sprites/367.png similarity index 100% rename from Resources/img/Pokemon Sprites/367.png rename to PKHeX/Resources/img/Pokemon Sprites/367.png diff --git a/Resources/img/Pokemon Sprites/368.png b/PKHeX/Resources/img/Pokemon Sprites/368.png similarity index 100% rename from Resources/img/Pokemon Sprites/368.png rename to PKHeX/Resources/img/Pokemon Sprites/368.png diff --git a/Resources/img/Pokemon Sprites/369.png b/PKHeX/Resources/img/Pokemon Sprites/369.png similarity index 100% rename from Resources/img/Pokemon Sprites/369.png rename to PKHeX/Resources/img/Pokemon Sprites/369.png diff --git a/Resources/img/Pokemon Sprites/37.png b/PKHeX/Resources/img/Pokemon Sprites/37.png similarity index 100% rename from Resources/img/Pokemon Sprites/37.png rename to PKHeX/Resources/img/Pokemon Sprites/37.png diff --git a/Resources/img/Pokemon Sprites/370.png b/PKHeX/Resources/img/Pokemon Sprites/370.png similarity index 100% rename from Resources/img/Pokemon Sprites/370.png rename to PKHeX/Resources/img/Pokemon Sprites/370.png diff --git a/Resources/img/Pokemon Sprites/371.png b/PKHeX/Resources/img/Pokemon Sprites/371.png similarity index 100% rename from Resources/img/Pokemon Sprites/371.png rename to PKHeX/Resources/img/Pokemon Sprites/371.png diff --git a/Resources/img/Pokemon Sprites/372.png b/PKHeX/Resources/img/Pokemon Sprites/372.png similarity index 100% rename from Resources/img/Pokemon Sprites/372.png rename to PKHeX/Resources/img/Pokemon Sprites/372.png diff --git a/Resources/img/Pokemon Sprites/373-1.png b/PKHeX/Resources/img/Pokemon Sprites/373-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/373-1.png rename to PKHeX/Resources/img/Pokemon Sprites/373-1.png diff --git a/Resources/img/Pokemon Sprites/373.png b/PKHeX/Resources/img/Pokemon Sprites/373.png similarity index 100% rename from Resources/img/Pokemon Sprites/373.png rename to PKHeX/Resources/img/Pokemon Sprites/373.png diff --git a/Resources/img/Pokemon Sprites/374.png b/PKHeX/Resources/img/Pokemon Sprites/374.png similarity index 100% rename from Resources/img/Pokemon Sprites/374.png rename to PKHeX/Resources/img/Pokemon Sprites/374.png diff --git a/Resources/img/Pokemon Sprites/375.png b/PKHeX/Resources/img/Pokemon Sprites/375.png similarity index 100% rename from Resources/img/Pokemon Sprites/375.png rename to PKHeX/Resources/img/Pokemon Sprites/375.png diff --git a/Resources/img/Pokemon Sprites/376-1.png b/PKHeX/Resources/img/Pokemon Sprites/376-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/376-1.png rename to PKHeX/Resources/img/Pokemon Sprites/376-1.png diff --git a/Resources/img/Pokemon Sprites/376.png b/PKHeX/Resources/img/Pokemon Sprites/376.png similarity index 100% rename from Resources/img/Pokemon Sprites/376.png rename to PKHeX/Resources/img/Pokemon Sprites/376.png diff --git a/Resources/img/Pokemon Sprites/377.png b/PKHeX/Resources/img/Pokemon Sprites/377.png similarity index 100% rename from Resources/img/Pokemon Sprites/377.png rename to PKHeX/Resources/img/Pokemon Sprites/377.png diff --git a/Resources/img/Pokemon Sprites/378.png b/PKHeX/Resources/img/Pokemon Sprites/378.png similarity index 100% rename from Resources/img/Pokemon Sprites/378.png rename to PKHeX/Resources/img/Pokemon Sprites/378.png diff --git a/Resources/img/Pokemon Sprites/379.png b/PKHeX/Resources/img/Pokemon Sprites/379.png similarity index 100% rename from Resources/img/Pokemon Sprites/379.png rename to PKHeX/Resources/img/Pokemon Sprites/379.png diff --git a/Resources/img/Pokemon Sprites/38.png b/PKHeX/Resources/img/Pokemon Sprites/38.png similarity index 100% rename from Resources/img/Pokemon Sprites/38.png rename to PKHeX/Resources/img/Pokemon Sprites/38.png diff --git a/Resources/img/Pokemon Sprites/380-1.png b/PKHeX/Resources/img/Pokemon Sprites/380-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/380-1.png rename to PKHeX/Resources/img/Pokemon Sprites/380-1.png diff --git a/Resources/img/Pokemon Sprites/380.png b/PKHeX/Resources/img/Pokemon Sprites/380.png similarity index 100% rename from Resources/img/Pokemon Sprites/380.png rename to PKHeX/Resources/img/Pokemon Sprites/380.png diff --git a/Resources/img/Pokemon Sprites/381-1.png b/PKHeX/Resources/img/Pokemon Sprites/381-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/381-1.png rename to PKHeX/Resources/img/Pokemon Sprites/381-1.png diff --git a/Resources/img/Pokemon Sprites/381.png b/PKHeX/Resources/img/Pokemon Sprites/381.png similarity index 100% rename from Resources/img/Pokemon Sprites/381.png rename to PKHeX/Resources/img/Pokemon Sprites/381.png diff --git a/Resources/img/Pokemon Sprites/382-1.png b/PKHeX/Resources/img/Pokemon Sprites/382-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/382-1.png rename to PKHeX/Resources/img/Pokemon Sprites/382-1.png diff --git a/Resources/img/Pokemon Sprites/382.png b/PKHeX/Resources/img/Pokemon Sprites/382.png similarity index 100% rename from Resources/img/Pokemon Sprites/382.png rename to PKHeX/Resources/img/Pokemon Sprites/382.png diff --git a/Resources/img/Pokemon Sprites/383-1.png b/PKHeX/Resources/img/Pokemon Sprites/383-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/383-1.png rename to PKHeX/Resources/img/Pokemon Sprites/383-1.png diff --git a/Resources/img/Pokemon Sprites/383.png b/PKHeX/Resources/img/Pokemon Sprites/383.png similarity index 100% rename from Resources/img/Pokemon Sprites/383.png rename to PKHeX/Resources/img/Pokemon Sprites/383.png diff --git a/Resources/img/Pokemon Sprites/384-1.png b/PKHeX/Resources/img/Pokemon Sprites/384-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/384-1.png rename to PKHeX/Resources/img/Pokemon Sprites/384-1.png diff --git a/Resources/img/Pokemon Sprites/384.png b/PKHeX/Resources/img/Pokemon Sprites/384.png similarity index 100% rename from Resources/img/Pokemon Sprites/384.png rename to PKHeX/Resources/img/Pokemon Sprites/384.png diff --git a/Resources/img/Pokemon Sprites/385.png b/PKHeX/Resources/img/Pokemon Sprites/385.png similarity index 100% rename from Resources/img/Pokemon Sprites/385.png rename to PKHeX/Resources/img/Pokemon Sprites/385.png diff --git a/Resources/img/Pokemon Sprites/386-1.png b/PKHeX/Resources/img/Pokemon Sprites/386-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/386-1.png rename to PKHeX/Resources/img/Pokemon Sprites/386-1.png diff --git a/Resources/img/Pokemon Sprites/386-2.png b/PKHeX/Resources/img/Pokemon Sprites/386-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/386-2.png rename to PKHeX/Resources/img/Pokemon Sprites/386-2.png diff --git a/Resources/img/Pokemon Sprites/386-3.png b/PKHeX/Resources/img/Pokemon Sprites/386-3.png similarity index 100% rename from Resources/img/Pokemon Sprites/386-3.png rename to PKHeX/Resources/img/Pokemon Sprites/386-3.png diff --git a/Resources/img/Pokemon Sprites/386.png b/PKHeX/Resources/img/Pokemon Sprites/386.png similarity index 100% rename from Resources/img/Pokemon Sprites/386.png rename to PKHeX/Resources/img/Pokemon Sprites/386.png diff --git a/Resources/img/Pokemon Sprites/387.png b/PKHeX/Resources/img/Pokemon Sprites/387.png similarity index 100% rename from Resources/img/Pokemon Sprites/387.png rename to PKHeX/Resources/img/Pokemon Sprites/387.png diff --git a/Resources/img/Pokemon Sprites/388.png b/PKHeX/Resources/img/Pokemon Sprites/388.png similarity index 100% rename from Resources/img/Pokemon Sprites/388.png rename to PKHeX/Resources/img/Pokemon Sprites/388.png diff --git a/Resources/img/Pokemon Sprites/389.png b/PKHeX/Resources/img/Pokemon Sprites/389.png similarity index 100% rename from Resources/img/Pokemon Sprites/389.png rename to PKHeX/Resources/img/Pokemon Sprites/389.png diff --git a/Resources/img/Pokemon Sprites/39.png b/PKHeX/Resources/img/Pokemon Sprites/39.png similarity index 100% rename from Resources/img/Pokemon Sprites/39.png rename to PKHeX/Resources/img/Pokemon Sprites/39.png diff --git a/Resources/img/Pokemon Sprites/390.png b/PKHeX/Resources/img/Pokemon Sprites/390.png similarity index 100% rename from Resources/img/Pokemon Sprites/390.png rename to PKHeX/Resources/img/Pokemon Sprites/390.png diff --git a/Resources/img/Pokemon Sprites/391.png b/PKHeX/Resources/img/Pokemon Sprites/391.png similarity index 100% rename from Resources/img/Pokemon Sprites/391.png rename to PKHeX/Resources/img/Pokemon Sprites/391.png diff --git a/Resources/img/Pokemon Sprites/392.png b/PKHeX/Resources/img/Pokemon Sprites/392.png similarity index 100% rename from Resources/img/Pokemon Sprites/392.png rename to PKHeX/Resources/img/Pokemon Sprites/392.png diff --git a/Resources/img/Pokemon Sprites/393.png b/PKHeX/Resources/img/Pokemon Sprites/393.png similarity index 100% rename from Resources/img/Pokemon Sprites/393.png rename to PKHeX/Resources/img/Pokemon Sprites/393.png diff --git a/Resources/img/Pokemon Sprites/394.png b/PKHeX/Resources/img/Pokemon Sprites/394.png similarity index 100% rename from Resources/img/Pokemon Sprites/394.png rename to PKHeX/Resources/img/Pokemon Sprites/394.png diff --git a/Resources/img/Pokemon Sprites/395.png b/PKHeX/Resources/img/Pokemon Sprites/395.png similarity index 100% rename from Resources/img/Pokemon Sprites/395.png rename to PKHeX/Resources/img/Pokemon Sprites/395.png diff --git a/Resources/img/Pokemon Sprites/396.png b/PKHeX/Resources/img/Pokemon Sprites/396.png similarity index 100% rename from Resources/img/Pokemon Sprites/396.png rename to PKHeX/Resources/img/Pokemon Sprites/396.png diff --git a/Resources/img/Pokemon Sprites/397.png b/PKHeX/Resources/img/Pokemon Sprites/397.png similarity index 100% rename from Resources/img/Pokemon Sprites/397.png rename to PKHeX/Resources/img/Pokemon Sprites/397.png diff --git a/Resources/img/Pokemon Sprites/398.png b/PKHeX/Resources/img/Pokemon Sprites/398.png similarity index 100% rename from Resources/img/Pokemon Sprites/398.png rename to PKHeX/Resources/img/Pokemon Sprites/398.png diff --git a/Resources/img/Pokemon Sprites/399.png b/PKHeX/Resources/img/Pokemon Sprites/399.png similarity index 100% rename from Resources/img/Pokemon Sprites/399.png rename to PKHeX/Resources/img/Pokemon Sprites/399.png diff --git a/Resources/img/Pokemon Sprites/4.png b/PKHeX/Resources/img/Pokemon Sprites/4.png similarity index 100% rename from Resources/img/Pokemon Sprites/4.png rename to PKHeX/Resources/img/Pokemon Sprites/4.png diff --git a/Resources/img/Pokemon Sprites/40.png b/PKHeX/Resources/img/Pokemon Sprites/40.png similarity index 100% rename from Resources/img/Pokemon Sprites/40.png rename to PKHeX/Resources/img/Pokemon Sprites/40.png diff --git a/Resources/img/Pokemon Sprites/400.png b/PKHeX/Resources/img/Pokemon Sprites/400.png similarity index 100% rename from Resources/img/Pokemon Sprites/400.png rename to PKHeX/Resources/img/Pokemon Sprites/400.png diff --git a/Resources/img/Pokemon Sprites/401.png b/PKHeX/Resources/img/Pokemon Sprites/401.png similarity index 100% rename from Resources/img/Pokemon Sprites/401.png rename to PKHeX/Resources/img/Pokemon Sprites/401.png diff --git a/Resources/img/Pokemon Sprites/402.png b/PKHeX/Resources/img/Pokemon Sprites/402.png similarity index 100% rename from Resources/img/Pokemon Sprites/402.png rename to PKHeX/Resources/img/Pokemon Sprites/402.png diff --git a/Resources/img/Pokemon Sprites/403.png b/PKHeX/Resources/img/Pokemon Sprites/403.png similarity index 100% rename from Resources/img/Pokemon Sprites/403.png rename to PKHeX/Resources/img/Pokemon Sprites/403.png diff --git a/Resources/img/Pokemon Sprites/404.png b/PKHeX/Resources/img/Pokemon Sprites/404.png similarity index 100% rename from Resources/img/Pokemon Sprites/404.png rename to PKHeX/Resources/img/Pokemon Sprites/404.png diff --git a/Resources/img/Pokemon Sprites/405.png b/PKHeX/Resources/img/Pokemon Sprites/405.png similarity index 100% rename from Resources/img/Pokemon Sprites/405.png rename to PKHeX/Resources/img/Pokemon Sprites/405.png diff --git a/Resources/img/Pokemon Sprites/406.png b/PKHeX/Resources/img/Pokemon Sprites/406.png similarity index 100% rename from Resources/img/Pokemon Sprites/406.png rename to PKHeX/Resources/img/Pokemon Sprites/406.png diff --git a/Resources/img/Pokemon Sprites/407.png b/PKHeX/Resources/img/Pokemon Sprites/407.png similarity index 100% rename from Resources/img/Pokemon Sprites/407.png rename to PKHeX/Resources/img/Pokemon Sprites/407.png diff --git a/Resources/img/Pokemon Sprites/408.png b/PKHeX/Resources/img/Pokemon Sprites/408.png similarity index 100% rename from Resources/img/Pokemon Sprites/408.png rename to PKHeX/Resources/img/Pokemon Sprites/408.png diff --git a/Resources/img/Pokemon Sprites/409.png b/PKHeX/Resources/img/Pokemon Sprites/409.png similarity index 100% rename from Resources/img/Pokemon Sprites/409.png rename to PKHeX/Resources/img/Pokemon Sprites/409.png diff --git a/Resources/img/Pokemon Sprites/41.png b/PKHeX/Resources/img/Pokemon Sprites/41.png similarity index 100% rename from Resources/img/Pokemon Sprites/41.png rename to PKHeX/Resources/img/Pokemon Sprites/41.png diff --git a/Resources/img/Pokemon Sprites/410.png b/PKHeX/Resources/img/Pokemon Sprites/410.png similarity index 100% rename from Resources/img/Pokemon Sprites/410.png rename to PKHeX/Resources/img/Pokemon Sprites/410.png diff --git a/Resources/img/Pokemon Sprites/411.png b/PKHeX/Resources/img/Pokemon Sprites/411.png similarity index 100% rename from Resources/img/Pokemon Sprites/411.png rename to PKHeX/Resources/img/Pokemon Sprites/411.png diff --git a/Resources/img/Pokemon Sprites/412-1.png b/PKHeX/Resources/img/Pokemon Sprites/412-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/412-1.png rename to PKHeX/Resources/img/Pokemon Sprites/412-1.png diff --git a/Resources/img/Pokemon Sprites/412-2.png b/PKHeX/Resources/img/Pokemon Sprites/412-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/412-2.png rename to PKHeX/Resources/img/Pokemon Sprites/412-2.png diff --git a/Resources/img/Pokemon Sprites/412.png b/PKHeX/Resources/img/Pokemon Sprites/412.png similarity index 100% rename from Resources/img/Pokemon Sprites/412.png rename to PKHeX/Resources/img/Pokemon Sprites/412.png diff --git a/Resources/img/Pokemon Sprites/413-1.png b/PKHeX/Resources/img/Pokemon Sprites/413-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/413-1.png rename to PKHeX/Resources/img/Pokemon Sprites/413-1.png diff --git a/Resources/img/Pokemon Sprites/413-2.png b/PKHeX/Resources/img/Pokemon Sprites/413-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/413-2.png rename to PKHeX/Resources/img/Pokemon Sprites/413-2.png diff --git a/Resources/img/Pokemon Sprites/413.png b/PKHeX/Resources/img/Pokemon Sprites/413.png similarity index 100% rename from Resources/img/Pokemon Sprites/413.png rename to PKHeX/Resources/img/Pokemon Sprites/413.png diff --git a/Resources/img/Pokemon Sprites/414.png b/PKHeX/Resources/img/Pokemon Sprites/414.png similarity index 100% rename from Resources/img/Pokemon Sprites/414.png rename to PKHeX/Resources/img/Pokemon Sprites/414.png diff --git a/Resources/img/Pokemon Sprites/415.png b/PKHeX/Resources/img/Pokemon Sprites/415.png similarity index 100% rename from Resources/img/Pokemon Sprites/415.png rename to PKHeX/Resources/img/Pokemon Sprites/415.png diff --git a/Resources/img/Pokemon Sprites/416.png b/PKHeX/Resources/img/Pokemon Sprites/416.png similarity index 100% rename from Resources/img/Pokemon Sprites/416.png rename to PKHeX/Resources/img/Pokemon Sprites/416.png diff --git a/Resources/img/Pokemon Sprites/417.png b/PKHeX/Resources/img/Pokemon Sprites/417.png similarity index 100% rename from Resources/img/Pokemon Sprites/417.png rename to PKHeX/Resources/img/Pokemon Sprites/417.png diff --git a/Resources/img/Pokemon Sprites/418.png b/PKHeX/Resources/img/Pokemon Sprites/418.png similarity index 100% rename from Resources/img/Pokemon Sprites/418.png rename to PKHeX/Resources/img/Pokemon Sprites/418.png diff --git a/Resources/img/Pokemon Sprites/419.png b/PKHeX/Resources/img/Pokemon Sprites/419.png similarity index 100% rename from Resources/img/Pokemon Sprites/419.png rename to PKHeX/Resources/img/Pokemon Sprites/419.png diff --git a/Resources/img/Pokemon Sprites/42.png b/PKHeX/Resources/img/Pokemon Sprites/42.png similarity index 100% rename from Resources/img/Pokemon Sprites/42.png rename to PKHeX/Resources/img/Pokemon Sprites/42.png diff --git a/Resources/img/Pokemon Sprites/420.png b/PKHeX/Resources/img/Pokemon Sprites/420.png similarity index 100% rename from Resources/img/Pokemon Sprites/420.png rename to PKHeX/Resources/img/Pokemon Sprites/420.png diff --git a/Resources/img/Pokemon Sprites/421-1.png b/PKHeX/Resources/img/Pokemon Sprites/421-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/421-1.png rename to PKHeX/Resources/img/Pokemon Sprites/421-1.png diff --git a/Resources/img/Pokemon Sprites/421.png b/PKHeX/Resources/img/Pokemon Sprites/421.png similarity index 100% rename from Resources/img/Pokemon Sprites/421.png rename to PKHeX/Resources/img/Pokemon Sprites/421.png diff --git a/Resources/img/Pokemon Sprites/422-1.png b/PKHeX/Resources/img/Pokemon Sprites/422-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/422-1.png rename to PKHeX/Resources/img/Pokemon Sprites/422-1.png diff --git a/Resources/img/Pokemon Sprites/422.png b/PKHeX/Resources/img/Pokemon Sprites/422.png similarity index 100% rename from Resources/img/Pokemon Sprites/422.png rename to PKHeX/Resources/img/Pokemon Sprites/422.png diff --git a/Resources/img/Pokemon Sprites/423-1.png b/PKHeX/Resources/img/Pokemon Sprites/423-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/423-1.png rename to PKHeX/Resources/img/Pokemon Sprites/423-1.png diff --git a/Resources/img/Pokemon Sprites/423.png b/PKHeX/Resources/img/Pokemon Sprites/423.png similarity index 100% rename from Resources/img/Pokemon Sprites/423.png rename to PKHeX/Resources/img/Pokemon Sprites/423.png diff --git a/Resources/img/Pokemon Sprites/424.png b/PKHeX/Resources/img/Pokemon Sprites/424.png similarity index 100% rename from Resources/img/Pokemon Sprites/424.png rename to PKHeX/Resources/img/Pokemon Sprites/424.png diff --git a/Resources/img/Pokemon Sprites/425.png b/PKHeX/Resources/img/Pokemon Sprites/425.png similarity index 100% rename from Resources/img/Pokemon Sprites/425.png rename to PKHeX/Resources/img/Pokemon Sprites/425.png diff --git a/Resources/img/Pokemon Sprites/426.png b/PKHeX/Resources/img/Pokemon Sprites/426.png similarity index 100% rename from Resources/img/Pokemon Sprites/426.png rename to PKHeX/Resources/img/Pokemon Sprites/426.png diff --git a/Resources/img/Pokemon Sprites/427.png b/PKHeX/Resources/img/Pokemon Sprites/427.png similarity index 100% rename from Resources/img/Pokemon Sprites/427.png rename to PKHeX/Resources/img/Pokemon Sprites/427.png diff --git a/Resources/img/Pokemon Sprites/428-1.png b/PKHeX/Resources/img/Pokemon Sprites/428-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/428-1.png rename to PKHeX/Resources/img/Pokemon Sprites/428-1.png diff --git a/Resources/img/Pokemon Sprites/428.png b/PKHeX/Resources/img/Pokemon Sprites/428.png similarity index 100% rename from Resources/img/Pokemon Sprites/428.png rename to PKHeX/Resources/img/Pokemon Sprites/428.png diff --git a/Resources/img/Pokemon Sprites/429.png b/PKHeX/Resources/img/Pokemon Sprites/429.png similarity index 100% rename from Resources/img/Pokemon Sprites/429.png rename to PKHeX/Resources/img/Pokemon Sprites/429.png diff --git a/Resources/img/Pokemon Sprites/43.png b/PKHeX/Resources/img/Pokemon Sprites/43.png similarity index 100% rename from Resources/img/Pokemon Sprites/43.png rename to PKHeX/Resources/img/Pokemon Sprites/43.png diff --git a/Resources/img/Pokemon Sprites/430.png b/PKHeX/Resources/img/Pokemon Sprites/430.png similarity index 100% rename from Resources/img/Pokemon Sprites/430.png rename to PKHeX/Resources/img/Pokemon Sprites/430.png diff --git a/Resources/img/Pokemon Sprites/431.png b/PKHeX/Resources/img/Pokemon Sprites/431.png similarity index 100% rename from Resources/img/Pokemon Sprites/431.png rename to PKHeX/Resources/img/Pokemon Sprites/431.png diff --git a/Resources/img/Pokemon Sprites/432.png b/PKHeX/Resources/img/Pokemon Sprites/432.png similarity index 100% rename from Resources/img/Pokemon Sprites/432.png rename to PKHeX/Resources/img/Pokemon Sprites/432.png diff --git a/Resources/img/Pokemon Sprites/433.png b/PKHeX/Resources/img/Pokemon Sprites/433.png similarity index 100% rename from Resources/img/Pokemon Sprites/433.png rename to PKHeX/Resources/img/Pokemon Sprites/433.png diff --git a/Resources/img/Pokemon Sprites/434.png b/PKHeX/Resources/img/Pokemon Sprites/434.png similarity index 100% rename from Resources/img/Pokemon Sprites/434.png rename to PKHeX/Resources/img/Pokemon Sprites/434.png diff --git a/Resources/img/Pokemon Sprites/435.png b/PKHeX/Resources/img/Pokemon Sprites/435.png similarity index 100% rename from Resources/img/Pokemon Sprites/435.png rename to PKHeX/Resources/img/Pokemon Sprites/435.png diff --git a/Resources/img/Pokemon Sprites/436.png b/PKHeX/Resources/img/Pokemon Sprites/436.png similarity index 100% rename from Resources/img/Pokemon Sprites/436.png rename to PKHeX/Resources/img/Pokemon Sprites/436.png diff --git a/Resources/img/Pokemon Sprites/437.png b/PKHeX/Resources/img/Pokemon Sprites/437.png similarity index 100% rename from Resources/img/Pokemon Sprites/437.png rename to PKHeX/Resources/img/Pokemon Sprites/437.png diff --git a/Resources/img/Pokemon Sprites/438.png b/PKHeX/Resources/img/Pokemon Sprites/438.png similarity index 100% rename from Resources/img/Pokemon Sprites/438.png rename to PKHeX/Resources/img/Pokemon Sprites/438.png diff --git a/Resources/img/Pokemon Sprites/439.png b/PKHeX/Resources/img/Pokemon Sprites/439.png similarity index 100% rename from Resources/img/Pokemon Sprites/439.png rename to PKHeX/Resources/img/Pokemon Sprites/439.png diff --git a/Resources/img/Pokemon Sprites/44.png b/PKHeX/Resources/img/Pokemon Sprites/44.png similarity index 100% rename from Resources/img/Pokemon Sprites/44.png rename to PKHeX/Resources/img/Pokemon Sprites/44.png diff --git a/Resources/img/Pokemon Sprites/440.png b/PKHeX/Resources/img/Pokemon Sprites/440.png similarity index 100% rename from Resources/img/Pokemon Sprites/440.png rename to PKHeX/Resources/img/Pokemon Sprites/440.png diff --git a/Resources/img/Pokemon Sprites/441.png b/PKHeX/Resources/img/Pokemon Sprites/441.png similarity index 100% rename from Resources/img/Pokemon Sprites/441.png rename to PKHeX/Resources/img/Pokemon Sprites/441.png diff --git a/Resources/img/Pokemon Sprites/442.png b/PKHeX/Resources/img/Pokemon Sprites/442.png similarity index 100% rename from Resources/img/Pokemon Sprites/442.png rename to PKHeX/Resources/img/Pokemon Sprites/442.png diff --git a/Resources/img/Pokemon Sprites/443.png b/PKHeX/Resources/img/Pokemon Sprites/443.png similarity index 100% rename from Resources/img/Pokemon Sprites/443.png rename to PKHeX/Resources/img/Pokemon Sprites/443.png diff --git a/Resources/img/Pokemon Sprites/444.png b/PKHeX/Resources/img/Pokemon Sprites/444.png similarity index 100% rename from Resources/img/Pokemon Sprites/444.png rename to PKHeX/Resources/img/Pokemon Sprites/444.png diff --git a/Resources/img/Pokemon Sprites/445-1.png b/PKHeX/Resources/img/Pokemon Sprites/445-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/445-1.png rename to PKHeX/Resources/img/Pokemon Sprites/445-1.png diff --git a/Resources/img/Pokemon Sprites/445.png b/PKHeX/Resources/img/Pokemon Sprites/445.png similarity index 100% rename from Resources/img/Pokemon Sprites/445.png rename to PKHeX/Resources/img/Pokemon Sprites/445.png diff --git a/Resources/img/Pokemon Sprites/446.png b/PKHeX/Resources/img/Pokemon Sprites/446.png similarity index 100% rename from Resources/img/Pokemon Sprites/446.png rename to PKHeX/Resources/img/Pokemon Sprites/446.png diff --git a/Resources/img/Pokemon Sprites/447.png b/PKHeX/Resources/img/Pokemon Sprites/447.png similarity index 100% rename from Resources/img/Pokemon Sprites/447.png rename to PKHeX/Resources/img/Pokemon Sprites/447.png diff --git a/Resources/img/Pokemon Sprites/448-1.png b/PKHeX/Resources/img/Pokemon Sprites/448-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/448-1.png rename to PKHeX/Resources/img/Pokemon Sprites/448-1.png diff --git a/Resources/img/Pokemon Sprites/448.png b/PKHeX/Resources/img/Pokemon Sprites/448.png similarity index 100% rename from Resources/img/Pokemon Sprites/448.png rename to PKHeX/Resources/img/Pokemon Sprites/448.png diff --git a/Resources/img/Pokemon Sprites/449.png b/PKHeX/Resources/img/Pokemon Sprites/449.png similarity index 100% rename from Resources/img/Pokemon Sprites/449.png rename to PKHeX/Resources/img/Pokemon Sprites/449.png diff --git a/Resources/img/Pokemon Sprites/45.png b/PKHeX/Resources/img/Pokemon Sprites/45.png similarity index 100% rename from Resources/img/Pokemon Sprites/45.png rename to PKHeX/Resources/img/Pokemon Sprites/45.png diff --git a/Resources/img/Pokemon Sprites/450.png b/PKHeX/Resources/img/Pokemon Sprites/450.png similarity index 100% rename from Resources/img/Pokemon Sprites/450.png rename to PKHeX/Resources/img/Pokemon Sprites/450.png diff --git a/Resources/img/Pokemon Sprites/451.png b/PKHeX/Resources/img/Pokemon Sprites/451.png similarity index 100% rename from Resources/img/Pokemon Sprites/451.png rename to PKHeX/Resources/img/Pokemon Sprites/451.png diff --git a/Resources/img/Pokemon Sprites/452.png b/PKHeX/Resources/img/Pokemon Sprites/452.png similarity index 100% rename from Resources/img/Pokemon Sprites/452.png rename to PKHeX/Resources/img/Pokemon Sprites/452.png diff --git a/Resources/img/Pokemon Sprites/453.png b/PKHeX/Resources/img/Pokemon Sprites/453.png similarity index 100% rename from Resources/img/Pokemon Sprites/453.png rename to PKHeX/Resources/img/Pokemon Sprites/453.png diff --git a/Resources/img/Pokemon Sprites/454.png b/PKHeX/Resources/img/Pokemon Sprites/454.png similarity index 100% rename from Resources/img/Pokemon Sprites/454.png rename to PKHeX/Resources/img/Pokemon Sprites/454.png diff --git a/Resources/img/Pokemon Sprites/455.png b/PKHeX/Resources/img/Pokemon Sprites/455.png similarity index 100% rename from Resources/img/Pokemon Sprites/455.png rename to PKHeX/Resources/img/Pokemon Sprites/455.png diff --git a/Resources/img/Pokemon Sprites/456.png b/PKHeX/Resources/img/Pokemon Sprites/456.png similarity index 100% rename from Resources/img/Pokemon Sprites/456.png rename to PKHeX/Resources/img/Pokemon Sprites/456.png diff --git a/Resources/img/Pokemon Sprites/457.png b/PKHeX/Resources/img/Pokemon Sprites/457.png similarity index 100% rename from Resources/img/Pokemon Sprites/457.png rename to PKHeX/Resources/img/Pokemon Sprites/457.png diff --git a/Resources/img/Pokemon Sprites/458.png b/PKHeX/Resources/img/Pokemon Sprites/458.png similarity index 100% rename from Resources/img/Pokemon Sprites/458.png rename to PKHeX/Resources/img/Pokemon Sprites/458.png diff --git a/Resources/img/Pokemon Sprites/459.png b/PKHeX/Resources/img/Pokemon Sprites/459.png similarity index 100% rename from Resources/img/Pokemon Sprites/459.png rename to PKHeX/Resources/img/Pokemon Sprites/459.png diff --git a/Resources/img/Pokemon Sprites/46.png b/PKHeX/Resources/img/Pokemon Sprites/46.png similarity index 100% rename from Resources/img/Pokemon Sprites/46.png rename to PKHeX/Resources/img/Pokemon Sprites/46.png diff --git a/Resources/img/Pokemon Sprites/460-1.png b/PKHeX/Resources/img/Pokemon Sprites/460-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/460-1.png rename to PKHeX/Resources/img/Pokemon Sprites/460-1.png diff --git a/Resources/img/Pokemon Sprites/460.png b/PKHeX/Resources/img/Pokemon Sprites/460.png similarity index 100% rename from Resources/img/Pokemon Sprites/460.png rename to PKHeX/Resources/img/Pokemon Sprites/460.png diff --git a/Resources/img/Pokemon Sprites/461.png b/PKHeX/Resources/img/Pokemon Sprites/461.png similarity index 100% rename from Resources/img/Pokemon Sprites/461.png rename to PKHeX/Resources/img/Pokemon Sprites/461.png diff --git a/Resources/img/Pokemon Sprites/462.png b/PKHeX/Resources/img/Pokemon Sprites/462.png similarity index 100% rename from Resources/img/Pokemon Sprites/462.png rename to PKHeX/Resources/img/Pokemon Sprites/462.png diff --git a/Resources/img/Pokemon Sprites/463.png b/PKHeX/Resources/img/Pokemon Sprites/463.png similarity index 100% rename from Resources/img/Pokemon Sprites/463.png rename to PKHeX/Resources/img/Pokemon Sprites/463.png diff --git a/Resources/img/Pokemon Sprites/464.png b/PKHeX/Resources/img/Pokemon Sprites/464.png similarity index 100% rename from Resources/img/Pokemon Sprites/464.png rename to PKHeX/Resources/img/Pokemon Sprites/464.png diff --git a/Resources/img/Pokemon Sprites/465.png b/PKHeX/Resources/img/Pokemon Sprites/465.png similarity index 100% rename from Resources/img/Pokemon Sprites/465.png rename to PKHeX/Resources/img/Pokemon Sprites/465.png diff --git a/Resources/img/Pokemon Sprites/466.png b/PKHeX/Resources/img/Pokemon Sprites/466.png similarity index 100% rename from Resources/img/Pokemon Sprites/466.png rename to PKHeX/Resources/img/Pokemon Sprites/466.png diff --git a/Resources/img/Pokemon Sprites/467.png b/PKHeX/Resources/img/Pokemon Sprites/467.png similarity index 100% rename from Resources/img/Pokemon Sprites/467.png rename to PKHeX/Resources/img/Pokemon Sprites/467.png diff --git a/Resources/img/Pokemon Sprites/468.png b/PKHeX/Resources/img/Pokemon Sprites/468.png similarity index 100% rename from Resources/img/Pokemon Sprites/468.png rename to PKHeX/Resources/img/Pokemon Sprites/468.png diff --git a/Resources/img/Pokemon Sprites/469.png b/PKHeX/Resources/img/Pokemon Sprites/469.png similarity index 100% rename from Resources/img/Pokemon Sprites/469.png rename to PKHeX/Resources/img/Pokemon Sprites/469.png diff --git a/Resources/img/Pokemon Sprites/47.png b/PKHeX/Resources/img/Pokemon Sprites/47.png similarity index 100% rename from Resources/img/Pokemon Sprites/47.png rename to PKHeX/Resources/img/Pokemon Sprites/47.png diff --git a/Resources/img/Pokemon Sprites/470.png b/PKHeX/Resources/img/Pokemon Sprites/470.png similarity index 100% rename from Resources/img/Pokemon Sprites/470.png rename to PKHeX/Resources/img/Pokemon Sprites/470.png diff --git a/Resources/img/Pokemon Sprites/471.png b/PKHeX/Resources/img/Pokemon Sprites/471.png similarity index 100% rename from Resources/img/Pokemon Sprites/471.png rename to PKHeX/Resources/img/Pokemon Sprites/471.png diff --git a/Resources/img/Pokemon Sprites/472.png b/PKHeX/Resources/img/Pokemon Sprites/472.png similarity index 100% rename from Resources/img/Pokemon Sprites/472.png rename to PKHeX/Resources/img/Pokemon Sprites/472.png diff --git a/Resources/img/Pokemon Sprites/473.png b/PKHeX/Resources/img/Pokemon Sprites/473.png similarity index 100% rename from Resources/img/Pokemon Sprites/473.png rename to PKHeX/Resources/img/Pokemon Sprites/473.png diff --git a/Resources/img/Pokemon Sprites/474.png b/PKHeX/Resources/img/Pokemon Sprites/474.png similarity index 100% rename from Resources/img/Pokemon Sprites/474.png rename to PKHeX/Resources/img/Pokemon Sprites/474.png diff --git a/Resources/img/Pokemon Sprites/475-1.png b/PKHeX/Resources/img/Pokemon Sprites/475-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/475-1.png rename to PKHeX/Resources/img/Pokemon Sprites/475-1.png diff --git a/Resources/img/Pokemon Sprites/475.png b/PKHeX/Resources/img/Pokemon Sprites/475.png similarity index 100% rename from Resources/img/Pokemon Sprites/475.png rename to PKHeX/Resources/img/Pokemon Sprites/475.png diff --git a/Resources/img/Pokemon Sprites/476.png b/PKHeX/Resources/img/Pokemon Sprites/476.png similarity index 100% rename from Resources/img/Pokemon Sprites/476.png rename to PKHeX/Resources/img/Pokemon Sprites/476.png diff --git a/Resources/img/Pokemon Sprites/477.png b/PKHeX/Resources/img/Pokemon Sprites/477.png similarity index 100% rename from Resources/img/Pokemon Sprites/477.png rename to PKHeX/Resources/img/Pokemon Sprites/477.png diff --git a/Resources/img/Pokemon Sprites/478.png b/PKHeX/Resources/img/Pokemon Sprites/478.png similarity index 100% rename from Resources/img/Pokemon Sprites/478.png rename to PKHeX/Resources/img/Pokemon Sprites/478.png diff --git a/Resources/img/Pokemon Sprites/479-1.png b/PKHeX/Resources/img/Pokemon Sprites/479-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/479-1.png rename to PKHeX/Resources/img/Pokemon Sprites/479-1.png diff --git a/Resources/img/Pokemon Sprites/479-2.png b/PKHeX/Resources/img/Pokemon Sprites/479-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/479-2.png rename to PKHeX/Resources/img/Pokemon Sprites/479-2.png diff --git a/Resources/img/Pokemon Sprites/479-3.png b/PKHeX/Resources/img/Pokemon Sprites/479-3.png similarity index 100% rename from Resources/img/Pokemon Sprites/479-3.png rename to PKHeX/Resources/img/Pokemon Sprites/479-3.png diff --git a/Resources/img/Pokemon Sprites/479-4.png b/PKHeX/Resources/img/Pokemon Sprites/479-4.png similarity index 100% rename from Resources/img/Pokemon Sprites/479-4.png rename to PKHeX/Resources/img/Pokemon Sprites/479-4.png diff --git a/Resources/img/Pokemon Sprites/479-5.png b/PKHeX/Resources/img/Pokemon Sprites/479-5.png similarity index 100% rename from Resources/img/Pokemon Sprites/479-5.png rename to PKHeX/Resources/img/Pokemon Sprites/479-5.png diff --git a/Resources/img/Pokemon Sprites/479.png b/PKHeX/Resources/img/Pokemon Sprites/479.png similarity index 100% rename from Resources/img/Pokemon Sprites/479.png rename to PKHeX/Resources/img/Pokemon Sprites/479.png diff --git a/Resources/img/Pokemon Sprites/48.png b/PKHeX/Resources/img/Pokemon Sprites/48.png similarity index 100% rename from Resources/img/Pokemon Sprites/48.png rename to PKHeX/Resources/img/Pokemon Sprites/48.png diff --git a/Resources/img/Pokemon Sprites/480.png b/PKHeX/Resources/img/Pokemon Sprites/480.png similarity index 100% rename from Resources/img/Pokemon Sprites/480.png rename to PKHeX/Resources/img/Pokemon Sprites/480.png diff --git a/Resources/img/Pokemon Sprites/481.png b/PKHeX/Resources/img/Pokemon Sprites/481.png similarity index 100% rename from Resources/img/Pokemon Sprites/481.png rename to PKHeX/Resources/img/Pokemon Sprites/481.png diff --git a/Resources/img/Pokemon Sprites/482.png b/PKHeX/Resources/img/Pokemon Sprites/482.png similarity index 100% rename from Resources/img/Pokemon Sprites/482.png rename to PKHeX/Resources/img/Pokemon Sprites/482.png diff --git a/Resources/img/Pokemon Sprites/483.png b/PKHeX/Resources/img/Pokemon Sprites/483.png similarity index 100% rename from Resources/img/Pokemon Sprites/483.png rename to PKHeX/Resources/img/Pokemon Sprites/483.png diff --git a/Resources/img/Pokemon Sprites/484.png b/PKHeX/Resources/img/Pokemon Sprites/484.png similarity index 100% rename from Resources/img/Pokemon Sprites/484.png rename to PKHeX/Resources/img/Pokemon Sprites/484.png diff --git a/Resources/img/Pokemon Sprites/485.png b/PKHeX/Resources/img/Pokemon Sprites/485.png similarity index 100% rename from Resources/img/Pokemon Sprites/485.png rename to PKHeX/Resources/img/Pokemon Sprites/485.png diff --git a/Resources/img/Pokemon Sprites/486.png b/PKHeX/Resources/img/Pokemon Sprites/486.png similarity index 100% rename from Resources/img/Pokemon Sprites/486.png rename to PKHeX/Resources/img/Pokemon Sprites/486.png diff --git a/Resources/img/Pokemon Sprites/487-1.png b/PKHeX/Resources/img/Pokemon Sprites/487-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/487-1.png rename to PKHeX/Resources/img/Pokemon Sprites/487-1.png diff --git a/Resources/img/Pokemon Sprites/487.png b/PKHeX/Resources/img/Pokemon Sprites/487.png similarity index 100% rename from Resources/img/Pokemon Sprites/487.png rename to PKHeX/Resources/img/Pokemon Sprites/487.png diff --git a/Resources/img/Pokemon Sprites/488.png b/PKHeX/Resources/img/Pokemon Sprites/488.png similarity index 100% rename from Resources/img/Pokemon Sprites/488.png rename to PKHeX/Resources/img/Pokemon Sprites/488.png diff --git a/Resources/img/Pokemon Sprites/489.png b/PKHeX/Resources/img/Pokemon Sprites/489.png similarity index 100% rename from Resources/img/Pokemon Sprites/489.png rename to PKHeX/Resources/img/Pokemon Sprites/489.png diff --git a/Resources/img/Pokemon Sprites/49.png b/PKHeX/Resources/img/Pokemon Sprites/49.png similarity index 100% rename from Resources/img/Pokemon Sprites/49.png rename to PKHeX/Resources/img/Pokemon Sprites/49.png diff --git a/Resources/img/Pokemon Sprites/490.png b/PKHeX/Resources/img/Pokemon Sprites/490.png similarity index 100% rename from Resources/img/Pokemon Sprites/490.png rename to PKHeX/Resources/img/Pokemon Sprites/490.png diff --git a/Resources/img/Pokemon Sprites/491.png b/PKHeX/Resources/img/Pokemon Sprites/491.png similarity index 100% rename from Resources/img/Pokemon Sprites/491.png rename to PKHeX/Resources/img/Pokemon Sprites/491.png diff --git a/Resources/img/Pokemon Sprites/492-1.png b/PKHeX/Resources/img/Pokemon Sprites/492-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/492-1.png rename to PKHeX/Resources/img/Pokemon Sprites/492-1.png diff --git a/Resources/img/Pokemon Sprites/492.png b/PKHeX/Resources/img/Pokemon Sprites/492.png similarity index 100% rename from Resources/img/Pokemon Sprites/492.png rename to PKHeX/Resources/img/Pokemon Sprites/492.png diff --git a/Resources/img/Pokemon Sprites/493.png b/PKHeX/Resources/img/Pokemon Sprites/493.png similarity index 100% rename from Resources/img/Pokemon Sprites/493.png rename to PKHeX/Resources/img/Pokemon Sprites/493.png diff --git a/Resources/img/Pokemon Sprites/494.png b/PKHeX/Resources/img/Pokemon Sprites/494.png similarity index 100% rename from Resources/img/Pokemon Sprites/494.png rename to PKHeX/Resources/img/Pokemon Sprites/494.png diff --git a/Resources/img/Pokemon Sprites/495.png b/PKHeX/Resources/img/Pokemon Sprites/495.png similarity index 100% rename from Resources/img/Pokemon Sprites/495.png rename to PKHeX/Resources/img/Pokemon Sprites/495.png diff --git a/Resources/img/Pokemon Sprites/496.png b/PKHeX/Resources/img/Pokemon Sprites/496.png similarity index 100% rename from Resources/img/Pokemon Sprites/496.png rename to PKHeX/Resources/img/Pokemon Sprites/496.png diff --git a/Resources/img/Pokemon Sprites/497.png b/PKHeX/Resources/img/Pokemon Sprites/497.png similarity index 100% rename from Resources/img/Pokemon Sprites/497.png rename to PKHeX/Resources/img/Pokemon Sprites/497.png diff --git a/Resources/img/Pokemon Sprites/498.png b/PKHeX/Resources/img/Pokemon Sprites/498.png similarity index 100% rename from Resources/img/Pokemon Sprites/498.png rename to PKHeX/Resources/img/Pokemon Sprites/498.png diff --git a/Resources/img/Pokemon Sprites/499.png b/PKHeX/Resources/img/Pokemon Sprites/499.png similarity index 100% rename from Resources/img/Pokemon Sprites/499.png rename to PKHeX/Resources/img/Pokemon Sprites/499.png diff --git a/Resources/img/Pokemon Sprites/5.png b/PKHeX/Resources/img/Pokemon Sprites/5.png similarity index 100% rename from Resources/img/Pokemon Sprites/5.png rename to PKHeX/Resources/img/Pokemon Sprites/5.png diff --git a/Resources/img/Pokemon Sprites/50.png b/PKHeX/Resources/img/Pokemon Sprites/50.png similarity index 100% rename from Resources/img/Pokemon Sprites/50.png rename to PKHeX/Resources/img/Pokemon Sprites/50.png diff --git a/Resources/img/Pokemon Sprites/500.png b/PKHeX/Resources/img/Pokemon Sprites/500.png similarity index 100% rename from Resources/img/Pokemon Sprites/500.png rename to PKHeX/Resources/img/Pokemon Sprites/500.png diff --git a/Resources/img/Pokemon Sprites/501.png b/PKHeX/Resources/img/Pokemon Sprites/501.png similarity index 100% rename from Resources/img/Pokemon Sprites/501.png rename to PKHeX/Resources/img/Pokemon Sprites/501.png diff --git a/Resources/img/Pokemon Sprites/502.png b/PKHeX/Resources/img/Pokemon Sprites/502.png similarity index 100% rename from Resources/img/Pokemon Sprites/502.png rename to PKHeX/Resources/img/Pokemon Sprites/502.png diff --git a/Resources/img/Pokemon Sprites/503.png b/PKHeX/Resources/img/Pokemon Sprites/503.png similarity index 100% rename from Resources/img/Pokemon Sprites/503.png rename to PKHeX/Resources/img/Pokemon Sprites/503.png diff --git a/Resources/img/Pokemon Sprites/504.png b/PKHeX/Resources/img/Pokemon Sprites/504.png similarity index 100% rename from Resources/img/Pokemon Sprites/504.png rename to PKHeX/Resources/img/Pokemon Sprites/504.png diff --git a/Resources/img/Pokemon Sprites/505.png b/PKHeX/Resources/img/Pokemon Sprites/505.png similarity index 100% rename from Resources/img/Pokemon Sprites/505.png rename to PKHeX/Resources/img/Pokemon Sprites/505.png diff --git a/Resources/img/Pokemon Sprites/506.png b/PKHeX/Resources/img/Pokemon Sprites/506.png similarity index 100% rename from Resources/img/Pokemon Sprites/506.png rename to PKHeX/Resources/img/Pokemon Sprites/506.png diff --git a/Resources/img/Pokemon Sprites/507.png b/PKHeX/Resources/img/Pokemon Sprites/507.png similarity index 100% rename from Resources/img/Pokemon Sprites/507.png rename to PKHeX/Resources/img/Pokemon Sprites/507.png diff --git a/Resources/img/Pokemon Sprites/508.png b/PKHeX/Resources/img/Pokemon Sprites/508.png similarity index 100% rename from Resources/img/Pokemon Sprites/508.png rename to PKHeX/Resources/img/Pokemon Sprites/508.png diff --git a/Resources/img/Pokemon Sprites/509.png b/PKHeX/Resources/img/Pokemon Sprites/509.png similarity index 100% rename from Resources/img/Pokemon Sprites/509.png rename to PKHeX/Resources/img/Pokemon Sprites/509.png diff --git a/Resources/img/Pokemon Sprites/51.png b/PKHeX/Resources/img/Pokemon Sprites/51.png similarity index 100% rename from Resources/img/Pokemon Sprites/51.png rename to PKHeX/Resources/img/Pokemon Sprites/51.png diff --git a/Resources/img/Pokemon Sprites/510.png b/PKHeX/Resources/img/Pokemon Sprites/510.png similarity index 100% rename from Resources/img/Pokemon Sprites/510.png rename to PKHeX/Resources/img/Pokemon Sprites/510.png diff --git a/Resources/img/Pokemon Sprites/511.png b/PKHeX/Resources/img/Pokemon Sprites/511.png similarity index 100% rename from Resources/img/Pokemon Sprites/511.png rename to PKHeX/Resources/img/Pokemon Sprites/511.png diff --git a/Resources/img/Pokemon Sprites/512.png b/PKHeX/Resources/img/Pokemon Sprites/512.png similarity index 100% rename from Resources/img/Pokemon Sprites/512.png rename to PKHeX/Resources/img/Pokemon Sprites/512.png diff --git a/Resources/img/Pokemon Sprites/513.png b/PKHeX/Resources/img/Pokemon Sprites/513.png similarity index 100% rename from Resources/img/Pokemon Sprites/513.png rename to PKHeX/Resources/img/Pokemon Sprites/513.png diff --git a/Resources/img/Pokemon Sprites/514.png b/PKHeX/Resources/img/Pokemon Sprites/514.png similarity index 100% rename from Resources/img/Pokemon Sprites/514.png rename to PKHeX/Resources/img/Pokemon Sprites/514.png diff --git a/Resources/img/Pokemon Sprites/515.png b/PKHeX/Resources/img/Pokemon Sprites/515.png similarity index 100% rename from Resources/img/Pokemon Sprites/515.png rename to PKHeX/Resources/img/Pokemon Sprites/515.png diff --git a/Resources/img/Pokemon Sprites/516.png b/PKHeX/Resources/img/Pokemon Sprites/516.png similarity index 100% rename from Resources/img/Pokemon Sprites/516.png rename to PKHeX/Resources/img/Pokemon Sprites/516.png diff --git a/Resources/img/Pokemon Sprites/517.png b/PKHeX/Resources/img/Pokemon Sprites/517.png similarity index 100% rename from Resources/img/Pokemon Sprites/517.png rename to PKHeX/Resources/img/Pokemon Sprites/517.png diff --git a/Resources/img/Pokemon Sprites/518.png b/PKHeX/Resources/img/Pokemon Sprites/518.png similarity index 100% rename from Resources/img/Pokemon Sprites/518.png rename to PKHeX/Resources/img/Pokemon Sprites/518.png diff --git a/Resources/img/Pokemon Sprites/519.png b/PKHeX/Resources/img/Pokemon Sprites/519.png similarity index 100% rename from Resources/img/Pokemon Sprites/519.png rename to PKHeX/Resources/img/Pokemon Sprites/519.png diff --git a/Resources/img/Pokemon Sprites/52.png b/PKHeX/Resources/img/Pokemon Sprites/52.png similarity index 100% rename from Resources/img/Pokemon Sprites/52.png rename to PKHeX/Resources/img/Pokemon Sprites/52.png diff --git a/Resources/img/Pokemon Sprites/520.png b/PKHeX/Resources/img/Pokemon Sprites/520.png similarity index 100% rename from Resources/img/Pokemon Sprites/520.png rename to PKHeX/Resources/img/Pokemon Sprites/520.png diff --git a/Resources/img/Pokemon Sprites/521.png b/PKHeX/Resources/img/Pokemon Sprites/521.png similarity index 100% rename from Resources/img/Pokemon Sprites/521.png rename to PKHeX/Resources/img/Pokemon Sprites/521.png diff --git a/Resources/img/Pokemon Sprites/521_1.png b/PKHeX/Resources/img/Pokemon Sprites/521_1.png similarity index 100% rename from Resources/img/Pokemon Sprites/521_1.png rename to PKHeX/Resources/img/Pokemon Sprites/521_1.png diff --git a/Resources/img/Pokemon Sprites/522.png b/PKHeX/Resources/img/Pokemon Sprites/522.png similarity index 100% rename from Resources/img/Pokemon Sprites/522.png rename to PKHeX/Resources/img/Pokemon Sprites/522.png diff --git a/Resources/img/Pokemon Sprites/523.png b/PKHeX/Resources/img/Pokemon Sprites/523.png similarity index 100% rename from Resources/img/Pokemon Sprites/523.png rename to PKHeX/Resources/img/Pokemon Sprites/523.png diff --git a/Resources/img/Pokemon Sprites/524.png b/PKHeX/Resources/img/Pokemon Sprites/524.png similarity index 100% rename from Resources/img/Pokemon Sprites/524.png rename to PKHeX/Resources/img/Pokemon Sprites/524.png diff --git a/Resources/img/Pokemon Sprites/525.png b/PKHeX/Resources/img/Pokemon Sprites/525.png similarity index 100% rename from Resources/img/Pokemon Sprites/525.png rename to PKHeX/Resources/img/Pokemon Sprites/525.png diff --git a/Resources/img/Pokemon Sprites/526.png b/PKHeX/Resources/img/Pokemon Sprites/526.png similarity index 100% rename from Resources/img/Pokemon Sprites/526.png rename to PKHeX/Resources/img/Pokemon Sprites/526.png diff --git a/Resources/img/Pokemon Sprites/527.png b/PKHeX/Resources/img/Pokemon Sprites/527.png similarity index 100% rename from Resources/img/Pokemon Sprites/527.png rename to PKHeX/Resources/img/Pokemon Sprites/527.png diff --git a/Resources/img/Pokemon Sprites/528.png b/PKHeX/Resources/img/Pokemon Sprites/528.png similarity index 100% rename from Resources/img/Pokemon Sprites/528.png rename to PKHeX/Resources/img/Pokemon Sprites/528.png diff --git a/Resources/img/Pokemon Sprites/529.png b/PKHeX/Resources/img/Pokemon Sprites/529.png similarity index 100% rename from Resources/img/Pokemon Sprites/529.png rename to PKHeX/Resources/img/Pokemon Sprites/529.png diff --git a/Resources/img/Pokemon Sprites/53.png b/PKHeX/Resources/img/Pokemon Sprites/53.png similarity index 100% rename from Resources/img/Pokemon Sprites/53.png rename to PKHeX/Resources/img/Pokemon Sprites/53.png diff --git a/Resources/img/Pokemon Sprites/530.png b/PKHeX/Resources/img/Pokemon Sprites/530.png similarity index 100% rename from Resources/img/Pokemon Sprites/530.png rename to PKHeX/Resources/img/Pokemon Sprites/530.png diff --git a/Resources/img/Pokemon Sprites/531-1.png b/PKHeX/Resources/img/Pokemon Sprites/531-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/531-1.png rename to PKHeX/Resources/img/Pokemon Sprites/531-1.png diff --git a/Resources/img/Pokemon Sprites/531.png b/PKHeX/Resources/img/Pokemon Sprites/531.png similarity index 100% rename from Resources/img/Pokemon Sprites/531.png rename to PKHeX/Resources/img/Pokemon Sprites/531.png diff --git a/Resources/img/Pokemon Sprites/532.png b/PKHeX/Resources/img/Pokemon Sprites/532.png similarity index 100% rename from Resources/img/Pokemon Sprites/532.png rename to PKHeX/Resources/img/Pokemon Sprites/532.png diff --git a/Resources/img/Pokemon Sprites/533.png b/PKHeX/Resources/img/Pokemon Sprites/533.png similarity index 100% rename from Resources/img/Pokemon Sprites/533.png rename to PKHeX/Resources/img/Pokemon Sprites/533.png diff --git a/Resources/img/Pokemon Sprites/534.png b/PKHeX/Resources/img/Pokemon Sprites/534.png similarity index 100% rename from Resources/img/Pokemon Sprites/534.png rename to PKHeX/Resources/img/Pokemon Sprites/534.png diff --git a/Resources/img/Pokemon Sprites/535.png b/PKHeX/Resources/img/Pokemon Sprites/535.png similarity index 100% rename from Resources/img/Pokemon Sprites/535.png rename to PKHeX/Resources/img/Pokemon Sprites/535.png diff --git a/Resources/img/Pokemon Sprites/536.png b/PKHeX/Resources/img/Pokemon Sprites/536.png similarity index 100% rename from Resources/img/Pokemon Sprites/536.png rename to PKHeX/Resources/img/Pokemon Sprites/536.png diff --git a/Resources/img/Pokemon Sprites/537.png b/PKHeX/Resources/img/Pokemon Sprites/537.png similarity index 100% rename from Resources/img/Pokemon Sprites/537.png rename to PKHeX/Resources/img/Pokemon Sprites/537.png diff --git a/Resources/img/Pokemon Sprites/538.png b/PKHeX/Resources/img/Pokemon Sprites/538.png similarity index 100% rename from Resources/img/Pokemon Sprites/538.png rename to PKHeX/Resources/img/Pokemon Sprites/538.png diff --git a/Resources/img/Pokemon Sprites/539.png b/PKHeX/Resources/img/Pokemon Sprites/539.png similarity index 100% rename from Resources/img/Pokemon Sprites/539.png rename to PKHeX/Resources/img/Pokemon Sprites/539.png diff --git a/Resources/img/Pokemon Sprites/54.png b/PKHeX/Resources/img/Pokemon Sprites/54.png similarity index 100% rename from Resources/img/Pokemon Sprites/54.png rename to PKHeX/Resources/img/Pokemon Sprites/54.png diff --git a/Resources/img/Pokemon Sprites/540.png b/PKHeX/Resources/img/Pokemon Sprites/540.png similarity index 100% rename from Resources/img/Pokemon Sprites/540.png rename to PKHeX/Resources/img/Pokemon Sprites/540.png diff --git a/Resources/img/Pokemon Sprites/541.png b/PKHeX/Resources/img/Pokemon Sprites/541.png similarity index 100% rename from Resources/img/Pokemon Sprites/541.png rename to PKHeX/Resources/img/Pokemon Sprites/541.png diff --git a/Resources/img/Pokemon Sprites/542.png b/PKHeX/Resources/img/Pokemon Sprites/542.png similarity index 100% rename from Resources/img/Pokemon Sprites/542.png rename to PKHeX/Resources/img/Pokemon Sprites/542.png diff --git a/Resources/img/Pokemon Sprites/543.png b/PKHeX/Resources/img/Pokemon Sprites/543.png similarity index 100% rename from Resources/img/Pokemon Sprites/543.png rename to PKHeX/Resources/img/Pokemon Sprites/543.png diff --git a/Resources/img/Pokemon Sprites/544.png b/PKHeX/Resources/img/Pokemon Sprites/544.png similarity index 100% rename from Resources/img/Pokemon Sprites/544.png rename to PKHeX/Resources/img/Pokemon Sprites/544.png diff --git a/Resources/img/Pokemon Sprites/545.png b/PKHeX/Resources/img/Pokemon Sprites/545.png similarity index 100% rename from Resources/img/Pokemon Sprites/545.png rename to PKHeX/Resources/img/Pokemon Sprites/545.png diff --git a/Resources/img/Pokemon Sprites/546.png b/PKHeX/Resources/img/Pokemon Sprites/546.png similarity index 100% rename from Resources/img/Pokemon Sprites/546.png rename to PKHeX/Resources/img/Pokemon Sprites/546.png diff --git a/Resources/img/Pokemon Sprites/547.png b/PKHeX/Resources/img/Pokemon Sprites/547.png similarity index 100% rename from Resources/img/Pokemon Sprites/547.png rename to PKHeX/Resources/img/Pokemon Sprites/547.png diff --git a/Resources/img/Pokemon Sprites/548.png b/PKHeX/Resources/img/Pokemon Sprites/548.png similarity index 100% rename from Resources/img/Pokemon Sprites/548.png rename to PKHeX/Resources/img/Pokemon Sprites/548.png diff --git a/Resources/img/Pokemon Sprites/549.png b/PKHeX/Resources/img/Pokemon Sprites/549.png similarity index 100% rename from Resources/img/Pokemon Sprites/549.png rename to PKHeX/Resources/img/Pokemon Sprites/549.png diff --git a/Resources/img/Pokemon Sprites/55.png b/PKHeX/Resources/img/Pokemon Sprites/55.png similarity index 100% rename from Resources/img/Pokemon Sprites/55.png rename to PKHeX/Resources/img/Pokemon Sprites/55.png diff --git a/Resources/img/Pokemon Sprites/550-1.png b/PKHeX/Resources/img/Pokemon Sprites/550-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/550-1.png rename to PKHeX/Resources/img/Pokemon Sprites/550-1.png diff --git a/Resources/img/Pokemon Sprites/550.png b/PKHeX/Resources/img/Pokemon Sprites/550.png similarity index 100% rename from Resources/img/Pokemon Sprites/550.png rename to PKHeX/Resources/img/Pokemon Sprites/550.png diff --git a/Resources/img/Pokemon Sprites/551.png b/PKHeX/Resources/img/Pokemon Sprites/551.png similarity index 100% rename from Resources/img/Pokemon Sprites/551.png rename to PKHeX/Resources/img/Pokemon Sprites/551.png diff --git a/Resources/img/Pokemon Sprites/552.png b/PKHeX/Resources/img/Pokemon Sprites/552.png similarity index 100% rename from Resources/img/Pokemon Sprites/552.png rename to PKHeX/Resources/img/Pokemon Sprites/552.png diff --git a/Resources/img/Pokemon Sprites/553.png b/PKHeX/Resources/img/Pokemon Sprites/553.png similarity index 100% rename from Resources/img/Pokemon Sprites/553.png rename to PKHeX/Resources/img/Pokemon Sprites/553.png diff --git a/Resources/img/Pokemon Sprites/554.png b/PKHeX/Resources/img/Pokemon Sprites/554.png similarity index 100% rename from Resources/img/Pokemon Sprites/554.png rename to PKHeX/Resources/img/Pokemon Sprites/554.png diff --git a/Resources/img/Pokemon Sprites/555-1.png b/PKHeX/Resources/img/Pokemon Sprites/555-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/555-1.png rename to PKHeX/Resources/img/Pokemon Sprites/555-1.png diff --git a/Resources/img/Pokemon Sprites/555.png b/PKHeX/Resources/img/Pokemon Sprites/555.png similarity index 100% rename from Resources/img/Pokemon Sprites/555.png rename to PKHeX/Resources/img/Pokemon Sprites/555.png diff --git a/Resources/img/Pokemon Sprites/556.png b/PKHeX/Resources/img/Pokemon Sprites/556.png similarity index 100% rename from Resources/img/Pokemon Sprites/556.png rename to PKHeX/Resources/img/Pokemon Sprites/556.png diff --git a/Resources/img/Pokemon Sprites/557.png b/PKHeX/Resources/img/Pokemon Sprites/557.png similarity index 100% rename from Resources/img/Pokemon Sprites/557.png rename to PKHeX/Resources/img/Pokemon Sprites/557.png diff --git a/Resources/img/Pokemon Sprites/558.png b/PKHeX/Resources/img/Pokemon Sprites/558.png similarity index 100% rename from Resources/img/Pokemon Sprites/558.png rename to PKHeX/Resources/img/Pokemon Sprites/558.png diff --git a/Resources/img/Pokemon Sprites/559.png b/PKHeX/Resources/img/Pokemon Sprites/559.png similarity index 100% rename from Resources/img/Pokemon Sprites/559.png rename to PKHeX/Resources/img/Pokemon Sprites/559.png diff --git a/Resources/img/Pokemon Sprites/56.png b/PKHeX/Resources/img/Pokemon Sprites/56.png similarity index 100% rename from Resources/img/Pokemon Sprites/56.png rename to PKHeX/Resources/img/Pokemon Sprites/56.png diff --git a/Resources/img/Pokemon Sprites/560.png b/PKHeX/Resources/img/Pokemon Sprites/560.png similarity index 100% rename from Resources/img/Pokemon Sprites/560.png rename to PKHeX/Resources/img/Pokemon Sprites/560.png diff --git a/Resources/img/Pokemon Sprites/561.png b/PKHeX/Resources/img/Pokemon Sprites/561.png similarity index 100% rename from Resources/img/Pokemon Sprites/561.png rename to PKHeX/Resources/img/Pokemon Sprites/561.png diff --git a/Resources/img/Pokemon Sprites/562.png b/PKHeX/Resources/img/Pokemon Sprites/562.png similarity index 100% rename from Resources/img/Pokemon Sprites/562.png rename to PKHeX/Resources/img/Pokemon Sprites/562.png diff --git a/Resources/img/Pokemon Sprites/563.png b/PKHeX/Resources/img/Pokemon Sprites/563.png similarity index 100% rename from Resources/img/Pokemon Sprites/563.png rename to PKHeX/Resources/img/Pokemon Sprites/563.png diff --git a/Resources/img/Pokemon Sprites/564.png b/PKHeX/Resources/img/Pokemon Sprites/564.png similarity index 100% rename from Resources/img/Pokemon Sprites/564.png rename to PKHeX/Resources/img/Pokemon Sprites/564.png diff --git a/Resources/img/Pokemon Sprites/565.png b/PKHeX/Resources/img/Pokemon Sprites/565.png similarity index 100% rename from Resources/img/Pokemon Sprites/565.png rename to PKHeX/Resources/img/Pokemon Sprites/565.png diff --git a/Resources/img/Pokemon Sprites/566.png b/PKHeX/Resources/img/Pokemon Sprites/566.png similarity index 100% rename from Resources/img/Pokemon Sprites/566.png rename to PKHeX/Resources/img/Pokemon Sprites/566.png diff --git a/Resources/img/Pokemon Sprites/567.png b/PKHeX/Resources/img/Pokemon Sprites/567.png similarity index 100% rename from Resources/img/Pokemon Sprites/567.png rename to PKHeX/Resources/img/Pokemon Sprites/567.png diff --git a/Resources/img/Pokemon Sprites/568.png b/PKHeX/Resources/img/Pokemon Sprites/568.png similarity index 100% rename from Resources/img/Pokemon Sprites/568.png rename to PKHeX/Resources/img/Pokemon Sprites/568.png diff --git a/Resources/img/Pokemon Sprites/569.png b/PKHeX/Resources/img/Pokemon Sprites/569.png similarity index 100% rename from Resources/img/Pokemon Sprites/569.png rename to PKHeX/Resources/img/Pokemon Sprites/569.png diff --git a/Resources/img/Pokemon Sprites/57.png b/PKHeX/Resources/img/Pokemon Sprites/57.png similarity index 100% rename from Resources/img/Pokemon Sprites/57.png rename to PKHeX/Resources/img/Pokemon Sprites/57.png diff --git a/Resources/img/Pokemon Sprites/570.png b/PKHeX/Resources/img/Pokemon Sprites/570.png similarity index 100% rename from Resources/img/Pokemon Sprites/570.png rename to PKHeX/Resources/img/Pokemon Sprites/570.png diff --git a/Resources/img/Pokemon Sprites/571.png b/PKHeX/Resources/img/Pokemon Sprites/571.png similarity index 100% rename from Resources/img/Pokemon Sprites/571.png rename to PKHeX/Resources/img/Pokemon Sprites/571.png diff --git a/Resources/img/Pokemon Sprites/572.png b/PKHeX/Resources/img/Pokemon Sprites/572.png similarity index 100% rename from Resources/img/Pokemon Sprites/572.png rename to PKHeX/Resources/img/Pokemon Sprites/572.png diff --git a/Resources/img/Pokemon Sprites/573.png b/PKHeX/Resources/img/Pokemon Sprites/573.png similarity index 100% rename from Resources/img/Pokemon Sprites/573.png rename to PKHeX/Resources/img/Pokemon Sprites/573.png diff --git a/Resources/img/Pokemon Sprites/574.png b/PKHeX/Resources/img/Pokemon Sprites/574.png similarity index 100% rename from Resources/img/Pokemon Sprites/574.png rename to PKHeX/Resources/img/Pokemon Sprites/574.png diff --git a/Resources/img/Pokemon Sprites/575.png b/PKHeX/Resources/img/Pokemon Sprites/575.png similarity index 100% rename from Resources/img/Pokemon Sprites/575.png rename to PKHeX/Resources/img/Pokemon Sprites/575.png diff --git a/Resources/img/Pokemon Sprites/576.png b/PKHeX/Resources/img/Pokemon Sprites/576.png similarity index 100% rename from Resources/img/Pokemon Sprites/576.png rename to PKHeX/Resources/img/Pokemon Sprites/576.png diff --git a/Resources/img/Pokemon Sprites/577.png b/PKHeX/Resources/img/Pokemon Sprites/577.png similarity index 100% rename from Resources/img/Pokemon Sprites/577.png rename to PKHeX/Resources/img/Pokemon Sprites/577.png diff --git a/Resources/img/Pokemon Sprites/578.png b/PKHeX/Resources/img/Pokemon Sprites/578.png similarity index 100% rename from Resources/img/Pokemon Sprites/578.png rename to PKHeX/Resources/img/Pokemon Sprites/578.png diff --git a/Resources/img/Pokemon Sprites/579.png b/PKHeX/Resources/img/Pokemon Sprites/579.png similarity index 100% rename from Resources/img/Pokemon Sprites/579.png rename to PKHeX/Resources/img/Pokemon Sprites/579.png diff --git a/Resources/img/Pokemon Sprites/58.png b/PKHeX/Resources/img/Pokemon Sprites/58.png similarity index 100% rename from Resources/img/Pokemon Sprites/58.png rename to PKHeX/Resources/img/Pokemon Sprites/58.png diff --git a/Resources/img/Pokemon Sprites/580.png b/PKHeX/Resources/img/Pokemon Sprites/580.png similarity index 100% rename from Resources/img/Pokemon Sprites/580.png rename to PKHeX/Resources/img/Pokemon Sprites/580.png diff --git a/Resources/img/Pokemon Sprites/581.png b/PKHeX/Resources/img/Pokemon Sprites/581.png similarity index 100% rename from Resources/img/Pokemon Sprites/581.png rename to PKHeX/Resources/img/Pokemon Sprites/581.png diff --git a/Resources/img/Pokemon Sprites/582.png b/PKHeX/Resources/img/Pokemon Sprites/582.png similarity index 100% rename from Resources/img/Pokemon Sprites/582.png rename to PKHeX/Resources/img/Pokemon Sprites/582.png diff --git a/Resources/img/Pokemon Sprites/583.png b/PKHeX/Resources/img/Pokemon Sprites/583.png similarity index 100% rename from Resources/img/Pokemon Sprites/583.png rename to PKHeX/Resources/img/Pokemon Sprites/583.png diff --git a/Resources/img/Pokemon Sprites/584.png b/PKHeX/Resources/img/Pokemon Sprites/584.png similarity index 100% rename from Resources/img/Pokemon Sprites/584.png rename to PKHeX/Resources/img/Pokemon Sprites/584.png diff --git a/Resources/img/Pokemon Sprites/585-1.png b/PKHeX/Resources/img/Pokemon Sprites/585-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/585-1.png rename to PKHeX/Resources/img/Pokemon Sprites/585-1.png diff --git a/Resources/img/Pokemon Sprites/585-2.png b/PKHeX/Resources/img/Pokemon Sprites/585-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/585-2.png rename to PKHeX/Resources/img/Pokemon Sprites/585-2.png diff --git a/Resources/img/Pokemon Sprites/585-3.png b/PKHeX/Resources/img/Pokemon Sprites/585-3.png similarity index 100% rename from Resources/img/Pokemon Sprites/585-3.png rename to PKHeX/Resources/img/Pokemon Sprites/585-3.png diff --git a/Resources/img/Pokemon Sprites/585.png b/PKHeX/Resources/img/Pokemon Sprites/585.png similarity index 100% rename from Resources/img/Pokemon Sprites/585.png rename to PKHeX/Resources/img/Pokemon Sprites/585.png diff --git a/Resources/img/Pokemon Sprites/586-1.png b/PKHeX/Resources/img/Pokemon Sprites/586-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/586-1.png rename to PKHeX/Resources/img/Pokemon Sprites/586-1.png diff --git a/Resources/img/Pokemon Sprites/586-2.png b/PKHeX/Resources/img/Pokemon Sprites/586-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/586-2.png rename to PKHeX/Resources/img/Pokemon Sprites/586-2.png diff --git a/Resources/img/Pokemon Sprites/586-3.png b/PKHeX/Resources/img/Pokemon Sprites/586-3.png similarity index 100% rename from Resources/img/Pokemon Sprites/586-3.png rename to PKHeX/Resources/img/Pokemon Sprites/586-3.png diff --git a/Resources/img/Pokemon Sprites/586.png b/PKHeX/Resources/img/Pokemon Sprites/586.png similarity index 100% rename from Resources/img/Pokemon Sprites/586.png rename to PKHeX/Resources/img/Pokemon Sprites/586.png diff --git a/Resources/img/Pokemon Sprites/587.png b/PKHeX/Resources/img/Pokemon Sprites/587.png similarity index 100% rename from Resources/img/Pokemon Sprites/587.png rename to PKHeX/Resources/img/Pokemon Sprites/587.png diff --git a/Resources/img/Pokemon Sprites/588.png b/PKHeX/Resources/img/Pokemon Sprites/588.png similarity index 100% rename from Resources/img/Pokemon Sprites/588.png rename to PKHeX/Resources/img/Pokemon Sprites/588.png diff --git a/Resources/img/Pokemon Sprites/589.png b/PKHeX/Resources/img/Pokemon Sprites/589.png similarity index 100% rename from Resources/img/Pokemon Sprites/589.png rename to PKHeX/Resources/img/Pokemon Sprites/589.png diff --git a/Resources/img/Pokemon Sprites/59.png b/PKHeX/Resources/img/Pokemon Sprites/59.png similarity index 100% rename from Resources/img/Pokemon Sprites/59.png rename to PKHeX/Resources/img/Pokemon Sprites/59.png diff --git a/Resources/img/Pokemon Sprites/590.png b/PKHeX/Resources/img/Pokemon Sprites/590.png similarity index 100% rename from Resources/img/Pokemon Sprites/590.png rename to PKHeX/Resources/img/Pokemon Sprites/590.png diff --git a/Resources/img/Pokemon Sprites/591.png b/PKHeX/Resources/img/Pokemon Sprites/591.png similarity index 100% rename from Resources/img/Pokemon Sprites/591.png rename to PKHeX/Resources/img/Pokemon Sprites/591.png diff --git a/Resources/img/Pokemon Sprites/592-1.png b/PKHeX/Resources/img/Pokemon Sprites/592-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/592-1.png rename to PKHeX/Resources/img/Pokemon Sprites/592-1.png diff --git a/Resources/img/Pokemon Sprites/592.png b/PKHeX/Resources/img/Pokemon Sprites/592.png similarity index 100% rename from Resources/img/Pokemon Sprites/592.png rename to PKHeX/Resources/img/Pokemon Sprites/592.png diff --git a/Resources/img/Pokemon Sprites/593-1.png b/PKHeX/Resources/img/Pokemon Sprites/593-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/593-1.png rename to PKHeX/Resources/img/Pokemon Sprites/593-1.png diff --git a/Resources/img/Pokemon Sprites/593.png b/PKHeX/Resources/img/Pokemon Sprites/593.png similarity index 100% rename from Resources/img/Pokemon Sprites/593.png rename to PKHeX/Resources/img/Pokemon Sprites/593.png diff --git a/Resources/img/Pokemon Sprites/594.png b/PKHeX/Resources/img/Pokemon Sprites/594.png similarity index 100% rename from Resources/img/Pokemon Sprites/594.png rename to PKHeX/Resources/img/Pokemon Sprites/594.png diff --git a/Resources/img/Pokemon Sprites/595.png b/PKHeX/Resources/img/Pokemon Sprites/595.png similarity index 100% rename from Resources/img/Pokemon Sprites/595.png rename to PKHeX/Resources/img/Pokemon Sprites/595.png diff --git a/Resources/img/Pokemon Sprites/596.png b/PKHeX/Resources/img/Pokemon Sprites/596.png similarity index 100% rename from Resources/img/Pokemon Sprites/596.png rename to PKHeX/Resources/img/Pokemon Sprites/596.png diff --git a/Resources/img/Pokemon Sprites/597.png b/PKHeX/Resources/img/Pokemon Sprites/597.png similarity index 100% rename from Resources/img/Pokemon Sprites/597.png rename to PKHeX/Resources/img/Pokemon Sprites/597.png diff --git a/Resources/img/Pokemon Sprites/598.png b/PKHeX/Resources/img/Pokemon Sprites/598.png similarity index 100% rename from Resources/img/Pokemon Sprites/598.png rename to PKHeX/Resources/img/Pokemon Sprites/598.png diff --git a/Resources/img/Pokemon Sprites/599.png b/PKHeX/Resources/img/Pokemon Sprites/599.png similarity index 100% rename from Resources/img/Pokemon Sprites/599.png rename to PKHeX/Resources/img/Pokemon Sprites/599.png diff --git a/Resources/img/Pokemon Sprites/6-1.png b/PKHeX/Resources/img/Pokemon Sprites/6-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/6-1.png rename to PKHeX/Resources/img/Pokemon Sprites/6-1.png diff --git a/Resources/img/Pokemon Sprites/6-2.png b/PKHeX/Resources/img/Pokemon Sprites/6-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/6-2.png rename to PKHeX/Resources/img/Pokemon Sprites/6-2.png diff --git a/Resources/img/Pokemon Sprites/6.png b/PKHeX/Resources/img/Pokemon Sprites/6.png similarity index 100% rename from Resources/img/Pokemon Sprites/6.png rename to PKHeX/Resources/img/Pokemon Sprites/6.png diff --git a/Resources/img/Pokemon Sprites/60.png b/PKHeX/Resources/img/Pokemon Sprites/60.png similarity index 100% rename from Resources/img/Pokemon Sprites/60.png rename to PKHeX/Resources/img/Pokemon Sprites/60.png diff --git a/Resources/img/Pokemon Sprites/600.png b/PKHeX/Resources/img/Pokemon Sprites/600.png similarity index 100% rename from Resources/img/Pokemon Sprites/600.png rename to PKHeX/Resources/img/Pokemon Sprites/600.png diff --git a/Resources/img/Pokemon Sprites/601.png b/PKHeX/Resources/img/Pokemon Sprites/601.png similarity index 100% rename from Resources/img/Pokemon Sprites/601.png rename to PKHeX/Resources/img/Pokemon Sprites/601.png diff --git a/Resources/img/Pokemon Sprites/602.png b/PKHeX/Resources/img/Pokemon Sprites/602.png similarity index 100% rename from Resources/img/Pokemon Sprites/602.png rename to PKHeX/Resources/img/Pokemon Sprites/602.png diff --git a/Resources/img/Pokemon Sprites/603.png b/PKHeX/Resources/img/Pokemon Sprites/603.png similarity index 100% rename from Resources/img/Pokemon Sprites/603.png rename to PKHeX/Resources/img/Pokemon Sprites/603.png diff --git a/Resources/img/Pokemon Sprites/604.png b/PKHeX/Resources/img/Pokemon Sprites/604.png similarity index 100% rename from Resources/img/Pokemon Sprites/604.png rename to PKHeX/Resources/img/Pokemon Sprites/604.png diff --git a/Resources/img/Pokemon Sprites/605.png b/PKHeX/Resources/img/Pokemon Sprites/605.png similarity index 100% rename from Resources/img/Pokemon Sprites/605.png rename to PKHeX/Resources/img/Pokemon Sprites/605.png diff --git a/Resources/img/Pokemon Sprites/606.png b/PKHeX/Resources/img/Pokemon Sprites/606.png similarity index 100% rename from Resources/img/Pokemon Sprites/606.png rename to PKHeX/Resources/img/Pokemon Sprites/606.png diff --git a/Resources/img/Pokemon Sprites/607.png b/PKHeX/Resources/img/Pokemon Sprites/607.png similarity index 100% rename from Resources/img/Pokemon Sprites/607.png rename to PKHeX/Resources/img/Pokemon Sprites/607.png diff --git a/Resources/img/Pokemon Sprites/608.png b/PKHeX/Resources/img/Pokemon Sprites/608.png similarity index 100% rename from Resources/img/Pokemon Sprites/608.png rename to PKHeX/Resources/img/Pokemon Sprites/608.png diff --git a/Resources/img/Pokemon Sprites/609.png b/PKHeX/Resources/img/Pokemon Sprites/609.png similarity index 100% rename from Resources/img/Pokemon Sprites/609.png rename to PKHeX/Resources/img/Pokemon Sprites/609.png diff --git a/Resources/img/Pokemon Sprites/61.png b/PKHeX/Resources/img/Pokemon Sprites/61.png similarity index 100% rename from Resources/img/Pokemon Sprites/61.png rename to PKHeX/Resources/img/Pokemon Sprites/61.png diff --git a/Resources/img/Pokemon Sprites/610.png b/PKHeX/Resources/img/Pokemon Sprites/610.png similarity index 100% rename from Resources/img/Pokemon Sprites/610.png rename to PKHeX/Resources/img/Pokemon Sprites/610.png diff --git a/Resources/img/Pokemon Sprites/611.png b/PKHeX/Resources/img/Pokemon Sprites/611.png similarity index 100% rename from Resources/img/Pokemon Sprites/611.png rename to PKHeX/Resources/img/Pokemon Sprites/611.png diff --git a/Resources/img/Pokemon Sprites/612.png b/PKHeX/Resources/img/Pokemon Sprites/612.png similarity index 100% rename from Resources/img/Pokemon Sprites/612.png rename to PKHeX/Resources/img/Pokemon Sprites/612.png diff --git a/Resources/img/Pokemon Sprites/613.png b/PKHeX/Resources/img/Pokemon Sprites/613.png similarity index 100% rename from Resources/img/Pokemon Sprites/613.png rename to PKHeX/Resources/img/Pokemon Sprites/613.png diff --git a/Resources/img/Pokemon Sprites/614.png b/PKHeX/Resources/img/Pokemon Sprites/614.png similarity index 100% rename from Resources/img/Pokemon Sprites/614.png rename to PKHeX/Resources/img/Pokemon Sprites/614.png diff --git a/Resources/img/Pokemon Sprites/615.png b/PKHeX/Resources/img/Pokemon Sprites/615.png similarity index 100% rename from Resources/img/Pokemon Sprites/615.png rename to PKHeX/Resources/img/Pokemon Sprites/615.png diff --git a/Resources/img/Pokemon Sprites/616.png b/PKHeX/Resources/img/Pokemon Sprites/616.png similarity index 100% rename from Resources/img/Pokemon Sprites/616.png rename to PKHeX/Resources/img/Pokemon Sprites/616.png diff --git a/Resources/img/Pokemon Sprites/617.png b/PKHeX/Resources/img/Pokemon Sprites/617.png similarity index 100% rename from Resources/img/Pokemon Sprites/617.png rename to PKHeX/Resources/img/Pokemon Sprites/617.png diff --git a/Resources/img/Pokemon Sprites/618.png b/PKHeX/Resources/img/Pokemon Sprites/618.png similarity index 100% rename from Resources/img/Pokemon Sprites/618.png rename to PKHeX/Resources/img/Pokemon Sprites/618.png diff --git a/Resources/img/Pokemon Sprites/619.png b/PKHeX/Resources/img/Pokemon Sprites/619.png similarity index 100% rename from Resources/img/Pokemon Sprites/619.png rename to PKHeX/Resources/img/Pokemon Sprites/619.png diff --git a/Resources/img/Pokemon Sprites/62.png b/PKHeX/Resources/img/Pokemon Sprites/62.png similarity index 100% rename from Resources/img/Pokemon Sprites/62.png rename to PKHeX/Resources/img/Pokemon Sprites/62.png diff --git a/Resources/img/Pokemon Sprites/620.png b/PKHeX/Resources/img/Pokemon Sprites/620.png similarity index 100% rename from Resources/img/Pokemon Sprites/620.png rename to PKHeX/Resources/img/Pokemon Sprites/620.png diff --git a/Resources/img/Pokemon Sprites/621.png b/PKHeX/Resources/img/Pokemon Sprites/621.png similarity index 100% rename from Resources/img/Pokemon Sprites/621.png rename to PKHeX/Resources/img/Pokemon Sprites/621.png diff --git a/Resources/img/Pokemon Sprites/622.png b/PKHeX/Resources/img/Pokemon Sprites/622.png similarity index 100% rename from Resources/img/Pokemon Sprites/622.png rename to PKHeX/Resources/img/Pokemon Sprites/622.png diff --git a/Resources/img/Pokemon Sprites/623.png b/PKHeX/Resources/img/Pokemon Sprites/623.png similarity index 100% rename from Resources/img/Pokemon Sprites/623.png rename to PKHeX/Resources/img/Pokemon Sprites/623.png diff --git a/Resources/img/Pokemon Sprites/624.png b/PKHeX/Resources/img/Pokemon Sprites/624.png similarity index 100% rename from Resources/img/Pokemon Sprites/624.png rename to PKHeX/Resources/img/Pokemon Sprites/624.png diff --git a/Resources/img/Pokemon Sprites/625.png b/PKHeX/Resources/img/Pokemon Sprites/625.png similarity index 100% rename from Resources/img/Pokemon Sprites/625.png rename to PKHeX/Resources/img/Pokemon Sprites/625.png diff --git a/Resources/img/Pokemon Sprites/626.png b/PKHeX/Resources/img/Pokemon Sprites/626.png similarity index 100% rename from Resources/img/Pokemon Sprites/626.png rename to PKHeX/Resources/img/Pokemon Sprites/626.png diff --git a/Resources/img/Pokemon Sprites/627.png b/PKHeX/Resources/img/Pokemon Sprites/627.png similarity index 100% rename from Resources/img/Pokemon Sprites/627.png rename to PKHeX/Resources/img/Pokemon Sprites/627.png diff --git a/Resources/img/Pokemon Sprites/628.png b/PKHeX/Resources/img/Pokemon Sprites/628.png similarity index 100% rename from Resources/img/Pokemon Sprites/628.png rename to PKHeX/Resources/img/Pokemon Sprites/628.png diff --git a/Resources/img/Pokemon Sprites/629.png b/PKHeX/Resources/img/Pokemon Sprites/629.png similarity index 100% rename from Resources/img/Pokemon Sprites/629.png rename to PKHeX/Resources/img/Pokemon Sprites/629.png diff --git a/Resources/img/Pokemon Sprites/63.png b/PKHeX/Resources/img/Pokemon Sprites/63.png similarity index 100% rename from Resources/img/Pokemon Sprites/63.png rename to PKHeX/Resources/img/Pokemon Sprites/63.png diff --git a/Resources/img/Pokemon Sprites/630.png b/PKHeX/Resources/img/Pokemon Sprites/630.png similarity index 100% rename from Resources/img/Pokemon Sprites/630.png rename to PKHeX/Resources/img/Pokemon Sprites/630.png diff --git a/Resources/img/Pokemon Sprites/631.png b/PKHeX/Resources/img/Pokemon Sprites/631.png similarity index 100% rename from Resources/img/Pokemon Sprites/631.png rename to PKHeX/Resources/img/Pokemon Sprites/631.png diff --git a/Resources/img/Pokemon Sprites/632.png b/PKHeX/Resources/img/Pokemon Sprites/632.png similarity index 100% rename from Resources/img/Pokemon Sprites/632.png rename to PKHeX/Resources/img/Pokemon Sprites/632.png diff --git a/Resources/img/Pokemon Sprites/633.png b/PKHeX/Resources/img/Pokemon Sprites/633.png similarity index 100% rename from Resources/img/Pokemon Sprites/633.png rename to PKHeX/Resources/img/Pokemon Sprites/633.png diff --git a/Resources/img/Pokemon Sprites/634.png b/PKHeX/Resources/img/Pokemon Sprites/634.png similarity index 100% rename from Resources/img/Pokemon Sprites/634.png rename to PKHeX/Resources/img/Pokemon Sprites/634.png diff --git a/Resources/img/Pokemon Sprites/635.png b/PKHeX/Resources/img/Pokemon Sprites/635.png similarity index 100% rename from Resources/img/Pokemon Sprites/635.png rename to PKHeX/Resources/img/Pokemon Sprites/635.png diff --git a/Resources/img/Pokemon Sprites/636.png b/PKHeX/Resources/img/Pokemon Sprites/636.png similarity index 100% rename from Resources/img/Pokemon Sprites/636.png rename to PKHeX/Resources/img/Pokemon Sprites/636.png diff --git a/Resources/img/Pokemon Sprites/637.png b/PKHeX/Resources/img/Pokemon Sprites/637.png similarity index 100% rename from Resources/img/Pokemon Sprites/637.png rename to PKHeX/Resources/img/Pokemon Sprites/637.png diff --git a/Resources/img/Pokemon Sprites/638.png b/PKHeX/Resources/img/Pokemon Sprites/638.png similarity index 100% rename from Resources/img/Pokemon Sprites/638.png rename to PKHeX/Resources/img/Pokemon Sprites/638.png diff --git a/Resources/img/Pokemon Sprites/639.png b/PKHeX/Resources/img/Pokemon Sprites/639.png similarity index 100% rename from Resources/img/Pokemon Sprites/639.png rename to PKHeX/Resources/img/Pokemon Sprites/639.png diff --git a/Resources/img/Pokemon Sprites/64.png b/PKHeX/Resources/img/Pokemon Sprites/64.png similarity index 100% rename from Resources/img/Pokemon Sprites/64.png rename to PKHeX/Resources/img/Pokemon Sprites/64.png diff --git a/Resources/img/Pokemon Sprites/640.png b/PKHeX/Resources/img/Pokemon Sprites/640.png similarity index 100% rename from Resources/img/Pokemon Sprites/640.png rename to PKHeX/Resources/img/Pokemon Sprites/640.png diff --git a/Resources/img/Pokemon Sprites/641-1.png b/PKHeX/Resources/img/Pokemon Sprites/641-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/641-1.png rename to PKHeX/Resources/img/Pokemon Sprites/641-1.png diff --git a/Resources/img/Pokemon Sprites/641.png b/PKHeX/Resources/img/Pokemon Sprites/641.png similarity index 100% rename from Resources/img/Pokemon Sprites/641.png rename to PKHeX/Resources/img/Pokemon Sprites/641.png diff --git a/Resources/img/Pokemon Sprites/642-1.png b/PKHeX/Resources/img/Pokemon Sprites/642-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/642-1.png rename to PKHeX/Resources/img/Pokemon Sprites/642-1.png diff --git a/Resources/img/Pokemon Sprites/642.png b/PKHeX/Resources/img/Pokemon Sprites/642.png similarity index 100% rename from Resources/img/Pokemon Sprites/642.png rename to PKHeX/Resources/img/Pokemon Sprites/642.png diff --git a/Resources/img/Pokemon Sprites/643.png b/PKHeX/Resources/img/Pokemon Sprites/643.png similarity index 100% rename from Resources/img/Pokemon Sprites/643.png rename to PKHeX/Resources/img/Pokemon Sprites/643.png diff --git a/Resources/img/Pokemon Sprites/644.png b/PKHeX/Resources/img/Pokemon Sprites/644.png similarity index 100% rename from Resources/img/Pokemon Sprites/644.png rename to PKHeX/Resources/img/Pokemon Sprites/644.png diff --git a/Resources/img/Pokemon Sprites/645-1.png b/PKHeX/Resources/img/Pokemon Sprites/645-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/645-1.png rename to PKHeX/Resources/img/Pokemon Sprites/645-1.png diff --git a/Resources/img/Pokemon Sprites/645.png b/PKHeX/Resources/img/Pokemon Sprites/645.png similarity index 100% rename from Resources/img/Pokemon Sprites/645.png rename to PKHeX/Resources/img/Pokemon Sprites/645.png diff --git a/Resources/img/Pokemon Sprites/646-1.png b/PKHeX/Resources/img/Pokemon Sprites/646-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/646-1.png rename to PKHeX/Resources/img/Pokemon Sprites/646-1.png diff --git a/Resources/img/Pokemon Sprites/646-2.png b/PKHeX/Resources/img/Pokemon Sprites/646-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/646-2.png rename to PKHeX/Resources/img/Pokemon Sprites/646-2.png diff --git a/Resources/img/Pokemon Sprites/646.png b/PKHeX/Resources/img/Pokemon Sprites/646.png similarity index 100% rename from Resources/img/Pokemon Sprites/646.png rename to PKHeX/Resources/img/Pokemon Sprites/646.png diff --git a/Resources/img/Pokemon Sprites/647-1.png b/PKHeX/Resources/img/Pokemon Sprites/647-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/647-1.png rename to PKHeX/Resources/img/Pokemon Sprites/647-1.png diff --git a/Resources/img/Pokemon Sprites/647.png b/PKHeX/Resources/img/Pokemon Sprites/647.png similarity index 100% rename from Resources/img/Pokemon Sprites/647.png rename to PKHeX/Resources/img/Pokemon Sprites/647.png diff --git a/Resources/img/Pokemon Sprites/648-1.png b/PKHeX/Resources/img/Pokemon Sprites/648-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/648-1.png rename to PKHeX/Resources/img/Pokemon Sprites/648-1.png diff --git a/Resources/img/Pokemon Sprites/648.png b/PKHeX/Resources/img/Pokemon Sprites/648.png similarity index 100% rename from Resources/img/Pokemon Sprites/648.png rename to PKHeX/Resources/img/Pokemon Sprites/648.png diff --git a/Resources/img/Pokemon Sprites/649-1.png b/PKHeX/Resources/img/Pokemon Sprites/649-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/649-1.png rename to PKHeX/Resources/img/Pokemon Sprites/649-1.png diff --git a/Resources/img/Pokemon Sprites/649-2.png b/PKHeX/Resources/img/Pokemon Sprites/649-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/649-2.png rename to PKHeX/Resources/img/Pokemon Sprites/649-2.png diff --git a/Resources/img/Pokemon Sprites/649-3.png b/PKHeX/Resources/img/Pokemon Sprites/649-3.png similarity index 100% rename from Resources/img/Pokemon Sprites/649-3.png rename to PKHeX/Resources/img/Pokemon Sprites/649-3.png diff --git a/Resources/img/Pokemon Sprites/649-4.png b/PKHeX/Resources/img/Pokemon Sprites/649-4.png similarity index 100% rename from Resources/img/Pokemon Sprites/649-4.png rename to PKHeX/Resources/img/Pokemon Sprites/649-4.png diff --git a/Resources/img/Pokemon Sprites/649.png b/PKHeX/Resources/img/Pokemon Sprites/649.png similarity index 100% rename from Resources/img/Pokemon Sprites/649.png rename to PKHeX/Resources/img/Pokemon Sprites/649.png diff --git a/Resources/img/Pokemon Sprites/65-1.png b/PKHeX/Resources/img/Pokemon Sprites/65-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/65-1.png rename to PKHeX/Resources/img/Pokemon Sprites/65-1.png diff --git a/Resources/img/Pokemon Sprites/65.png b/PKHeX/Resources/img/Pokemon Sprites/65.png similarity index 100% rename from Resources/img/Pokemon Sprites/65.png rename to PKHeX/Resources/img/Pokemon Sprites/65.png diff --git a/Resources/img/Pokemon Sprites/650.png b/PKHeX/Resources/img/Pokemon Sprites/650.png similarity index 100% rename from Resources/img/Pokemon Sprites/650.png rename to PKHeX/Resources/img/Pokemon Sprites/650.png diff --git a/Resources/img/Pokemon Sprites/651.png b/PKHeX/Resources/img/Pokemon Sprites/651.png similarity index 100% rename from Resources/img/Pokemon Sprites/651.png rename to PKHeX/Resources/img/Pokemon Sprites/651.png diff --git a/Resources/img/Pokemon Sprites/652.png b/PKHeX/Resources/img/Pokemon Sprites/652.png similarity index 100% rename from Resources/img/Pokemon Sprites/652.png rename to PKHeX/Resources/img/Pokemon Sprites/652.png diff --git a/Resources/img/Pokemon Sprites/653.png b/PKHeX/Resources/img/Pokemon Sprites/653.png similarity index 100% rename from Resources/img/Pokemon Sprites/653.png rename to PKHeX/Resources/img/Pokemon Sprites/653.png diff --git a/Resources/img/Pokemon Sprites/654.png b/PKHeX/Resources/img/Pokemon Sprites/654.png similarity index 100% rename from Resources/img/Pokemon Sprites/654.png rename to PKHeX/Resources/img/Pokemon Sprites/654.png diff --git a/Resources/img/Pokemon Sprites/655.png b/PKHeX/Resources/img/Pokemon Sprites/655.png similarity index 100% rename from Resources/img/Pokemon Sprites/655.png rename to PKHeX/Resources/img/Pokemon Sprites/655.png diff --git a/Resources/img/Pokemon Sprites/656.png b/PKHeX/Resources/img/Pokemon Sprites/656.png similarity index 100% rename from Resources/img/Pokemon Sprites/656.png rename to PKHeX/Resources/img/Pokemon Sprites/656.png diff --git a/Resources/img/Pokemon Sprites/657.png b/PKHeX/Resources/img/Pokemon Sprites/657.png similarity index 100% rename from Resources/img/Pokemon Sprites/657.png rename to PKHeX/Resources/img/Pokemon Sprites/657.png diff --git a/Resources/img/Pokemon Sprites/658.png b/PKHeX/Resources/img/Pokemon Sprites/658.png similarity index 100% rename from Resources/img/Pokemon Sprites/658.png rename to PKHeX/Resources/img/Pokemon Sprites/658.png diff --git a/Resources/img/Pokemon Sprites/659.png b/PKHeX/Resources/img/Pokemon Sprites/659.png similarity index 100% rename from Resources/img/Pokemon Sprites/659.png rename to PKHeX/Resources/img/Pokemon Sprites/659.png diff --git a/Resources/img/Pokemon Sprites/66.png b/PKHeX/Resources/img/Pokemon Sprites/66.png similarity index 100% rename from Resources/img/Pokemon Sprites/66.png rename to PKHeX/Resources/img/Pokemon Sprites/66.png diff --git a/Resources/img/Pokemon Sprites/660.png b/PKHeX/Resources/img/Pokemon Sprites/660.png similarity index 100% rename from Resources/img/Pokemon Sprites/660.png rename to PKHeX/Resources/img/Pokemon Sprites/660.png diff --git a/Resources/img/Pokemon Sprites/661.png b/PKHeX/Resources/img/Pokemon Sprites/661.png similarity index 100% rename from Resources/img/Pokemon Sprites/661.png rename to PKHeX/Resources/img/Pokemon Sprites/661.png diff --git a/Resources/img/Pokemon Sprites/662.png b/PKHeX/Resources/img/Pokemon Sprites/662.png similarity index 100% rename from Resources/img/Pokemon Sprites/662.png rename to PKHeX/Resources/img/Pokemon Sprites/662.png diff --git a/Resources/img/Pokemon Sprites/663.png b/PKHeX/Resources/img/Pokemon Sprites/663.png similarity index 100% rename from Resources/img/Pokemon Sprites/663.png rename to PKHeX/Resources/img/Pokemon Sprites/663.png diff --git a/Resources/img/Pokemon Sprites/664.png b/PKHeX/Resources/img/Pokemon Sprites/664.png similarity index 100% rename from Resources/img/Pokemon Sprites/664.png rename to PKHeX/Resources/img/Pokemon Sprites/664.png diff --git a/Resources/img/Pokemon Sprites/665.png b/PKHeX/Resources/img/Pokemon Sprites/665.png similarity index 100% rename from Resources/img/Pokemon Sprites/665.png rename to PKHeX/Resources/img/Pokemon Sprites/665.png diff --git a/Resources/img/Pokemon Sprites/666-1.png b/PKHeX/Resources/img/Pokemon Sprites/666-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-1.png rename to PKHeX/Resources/img/Pokemon Sprites/666-1.png diff --git a/Resources/img/Pokemon Sprites/666-10.png b/PKHeX/Resources/img/Pokemon Sprites/666-10.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-10.png rename to PKHeX/Resources/img/Pokemon Sprites/666-10.png diff --git a/Resources/img/Pokemon Sprites/666-11.png b/PKHeX/Resources/img/Pokemon Sprites/666-11.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-11.png rename to PKHeX/Resources/img/Pokemon Sprites/666-11.png diff --git a/Resources/img/Pokemon Sprites/666-12.png b/PKHeX/Resources/img/Pokemon Sprites/666-12.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-12.png rename to PKHeX/Resources/img/Pokemon Sprites/666-12.png diff --git a/Resources/img/Pokemon Sprites/666-13.png b/PKHeX/Resources/img/Pokemon Sprites/666-13.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-13.png rename to PKHeX/Resources/img/Pokemon Sprites/666-13.png diff --git a/Resources/img/Pokemon Sprites/666-14.png b/PKHeX/Resources/img/Pokemon Sprites/666-14.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-14.png rename to PKHeX/Resources/img/Pokemon Sprites/666-14.png diff --git a/Resources/img/Pokemon Sprites/666-15.png b/PKHeX/Resources/img/Pokemon Sprites/666-15.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-15.png rename to PKHeX/Resources/img/Pokemon Sprites/666-15.png diff --git a/Resources/img/Pokemon Sprites/666-16.png b/PKHeX/Resources/img/Pokemon Sprites/666-16.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-16.png rename to PKHeX/Resources/img/Pokemon Sprites/666-16.png diff --git a/Resources/img/Pokemon Sprites/666-17.png b/PKHeX/Resources/img/Pokemon Sprites/666-17.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-17.png rename to PKHeX/Resources/img/Pokemon Sprites/666-17.png diff --git a/Resources/img/Pokemon Sprites/666-18.png b/PKHeX/Resources/img/Pokemon Sprites/666-18.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-18.png rename to PKHeX/Resources/img/Pokemon Sprites/666-18.png diff --git a/Resources/img/Pokemon Sprites/666-19.png b/PKHeX/Resources/img/Pokemon Sprites/666-19.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-19.png rename to PKHeX/Resources/img/Pokemon Sprites/666-19.png diff --git a/Resources/img/Pokemon Sprites/666-2.png b/PKHeX/Resources/img/Pokemon Sprites/666-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-2.png rename to PKHeX/Resources/img/Pokemon Sprites/666-2.png diff --git a/Resources/img/Pokemon Sprites/666-3.png b/PKHeX/Resources/img/Pokemon Sprites/666-3.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-3.png rename to PKHeX/Resources/img/Pokemon Sprites/666-3.png diff --git a/Resources/img/Pokemon Sprites/666-4.png b/PKHeX/Resources/img/Pokemon Sprites/666-4.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-4.png rename to PKHeX/Resources/img/Pokemon Sprites/666-4.png diff --git a/Resources/img/Pokemon Sprites/666-5.png b/PKHeX/Resources/img/Pokemon Sprites/666-5.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-5.png rename to PKHeX/Resources/img/Pokemon Sprites/666-5.png diff --git a/Resources/img/Pokemon Sprites/666-6.png b/PKHeX/Resources/img/Pokemon Sprites/666-6.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-6.png rename to PKHeX/Resources/img/Pokemon Sprites/666-6.png diff --git a/Resources/img/Pokemon Sprites/666-7.png b/PKHeX/Resources/img/Pokemon Sprites/666-7.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-7.png rename to PKHeX/Resources/img/Pokemon Sprites/666-7.png diff --git a/Resources/img/Pokemon Sprites/666-8.png b/PKHeX/Resources/img/Pokemon Sprites/666-8.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-8.png rename to PKHeX/Resources/img/Pokemon Sprites/666-8.png diff --git a/Resources/img/Pokemon Sprites/666-9.png b/PKHeX/Resources/img/Pokemon Sprites/666-9.png similarity index 100% rename from Resources/img/Pokemon Sprites/666-9.png rename to PKHeX/Resources/img/Pokemon Sprites/666-9.png diff --git a/Resources/img/Pokemon Sprites/666.png b/PKHeX/Resources/img/Pokemon Sprites/666.png similarity index 100% rename from Resources/img/Pokemon Sprites/666.png rename to PKHeX/Resources/img/Pokemon Sprites/666.png diff --git a/Resources/img/Pokemon Sprites/667.png b/PKHeX/Resources/img/Pokemon Sprites/667.png similarity index 100% rename from Resources/img/Pokemon Sprites/667.png rename to PKHeX/Resources/img/Pokemon Sprites/667.png diff --git a/Resources/img/Pokemon Sprites/668.png b/PKHeX/Resources/img/Pokemon Sprites/668.png similarity index 100% rename from Resources/img/Pokemon Sprites/668.png rename to PKHeX/Resources/img/Pokemon Sprites/668.png diff --git a/Resources/img/Pokemon Sprites/668_1.png b/PKHeX/Resources/img/Pokemon Sprites/668_1.png similarity index 100% rename from Resources/img/Pokemon Sprites/668_1.png rename to PKHeX/Resources/img/Pokemon Sprites/668_1.png diff --git a/Resources/img/Pokemon Sprites/669-1.png b/PKHeX/Resources/img/Pokemon Sprites/669-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/669-1.png rename to PKHeX/Resources/img/Pokemon Sprites/669-1.png diff --git a/Resources/img/Pokemon Sprites/669-2.png b/PKHeX/Resources/img/Pokemon Sprites/669-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/669-2.png rename to PKHeX/Resources/img/Pokemon Sprites/669-2.png diff --git a/Resources/img/Pokemon Sprites/669-3.png b/PKHeX/Resources/img/Pokemon Sprites/669-3.png similarity index 100% rename from Resources/img/Pokemon Sprites/669-3.png rename to PKHeX/Resources/img/Pokemon Sprites/669-3.png diff --git a/Resources/img/Pokemon Sprites/669-4.png b/PKHeX/Resources/img/Pokemon Sprites/669-4.png similarity index 100% rename from Resources/img/Pokemon Sprites/669-4.png rename to PKHeX/Resources/img/Pokemon Sprites/669-4.png diff --git a/Resources/img/Pokemon Sprites/669.png b/PKHeX/Resources/img/Pokemon Sprites/669.png similarity index 100% rename from Resources/img/Pokemon Sprites/669.png rename to PKHeX/Resources/img/Pokemon Sprites/669.png diff --git a/Resources/img/Pokemon Sprites/67.png b/PKHeX/Resources/img/Pokemon Sprites/67.png similarity index 100% rename from Resources/img/Pokemon Sprites/67.png rename to PKHeX/Resources/img/Pokemon Sprites/67.png diff --git a/Resources/img/Pokemon Sprites/670-1.png b/PKHeX/Resources/img/Pokemon Sprites/670-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/670-1.png rename to PKHeX/Resources/img/Pokemon Sprites/670-1.png diff --git a/Resources/img/Pokemon Sprites/670-2.png b/PKHeX/Resources/img/Pokemon Sprites/670-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/670-2.png rename to PKHeX/Resources/img/Pokemon Sprites/670-2.png diff --git a/Resources/img/Pokemon Sprites/670-3.png b/PKHeX/Resources/img/Pokemon Sprites/670-3.png similarity index 100% rename from Resources/img/Pokemon Sprites/670-3.png rename to PKHeX/Resources/img/Pokemon Sprites/670-3.png diff --git a/Resources/img/Pokemon Sprites/670-4.png b/PKHeX/Resources/img/Pokemon Sprites/670-4.png similarity index 100% rename from Resources/img/Pokemon Sprites/670-4.png rename to PKHeX/Resources/img/Pokemon Sprites/670-4.png diff --git a/Resources/img/Pokemon Sprites/670-5.png b/PKHeX/Resources/img/Pokemon Sprites/670-5.png similarity index 100% rename from Resources/img/Pokemon Sprites/670-5.png rename to PKHeX/Resources/img/Pokemon Sprites/670-5.png diff --git a/Resources/img/Pokemon Sprites/670.png b/PKHeX/Resources/img/Pokemon Sprites/670.png similarity index 100% rename from Resources/img/Pokemon Sprites/670.png rename to PKHeX/Resources/img/Pokemon Sprites/670.png diff --git a/Resources/img/Pokemon Sprites/671-1.png b/PKHeX/Resources/img/Pokemon Sprites/671-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/671-1.png rename to PKHeX/Resources/img/Pokemon Sprites/671-1.png diff --git a/Resources/img/Pokemon Sprites/671-2.png b/PKHeX/Resources/img/Pokemon Sprites/671-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/671-2.png rename to PKHeX/Resources/img/Pokemon Sprites/671-2.png diff --git a/Resources/img/Pokemon Sprites/671-3.png b/PKHeX/Resources/img/Pokemon Sprites/671-3.png similarity index 100% rename from Resources/img/Pokemon Sprites/671-3.png rename to PKHeX/Resources/img/Pokemon Sprites/671-3.png diff --git a/Resources/img/Pokemon Sprites/671-4.png b/PKHeX/Resources/img/Pokemon Sprites/671-4.png similarity index 100% rename from Resources/img/Pokemon Sprites/671-4.png rename to PKHeX/Resources/img/Pokemon Sprites/671-4.png diff --git a/Resources/img/Pokemon Sprites/671.png b/PKHeX/Resources/img/Pokemon Sprites/671.png similarity index 100% rename from Resources/img/Pokemon Sprites/671.png rename to PKHeX/Resources/img/Pokemon Sprites/671.png diff --git a/Resources/img/Pokemon Sprites/672.png b/PKHeX/Resources/img/Pokemon Sprites/672.png similarity index 100% rename from Resources/img/Pokemon Sprites/672.png rename to PKHeX/Resources/img/Pokemon Sprites/672.png diff --git a/Resources/img/Pokemon Sprites/673.png b/PKHeX/Resources/img/Pokemon Sprites/673.png similarity index 100% rename from Resources/img/Pokemon Sprites/673.png rename to PKHeX/Resources/img/Pokemon Sprites/673.png diff --git a/Resources/img/Pokemon Sprites/674.png b/PKHeX/Resources/img/Pokemon Sprites/674.png similarity index 100% rename from Resources/img/Pokemon Sprites/674.png rename to PKHeX/Resources/img/Pokemon Sprites/674.png diff --git a/Resources/img/Pokemon Sprites/675.png b/PKHeX/Resources/img/Pokemon Sprites/675.png similarity index 100% rename from Resources/img/Pokemon Sprites/675.png rename to PKHeX/Resources/img/Pokemon Sprites/675.png diff --git a/Resources/img/Pokemon Sprites/676-1.png b/PKHeX/Resources/img/Pokemon Sprites/676-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/676-1.png rename to PKHeX/Resources/img/Pokemon Sprites/676-1.png diff --git a/Resources/img/Pokemon Sprites/676-2.png b/PKHeX/Resources/img/Pokemon Sprites/676-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/676-2.png rename to PKHeX/Resources/img/Pokemon Sprites/676-2.png diff --git a/Resources/img/Pokemon Sprites/676-3.png b/PKHeX/Resources/img/Pokemon Sprites/676-3.png similarity index 100% rename from Resources/img/Pokemon Sprites/676-3.png rename to PKHeX/Resources/img/Pokemon Sprites/676-3.png diff --git a/Resources/img/Pokemon Sprites/676-4.png b/PKHeX/Resources/img/Pokemon Sprites/676-4.png similarity index 100% rename from Resources/img/Pokemon Sprites/676-4.png rename to PKHeX/Resources/img/Pokemon Sprites/676-4.png diff --git a/Resources/img/Pokemon Sprites/676-5.png b/PKHeX/Resources/img/Pokemon Sprites/676-5.png similarity index 100% rename from Resources/img/Pokemon Sprites/676-5.png rename to PKHeX/Resources/img/Pokemon Sprites/676-5.png diff --git a/Resources/img/Pokemon Sprites/676-6.png b/PKHeX/Resources/img/Pokemon Sprites/676-6.png similarity index 100% rename from Resources/img/Pokemon Sprites/676-6.png rename to PKHeX/Resources/img/Pokemon Sprites/676-6.png diff --git a/Resources/img/Pokemon Sprites/676-7.png b/PKHeX/Resources/img/Pokemon Sprites/676-7.png similarity index 100% rename from Resources/img/Pokemon Sprites/676-7.png rename to PKHeX/Resources/img/Pokemon Sprites/676-7.png diff --git a/Resources/img/Pokemon Sprites/676-8.png b/PKHeX/Resources/img/Pokemon Sprites/676-8.png similarity index 100% rename from Resources/img/Pokemon Sprites/676-8.png rename to PKHeX/Resources/img/Pokemon Sprites/676-8.png diff --git a/Resources/img/Pokemon Sprites/676-9.png b/PKHeX/Resources/img/Pokemon Sprites/676-9.png similarity index 100% rename from Resources/img/Pokemon Sprites/676-9.png rename to PKHeX/Resources/img/Pokemon Sprites/676-9.png diff --git a/Resources/img/Pokemon Sprites/676.png b/PKHeX/Resources/img/Pokemon Sprites/676.png similarity index 100% rename from Resources/img/Pokemon Sprites/676.png rename to PKHeX/Resources/img/Pokemon Sprites/676.png diff --git a/Resources/img/Pokemon Sprites/677.png b/PKHeX/Resources/img/Pokemon Sprites/677.png similarity index 100% rename from Resources/img/Pokemon Sprites/677.png rename to PKHeX/Resources/img/Pokemon Sprites/677.png diff --git a/Resources/img/Pokemon Sprites/678-1.png b/PKHeX/Resources/img/Pokemon Sprites/678-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/678-1.png rename to PKHeX/Resources/img/Pokemon Sprites/678-1.png diff --git a/Resources/img/Pokemon Sprites/678.png b/PKHeX/Resources/img/Pokemon Sprites/678.png similarity index 100% rename from Resources/img/Pokemon Sprites/678.png rename to PKHeX/Resources/img/Pokemon Sprites/678.png diff --git a/Resources/img/Pokemon Sprites/679.png b/PKHeX/Resources/img/Pokemon Sprites/679.png similarity index 100% rename from Resources/img/Pokemon Sprites/679.png rename to PKHeX/Resources/img/Pokemon Sprites/679.png diff --git a/Resources/img/Pokemon Sprites/68.png b/PKHeX/Resources/img/Pokemon Sprites/68.png similarity index 100% rename from Resources/img/Pokemon Sprites/68.png rename to PKHeX/Resources/img/Pokemon Sprites/68.png diff --git a/Resources/img/Pokemon Sprites/680.png b/PKHeX/Resources/img/Pokemon Sprites/680.png similarity index 100% rename from Resources/img/Pokemon Sprites/680.png rename to PKHeX/Resources/img/Pokemon Sprites/680.png diff --git a/Resources/img/Pokemon Sprites/681-1.png b/PKHeX/Resources/img/Pokemon Sprites/681-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/681-1.png rename to PKHeX/Resources/img/Pokemon Sprites/681-1.png diff --git a/Resources/img/Pokemon Sprites/681.png b/PKHeX/Resources/img/Pokemon Sprites/681.png similarity index 100% rename from Resources/img/Pokemon Sprites/681.png rename to PKHeX/Resources/img/Pokemon Sprites/681.png diff --git a/Resources/img/Pokemon Sprites/682.png b/PKHeX/Resources/img/Pokemon Sprites/682.png similarity index 100% rename from Resources/img/Pokemon Sprites/682.png rename to PKHeX/Resources/img/Pokemon Sprites/682.png diff --git a/Resources/img/Pokemon Sprites/683.png b/PKHeX/Resources/img/Pokemon Sprites/683.png similarity index 100% rename from Resources/img/Pokemon Sprites/683.png rename to PKHeX/Resources/img/Pokemon Sprites/683.png diff --git a/Resources/img/Pokemon Sprites/684.png b/PKHeX/Resources/img/Pokemon Sprites/684.png similarity index 100% rename from Resources/img/Pokemon Sprites/684.png rename to PKHeX/Resources/img/Pokemon Sprites/684.png diff --git a/Resources/img/Pokemon Sprites/685.png b/PKHeX/Resources/img/Pokemon Sprites/685.png similarity index 100% rename from Resources/img/Pokemon Sprites/685.png rename to PKHeX/Resources/img/Pokemon Sprites/685.png diff --git a/Resources/img/Pokemon Sprites/686.png b/PKHeX/Resources/img/Pokemon Sprites/686.png similarity index 100% rename from Resources/img/Pokemon Sprites/686.png rename to PKHeX/Resources/img/Pokemon Sprites/686.png diff --git a/Resources/img/Pokemon Sprites/687.png b/PKHeX/Resources/img/Pokemon Sprites/687.png similarity index 100% rename from Resources/img/Pokemon Sprites/687.png rename to PKHeX/Resources/img/Pokemon Sprites/687.png diff --git a/Resources/img/Pokemon Sprites/688.png b/PKHeX/Resources/img/Pokemon Sprites/688.png similarity index 100% rename from Resources/img/Pokemon Sprites/688.png rename to PKHeX/Resources/img/Pokemon Sprites/688.png diff --git a/Resources/img/Pokemon Sprites/689.png b/PKHeX/Resources/img/Pokemon Sprites/689.png similarity index 100% rename from Resources/img/Pokemon Sprites/689.png rename to PKHeX/Resources/img/Pokemon Sprites/689.png diff --git a/Resources/img/Pokemon Sprites/69.png b/PKHeX/Resources/img/Pokemon Sprites/69.png similarity index 100% rename from Resources/img/Pokemon Sprites/69.png rename to PKHeX/Resources/img/Pokemon Sprites/69.png diff --git a/Resources/img/Pokemon Sprites/690.png b/PKHeX/Resources/img/Pokemon Sprites/690.png similarity index 100% rename from Resources/img/Pokemon Sprites/690.png rename to PKHeX/Resources/img/Pokemon Sprites/690.png diff --git a/Resources/img/Pokemon Sprites/691.png b/PKHeX/Resources/img/Pokemon Sprites/691.png similarity index 100% rename from Resources/img/Pokemon Sprites/691.png rename to PKHeX/Resources/img/Pokemon Sprites/691.png diff --git a/Resources/img/Pokemon Sprites/692.png b/PKHeX/Resources/img/Pokemon Sprites/692.png similarity index 100% rename from Resources/img/Pokemon Sprites/692.png rename to PKHeX/Resources/img/Pokemon Sprites/692.png diff --git a/Resources/img/Pokemon Sprites/693.png b/PKHeX/Resources/img/Pokemon Sprites/693.png similarity index 100% rename from Resources/img/Pokemon Sprites/693.png rename to PKHeX/Resources/img/Pokemon Sprites/693.png diff --git a/Resources/img/Pokemon Sprites/694.png b/PKHeX/Resources/img/Pokemon Sprites/694.png similarity index 100% rename from Resources/img/Pokemon Sprites/694.png rename to PKHeX/Resources/img/Pokemon Sprites/694.png diff --git a/Resources/img/Pokemon Sprites/695.png b/PKHeX/Resources/img/Pokemon Sprites/695.png similarity index 100% rename from Resources/img/Pokemon Sprites/695.png rename to PKHeX/Resources/img/Pokemon Sprites/695.png diff --git a/Resources/img/Pokemon Sprites/696.png b/PKHeX/Resources/img/Pokemon Sprites/696.png similarity index 100% rename from Resources/img/Pokemon Sprites/696.png rename to PKHeX/Resources/img/Pokemon Sprites/696.png diff --git a/Resources/img/Pokemon Sprites/697.png b/PKHeX/Resources/img/Pokemon Sprites/697.png similarity index 100% rename from Resources/img/Pokemon Sprites/697.png rename to PKHeX/Resources/img/Pokemon Sprites/697.png diff --git a/Resources/img/Pokemon Sprites/698.png b/PKHeX/Resources/img/Pokemon Sprites/698.png similarity index 100% rename from Resources/img/Pokemon Sprites/698.png rename to PKHeX/Resources/img/Pokemon Sprites/698.png diff --git a/Resources/img/Pokemon Sprites/699.png b/PKHeX/Resources/img/Pokemon Sprites/699.png similarity index 100% rename from Resources/img/Pokemon Sprites/699.png rename to PKHeX/Resources/img/Pokemon Sprites/699.png diff --git a/Resources/img/Pokemon Sprites/7.png b/PKHeX/Resources/img/Pokemon Sprites/7.png similarity index 100% rename from Resources/img/Pokemon Sprites/7.png rename to PKHeX/Resources/img/Pokemon Sprites/7.png diff --git a/Resources/img/Pokemon Sprites/70.png b/PKHeX/Resources/img/Pokemon Sprites/70.png similarity index 100% rename from Resources/img/Pokemon Sprites/70.png rename to PKHeX/Resources/img/Pokemon Sprites/70.png diff --git a/Resources/img/Pokemon Sprites/700.png b/PKHeX/Resources/img/Pokemon Sprites/700.png similarity index 100% rename from Resources/img/Pokemon Sprites/700.png rename to PKHeX/Resources/img/Pokemon Sprites/700.png diff --git a/Resources/img/Pokemon Sprites/701.png b/PKHeX/Resources/img/Pokemon Sprites/701.png similarity index 100% rename from Resources/img/Pokemon Sprites/701.png rename to PKHeX/Resources/img/Pokemon Sprites/701.png diff --git a/Resources/img/Pokemon Sprites/702.png b/PKHeX/Resources/img/Pokemon Sprites/702.png similarity index 100% rename from Resources/img/Pokemon Sprites/702.png rename to PKHeX/Resources/img/Pokemon Sprites/702.png diff --git a/Resources/img/Pokemon Sprites/703.png b/PKHeX/Resources/img/Pokemon Sprites/703.png similarity index 100% rename from Resources/img/Pokemon Sprites/703.png rename to PKHeX/Resources/img/Pokemon Sprites/703.png diff --git a/Resources/img/Pokemon Sprites/704.png b/PKHeX/Resources/img/Pokemon Sprites/704.png similarity index 100% rename from Resources/img/Pokemon Sprites/704.png rename to PKHeX/Resources/img/Pokemon Sprites/704.png diff --git a/Resources/img/Pokemon Sprites/705.png b/PKHeX/Resources/img/Pokemon Sprites/705.png similarity index 100% rename from Resources/img/Pokemon Sprites/705.png rename to PKHeX/Resources/img/Pokemon Sprites/705.png diff --git a/Resources/img/Pokemon Sprites/706.png b/PKHeX/Resources/img/Pokemon Sprites/706.png similarity index 100% rename from Resources/img/Pokemon Sprites/706.png rename to PKHeX/Resources/img/Pokemon Sprites/706.png diff --git a/Resources/img/Pokemon Sprites/707.png b/PKHeX/Resources/img/Pokemon Sprites/707.png similarity index 100% rename from Resources/img/Pokemon Sprites/707.png rename to PKHeX/Resources/img/Pokemon Sprites/707.png diff --git a/Resources/img/Pokemon Sprites/708.png b/PKHeX/Resources/img/Pokemon Sprites/708.png similarity index 100% rename from Resources/img/Pokemon Sprites/708.png rename to PKHeX/Resources/img/Pokemon Sprites/708.png diff --git a/Resources/img/Pokemon Sprites/709.png b/PKHeX/Resources/img/Pokemon Sprites/709.png similarity index 100% rename from Resources/img/Pokemon Sprites/709.png rename to PKHeX/Resources/img/Pokemon Sprites/709.png diff --git a/Resources/img/Pokemon Sprites/71.png b/PKHeX/Resources/img/Pokemon Sprites/71.png similarity index 100% rename from Resources/img/Pokemon Sprites/71.png rename to PKHeX/Resources/img/Pokemon Sprites/71.png diff --git a/Resources/img/Pokemon Sprites/710-1.png b/PKHeX/Resources/img/Pokemon Sprites/710-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/710-1.png rename to PKHeX/Resources/img/Pokemon Sprites/710-1.png diff --git a/Resources/img/Pokemon Sprites/710-2.png b/PKHeX/Resources/img/Pokemon Sprites/710-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/710-2.png rename to PKHeX/Resources/img/Pokemon Sprites/710-2.png diff --git a/Resources/img/Pokemon Sprites/710-3.png b/PKHeX/Resources/img/Pokemon Sprites/710-3.png similarity index 100% rename from Resources/img/Pokemon Sprites/710-3.png rename to PKHeX/Resources/img/Pokemon Sprites/710-3.png diff --git a/Resources/img/Pokemon Sprites/710.png b/PKHeX/Resources/img/Pokemon Sprites/710.png similarity index 100% rename from Resources/img/Pokemon Sprites/710.png rename to PKHeX/Resources/img/Pokemon Sprites/710.png diff --git a/Resources/img/Pokemon Sprites/711-1.png b/PKHeX/Resources/img/Pokemon Sprites/711-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/711-1.png rename to PKHeX/Resources/img/Pokemon Sprites/711-1.png diff --git a/Resources/img/Pokemon Sprites/711-2.png b/PKHeX/Resources/img/Pokemon Sprites/711-2.png similarity index 100% rename from Resources/img/Pokemon Sprites/711-2.png rename to PKHeX/Resources/img/Pokemon Sprites/711-2.png diff --git a/Resources/img/Pokemon Sprites/711-3.png b/PKHeX/Resources/img/Pokemon Sprites/711-3.png similarity index 100% rename from Resources/img/Pokemon Sprites/711-3.png rename to PKHeX/Resources/img/Pokemon Sprites/711-3.png diff --git a/Resources/img/Pokemon Sprites/711.png b/PKHeX/Resources/img/Pokemon Sprites/711.png similarity index 100% rename from Resources/img/Pokemon Sprites/711.png rename to PKHeX/Resources/img/Pokemon Sprites/711.png diff --git a/Resources/img/Pokemon Sprites/712.png b/PKHeX/Resources/img/Pokemon Sprites/712.png similarity index 100% rename from Resources/img/Pokemon Sprites/712.png rename to PKHeX/Resources/img/Pokemon Sprites/712.png diff --git a/Resources/img/Pokemon Sprites/713.png b/PKHeX/Resources/img/Pokemon Sprites/713.png similarity index 100% rename from Resources/img/Pokemon Sprites/713.png rename to PKHeX/Resources/img/Pokemon Sprites/713.png diff --git a/Resources/img/Pokemon Sprites/714.png b/PKHeX/Resources/img/Pokemon Sprites/714.png similarity index 100% rename from Resources/img/Pokemon Sprites/714.png rename to PKHeX/Resources/img/Pokemon Sprites/714.png diff --git a/Resources/img/Pokemon Sprites/715.png b/PKHeX/Resources/img/Pokemon Sprites/715.png similarity index 100% rename from Resources/img/Pokemon Sprites/715.png rename to PKHeX/Resources/img/Pokemon Sprites/715.png diff --git a/Resources/img/Pokemon Sprites/716-1.png b/PKHeX/Resources/img/Pokemon Sprites/716-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/716-1.png rename to PKHeX/Resources/img/Pokemon Sprites/716-1.png diff --git a/Resources/img/Pokemon Sprites/716.png b/PKHeX/Resources/img/Pokemon Sprites/716.png similarity index 100% rename from Resources/img/Pokemon Sprites/716.png rename to PKHeX/Resources/img/Pokemon Sprites/716.png diff --git a/Resources/img/Pokemon Sprites/717.png b/PKHeX/Resources/img/Pokemon Sprites/717.png similarity index 100% rename from Resources/img/Pokemon Sprites/717.png rename to PKHeX/Resources/img/Pokemon Sprites/717.png diff --git a/Resources/img/Pokemon Sprites/718.png b/PKHeX/Resources/img/Pokemon Sprites/718.png similarity index 100% rename from Resources/img/Pokemon Sprites/718.png rename to PKHeX/Resources/img/Pokemon Sprites/718.png diff --git a/Resources/img/Pokemon Sprites/719-1.png b/PKHeX/Resources/img/Pokemon Sprites/719-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/719-1.png rename to PKHeX/Resources/img/Pokemon Sprites/719-1.png diff --git a/Resources/img/Pokemon Sprites/719.png b/PKHeX/Resources/img/Pokemon Sprites/719.png similarity index 100% rename from Resources/img/Pokemon Sprites/719.png rename to PKHeX/Resources/img/Pokemon Sprites/719.png diff --git a/Resources/img/Pokemon Sprites/72.png b/PKHeX/Resources/img/Pokemon Sprites/72.png similarity index 100% rename from Resources/img/Pokemon Sprites/72.png rename to PKHeX/Resources/img/Pokemon Sprites/72.png diff --git a/Resources/img/Pokemon Sprites/720-1.png b/PKHeX/Resources/img/Pokemon Sprites/720-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/720-1.png rename to PKHeX/Resources/img/Pokemon Sprites/720-1.png diff --git a/Resources/img/Pokemon Sprites/720.png b/PKHeX/Resources/img/Pokemon Sprites/720.png similarity index 100% rename from Resources/img/Pokemon Sprites/720.png rename to PKHeX/Resources/img/Pokemon Sprites/720.png diff --git a/Resources/img/Pokemon Sprites/721.png b/PKHeX/Resources/img/Pokemon Sprites/721.png similarity index 100% rename from Resources/img/Pokemon Sprites/721.png rename to PKHeX/Resources/img/Pokemon Sprites/721.png diff --git a/Resources/img/Pokemon Sprites/722.png b/PKHeX/Resources/img/Pokemon Sprites/722.png similarity index 100% rename from Resources/img/Pokemon Sprites/722.png rename to PKHeX/Resources/img/Pokemon Sprites/722.png diff --git a/Resources/img/Pokemon Sprites/73.png b/PKHeX/Resources/img/Pokemon Sprites/73.png similarity index 100% rename from Resources/img/Pokemon Sprites/73.png rename to PKHeX/Resources/img/Pokemon Sprites/73.png diff --git a/Resources/img/Pokemon Sprites/74.png b/PKHeX/Resources/img/Pokemon Sprites/74.png similarity index 100% rename from Resources/img/Pokemon Sprites/74.png rename to PKHeX/Resources/img/Pokemon Sprites/74.png diff --git a/Resources/img/Pokemon Sprites/75.png b/PKHeX/Resources/img/Pokemon Sprites/75.png similarity index 100% rename from Resources/img/Pokemon Sprites/75.png rename to PKHeX/Resources/img/Pokemon Sprites/75.png diff --git a/Resources/img/Pokemon Sprites/76.png b/PKHeX/Resources/img/Pokemon Sprites/76.png similarity index 100% rename from Resources/img/Pokemon Sprites/76.png rename to PKHeX/Resources/img/Pokemon Sprites/76.png diff --git a/Resources/img/Pokemon Sprites/77.png b/PKHeX/Resources/img/Pokemon Sprites/77.png similarity index 100% rename from Resources/img/Pokemon Sprites/77.png rename to PKHeX/Resources/img/Pokemon Sprites/77.png diff --git a/Resources/img/Pokemon Sprites/78.png b/PKHeX/Resources/img/Pokemon Sprites/78.png similarity index 100% rename from Resources/img/Pokemon Sprites/78.png rename to PKHeX/Resources/img/Pokemon Sprites/78.png diff --git a/Resources/img/Pokemon Sprites/79.png b/PKHeX/Resources/img/Pokemon Sprites/79.png similarity index 100% rename from Resources/img/Pokemon Sprites/79.png rename to PKHeX/Resources/img/Pokemon Sprites/79.png diff --git a/Resources/img/Pokemon Sprites/8.png b/PKHeX/Resources/img/Pokemon Sprites/8.png similarity index 100% rename from Resources/img/Pokemon Sprites/8.png rename to PKHeX/Resources/img/Pokemon Sprites/8.png diff --git a/Resources/img/Pokemon Sprites/80-1.png b/PKHeX/Resources/img/Pokemon Sprites/80-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/80-1.png rename to PKHeX/Resources/img/Pokemon Sprites/80-1.png diff --git a/Resources/img/Pokemon Sprites/80.png b/PKHeX/Resources/img/Pokemon Sprites/80.png similarity index 100% rename from Resources/img/Pokemon Sprites/80.png rename to PKHeX/Resources/img/Pokemon Sprites/80.png diff --git a/Resources/img/Pokemon Sprites/81.png b/PKHeX/Resources/img/Pokemon Sprites/81.png similarity index 100% rename from Resources/img/Pokemon Sprites/81.png rename to PKHeX/Resources/img/Pokemon Sprites/81.png diff --git a/Resources/img/Pokemon Sprites/82.png b/PKHeX/Resources/img/Pokemon Sprites/82.png similarity index 100% rename from Resources/img/Pokemon Sprites/82.png rename to PKHeX/Resources/img/Pokemon Sprites/82.png diff --git a/Resources/img/Pokemon Sprites/83.png b/PKHeX/Resources/img/Pokemon Sprites/83.png similarity index 100% rename from Resources/img/Pokemon Sprites/83.png rename to PKHeX/Resources/img/Pokemon Sprites/83.png diff --git a/Resources/img/Pokemon Sprites/84.png b/PKHeX/Resources/img/Pokemon Sprites/84.png similarity index 100% rename from Resources/img/Pokemon Sprites/84.png rename to PKHeX/Resources/img/Pokemon Sprites/84.png diff --git a/Resources/img/Pokemon Sprites/85.png b/PKHeX/Resources/img/Pokemon Sprites/85.png similarity index 100% rename from Resources/img/Pokemon Sprites/85.png rename to PKHeX/Resources/img/Pokemon Sprites/85.png diff --git a/Resources/img/Pokemon Sprites/86.png b/PKHeX/Resources/img/Pokemon Sprites/86.png similarity index 100% rename from Resources/img/Pokemon Sprites/86.png rename to PKHeX/Resources/img/Pokemon Sprites/86.png diff --git a/Resources/img/Pokemon Sprites/87.png b/PKHeX/Resources/img/Pokemon Sprites/87.png similarity index 100% rename from Resources/img/Pokemon Sprites/87.png rename to PKHeX/Resources/img/Pokemon Sprites/87.png diff --git a/Resources/img/Pokemon Sprites/88.png b/PKHeX/Resources/img/Pokemon Sprites/88.png similarity index 100% rename from Resources/img/Pokemon Sprites/88.png rename to PKHeX/Resources/img/Pokemon Sprites/88.png diff --git a/Resources/img/Pokemon Sprites/89.png b/PKHeX/Resources/img/Pokemon Sprites/89.png similarity index 100% rename from Resources/img/Pokemon Sprites/89.png rename to PKHeX/Resources/img/Pokemon Sprites/89.png diff --git a/Resources/img/Pokemon Sprites/9-1.png b/PKHeX/Resources/img/Pokemon Sprites/9-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/9-1.png rename to PKHeX/Resources/img/Pokemon Sprites/9-1.png diff --git a/Resources/img/Pokemon Sprites/9.png b/PKHeX/Resources/img/Pokemon Sprites/9.png similarity index 100% rename from Resources/img/Pokemon Sprites/9.png rename to PKHeX/Resources/img/Pokemon Sprites/9.png diff --git a/Resources/img/Pokemon Sprites/90.png b/PKHeX/Resources/img/Pokemon Sprites/90.png similarity index 100% rename from Resources/img/Pokemon Sprites/90.png rename to PKHeX/Resources/img/Pokemon Sprites/90.png diff --git a/Resources/img/Pokemon Sprites/91.png b/PKHeX/Resources/img/Pokemon Sprites/91.png similarity index 100% rename from Resources/img/Pokemon Sprites/91.png rename to PKHeX/Resources/img/Pokemon Sprites/91.png diff --git a/Resources/img/Pokemon Sprites/92.png b/PKHeX/Resources/img/Pokemon Sprites/92.png similarity index 100% rename from Resources/img/Pokemon Sprites/92.png rename to PKHeX/Resources/img/Pokemon Sprites/92.png diff --git a/Resources/img/Pokemon Sprites/93.png b/PKHeX/Resources/img/Pokemon Sprites/93.png similarity index 100% rename from Resources/img/Pokemon Sprites/93.png rename to PKHeX/Resources/img/Pokemon Sprites/93.png diff --git a/Resources/img/Pokemon Sprites/94-1.png b/PKHeX/Resources/img/Pokemon Sprites/94-1.png similarity index 100% rename from Resources/img/Pokemon Sprites/94-1.png rename to PKHeX/Resources/img/Pokemon Sprites/94-1.png diff --git a/Resources/img/Pokemon Sprites/94.png b/PKHeX/Resources/img/Pokemon Sprites/94.png similarity index 100% rename from Resources/img/Pokemon Sprites/94.png rename to PKHeX/Resources/img/Pokemon Sprites/94.png diff --git a/Resources/img/Pokemon Sprites/95.png b/PKHeX/Resources/img/Pokemon Sprites/95.png similarity index 100% rename from Resources/img/Pokemon Sprites/95.png rename to PKHeX/Resources/img/Pokemon Sprites/95.png diff --git a/Resources/img/Pokemon Sprites/96.png b/PKHeX/Resources/img/Pokemon Sprites/96.png similarity index 100% rename from Resources/img/Pokemon Sprites/96.png rename to PKHeX/Resources/img/Pokemon Sprites/96.png diff --git a/Resources/img/Pokemon Sprites/97.png b/PKHeX/Resources/img/Pokemon Sprites/97.png similarity index 100% rename from Resources/img/Pokemon Sprites/97.png rename to PKHeX/Resources/img/Pokemon Sprites/97.png diff --git a/Resources/img/Pokemon Sprites/98.png b/PKHeX/Resources/img/Pokemon Sprites/98.png similarity index 100% rename from Resources/img/Pokemon Sprites/98.png rename to PKHeX/Resources/img/Pokemon Sprites/98.png diff --git a/Resources/img/Pokemon Sprites/99.png b/PKHeX/Resources/img/Pokemon Sprites/99.png similarity index 100% rename from Resources/img/Pokemon Sprites/99.png rename to PKHeX/Resources/img/Pokemon Sprites/99.png diff --git a/Resources/img/Pokemon Sprites/egg.png b/PKHeX/Resources/img/Pokemon Sprites/egg.png similarity index 100% rename from Resources/img/Pokemon Sprites/egg.png rename to PKHeX/Resources/img/Pokemon Sprites/egg.png diff --git a/Resources/img/Pokemon Sprites/unknown.png b/PKHeX/Resources/img/Pokemon Sprites/unknown.png similarity index 100% rename from Resources/img/Pokemon Sprites/unknown.png rename to PKHeX/Resources/img/Pokemon Sprites/unknown.png diff --git a/Resources/img/Program/about.png b/PKHeX/Resources/img/Program/about.png similarity index 100% rename from Resources/img/Program/about.png rename to PKHeX/Resources/img/Program/about.png diff --git a/Resources/img/Program/bak.png b/PKHeX/Resources/img/Program/bak.png similarity index 100% rename from Resources/img/Program/bak.png rename to PKHeX/Resources/img/Program/bak.png diff --git a/Resources/img/Program/data.png b/PKHeX/Resources/img/Program/data.png similarity index 100% rename from Resources/img/Program/data.png rename to PKHeX/Resources/img/Program/data.png diff --git a/Resources/img/Program/database.png b/PKHeX/Resources/img/Program/database.png similarity index 100% rename from Resources/img/Program/database.png rename to PKHeX/Resources/img/Program/database.png diff --git a/Resources/img/Program/dump.png b/PKHeX/Resources/img/Program/dump.png similarity index 100% rename from Resources/img/Program/dump.png rename to PKHeX/Resources/img/Program/dump.png diff --git a/Resources/img/Program/exit.png b/PKHeX/Resources/img/Program/exit.png similarity index 100% rename from Resources/img/Program/exit.png rename to PKHeX/Resources/img/Program/exit.png diff --git a/Resources/img/Program/export.png b/PKHeX/Resources/img/Program/export.png similarity index 100% rename from Resources/img/Program/export.png rename to PKHeX/Resources/img/Program/export.png diff --git a/Resources/img/Program/folder.png b/PKHeX/Resources/img/Program/folder.png similarity index 100% rename from Resources/img/Program/folder.png rename to PKHeX/Resources/img/Program/folder.png diff --git a/Resources/img/Program/import.png b/PKHeX/Resources/img/Program/import.png similarity index 100% rename from Resources/img/Program/import.png rename to PKHeX/Resources/img/Program/import.png diff --git a/Resources/img/Program/language.png b/PKHeX/Resources/img/Program/language.png similarity index 100% rename from Resources/img/Program/language.png rename to PKHeX/Resources/img/Program/language.png diff --git a/Resources/img/Program/load.png b/PKHeX/Resources/img/Program/load.png similarity index 100% rename from Resources/img/Program/load.png rename to PKHeX/Resources/img/Program/load.png diff --git a/Resources/img/Program/main.png b/PKHeX/Resources/img/Program/main.png similarity index 100% rename from Resources/img/Program/main.png rename to PKHeX/Resources/img/Program/main.png diff --git a/Resources/img/Program/nocheck.png b/PKHeX/Resources/img/Program/nocheck.png similarity index 100% rename from Resources/img/Program/nocheck.png rename to PKHeX/Resources/img/Program/nocheck.png diff --git a/Resources/img/Program/open.png b/PKHeX/Resources/img/Program/open.png similarity index 100% rename from Resources/img/Program/open.png rename to PKHeX/Resources/img/Program/open.png diff --git a/Resources/img/Program/other.png b/PKHeX/Resources/img/Program/other.png similarity index 100% rename from Resources/img/Program/other.png rename to PKHeX/Resources/img/Program/other.png diff --git a/Resources/img/Program/report.png b/PKHeX/Resources/img/Program/report.png similarity index 100% rename from Resources/img/Program/report.png rename to PKHeX/Resources/img/Program/report.png diff --git a/Resources/img/Program/savePKM.png b/PKHeX/Resources/img/Program/savePKM.png similarity index 100% rename from Resources/img/Program/savePKM.png rename to PKHeX/Resources/img/Program/savePKM.png diff --git a/Resources/img/Program/saveSAV.png b/PKHeX/Resources/img/Program/saveSAV.png similarity index 100% rename from Resources/img/Program/saveSAV.png rename to PKHeX/Resources/img/Program/saveSAV.png diff --git a/Resources/img/Program/settings.png b/PKHeX/Resources/img/Program/settings.png similarity index 100% rename from Resources/img/Program/settings.png rename to PKHeX/Resources/img/Program/settings.png diff --git a/Resources/img/Program/showdown.png b/PKHeX/Resources/img/Program/showdown.png similarity index 100% rename from Resources/img/Program/showdown.png rename to PKHeX/Resources/img/Program/showdown.png diff --git a/Resources/img/Trainer Sprites/tr_00.png b/PKHeX/Resources/img/Trainer Sprites/tr_00.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_00.png rename to PKHeX/Resources/img/Trainer Sprites/tr_00.png diff --git a/Resources/img/Trainer Sprites/tr_01.png b/PKHeX/Resources/img/Trainer Sprites/tr_01.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_01.png rename to PKHeX/Resources/img/Trainer Sprites/tr_01.png diff --git a/Resources/img/Trainer Sprites/tr_02.png b/PKHeX/Resources/img/Trainer Sprites/tr_02.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_02.png rename to PKHeX/Resources/img/Trainer Sprites/tr_02.png diff --git a/Resources/img/Trainer Sprites/tr_03.png b/PKHeX/Resources/img/Trainer Sprites/tr_03.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_03.png rename to PKHeX/Resources/img/Trainer Sprites/tr_03.png diff --git a/Resources/img/Trainer Sprites/tr_04.png b/PKHeX/Resources/img/Trainer Sprites/tr_04.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_04.png rename to PKHeX/Resources/img/Trainer Sprites/tr_04.png diff --git a/Resources/img/Trainer Sprites/tr_05.png b/PKHeX/Resources/img/Trainer Sprites/tr_05.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_05.png rename to PKHeX/Resources/img/Trainer Sprites/tr_05.png diff --git a/Resources/img/Trainer Sprites/tr_06.png b/PKHeX/Resources/img/Trainer Sprites/tr_06.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_06.png rename to PKHeX/Resources/img/Trainer Sprites/tr_06.png diff --git a/Resources/img/Trainer Sprites/tr_07.png b/PKHeX/Resources/img/Trainer Sprites/tr_07.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_07.png rename to PKHeX/Resources/img/Trainer Sprites/tr_07.png diff --git a/Resources/img/Trainer Sprites/tr_08.png b/PKHeX/Resources/img/Trainer Sprites/tr_08.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_08.png rename to PKHeX/Resources/img/Trainer Sprites/tr_08.png diff --git a/Resources/img/Trainer Sprites/tr_09.png b/PKHeX/Resources/img/Trainer Sprites/tr_09.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_09.png rename to PKHeX/Resources/img/Trainer Sprites/tr_09.png diff --git a/Resources/img/Trainer Sprites/tr_10.png b/PKHeX/Resources/img/Trainer Sprites/tr_10.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_10.png rename to PKHeX/Resources/img/Trainer Sprites/tr_10.png diff --git a/Resources/img/Trainer Sprites/tr_11.png b/PKHeX/Resources/img/Trainer Sprites/tr_11.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_11.png rename to PKHeX/Resources/img/Trainer Sprites/tr_11.png diff --git a/Resources/img/Trainer Sprites/tr_12.png b/PKHeX/Resources/img/Trainer Sprites/tr_12.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_12.png rename to PKHeX/Resources/img/Trainer Sprites/tr_12.png diff --git a/Resources/img/Trainer Sprites/tr_128.png b/PKHeX/Resources/img/Trainer Sprites/tr_128.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_128.png rename to PKHeX/Resources/img/Trainer Sprites/tr_128.png diff --git a/Resources/img/Trainer Sprites/tr_129.png b/PKHeX/Resources/img/Trainer Sprites/tr_129.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_129.png rename to PKHeX/Resources/img/Trainer Sprites/tr_129.png diff --git a/Resources/img/Trainer Sprites/tr_13.png b/PKHeX/Resources/img/Trainer Sprites/tr_13.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_13.png rename to PKHeX/Resources/img/Trainer Sprites/tr_13.png diff --git a/Resources/img/Trainer Sprites/tr_14.png b/PKHeX/Resources/img/Trainer Sprites/tr_14.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_14.png rename to PKHeX/Resources/img/Trainer Sprites/tr_14.png diff --git a/Resources/img/Trainer Sprites/tr_15.png b/PKHeX/Resources/img/Trainer Sprites/tr_15.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_15.png rename to PKHeX/Resources/img/Trainer Sprites/tr_15.png diff --git a/Resources/img/Trainer Sprites/tr_16.png b/PKHeX/Resources/img/Trainer Sprites/tr_16.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_16.png rename to PKHeX/Resources/img/Trainer Sprites/tr_16.png diff --git a/Resources/img/Trainer Sprites/tr_17.png b/PKHeX/Resources/img/Trainer Sprites/tr_17.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_17.png rename to PKHeX/Resources/img/Trainer Sprites/tr_17.png diff --git a/Resources/img/Trainer Sprites/tr_18.png b/PKHeX/Resources/img/Trainer Sprites/tr_18.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_18.png rename to PKHeX/Resources/img/Trainer Sprites/tr_18.png diff --git a/Resources/img/Trainer Sprites/tr_19.png b/PKHeX/Resources/img/Trainer Sprites/tr_19.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_19.png rename to PKHeX/Resources/img/Trainer Sprites/tr_19.png diff --git a/Resources/img/Trainer Sprites/tr_20.png b/PKHeX/Resources/img/Trainer Sprites/tr_20.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_20.png rename to PKHeX/Resources/img/Trainer Sprites/tr_20.png diff --git a/Resources/img/Trainer Sprites/tr_21.png b/PKHeX/Resources/img/Trainer Sprites/tr_21.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_21.png rename to PKHeX/Resources/img/Trainer Sprites/tr_21.png diff --git a/Resources/img/Trainer Sprites/tr_22.png b/PKHeX/Resources/img/Trainer Sprites/tr_22.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_22.png rename to PKHeX/Resources/img/Trainer Sprites/tr_22.png diff --git a/Resources/img/Trainer Sprites/tr_23.png b/PKHeX/Resources/img/Trainer Sprites/tr_23.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_23.png rename to PKHeX/Resources/img/Trainer Sprites/tr_23.png diff --git a/Resources/img/Trainer Sprites/tr_24.png b/PKHeX/Resources/img/Trainer Sprites/tr_24.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_24.png rename to PKHeX/Resources/img/Trainer Sprites/tr_24.png diff --git a/Resources/img/Trainer Sprites/tr_25.png b/PKHeX/Resources/img/Trainer Sprites/tr_25.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_25.png rename to PKHeX/Resources/img/Trainer Sprites/tr_25.png diff --git a/Resources/img/Trainer Sprites/tr_26.png b/PKHeX/Resources/img/Trainer Sprites/tr_26.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_26.png rename to PKHeX/Resources/img/Trainer Sprites/tr_26.png diff --git a/Resources/img/Trainer Sprites/tr_27.png b/PKHeX/Resources/img/Trainer Sprites/tr_27.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_27.png rename to PKHeX/Resources/img/Trainer Sprites/tr_27.png diff --git a/Resources/img/Trainer Sprites/tr_28.png b/PKHeX/Resources/img/Trainer Sprites/tr_28.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_28.png rename to PKHeX/Resources/img/Trainer Sprites/tr_28.png diff --git a/Resources/img/Trainer Sprites/tr_29.png b/PKHeX/Resources/img/Trainer Sprites/tr_29.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_29.png rename to PKHeX/Resources/img/Trainer Sprites/tr_29.png diff --git a/Resources/img/Trainer Sprites/tr_30.png b/PKHeX/Resources/img/Trainer Sprites/tr_30.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_30.png rename to PKHeX/Resources/img/Trainer Sprites/tr_30.png diff --git a/Resources/img/Trainer Sprites/tr_31.png b/PKHeX/Resources/img/Trainer Sprites/tr_31.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_31.png rename to PKHeX/Resources/img/Trainer Sprites/tr_31.png diff --git a/Resources/img/Trainer Sprites/tr_32.png b/PKHeX/Resources/img/Trainer Sprites/tr_32.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_32.png rename to PKHeX/Resources/img/Trainer Sprites/tr_32.png diff --git a/Resources/img/Trainer Sprites/tr_33.png b/PKHeX/Resources/img/Trainer Sprites/tr_33.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_33.png rename to PKHeX/Resources/img/Trainer Sprites/tr_33.png diff --git a/Resources/img/Trainer Sprites/tr_34.png b/PKHeX/Resources/img/Trainer Sprites/tr_34.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_34.png rename to PKHeX/Resources/img/Trainer Sprites/tr_34.png diff --git a/Resources/img/Trainer Sprites/tr_35.png b/PKHeX/Resources/img/Trainer Sprites/tr_35.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_35.png rename to PKHeX/Resources/img/Trainer Sprites/tr_35.png diff --git a/Resources/img/Trainer Sprites/tr_36.png b/PKHeX/Resources/img/Trainer Sprites/tr_36.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_36.png rename to PKHeX/Resources/img/Trainer Sprites/tr_36.png diff --git a/Resources/img/Trainer Sprites/tr_37.png b/PKHeX/Resources/img/Trainer Sprites/tr_37.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_37.png rename to PKHeX/Resources/img/Trainer Sprites/tr_37.png diff --git a/Resources/img/Trainer Sprites/tr_38.png b/PKHeX/Resources/img/Trainer Sprites/tr_38.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_38.png rename to PKHeX/Resources/img/Trainer Sprites/tr_38.png diff --git a/Resources/img/Trainer Sprites/tr_39.png b/PKHeX/Resources/img/Trainer Sprites/tr_39.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_39.png rename to PKHeX/Resources/img/Trainer Sprites/tr_39.png diff --git a/Resources/img/Trainer Sprites/tr_40.png b/PKHeX/Resources/img/Trainer Sprites/tr_40.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_40.png rename to PKHeX/Resources/img/Trainer Sprites/tr_40.png diff --git a/Resources/img/Trainer Sprites/tr_41.png b/PKHeX/Resources/img/Trainer Sprites/tr_41.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_41.png rename to PKHeX/Resources/img/Trainer Sprites/tr_41.png diff --git a/Resources/img/Trainer Sprites/tr_42.png b/PKHeX/Resources/img/Trainer Sprites/tr_42.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_42.png rename to PKHeX/Resources/img/Trainer Sprites/tr_42.png diff --git a/Resources/img/Trainer Sprites/tr_43.png b/PKHeX/Resources/img/Trainer Sprites/tr_43.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_43.png rename to PKHeX/Resources/img/Trainer Sprites/tr_43.png diff --git a/Resources/img/Trainer Sprites/tr_44.png b/PKHeX/Resources/img/Trainer Sprites/tr_44.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_44.png rename to PKHeX/Resources/img/Trainer Sprites/tr_44.png diff --git a/Resources/img/Trainer Sprites/tr_45.png b/PKHeX/Resources/img/Trainer Sprites/tr_45.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_45.png rename to PKHeX/Resources/img/Trainer Sprites/tr_45.png diff --git a/Resources/img/Trainer Sprites/tr_46.png b/PKHeX/Resources/img/Trainer Sprites/tr_46.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_46.png rename to PKHeX/Resources/img/Trainer Sprites/tr_46.png diff --git a/Resources/img/Trainer Sprites/tr_47.png b/PKHeX/Resources/img/Trainer Sprites/tr_47.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_47.png rename to PKHeX/Resources/img/Trainer Sprites/tr_47.png diff --git a/Resources/img/Trainer Sprites/tr_48.png b/PKHeX/Resources/img/Trainer Sprites/tr_48.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_48.png rename to PKHeX/Resources/img/Trainer Sprites/tr_48.png diff --git a/Resources/img/Trainer Sprites/tr_49.png b/PKHeX/Resources/img/Trainer Sprites/tr_49.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_49.png rename to PKHeX/Resources/img/Trainer Sprites/tr_49.png diff --git a/Resources/img/Trainer Sprites/tr_50.png b/PKHeX/Resources/img/Trainer Sprites/tr_50.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_50.png rename to PKHeX/Resources/img/Trainer Sprites/tr_50.png diff --git a/Resources/img/Trainer Sprites/tr_51.png b/PKHeX/Resources/img/Trainer Sprites/tr_51.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_51.png rename to PKHeX/Resources/img/Trainer Sprites/tr_51.png diff --git a/Resources/img/Trainer Sprites/tr_52.png b/PKHeX/Resources/img/Trainer Sprites/tr_52.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_52.png rename to PKHeX/Resources/img/Trainer Sprites/tr_52.png diff --git a/Resources/img/Trainer Sprites/tr_53.png b/PKHeX/Resources/img/Trainer Sprites/tr_53.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_53.png rename to PKHeX/Resources/img/Trainer Sprites/tr_53.png diff --git a/Resources/img/Trainer Sprites/tr_54.png b/PKHeX/Resources/img/Trainer Sprites/tr_54.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_54.png rename to PKHeX/Resources/img/Trainer Sprites/tr_54.png diff --git a/Resources/img/Trainer Sprites/tr_55.png b/PKHeX/Resources/img/Trainer Sprites/tr_55.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_55.png rename to PKHeX/Resources/img/Trainer Sprites/tr_55.png diff --git a/Resources/img/Trainer Sprites/tr_56.png b/PKHeX/Resources/img/Trainer Sprites/tr_56.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_56.png rename to PKHeX/Resources/img/Trainer Sprites/tr_56.png diff --git a/Resources/img/Trainer Sprites/tr_57.png b/PKHeX/Resources/img/Trainer Sprites/tr_57.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_57.png rename to PKHeX/Resources/img/Trainer Sprites/tr_57.png diff --git a/Resources/img/Trainer Sprites/tr_58.png b/PKHeX/Resources/img/Trainer Sprites/tr_58.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_58.png rename to PKHeX/Resources/img/Trainer Sprites/tr_58.png diff --git a/Resources/img/Trainer Sprites/tr_59.png b/PKHeX/Resources/img/Trainer Sprites/tr_59.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_59.png rename to PKHeX/Resources/img/Trainer Sprites/tr_59.png diff --git a/Resources/img/Trainer Sprites/tr_60.png b/PKHeX/Resources/img/Trainer Sprites/tr_60.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_60.png rename to PKHeX/Resources/img/Trainer Sprites/tr_60.png diff --git a/Resources/img/Trainer Sprites/tr_61.png b/PKHeX/Resources/img/Trainer Sprites/tr_61.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_61.png rename to PKHeX/Resources/img/Trainer Sprites/tr_61.png diff --git a/Resources/img/Trainer Sprites/tr_62.png b/PKHeX/Resources/img/Trainer Sprites/tr_62.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_62.png rename to PKHeX/Resources/img/Trainer Sprites/tr_62.png diff --git a/Resources/img/Trainer Sprites/tr_63.png b/PKHeX/Resources/img/Trainer Sprites/tr_63.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_63.png rename to PKHeX/Resources/img/Trainer Sprites/tr_63.png diff --git a/Resources/img/Trainer Sprites/tr_64.png b/PKHeX/Resources/img/Trainer Sprites/tr_64.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_64.png rename to PKHeX/Resources/img/Trainer Sprites/tr_64.png diff --git a/Resources/img/Trainer Sprites/tr_65.png b/PKHeX/Resources/img/Trainer Sprites/tr_65.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_65.png rename to PKHeX/Resources/img/Trainer Sprites/tr_65.png diff --git a/Resources/img/Trainer Sprites/tr_66.png b/PKHeX/Resources/img/Trainer Sprites/tr_66.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_66.png rename to PKHeX/Resources/img/Trainer Sprites/tr_66.png diff --git a/Resources/img/Trainer Sprites/tr_67.png b/PKHeX/Resources/img/Trainer Sprites/tr_67.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_67.png rename to PKHeX/Resources/img/Trainer Sprites/tr_67.png diff --git a/Resources/img/Trainer Sprites/tr_68.png b/PKHeX/Resources/img/Trainer Sprites/tr_68.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_68.png rename to PKHeX/Resources/img/Trainer Sprites/tr_68.png diff --git a/Resources/img/Trainer Sprites/tr_69.png b/PKHeX/Resources/img/Trainer Sprites/tr_69.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_69.png rename to PKHeX/Resources/img/Trainer Sprites/tr_69.png diff --git a/Resources/img/Trainer Sprites/tr_70.png b/PKHeX/Resources/img/Trainer Sprites/tr_70.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_70.png rename to PKHeX/Resources/img/Trainer Sprites/tr_70.png diff --git a/Resources/img/Trainer Sprites/tr_71.png b/PKHeX/Resources/img/Trainer Sprites/tr_71.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_71.png rename to PKHeX/Resources/img/Trainer Sprites/tr_71.png diff --git a/Resources/img/Trainer Sprites/tr_72.png b/PKHeX/Resources/img/Trainer Sprites/tr_72.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_72.png rename to PKHeX/Resources/img/Trainer Sprites/tr_72.png diff --git a/Resources/img/Trainer Sprites/tr_73.png b/PKHeX/Resources/img/Trainer Sprites/tr_73.png similarity index 100% rename from Resources/img/Trainer Sprites/tr_73.png rename to PKHeX/Resources/img/Trainer Sprites/tr_73.png diff --git a/Resources/img/badges/badge_01.png b/PKHeX/Resources/img/badges/badge_01.png similarity index 100% rename from Resources/img/badges/badge_01.png rename to PKHeX/Resources/img/badges/badge_01.png diff --git a/Resources/img/badges/badge_02.png b/PKHeX/Resources/img/badges/badge_02.png similarity index 100% rename from Resources/img/badges/badge_02.png rename to PKHeX/Resources/img/badges/badge_02.png diff --git a/Resources/img/badges/badge_03.png b/PKHeX/Resources/img/badges/badge_03.png similarity index 100% rename from Resources/img/badges/badge_03.png rename to PKHeX/Resources/img/badges/badge_03.png diff --git a/Resources/img/badges/badge_04.png b/PKHeX/Resources/img/badges/badge_04.png similarity index 100% rename from Resources/img/badges/badge_04.png rename to PKHeX/Resources/img/badges/badge_04.png diff --git a/Resources/img/badges/badge_05.png b/PKHeX/Resources/img/badges/badge_05.png similarity index 100% rename from Resources/img/badges/badge_05.png rename to PKHeX/Resources/img/badges/badge_05.png diff --git a/Resources/img/badges/badge_06.png b/PKHeX/Resources/img/badges/badge_06.png similarity index 100% rename from Resources/img/badges/badge_06.png rename to PKHeX/Resources/img/badges/badge_06.png diff --git a/Resources/img/badges/badge_07.png b/PKHeX/Resources/img/badges/badge_07.png similarity index 100% rename from Resources/img/badges/badge_07.png rename to PKHeX/Resources/img/badges/badge_07.png diff --git a/Resources/img/badges/badge_08.png b/PKHeX/Resources/img/badges/badge_08.png similarity index 100% rename from Resources/img/badges/badge_08.png rename to PKHeX/Resources/img/badges/badge_08.png diff --git a/Resources/img/badges/badge_1.png b/PKHeX/Resources/img/badges/badge_1.png similarity index 100% rename from Resources/img/badges/badge_1.png rename to PKHeX/Resources/img/badges/badge_1.png diff --git a/Resources/img/badges/badge_2.png b/PKHeX/Resources/img/badges/badge_2.png similarity index 100% rename from Resources/img/badges/badge_2.png rename to PKHeX/Resources/img/badges/badge_2.png diff --git a/Resources/img/badges/badge_3.png b/PKHeX/Resources/img/badges/badge_3.png similarity index 100% rename from Resources/img/badges/badge_3.png rename to PKHeX/Resources/img/badges/badge_3.png diff --git a/Resources/img/badges/badge_4.png b/PKHeX/Resources/img/badges/badge_4.png similarity index 100% rename from Resources/img/badges/badge_4.png rename to PKHeX/Resources/img/badges/badge_4.png diff --git a/Resources/img/badges/badge_5.png b/PKHeX/Resources/img/badges/badge_5.png similarity index 100% rename from Resources/img/badges/badge_5.png rename to PKHeX/Resources/img/badges/badge_5.png diff --git a/Resources/img/badges/badge_6.png b/PKHeX/Resources/img/badges/badge_6.png similarity index 100% rename from Resources/img/badges/badge_6.png rename to PKHeX/Resources/img/badges/badge_6.png diff --git a/Resources/img/badges/badge_7.png b/PKHeX/Resources/img/badges/badge_7.png similarity index 100% rename from Resources/img/badges/badge_7.png rename to PKHeX/Resources/img/badges/badge_7.png diff --git a/Resources/img/badges/badge_8.png b/PKHeX/Resources/img/badges/badge_8.png similarity index 100% rename from Resources/img/badges/badge_8.png rename to PKHeX/Resources/img/badges/badge_8.png diff --git a/Resources/img/box/ao/box_wp17ao.png b/PKHeX/Resources/img/box/ao/box_wp17ao.png similarity index 100% rename from Resources/img/box/ao/box_wp17ao.png rename to PKHeX/Resources/img/box/ao/box_wp17ao.png diff --git a/Resources/img/box/ao/box_wp18ao.png b/PKHeX/Resources/img/box/ao/box_wp18ao.png similarity index 100% rename from Resources/img/box/ao/box_wp18ao.png rename to PKHeX/Resources/img/box/ao/box_wp18ao.png diff --git a/Resources/img/box/ao/box_wp19ao.png b/PKHeX/Resources/img/box/ao/box_wp19ao.png similarity index 100% rename from Resources/img/box/ao/box_wp19ao.png rename to PKHeX/Resources/img/box/ao/box_wp19ao.png diff --git a/Resources/img/box/ao/box_wp20ao.png b/PKHeX/Resources/img/box/ao/box_wp20ao.png similarity index 100% rename from Resources/img/box/ao/box_wp20ao.png rename to PKHeX/Resources/img/box/ao/box_wp20ao.png diff --git a/Resources/img/box/ao/box_wp21ao.png b/PKHeX/Resources/img/box/ao/box_wp21ao.png similarity index 100% rename from Resources/img/box/ao/box_wp21ao.png rename to PKHeX/Resources/img/box/ao/box_wp21ao.png diff --git a/Resources/img/box/ao/box_wp22ao.png b/PKHeX/Resources/img/box/ao/box_wp22ao.png similarity index 100% rename from Resources/img/box/ao/box_wp22ao.png rename to PKHeX/Resources/img/box/ao/box_wp22ao.png diff --git a/Resources/img/box/ao/box_wp23ao.png b/PKHeX/Resources/img/box/ao/box_wp23ao.png similarity index 100% rename from Resources/img/box/ao/box_wp23ao.png rename to PKHeX/Resources/img/box/ao/box_wp23ao.png diff --git a/Resources/img/box/ao/box_wp24ao.png b/PKHeX/Resources/img/box/ao/box_wp24ao.png similarity index 100% rename from Resources/img/box/ao/box_wp24ao.png rename to PKHeX/Resources/img/box/ao/box_wp24ao.png diff --git a/Resources/img/box/b2w2/box_wp17b2w2.png b/PKHeX/Resources/img/box/b2w2/box_wp17b2w2.png similarity index 100% rename from Resources/img/box/b2w2/box_wp17b2w2.png rename to PKHeX/Resources/img/box/b2w2/box_wp17b2w2.png diff --git a/Resources/img/box/b2w2/box_wp18b2w2.png b/PKHeX/Resources/img/box/b2w2/box_wp18b2w2.png similarity index 100% rename from Resources/img/box/b2w2/box_wp18b2w2.png rename to PKHeX/Resources/img/box/b2w2/box_wp18b2w2.png diff --git a/Resources/img/box/b2w2/box_wp19b2w2.png b/PKHeX/Resources/img/box/b2w2/box_wp19b2w2.png similarity index 100% rename from Resources/img/box/b2w2/box_wp19b2w2.png rename to PKHeX/Resources/img/box/b2w2/box_wp19b2w2.png diff --git a/Resources/img/box/b2w2/box_wp20b2w2.png b/PKHeX/Resources/img/box/b2w2/box_wp20b2w2.png similarity index 100% rename from Resources/img/box/b2w2/box_wp20b2w2.png rename to PKHeX/Resources/img/box/b2w2/box_wp20b2w2.png diff --git a/Resources/img/box/b2w2/box_wp21b2w2.png b/PKHeX/Resources/img/box/b2w2/box_wp21b2w2.png similarity index 100% rename from Resources/img/box/b2w2/box_wp21b2w2.png rename to PKHeX/Resources/img/box/b2w2/box_wp21b2w2.png diff --git a/Resources/img/box/b2w2/box_wp22b2w2.png b/PKHeX/Resources/img/box/b2w2/box_wp22b2w2.png similarity index 100% rename from Resources/img/box/b2w2/box_wp22b2w2.png rename to PKHeX/Resources/img/box/b2w2/box_wp22b2w2.png diff --git a/Resources/img/box/b2w2/box_wp23b2w2.png b/PKHeX/Resources/img/box/b2w2/box_wp23b2w2.png similarity index 100% rename from Resources/img/box/b2w2/box_wp23b2w2.png rename to PKHeX/Resources/img/box/b2w2/box_wp23b2w2.png diff --git a/Resources/img/box/b2w2/box_wp24b2w2.png b/PKHeX/Resources/img/box/b2w2/box_wp24b2w2.png similarity index 100% rename from Resources/img/box/b2w2/box_wp24b2w2.png rename to PKHeX/Resources/img/box/b2w2/box_wp24b2w2.png diff --git a/Resources/img/box/bw/box_wp01bw.png b/PKHeX/Resources/img/box/bw/box_wp01bw.png similarity index 100% rename from Resources/img/box/bw/box_wp01bw.png rename to PKHeX/Resources/img/box/bw/box_wp01bw.png diff --git a/Resources/img/box/bw/box_wp02bw.png b/PKHeX/Resources/img/box/bw/box_wp02bw.png similarity index 100% rename from Resources/img/box/bw/box_wp02bw.png rename to PKHeX/Resources/img/box/bw/box_wp02bw.png diff --git a/Resources/img/box/bw/box_wp03bw.png b/PKHeX/Resources/img/box/bw/box_wp03bw.png similarity index 100% rename from Resources/img/box/bw/box_wp03bw.png rename to PKHeX/Resources/img/box/bw/box_wp03bw.png diff --git a/Resources/img/box/bw/box_wp04bw.png b/PKHeX/Resources/img/box/bw/box_wp04bw.png similarity index 100% rename from Resources/img/box/bw/box_wp04bw.png rename to PKHeX/Resources/img/box/bw/box_wp04bw.png diff --git a/Resources/img/box/bw/box_wp05bw.png b/PKHeX/Resources/img/box/bw/box_wp05bw.png similarity index 100% rename from Resources/img/box/bw/box_wp05bw.png rename to PKHeX/Resources/img/box/bw/box_wp05bw.png diff --git a/Resources/img/box/bw/box_wp06bw.png b/PKHeX/Resources/img/box/bw/box_wp06bw.png similarity index 100% rename from Resources/img/box/bw/box_wp06bw.png rename to PKHeX/Resources/img/box/bw/box_wp06bw.png diff --git a/Resources/img/box/bw/box_wp07bw.png b/PKHeX/Resources/img/box/bw/box_wp07bw.png similarity index 100% rename from Resources/img/box/bw/box_wp07bw.png rename to PKHeX/Resources/img/box/bw/box_wp07bw.png diff --git a/Resources/img/box/bw/box_wp08bw.png b/PKHeX/Resources/img/box/bw/box_wp08bw.png similarity index 100% rename from Resources/img/box/bw/box_wp08bw.png rename to PKHeX/Resources/img/box/bw/box_wp08bw.png diff --git a/Resources/img/box/bw/box_wp09bw.png b/PKHeX/Resources/img/box/bw/box_wp09bw.png similarity index 100% rename from Resources/img/box/bw/box_wp09bw.png rename to PKHeX/Resources/img/box/bw/box_wp09bw.png diff --git a/Resources/img/box/bw/box_wp10bw.png b/PKHeX/Resources/img/box/bw/box_wp10bw.png similarity index 100% rename from Resources/img/box/bw/box_wp10bw.png rename to PKHeX/Resources/img/box/bw/box_wp10bw.png diff --git a/Resources/img/box/bw/box_wp11bw.png b/PKHeX/Resources/img/box/bw/box_wp11bw.png similarity index 100% rename from Resources/img/box/bw/box_wp11bw.png rename to PKHeX/Resources/img/box/bw/box_wp11bw.png diff --git a/Resources/img/box/bw/box_wp12bw.png b/PKHeX/Resources/img/box/bw/box_wp12bw.png similarity index 100% rename from Resources/img/box/bw/box_wp12bw.png rename to PKHeX/Resources/img/box/bw/box_wp12bw.png diff --git a/Resources/img/box/bw/box_wp13bw.png b/PKHeX/Resources/img/box/bw/box_wp13bw.png similarity index 100% rename from Resources/img/box/bw/box_wp13bw.png rename to PKHeX/Resources/img/box/bw/box_wp13bw.png diff --git a/Resources/img/box/bw/box_wp14bw.png b/PKHeX/Resources/img/box/bw/box_wp14bw.png similarity index 100% rename from Resources/img/box/bw/box_wp14bw.png rename to PKHeX/Resources/img/box/bw/box_wp14bw.png diff --git a/Resources/img/box/bw/box_wp15bw.png b/PKHeX/Resources/img/box/bw/box_wp15bw.png similarity index 100% rename from Resources/img/box/bw/box_wp15bw.png rename to PKHeX/Resources/img/box/bw/box_wp15bw.png diff --git a/Resources/img/box/bw/box_wp16bw.png b/PKHeX/Resources/img/box/bw/box_wp16bw.png similarity index 100% rename from Resources/img/box/bw/box_wp16bw.png rename to PKHeX/Resources/img/box/bw/box_wp16bw.png diff --git a/Resources/img/box/bw/box_wp17bw.png b/PKHeX/Resources/img/box/bw/box_wp17bw.png similarity index 100% rename from Resources/img/box/bw/box_wp17bw.png rename to PKHeX/Resources/img/box/bw/box_wp17bw.png diff --git a/Resources/img/box/bw/box_wp18bw.png b/PKHeX/Resources/img/box/bw/box_wp18bw.png similarity index 100% rename from Resources/img/box/bw/box_wp18bw.png rename to PKHeX/Resources/img/box/bw/box_wp18bw.png diff --git a/Resources/img/box/bw/box_wp19bw.png b/PKHeX/Resources/img/box/bw/box_wp19bw.png similarity index 100% rename from Resources/img/box/bw/box_wp19bw.png rename to PKHeX/Resources/img/box/bw/box_wp19bw.png diff --git a/Resources/img/box/bw/box_wp20bw.png b/PKHeX/Resources/img/box/bw/box_wp20bw.png similarity index 100% rename from Resources/img/box/bw/box_wp20bw.png rename to PKHeX/Resources/img/box/bw/box_wp20bw.png diff --git a/Resources/img/box/bw/box_wp21bw.png b/PKHeX/Resources/img/box/bw/box_wp21bw.png similarity index 100% rename from Resources/img/box/bw/box_wp21bw.png rename to PKHeX/Resources/img/box/bw/box_wp21bw.png diff --git a/Resources/img/box/bw/box_wp22bw.png b/PKHeX/Resources/img/box/bw/box_wp22bw.png similarity index 100% rename from Resources/img/box/bw/box_wp22bw.png rename to PKHeX/Resources/img/box/bw/box_wp22bw.png diff --git a/Resources/img/box/bw/box_wp23bw.png b/PKHeX/Resources/img/box/bw/box_wp23bw.png similarity index 100% rename from Resources/img/box/bw/box_wp23bw.png rename to PKHeX/Resources/img/box/bw/box_wp23bw.png diff --git a/Resources/img/box/bw/box_wp24bw.png b/PKHeX/Resources/img/box/bw/box_wp24bw.png similarity index 100% rename from Resources/img/box/bw/box_wp24bw.png rename to PKHeX/Resources/img/box/bw/box_wp24bw.png diff --git a/Resources/img/box/dp/box_wp01dp.png b/PKHeX/Resources/img/box/dp/box_wp01dp.png similarity index 100% rename from Resources/img/box/dp/box_wp01dp.png rename to PKHeX/Resources/img/box/dp/box_wp01dp.png diff --git a/Resources/img/box/dp/box_wp02dp.png b/PKHeX/Resources/img/box/dp/box_wp02dp.png similarity index 100% rename from Resources/img/box/dp/box_wp02dp.png rename to PKHeX/Resources/img/box/dp/box_wp02dp.png diff --git a/Resources/img/box/dp/box_wp03dp.png b/PKHeX/Resources/img/box/dp/box_wp03dp.png similarity index 100% rename from Resources/img/box/dp/box_wp03dp.png rename to PKHeX/Resources/img/box/dp/box_wp03dp.png diff --git a/Resources/img/box/dp/box_wp04dp.png b/PKHeX/Resources/img/box/dp/box_wp04dp.png similarity index 100% rename from Resources/img/box/dp/box_wp04dp.png rename to PKHeX/Resources/img/box/dp/box_wp04dp.png diff --git a/Resources/img/box/dp/box_wp05dp.png b/PKHeX/Resources/img/box/dp/box_wp05dp.png similarity index 100% rename from Resources/img/box/dp/box_wp05dp.png rename to PKHeX/Resources/img/box/dp/box_wp05dp.png diff --git a/Resources/img/box/dp/box_wp06dp.png b/PKHeX/Resources/img/box/dp/box_wp06dp.png similarity index 100% rename from Resources/img/box/dp/box_wp06dp.png rename to PKHeX/Resources/img/box/dp/box_wp06dp.png diff --git a/Resources/img/box/dp/box_wp07dp.png b/PKHeX/Resources/img/box/dp/box_wp07dp.png similarity index 100% rename from Resources/img/box/dp/box_wp07dp.png rename to PKHeX/Resources/img/box/dp/box_wp07dp.png diff --git a/Resources/img/box/dp/box_wp08dp.png b/PKHeX/Resources/img/box/dp/box_wp08dp.png similarity index 100% rename from Resources/img/box/dp/box_wp08dp.png rename to PKHeX/Resources/img/box/dp/box_wp08dp.png diff --git a/Resources/img/box/dp/box_wp09dp.png b/PKHeX/Resources/img/box/dp/box_wp09dp.png similarity index 100% rename from Resources/img/box/dp/box_wp09dp.png rename to PKHeX/Resources/img/box/dp/box_wp09dp.png diff --git a/Resources/img/box/dp/box_wp10dp.png b/PKHeX/Resources/img/box/dp/box_wp10dp.png similarity index 100% rename from Resources/img/box/dp/box_wp10dp.png rename to PKHeX/Resources/img/box/dp/box_wp10dp.png diff --git a/Resources/img/box/dp/box_wp11dp.png b/PKHeX/Resources/img/box/dp/box_wp11dp.png similarity index 100% rename from Resources/img/box/dp/box_wp11dp.png rename to PKHeX/Resources/img/box/dp/box_wp11dp.png diff --git a/Resources/img/box/dp/box_wp12dp.png b/PKHeX/Resources/img/box/dp/box_wp12dp.png similarity index 100% rename from Resources/img/box/dp/box_wp12dp.png rename to PKHeX/Resources/img/box/dp/box_wp12dp.png diff --git a/Resources/img/box/dp/box_wp13dp.png b/PKHeX/Resources/img/box/dp/box_wp13dp.png similarity index 100% rename from Resources/img/box/dp/box_wp13dp.png rename to PKHeX/Resources/img/box/dp/box_wp13dp.png diff --git a/Resources/img/box/dp/box_wp14dp.png b/PKHeX/Resources/img/box/dp/box_wp14dp.png similarity index 100% rename from Resources/img/box/dp/box_wp14dp.png rename to PKHeX/Resources/img/box/dp/box_wp14dp.png diff --git a/Resources/img/box/dp/box_wp15dp.png b/PKHeX/Resources/img/box/dp/box_wp15dp.png similarity index 100% rename from Resources/img/box/dp/box_wp15dp.png rename to PKHeX/Resources/img/box/dp/box_wp15dp.png diff --git a/Resources/img/box/dp/box_wp16dp.png b/PKHeX/Resources/img/box/dp/box_wp16dp.png similarity index 100% rename from Resources/img/box/dp/box_wp16dp.png rename to PKHeX/Resources/img/box/dp/box_wp16dp.png diff --git a/Resources/img/box/dp/box_wp17dp.png b/PKHeX/Resources/img/box/dp/box_wp17dp.png similarity index 100% rename from Resources/img/box/dp/box_wp17dp.png rename to PKHeX/Resources/img/box/dp/box_wp17dp.png diff --git a/Resources/img/box/dp/box_wp18dp.png b/PKHeX/Resources/img/box/dp/box_wp18dp.png similarity index 100% rename from Resources/img/box/dp/box_wp18dp.png rename to PKHeX/Resources/img/box/dp/box_wp18dp.png diff --git a/Resources/img/box/dp/box_wp19dp.png b/PKHeX/Resources/img/box/dp/box_wp19dp.png similarity index 100% rename from Resources/img/box/dp/box_wp19dp.png rename to PKHeX/Resources/img/box/dp/box_wp19dp.png diff --git a/Resources/img/box/dp/box_wp20dp.png b/PKHeX/Resources/img/box/dp/box_wp20dp.png similarity index 100% rename from Resources/img/box/dp/box_wp20dp.png rename to PKHeX/Resources/img/box/dp/box_wp20dp.png diff --git a/Resources/img/box/dp/box_wp21dp.png b/PKHeX/Resources/img/box/dp/box_wp21dp.png similarity index 100% rename from Resources/img/box/dp/box_wp21dp.png rename to PKHeX/Resources/img/box/dp/box_wp21dp.png diff --git a/Resources/img/box/dp/box_wp22dp.png b/PKHeX/Resources/img/box/dp/box_wp22dp.png similarity index 100% rename from Resources/img/box/dp/box_wp22dp.png rename to PKHeX/Resources/img/box/dp/box_wp22dp.png diff --git a/Resources/img/box/dp/box_wp23dp.png b/PKHeX/Resources/img/box/dp/box_wp23dp.png similarity index 100% rename from Resources/img/box/dp/box_wp23dp.png rename to PKHeX/Resources/img/box/dp/box_wp23dp.png diff --git a/Resources/img/box/dp/box_wp24dp.png b/PKHeX/Resources/img/box/dp/box_wp24dp.png similarity index 100% rename from Resources/img/box/dp/box_wp24dp.png rename to PKHeX/Resources/img/box/dp/box_wp24dp.png diff --git a/Resources/img/box/e/box_wp01e.png b/PKHeX/Resources/img/box/e/box_wp01e.png similarity index 100% rename from Resources/img/box/e/box_wp01e.png rename to PKHeX/Resources/img/box/e/box_wp01e.png diff --git a/Resources/img/box/e/box_wp02e.png b/PKHeX/Resources/img/box/e/box_wp02e.png similarity index 100% rename from Resources/img/box/e/box_wp02e.png rename to PKHeX/Resources/img/box/e/box_wp02e.png diff --git a/Resources/img/box/e/box_wp03e.png b/PKHeX/Resources/img/box/e/box_wp03e.png similarity index 100% rename from Resources/img/box/e/box_wp03e.png rename to PKHeX/Resources/img/box/e/box_wp03e.png diff --git a/Resources/img/box/e/box_wp04e.png b/PKHeX/Resources/img/box/e/box_wp04e.png similarity index 100% rename from Resources/img/box/e/box_wp04e.png rename to PKHeX/Resources/img/box/e/box_wp04e.png diff --git a/Resources/img/box/e/box_wp05e.png b/PKHeX/Resources/img/box/e/box_wp05e.png similarity index 100% rename from Resources/img/box/e/box_wp05e.png rename to PKHeX/Resources/img/box/e/box_wp05e.png diff --git a/Resources/img/box/e/box_wp06e.png b/PKHeX/Resources/img/box/e/box_wp06e.png similarity index 100% rename from Resources/img/box/e/box_wp06e.png rename to PKHeX/Resources/img/box/e/box_wp06e.png diff --git a/Resources/img/box/e/box_wp07e.png b/PKHeX/Resources/img/box/e/box_wp07e.png similarity index 100% rename from Resources/img/box/e/box_wp07e.png rename to PKHeX/Resources/img/box/e/box_wp07e.png diff --git a/Resources/img/box/e/box_wp08e.png b/PKHeX/Resources/img/box/e/box_wp08e.png similarity index 100% rename from Resources/img/box/e/box_wp08e.png rename to PKHeX/Resources/img/box/e/box_wp08e.png diff --git a/Resources/img/box/e/box_wp09e.png b/PKHeX/Resources/img/box/e/box_wp09e.png similarity index 100% rename from Resources/img/box/e/box_wp09e.png rename to PKHeX/Resources/img/box/e/box_wp09e.png diff --git a/Resources/img/box/e/box_wp10e.png b/PKHeX/Resources/img/box/e/box_wp10e.png similarity index 100% rename from Resources/img/box/e/box_wp10e.png rename to PKHeX/Resources/img/box/e/box_wp10e.png diff --git a/Resources/img/box/e/box_wp11e.png b/PKHeX/Resources/img/box/e/box_wp11e.png similarity index 100% rename from Resources/img/box/e/box_wp11e.png rename to PKHeX/Resources/img/box/e/box_wp11e.png diff --git a/Resources/img/box/e/box_wp12e.png b/PKHeX/Resources/img/box/e/box_wp12e.png similarity index 100% rename from Resources/img/box/e/box_wp12e.png rename to PKHeX/Resources/img/box/e/box_wp12e.png diff --git a/Resources/img/box/e/box_wp13e.png b/PKHeX/Resources/img/box/e/box_wp13e.png similarity index 100% rename from Resources/img/box/e/box_wp13e.png rename to PKHeX/Resources/img/box/e/box_wp13e.png diff --git a/Resources/img/box/e/box_wp14e.png b/PKHeX/Resources/img/box/e/box_wp14e.png similarity index 100% rename from Resources/img/box/e/box_wp14e.png rename to PKHeX/Resources/img/box/e/box_wp14e.png diff --git a/Resources/img/box/e/box_wp15e.png b/PKHeX/Resources/img/box/e/box_wp15e.png similarity index 100% rename from Resources/img/box/e/box_wp15e.png rename to PKHeX/Resources/img/box/e/box_wp15e.png diff --git a/Resources/img/box/e/box_wp16e.png b/PKHeX/Resources/img/box/e/box_wp16e.png similarity index 100% rename from Resources/img/box/e/box_wp16e.png rename to PKHeX/Resources/img/box/e/box_wp16e.png diff --git a/Resources/img/box/frlg/box_wp13frlg.png b/PKHeX/Resources/img/box/frlg/box_wp13frlg.png similarity index 100% rename from Resources/img/box/frlg/box_wp13frlg.png rename to PKHeX/Resources/img/box/frlg/box_wp13frlg.png diff --git a/Resources/img/box/frlg/box_wp14frlg.png b/PKHeX/Resources/img/box/frlg/box_wp14frlg.png similarity index 100% rename from Resources/img/box/frlg/box_wp14frlg.png rename to PKHeX/Resources/img/box/frlg/box_wp14frlg.png diff --git a/Resources/img/box/frlg/box_wp15frlg.png b/PKHeX/Resources/img/box/frlg/box_wp15frlg.png similarity index 100% rename from Resources/img/box/frlg/box_wp15frlg.png rename to PKHeX/Resources/img/box/frlg/box_wp15frlg.png diff --git a/Resources/img/box/frlg/box_wp16frlg.png b/PKHeX/Resources/img/box/frlg/box_wp16frlg.png similarity index 100% rename from Resources/img/box/frlg/box_wp16frlg.png rename to PKHeX/Resources/img/box/frlg/box_wp16frlg.png diff --git a/Resources/img/box/hgss/box_wp17hgss.png b/PKHeX/Resources/img/box/hgss/box_wp17hgss.png similarity index 100% rename from Resources/img/box/hgss/box_wp17hgss.png rename to PKHeX/Resources/img/box/hgss/box_wp17hgss.png diff --git a/Resources/img/box/hgss/box_wp18hgss.png b/PKHeX/Resources/img/box/hgss/box_wp18hgss.png similarity index 100% rename from Resources/img/box/hgss/box_wp18hgss.png rename to PKHeX/Resources/img/box/hgss/box_wp18hgss.png diff --git a/Resources/img/box/hgss/box_wp19hgss.png b/PKHeX/Resources/img/box/hgss/box_wp19hgss.png similarity index 100% rename from Resources/img/box/hgss/box_wp19hgss.png rename to PKHeX/Resources/img/box/hgss/box_wp19hgss.png diff --git a/Resources/img/box/hgss/box_wp20hgss.png b/PKHeX/Resources/img/box/hgss/box_wp20hgss.png similarity index 100% rename from Resources/img/box/hgss/box_wp20hgss.png rename to PKHeX/Resources/img/box/hgss/box_wp20hgss.png diff --git a/Resources/img/box/hgss/box_wp21hgss.png b/PKHeX/Resources/img/box/hgss/box_wp21hgss.png similarity index 100% rename from Resources/img/box/hgss/box_wp21hgss.png rename to PKHeX/Resources/img/box/hgss/box_wp21hgss.png diff --git a/Resources/img/box/hgss/box_wp22hgss.png b/PKHeX/Resources/img/box/hgss/box_wp22hgss.png similarity index 100% rename from Resources/img/box/hgss/box_wp22hgss.png rename to PKHeX/Resources/img/box/hgss/box_wp22hgss.png diff --git a/Resources/img/box/hgss/box_wp23hgss.png b/PKHeX/Resources/img/box/hgss/box_wp23hgss.png similarity index 100% rename from Resources/img/box/hgss/box_wp23hgss.png rename to PKHeX/Resources/img/box/hgss/box_wp23hgss.png diff --git a/Resources/img/box/hgss/box_wp24hgss.png b/PKHeX/Resources/img/box/hgss/box_wp24hgss.png similarity index 100% rename from Resources/img/box/hgss/box_wp24hgss.png rename to PKHeX/Resources/img/box/hgss/box_wp24hgss.png diff --git a/Resources/img/box/pt/box_wp17pt.png b/PKHeX/Resources/img/box/pt/box_wp17pt.png similarity index 100% rename from Resources/img/box/pt/box_wp17pt.png rename to PKHeX/Resources/img/box/pt/box_wp17pt.png diff --git a/Resources/img/box/pt/box_wp18pt.png b/PKHeX/Resources/img/box/pt/box_wp18pt.png similarity index 100% rename from Resources/img/box/pt/box_wp18pt.png rename to PKHeX/Resources/img/box/pt/box_wp18pt.png diff --git a/Resources/img/box/pt/box_wp19pt.png b/PKHeX/Resources/img/box/pt/box_wp19pt.png similarity index 100% rename from Resources/img/box/pt/box_wp19pt.png rename to PKHeX/Resources/img/box/pt/box_wp19pt.png diff --git a/Resources/img/box/pt/box_wp20pt.png b/PKHeX/Resources/img/box/pt/box_wp20pt.png similarity index 100% rename from Resources/img/box/pt/box_wp20pt.png rename to PKHeX/Resources/img/box/pt/box_wp20pt.png diff --git a/Resources/img/box/pt/box_wp21pt.png b/PKHeX/Resources/img/box/pt/box_wp21pt.png similarity index 100% rename from Resources/img/box/pt/box_wp21pt.png rename to PKHeX/Resources/img/box/pt/box_wp21pt.png diff --git a/Resources/img/box/pt/box_wp22pt.png b/PKHeX/Resources/img/box/pt/box_wp22pt.png similarity index 100% rename from Resources/img/box/pt/box_wp22pt.png rename to PKHeX/Resources/img/box/pt/box_wp22pt.png diff --git a/Resources/img/box/pt/box_wp23pt.png b/PKHeX/Resources/img/box/pt/box_wp23pt.png similarity index 100% rename from Resources/img/box/pt/box_wp23pt.png rename to PKHeX/Resources/img/box/pt/box_wp23pt.png diff --git a/Resources/img/box/pt/box_wp24pt.png b/PKHeX/Resources/img/box/pt/box_wp24pt.png similarity index 100% rename from Resources/img/box/pt/box_wp24pt.png rename to PKHeX/Resources/img/box/pt/box_wp24pt.png diff --git a/Resources/img/box/rs/box_wp01rs.png b/PKHeX/Resources/img/box/rs/box_wp01rs.png similarity index 100% rename from Resources/img/box/rs/box_wp01rs.png rename to PKHeX/Resources/img/box/rs/box_wp01rs.png diff --git a/Resources/img/box/rs/box_wp02rs.png b/PKHeX/Resources/img/box/rs/box_wp02rs.png similarity index 100% rename from Resources/img/box/rs/box_wp02rs.png rename to PKHeX/Resources/img/box/rs/box_wp02rs.png diff --git a/Resources/img/box/rs/box_wp03rs.png b/PKHeX/Resources/img/box/rs/box_wp03rs.png similarity index 100% rename from Resources/img/box/rs/box_wp03rs.png rename to PKHeX/Resources/img/box/rs/box_wp03rs.png diff --git a/Resources/img/box/rs/box_wp04rs.png b/PKHeX/Resources/img/box/rs/box_wp04rs.png similarity index 100% rename from Resources/img/box/rs/box_wp04rs.png rename to PKHeX/Resources/img/box/rs/box_wp04rs.png diff --git a/Resources/img/box/rs/box_wp05rs.png b/PKHeX/Resources/img/box/rs/box_wp05rs.png similarity index 100% rename from Resources/img/box/rs/box_wp05rs.png rename to PKHeX/Resources/img/box/rs/box_wp05rs.png diff --git a/Resources/img/box/rs/box_wp06rs.png b/PKHeX/Resources/img/box/rs/box_wp06rs.png similarity index 100% rename from Resources/img/box/rs/box_wp06rs.png rename to PKHeX/Resources/img/box/rs/box_wp06rs.png diff --git a/Resources/img/box/rs/box_wp07rs.png b/PKHeX/Resources/img/box/rs/box_wp07rs.png similarity index 100% rename from Resources/img/box/rs/box_wp07rs.png rename to PKHeX/Resources/img/box/rs/box_wp07rs.png diff --git a/Resources/img/box/rs/box_wp08rs.png b/PKHeX/Resources/img/box/rs/box_wp08rs.png similarity index 100% rename from Resources/img/box/rs/box_wp08rs.png rename to PKHeX/Resources/img/box/rs/box_wp08rs.png diff --git a/Resources/img/box/rs/box_wp09rs.png b/PKHeX/Resources/img/box/rs/box_wp09rs.png similarity index 100% rename from Resources/img/box/rs/box_wp09rs.png rename to PKHeX/Resources/img/box/rs/box_wp09rs.png diff --git a/Resources/img/box/rs/box_wp10rs.png b/PKHeX/Resources/img/box/rs/box_wp10rs.png similarity index 100% rename from Resources/img/box/rs/box_wp10rs.png rename to PKHeX/Resources/img/box/rs/box_wp10rs.png diff --git a/Resources/img/box/rs/box_wp11rs.png b/PKHeX/Resources/img/box/rs/box_wp11rs.png similarity index 100% rename from Resources/img/box/rs/box_wp11rs.png rename to PKHeX/Resources/img/box/rs/box_wp11rs.png diff --git a/Resources/img/box/rs/box_wp12rs.png b/PKHeX/Resources/img/box/rs/box_wp12rs.png similarity index 100% rename from Resources/img/box/rs/box_wp12rs.png rename to PKHeX/Resources/img/box/rs/box_wp12rs.png diff --git a/Resources/img/box/rs/box_wp13rs.png b/PKHeX/Resources/img/box/rs/box_wp13rs.png similarity index 100% rename from Resources/img/box/rs/box_wp13rs.png rename to PKHeX/Resources/img/box/rs/box_wp13rs.png diff --git a/Resources/img/box/rs/box_wp14rs.png b/PKHeX/Resources/img/box/rs/box_wp14rs.png similarity index 100% rename from Resources/img/box/rs/box_wp14rs.png rename to PKHeX/Resources/img/box/rs/box_wp14rs.png diff --git a/Resources/img/box/rs/box_wp15rs.png b/PKHeX/Resources/img/box/rs/box_wp15rs.png similarity index 100% rename from Resources/img/box/rs/box_wp15rs.png rename to PKHeX/Resources/img/box/rs/box_wp15rs.png diff --git a/Resources/img/box/rs/box_wp16rs.png b/PKHeX/Resources/img/box/rs/box_wp16rs.png similarity index 100% rename from Resources/img/box/rs/box_wp16rs.png rename to PKHeX/Resources/img/box/rs/box_wp16rs.png diff --git a/Resources/img/box/slotDel.png b/PKHeX/Resources/img/box/slotDel.png similarity index 100% rename from Resources/img/box/slotDel.png rename to PKHeX/Resources/img/box/slotDel.png diff --git a/Resources/img/box/slotSet.png b/PKHeX/Resources/img/box/slotSet.png similarity index 100% rename from Resources/img/box/slotSet.png rename to PKHeX/Resources/img/box/slotSet.png diff --git a/Resources/img/box/slotTrans.png b/PKHeX/Resources/img/box/slotTrans.png similarity index 100% rename from Resources/img/box/slotTrans.png rename to PKHeX/Resources/img/box/slotTrans.png diff --git a/Resources/img/box/slotView.png b/PKHeX/Resources/img/box/slotView.png similarity index 100% rename from Resources/img/box/slotView.png rename to PKHeX/Resources/img/box/slotView.png diff --git a/Resources/img/box/xy/box_wp01xy.png b/PKHeX/Resources/img/box/xy/box_wp01xy.png similarity index 100% rename from Resources/img/box/xy/box_wp01xy.png rename to PKHeX/Resources/img/box/xy/box_wp01xy.png diff --git a/Resources/img/box/xy/box_wp02xy.png b/PKHeX/Resources/img/box/xy/box_wp02xy.png similarity index 100% rename from Resources/img/box/xy/box_wp02xy.png rename to PKHeX/Resources/img/box/xy/box_wp02xy.png diff --git a/Resources/img/box/xy/box_wp03xy.png b/PKHeX/Resources/img/box/xy/box_wp03xy.png similarity index 100% rename from Resources/img/box/xy/box_wp03xy.png rename to PKHeX/Resources/img/box/xy/box_wp03xy.png diff --git a/Resources/img/box/xy/box_wp04xy.png b/PKHeX/Resources/img/box/xy/box_wp04xy.png similarity index 100% rename from Resources/img/box/xy/box_wp04xy.png rename to PKHeX/Resources/img/box/xy/box_wp04xy.png diff --git a/Resources/img/box/xy/box_wp05xy.png b/PKHeX/Resources/img/box/xy/box_wp05xy.png similarity index 100% rename from Resources/img/box/xy/box_wp05xy.png rename to PKHeX/Resources/img/box/xy/box_wp05xy.png diff --git a/Resources/img/box/xy/box_wp06xy.png b/PKHeX/Resources/img/box/xy/box_wp06xy.png similarity index 100% rename from Resources/img/box/xy/box_wp06xy.png rename to PKHeX/Resources/img/box/xy/box_wp06xy.png diff --git a/Resources/img/box/xy/box_wp07xy.png b/PKHeX/Resources/img/box/xy/box_wp07xy.png similarity index 100% rename from Resources/img/box/xy/box_wp07xy.png rename to PKHeX/Resources/img/box/xy/box_wp07xy.png diff --git a/Resources/img/box/xy/box_wp08xy.png b/PKHeX/Resources/img/box/xy/box_wp08xy.png similarity index 100% rename from Resources/img/box/xy/box_wp08xy.png rename to PKHeX/Resources/img/box/xy/box_wp08xy.png diff --git a/Resources/img/box/xy/box_wp09xy.png b/PKHeX/Resources/img/box/xy/box_wp09xy.png similarity index 100% rename from Resources/img/box/xy/box_wp09xy.png rename to PKHeX/Resources/img/box/xy/box_wp09xy.png diff --git a/Resources/img/box/xy/box_wp10xy.png b/PKHeX/Resources/img/box/xy/box_wp10xy.png similarity index 100% rename from Resources/img/box/xy/box_wp10xy.png rename to PKHeX/Resources/img/box/xy/box_wp10xy.png diff --git a/Resources/img/box/xy/box_wp11xy.png b/PKHeX/Resources/img/box/xy/box_wp11xy.png similarity index 100% rename from Resources/img/box/xy/box_wp11xy.png rename to PKHeX/Resources/img/box/xy/box_wp11xy.png diff --git a/Resources/img/box/xy/box_wp12xy.png b/PKHeX/Resources/img/box/xy/box_wp12xy.png similarity index 100% rename from Resources/img/box/xy/box_wp12xy.png rename to PKHeX/Resources/img/box/xy/box_wp12xy.png diff --git a/Resources/img/box/xy/box_wp13xy.png b/PKHeX/Resources/img/box/xy/box_wp13xy.png similarity index 100% rename from Resources/img/box/xy/box_wp13xy.png rename to PKHeX/Resources/img/box/xy/box_wp13xy.png diff --git a/Resources/img/box/xy/box_wp14xy.png b/PKHeX/Resources/img/box/xy/box_wp14xy.png similarity index 100% rename from Resources/img/box/xy/box_wp14xy.png rename to PKHeX/Resources/img/box/xy/box_wp14xy.png diff --git a/Resources/img/box/xy/box_wp15xy.png b/PKHeX/Resources/img/box/xy/box_wp15xy.png similarity index 100% rename from Resources/img/box/xy/box_wp15xy.png rename to PKHeX/Resources/img/box/xy/box_wp15xy.png diff --git a/Resources/img/box/xy/box_wp16xy.png b/PKHeX/Resources/img/box/xy/box_wp16xy.png similarity index 100% rename from Resources/img/box/xy/box_wp16xy.png rename to PKHeX/Resources/img/box/xy/box_wp16xy.png diff --git a/Resources/img/box/xy/box_wp17xy.png b/PKHeX/Resources/img/box/xy/box_wp17xy.png similarity index 100% rename from Resources/img/box/xy/box_wp17xy.png rename to PKHeX/Resources/img/box/xy/box_wp17xy.png diff --git a/Resources/img/box/xy/box_wp18xy.png b/PKHeX/Resources/img/box/xy/box_wp18xy.png similarity index 100% rename from Resources/img/box/xy/box_wp18xy.png rename to PKHeX/Resources/img/box/xy/box_wp18xy.png diff --git a/Resources/img/box/xy/box_wp19xy.png b/PKHeX/Resources/img/box/xy/box_wp19xy.png similarity index 100% rename from Resources/img/box/xy/box_wp19xy.png rename to PKHeX/Resources/img/box/xy/box_wp19xy.png diff --git a/Resources/img/box/xy/box_wp20xy.png b/PKHeX/Resources/img/box/xy/box_wp20xy.png similarity index 100% rename from Resources/img/box/xy/box_wp20xy.png rename to PKHeX/Resources/img/box/xy/box_wp20xy.png diff --git a/Resources/img/box/xy/box_wp21xy.png b/PKHeX/Resources/img/box/xy/box_wp21xy.png similarity index 100% rename from Resources/img/box/xy/box_wp21xy.png rename to PKHeX/Resources/img/box/xy/box_wp21xy.png diff --git a/Resources/img/box/xy/box_wp22xy.png b/PKHeX/Resources/img/box/xy/box_wp22xy.png similarity index 100% rename from Resources/img/box/xy/box_wp22xy.png rename to PKHeX/Resources/img/box/xy/box_wp22xy.png diff --git a/Resources/img/box/xy/box_wp23xy.png b/PKHeX/Resources/img/box/xy/box_wp23xy.png similarity index 100% rename from Resources/img/box/xy/box_wp23xy.png rename to PKHeX/Resources/img/box/xy/box_wp23xy.png diff --git a/Resources/img/box/xy/box_wp24xy.png b/PKHeX/Resources/img/box/xy/box_wp24xy.png similarity index 100% rename from Resources/img/box/xy/box_wp24xy.png rename to PKHeX/Resources/img/box/xy/box_wp24xy.png diff --git a/Resources/img/icon.png b/PKHeX/Resources/img/icon.png similarity index 100% rename from Resources/img/icon.png rename to PKHeX/Resources/img/icon.png diff --git a/Resources/img/item/item_1.png b/PKHeX/Resources/img/item/item_1.png similarity index 100% rename from Resources/img/item/item_1.png rename to PKHeX/Resources/img/item/item_1.png diff --git a/Resources/img/item/item_10.png b/PKHeX/Resources/img/item/item_10.png similarity index 100% rename from Resources/img/item/item_10.png rename to PKHeX/Resources/img/item/item_10.png diff --git a/Resources/img/item/item_100.png b/PKHeX/Resources/img/item/item_100.png similarity index 100% rename from Resources/img/item/item_100.png rename to PKHeX/Resources/img/item/item_100.png diff --git a/Resources/img/item/item_101.png b/PKHeX/Resources/img/item/item_101.png similarity index 100% rename from Resources/img/item/item_101.png rename to PKHeX/Resources/img/item/item_101.png diff --git a/Resources/img/item/item_102.png b/PKHeX/Resources/img/item/item_102.png similarity index 100% rename from Resources/img/item/item_102.png rename to PKHeX/Resources/img/item/item_102.png diff --git a/Resources/img/item/item_103.png b/PKHeX/Resources/img/item/item_103.png similarity index 100% rename from Resources/img/item/item_103.png rename to PKHeX/Resources/img/item/item_103.png diff --git a/Resources/img/item/item_104.png b/PKHeX/Resources/img/item/item_104.png similarity index 100% rename from Resources/img/item/item_104.png rename to PKHeX/Resources/img/item/item_104.png diff --git a/Resources/img/item/item_105.png b/PKHeX/Resources/img/item/item_105.png similarity index 100% rename from Resources/img/item/item_105.png rename to PKHeX/Resources/img/item/item_105.png diff --git a/Resources/img/item/item_106.png b/PKHeX/Resources/img/item/item_106.png similarity index 100% rename from Resources/img/item/item_106.png rename to PKHeX/Resources/img/item/item_106.png diff --git a/Resources/img/item/item_107.png b/PKHeX/Resources/img/item/item_107.png similarity index 100% rename from Resources/img/item/item_107.png rename to PKHeX/Resources/img/item/item_107.png diff --git a/Resources/img/item/item_108.png b/PKHeX/Resources/img/item/item_108.png similarity index 100% rename from Resources/img/item/item_108.png rename to PKHeX/Resources/img/item/item_108.png diff --git a/Resources/img/item/item_109.png b/PKHeX/Resources/img/item/item_109.png similarity index 100% rename from Resources/img/item/item_109.png rename to PKHeX/Resources/img/item/item_109.png diff --git a/Resources/img/item/item_11.png b/PKHeX/Resources/img/item/item_11.png similarity index 100% rename from Resources/img/item/item_11.png rename to PKHeX/Resources/img/item/item_11.png diff --git a/Resources/img/item/item_110.png b/PKHeX/Resources/img/item/item_110.png similarity index 100% rename from Resources/img/item/item_110.png rename to PKHeX/Resources/img/item/item_110.png diff --git a/Resources/img/item/item_112.png b/PKHeX/Resources/img/item/item_112.png similarity index 100% rename from Resources/img/item/item_112.png rename to PKHeX/Resources/img/item/item_112.png diff --git a/Resources/img/item/item_116.png b/PKHeX/Resources/img/item/item_116.png similarity index 100% rename from Resources/img/item/item_116.png rename to PKHeX/Resources/img/item/item_116.png diff --git a/Resources/img/item/item_117.png b/PKHeX/Resources/img/item/item_117.png similarity index 100% rename from Resources/img/item/item_117.png rename to PKHeX/Resources/img/item/item_117.png diff --git a/Resources/img/item/item_118.png b/PKHeX/Resources/img/item/item_118.png similarity index 100% rename from Resources/img/item/item_118.png rename to PKHeX/Resources/img/item/item_118.png diff --git a/Resources/img/item/item_119.png b/PKHeX/Resources/img/item/item_119.png similarity index 100% rename from Resources/img/item/item_119.png rename to PKHeX/Resources/img/item/item_119.png diff --git a/Resources/img/item/item_12.png b/PKHeX/Resources/img/item/item_12.png similarity index 100% rename from Resources/img/item/item_12.png rename to PKHeX/Resources/img/item/item_12.png diff --git a/Resources/img/item/item_13.png b/PKHeX/Resources/img/item/item_13.png similarity index 100% rename from Resources/img/item/item_13.png rename to PKHeX/Resources/img/item/item_13.png diff --git a/Resources/img/item/item_134.png b/PKHeX/Resources/img/item/item_134.png similarity index 100% rename from Resources/img/item/item_134.png rename to PKHeX/Resources/img/item/item_134.png diff --git a/Resources/img/item/item_135.png b/PKHeX/Resources/img/item/item_135.png similarity index 100% rename from Resources/img/item/item_135.png rename to PKHeX/Resources/img/item/item_135.png diff --git a/Resources/img/item/item_136.png b/PKHeX/Resources/img/item/item_136.png similarity index 100% rename from Resources/img/item/item_136.png rename to PKHeX/Resources/img/item/item_136.png diff --git a/Resources/img/item/item_14.png b/PKHeX/Resources/img/item/item_14.png similarity index 100% rename from Resources/img/item/item_14.png rename to PKHeX/Resources/img/item/item_14.png diff --git a/Resources/img/item/item_149.png b/PKHeX/Resources/img/item/item_149.png similarity index 100% rename from Resources/img/item/item_149.png rename to PKHeX/Resources/img/item/item_149.png diff --git a/Resources/img/item/item_15.png b/PKHeX/Resources/img/item/item_15.png similarity index 100% rename from Resources/img/item/item_15.png rename to PKHeX/Resources/img/item/item_15.png diff --git a/Resources/img/item/item_150.png b/PKHeX/Resources/img/item/item_150.png similarity index 100% rename from Resources/img/item/item_150.png rename to PKHeX/Resources/img/item/item_150.png diff --git a/Resources/img/item/item_151.png b/PKHeX/Resources/img/item/item_151.png similarity index 100% rename from Resources/img/item/item_151.png rename to PKHeX/Resources/img/item/item_151.png diff --git a/Resources/img/item/item_152.png b/PKHeX/Resources/img/item/item_152.png similarity index 100% rename from Resources/img/item/item_152.png rename to PKHeX/Resources/img/item/item_152.png diff --git a/Resources/img/item/item_153.png b/PKHeX/Resources/img/item/item_153.png similarity index 100% rename from Resources/img/item/item_153.png rename to PKHeX/Resources/img/item/item_153.png diff --git a/Resources/img/item/item_154.png b/PKHeX/Resources/img/item/item_154.png similarity index 100% rename from Resources/img/item/item_154.png rename to PKHeX/Resources/img/item/item_154.png diff --git a/Resources/img/item/item_155.png b/PKHeX/Resources/img/item/item_155.png similarity index 100% rename from Resources/img/item/item_155.png rename to PKHeX/Resources/img/item/item_155.png diff --git a/Resources/img/item/item_156.png b/PKHeX/Resources/img/item/item_156.png similarity index 100% rename from Resources/img/item/item_156.png rename to PKHeX/Resources/img/item/item_156.png diff --git a/Resources/img/item/item_157.png b/PKHeX/Resources/img/item/item_157.png similarity index 100% rename from Resources/img/item/item_157.png rename to PKHeX/Resources/img/item/item_157.png diff --git a/Resources/img/item/item_158.png b/PKHeX/Resources/img/item/item_158.png similarity index 100% rename from Resources/img/item/item_158.png rename to PKHeX/Resources/img/item/item_158.png diff --git a/Resources/img/item/item_159.png b/PKHeX/Resources/img/item/item_159.png similarity index 100% rename from Resources/img/item/item_159.png rename to PKHeX/Resources/img/item/item_159.png diff --git a/Resources/img/item/item_16.png b/PKHeX/Resources/img/item/item_16.png similarity index 100% rename from Resources/img/item/item_16.png rename to PKHeX/Resources/img/item/item_16.png diff --git a/Resources/img/item/item_160.png b/PKHeX/Resources/img/item/item_160.png similarity index 100% rename from Resources/img/item/item_160.png rename to PKHeX/Resources/img/item/item_160.png diff --git a/Resources/img/item/item_161.png b/PKHeX/Resources/img/item/item_161.png similarity index 100% rename from Resources/img/item/item_161.png rename to PKHeX/Resources/img/item/item_161.png diff --git a/Resources/img/item/item_162.png b/PKHeX/Resources/img/item/item_162.png similarity index 100% rename from Resources/img/item/item_162.png rename to PKHeX/Resources/img/item/item_162.png diff --git a/Resources/img/item/item_163.png b/PKHeX/Resources/img/item/item_163.png similarity index 100% rename from Resources/img/item/item_163.png rename to PKHeX/Resources/img/item/item_163.png diff --git a/Resources/img/item/item_164.png b/PKHeX/Resources/img/item/item_164.png similarity index 100% rename from Resources/img/item/item_164.png rename to PKHeX/Resources/img/item/item_164.png diff --git a/Resources/img/item/item_165.png b/PKHeX/Resources/img/item/item_165.png similarity index 100% rename from Resources/img/item/item_165.png rename to PKHeX/Resources/img/item/item_165.png diff --git a/Resources/img/item/item_166.png b/PKHeX/Resources/img/item/item_166.png similarity index 100% rename from Resources/img/item/item_166.png rename to PKHeX/Resources/img/item/item_166.png diff --git a/Resources/img/item/item_167.png b/PKHeX/Resources/img/item/item_167.png similarity index 100% rename from Resources/img/item/item_167.png rename to PKHeX/Resources/img/item/item_167.png diff --git a/Resources/img/item/item_168.png b/PKHeX/Resources/img/item/item_168.png similarity index 100% rename from Resources/img/item/item_168.png rename to PKHeX/Resources/img/item/item_168.png diff --git a/Resources/img/item/item_169.png b/PKHeX/Resources/img/item/item_169.png similarity index 100% rename from Resources/img/item/item_169.png rename to PKHeX/Resources/img/item/item_169.png diff --git a/Resources/img/item/item_17.png b/PKHeX/Resources/img/item/item_17.png similarity index 100% rename from Resources/img/item/item_17.png rename to PKHeX/Resources/img/item/item_17.png diff --git a/Resources/img/item/item_170.png b/PKHeX/Resources/img/item/item_170.png similarity index 100% rename from Resources/img/item/item_170.png rename to PKHeX/Resources/img/item/item_170.png diff --git a/Resources/img/item/item_171.png b/PKHeX/Resources/img/item/item_171.png similarity index 100% rename from Resources/img/item/item_171.png rename to PKHeX/Resources/img/item/item_171.png diff --git a/Resources/img/item/item_172.png b/PKHeX/Resources/img/item/item_172.png similarity index 100% rename from Resources/img/item/item_172.png rename to PKHeX/Resources/img/item/item_172.png diff --git a/Resources/img/item/item_173.png b/PKHeX/Resources/img/item/item_173.png similarity index 100% rename from Resources/img/item/item_173.png rename to PKHeX/Resources/img/item/item_173.png diff --git a/Resources/img/item/item_174.png b/PKHeX/Resources/img/item/item_174.png similarity index 100% rename from Resources/img/item/item_174.png rename to PKHeX/Resources/img/item/item_174.png diff --git a/Resources/img/item/item_175.png b/PKHeX/Resources/img/item/item_175.png similarity index 100% rename from Resources/img/item/item_175.png rename to PKHeX/Resources/img/item/item_175.png diff --git a/Resources/img/item/item_176.png b/PKHeX/Resources/img/item/item_176.png similarity index 100% rename from Resources/img/item/item_176.png rename to PKHeX/Resources/img/item/item_176.png diff --git a/Resources/img/item/item_177.png b/PKHeX/Resources/img/item/item_177.png similarity index 100% rename from Resources/img/item/item_177.png rename to PKHeX/Resources/img/item/item_177.png diff --git a/Resources/img/item/item_178.png b/PKHeX/Resources/img/item/item_178.png similarity index 100% rename from Resources/img/item/item_178.png rename to PKHeX/Resources/img/item/item_178.png diff --git a/Resources/img/item/item_179.png b/PKHeX/Resources/img/item/item_179.png similarity index 100% rename from Resources/img/item/item_179.png rename to PKHeX/Resources/img/item/item_179.png diff --git a/Resources/img/item/item_18.png b/PKHeX/Resources/img/item/item_18.png similarity index 100% rename from Resources/img/item/item_18.png rename to PKHeX/Resources/img/item/item_18.png diff --git a/Resources/img/item/item_180.png b/PKHeX/Resources/img/item/item_180.png similarity index 100% rename from Resources/img/item/item_180.png rename to PKHeX/Resources/img/item/item_180.png diff --git a/Resources/img/item/item_181.png b/PKHeX/Resources/img/item/item_181.png similarity index 100% rename from Resources/img/item/item_181.png rename to PKHeX/Resources/img/item/item_181.png diff --git a/Resources/img/item/item_182.png b/PKHeX/Resources/img/item/item_182.png similarity index 100% rename from Resources/img/item/item_182.png rename to PKHeX/Resources/img/item/item_182.png diff --git a/Resources/img/item/item_183.png b/PKHeX/Resources/img/item/item_183.png similarity index 100% rename from Resources/img/item/item_183.png rename to PKHeX/Resources/img/item/item_183.png diff --git a/Resources/img/item/item_184.png b/PKHeX/Resources/img/item/item_184.png similarity index 100% rename from Resources/img/item/item_184.png rename to PKHeX/Resources/img/item/item_184.png diff --git a/Resources/img/item/item_185.png b/PKHeX/Resources/img/item/item_185.png similarity index 100% rename from Resources/img/item/item_185.png rename to PKHeX/Resources/img/item/item_185.png diff --git a/Resources/img/item/item_186.png b/PKHeX/Resources/img/item/item_186.png similarity index 100% rename from Resources/img/item/item_186.png rename to PKHeX/Resources/img/item/item_186.png diff --git a/Resources/img/item/item_187.png b/PKHeX/Resources/img/item/item_187.png similarity index 100% rename from Resources/img/item/item_187.png rename to PKHeX/Resources/img/item/item_187.png diff --git a/Resources/img/item/item_188.png b/PKHeX/Resources/img/item/item_188.png similarity index 100% rename from Resources/img/item/item_188.png rename to PKHeX/Resources/img/item/item_188.png diff --git a/Resources/img/item/item_189.png b/PKHeX/Resources/img/item/item_189.png similarity index 100% rename from Resources/img/item/item_189.png rename to PKHeX/Resources/img/item/item_189.png diff --git a/Resources/img/item/item_19.png b/PKHeX/Resources/img/item/item_19.png similarity index 100% rename from Resources/img/item/item_19.png rename to PKHeX/Resources/img/item/item_19.png diff --git a/Resources/img/item/item_190.png b/PKHeX/Resources/img/item/item_190.png similarity index 100% rename from Resources/img/item/item_190.png rename to PKHeX/Resources/img/item/item_190.png diff --git a/Resources/img/item/item_191.png b/PKHeX/Resources/img/item/item_191.png similarity index 100% rename from Resources/img/item/item_191.png rename to PKHeX/Resources/img/item/item_191.png diff --git a/Resources/img/item/item_192.png b/PKHeX/Resources/img/item/item_192.png similarity index 100% rename from Resources/img/item/item_192.png rename to PKHeX/Resources/img/item/item_192.png diff --git a/Resources/img/item/item_193.png b/PKHeX/Resources/img/item/item_193.png similarity index 100% rename from Resources/img/item/item_193.png rename to PKHeX/Resources/img/item/item_193.png diff --git a/Resources/img/item/item_194.png b/PKHeX/Resources/img/item/item_194.png similarity index 100% rename from Resources/img/item/item_194.png rename to PKHeX/Resources/img/item/item_194.png diff --git a/Resources/img/item/item_195.png b/PKHeX/Resources/img/item/item_195.png similarity index 100% rename from Resources/img/item/item_195.png rename to PKHeX/Resources/img/item/item_195.png diff --git a/Resources/img/item/item_196.png b/PKHeX/Resources/img/item/item_196.png similarity index 100% rename from Resources/img/item/item_196.png rename to PKHeX/Resources/img/item/item_196.png diff --git a/Resources/img/item/item_197.png b/PKHeX/Resources/img/item/item_197.png similarity index 100% rename from Resources/img/item/item_197.png rename to PKHeX/Resources/img/item/item_197.png diff --git a/Resources/img/item/item_198.png b/PKHeX/Resources/img/item/item_198.png similarity index 100% rename from Resources/img/item/item_198.png rename to PKHeX/Resources/img/item/item_198.png diff --git a/Resources/img/item/item_199.png b/PKHeX/Resources/img/item/item_199.png similarity index 100% rename from Resources/img/item/item_199.png rename to PKHeX/Resources/img/item/item_199.png diff --git a/Resources/img/item/item_2.png b/PKHeX/Resources/img/item/item_2.png similarity index 100% rename from Resources/img/item/item_2.png rename to PKHeX/Resources/img/item/item_2.png diff --git a/Resources/img/item/item_20.png b/PKHeX/Resources/img/item/item_20.png similarity index 100% rename from Resources/img/item/item_20.png rename to PKHeX/Resources/img/item/item_20.png diff --git a/Resources/img/item/item_200.png b/PKHeX/Resources/img/item/item_200.png similarity index 100% rename from Resources/img/item/item_200.png rename to PKHeX/Resources/img/item/item_200.png diff --git a/Resources/img/item/item_201.png b/PKHeX/Resources/img/item/item_201.png similarity index 100% rename from Resources/img/item/item_201.png rename to PKHeX/Resources/img/item/item_201.png diff --git a/Resources/img/item/item_202.png b/PKHeX/Resources/img/item/item_202.png similarity index 100% rename from Resources/img/item/item_202.png rename to PKHeX/Resources/img/item/item_202.png diff --git a/Resources/img/item/item_203.png b/PKHeX/Resources/img/item/item_203.png similarity index 100% rename from Resources/img/item/item_203.png rename to PKHeX/Resources/img/item/item_203.png diff --git a/Resources/img/item/item_204.png b/PKHeX/Resources/img/item/item_204.png similarity index 100% rename from Resources/img/item/item_204.png rename to PKHeX/Resources/img/item/item_204.png diff --git a/Resources/img/item/item_205.png b/PKHeX/Resources/img/item/item_205.png similarity index 100% rename from Resources/img/item/item_205.png rename to PKHeX/Resources/img/item/item_205.png diff --git a/Resources/img/item/item_206.png b/PKHeX/Resources/img/item/item_206.png similarity index 100% rename from Resources/img/item/item_206.png rename to PKHeX/Resources/img/item/item_206.png diff --git a/Resources/img/item/item_207.png b/PKHeX/Resources/img/item/item_207.png similarity index 100% rename from Resources/img/item/item_207.png rename to PKHeX/Resources/img/item/item_207.png diff --git a/Resources/img/item/item_208.png b/PKHeX/Resources/img/item/item_208.png similarity index 100% rename from Resources/img/item/item_208.png rename to PKHeX/Resources/img/item/item_208.png diff --git a/Resources/img/item/item_209.png b/PKHeX/Resources/img/item/item_209.png similarity index 100% rename from Resources/img/item/item_209.png rename to PKHeX/Resources/img/item/item_209.png diff --git a/Resources/img/item/item_21.png b/PKHeX/Resources/img/item/item_21.png similarity index 100% rename from Resources/img/item/item_21.png rename to PKHeX/Resources/img/item/item_21.png diff --git a/Resources/img/item/item_210.png b/PKHeX/Resources/img/item/item_210.png similarity index 100% rename from Resources/img/item/item_210.png rename to PKHeX/Resources/img/item/item_210.png diff --git a/Resources/img/item/item_211.png b/PKHeX/Resources/img/item/item_211.png similarity index 100% rename from Resources/img/item/item_211.png rename to PKHeX/Resources/img/item/item_211.png diff --git a/Resources/img/item/item_212.png b/PKHeX/Resources/img/item/item_212.png similarity index 100% rename from Resources/img/item/item_212.png rename to PKHeX/Resources/img/item/item_212.png diff --git a/Resources/img/item/item_213.png b/PKHeX/Resources/img/item/item_213.png similarity index 100% rename from Resources/img/item/item_213.png rename to PKHeX/Resources/img/item/item_213.png diff --git a/Resources/img/item/item_214.png b/PKHeX/Resources/img/item/item_214.png similarity index 100% rename from Resources/img/item/item_214.png rename to PKHeX/Resources/img/item/item_214.png diff --git a/Resources/img/item/item_215.png b/PKHeX/Resources/img/item/item_215.png similarity index 100% rename from Resources/img/item/item_215.png rename to PKHeX/Resources/img/item/item_215.png diff --git a/Resources/img/item/item_217.png b/PKHeX/Resources/img/item/item_217.png similarity index 100% rename from Resources/img/item/item_217.png rename to PKHeX/Resources/img/item/item_217.png diff --git a/Resources/img/item/item_218.png b/PKHeX/Resources/img/item/item_218.png similarity index 100% rename from Resources/img/item/item_218.png rename to PKHeX/Resources/img/item/item_218.png diff --git a/Resources/img/item/item_219.png b/PKHeX/Resources/img/item/item_219.png similarity index 100% rename from Resources/img/item/item_219.png rename to PKHeX/Resources/img/item/item_219.png diff --git a/Resources/img/item/item_22.png b/PKHeX/Resources/img/item/item_22.png similarity index 100% rename from Resources/img/item/item_22.png rename to PKHeX/Resources/img/item/item_22.png diff --git a/Resources/img/item/item_220.png b/PKHeX/Resources/img/item/item_220.png similarity index 100% rename from Resources/img/item/item_220.png rename to PKHeX/Resources/img/item/item_220.png diff --git a/Resources/img/item/item_221.png b/PKHeX/Resources/img/item/item_221.png similarity index 100% rename from Resources/img/item/item_221.png rename to PKHeX/Resources/img/item/item_221.png diff --git a/Resources/img/item/item_222.png b/PKHeX/Resources/img/item/item_222.png similarity index 100% rename from Resources/img/item/item_222.png rename to PKHeX/Resources/img/item/item_222.png diff --git a/Resources/img/item/item_223.png b/PKHeX/Resources/img/item/item_223.png similarity index 100% rename from Resources/img/item/item_223.png rename to PKHeX/Resources/img/item/item_223.png diff --git a/Resources/img/item/item_224.png b/PKHeX/Resources/img/item/item_224.png similarity index 100% rename from Resources/img/item/item_224.png rename to PKHeX/Resources/img/item/item_224.png diff --git a/Resources/img/item/item_225.png b/PKHeX/Resources/img/item/item_225.png similarity index 100% rename from Resources/img/item/item_225.png rename to PKHeX/Resources/img/item/item_225.png diff --git a/Resources/img/item/item_226.png b/PKHeX/Resources/img/item/item_226.png similarity index 100% rename from Resources/img/item/item_226.png rename to PKHeX/Resources/img/item/item_226.png diff --git a/Resources/img/item/item_227.png b/PKHeX/Resources/img/item/item_227.png similarity index 100% rename from Resources/img/item/item_227.png rename to PKHeX/Resources/img/item/item_227.png diff --git a/Resources/img/item/item_228.png b/PKHeX/Resources/img/item/item_228.png similarity index 100% rename from Resources/img/item/item_228.png rename to PKHeX/Resources/img/item/item_228.png diff --git a/Resources/img/item/item_229.png b/PKHeX/Resources/img/item/item_229.png similarity index 100% rename from Resources/img/item/item_229.png rename to PKHeX/Resources/img/item/item_229.png diff --git a/Resources/img/item/item_23.png b/PKHeX/Resources/img/item/item_23.png similarity index 100% rename from Resources/img/item/item_23.png rename to PKHeX/Resources/img/item/item_23.png diff --git a/Resources/img/item/item_230.png b/PKHeX/Resources/img/item/item_230.png similarity index 100% rename from Resources/img/item/item_230.png rename to PKHeX/Resources/img/item/item_230.png diff --git a/Resources/img/item/item_231.png b/PKHeX/Resources/img/item/item_231.png similarity index 100% rename from Resources/img/item/item_231.png rename to PKHeX/Resources/img/item/item_231.png diff --git a/Resources/img/item/item_232.png b/PKHeX/Resources/img/item/item_232.png similarity index 100% rename from Resources/img/item/item_232.png rename to PKHeX/Resources/img/item/item_232.png diff --git a/Resources/img/item/item_233.png b/PKHeX/Resources/img/item/item_233.png similarity index 100% rename from Resources/img/item/item_233.png rename to PKHeX/Resources/img/item/item_233.png diff --git a/Resources/img/item/item_234.png b/PKHeX/Resources/img/item/item_234.png similarity index 100% rename from Resources/img/item/item_234.png rename to PKHeX/Resources/img/item/item_234.png diff --git a/Resources/img/item/item_235.png b/PKHeX/Resources/img/item/item_235.png similarity index 100% rename from Resources/img/item/item_235.png rename to PKHeX/Resources/img/item/item_235.png diff --git a/Resources/img/item/item_236.png b/PKHeX/Resources/img/item/item_236.png similarity index 100% rename from Resources/img/item/item_236.png rename to PKHeX/Resources/img/item/item_236.png diff --git a/Resources/img/item/item_237.png b/PKHeX/Resources/img/item/item_237.png similarity index 100% rename from Resources/img/item/item_237.png rename to PKHeX/Resources/img/item/item_237.png diff --git a/Resources/img/item/item_238.png b/PKHeX/Resources/img/item/item_238.png similarity index 100% rename from Resources/img/item/item_238.png rename to PKHeX/Resources/img/item/item_238.png diff --git a/Resources/img/item/item_239.png b/PKHeX/Resources/img/item/item_239.png similarity index 100% rename from Resources/img/item/item_239.png rename to PKHeX/Resources/img/item/item_239.png diff --git a/Resources/img/item/item_24.png b/PKHeX/Resources/img/item/item_24.png similarity index 100% rename from Resources/img/item/item_24.png rename to PKHeX/Resources/img/item/item_24.png diff --git a/Resources/img/item/item_240.png b/PKHeX/Resources/img/item/item_240.png similarity index 100% rename from Resources/img/item/item_240.png rename to PKHeX/Resources/img/item/item_240.png diff --git a/Resources/img/item/item_241.png b/PKHeX/Resources/img/item/item_241.png similarity index 100% rename from Resources/img/item/item_241.png rename to PKHeX/Resources/img/item/item_241.png diff --git a/Resources/img/item/item_242.png b/PKHeX/Resources/img/item/item_242.png similarity index 100% rename from Resources/img/item/item_242.png rename to PKHeX/Resources/img/item/item_242.png diff --git a/Resources/img/item/item_243.png b/PKHeX/Resources/img/item/item_243.png similarity index 100% rename from Resources/img/item/item_243.png rename to PKHeX/Resources/img/item/item_243.png diff --git a/Resources/img/item/item_244.png b/PKHeX/Resources/img/item/item_244.png similarity index 100% rename from Resources/img/item/item_244.png rename to PKHeX/Resources/img/item/item_244.png diff --git a/Resources/img/item/item_245.png b/PKHeX/Resources/img/item/item_245.png similarity index 100% rename from Resources/img/item/item_245.png rename to PKHeX/Resources/img/item/item_245.png diff --git a/Resources/img/item/item_246.png b/PKHeX/Resources/img/item/item_246.png similarity index 100% rename from Resources/img/item/item_246.png rename to PKHeX/Resources/img/item/item_246.png diff --git a/Resources/img/item/item_247.png b/PKHeX/Resources/img/item/item_247.png similarity index 100% rename from Resources/img/item/item_247.png rename to PKHeX/Resources/img/item/item_247.png diff --git a/Resources/img/item/item_248.png b/PKHeX/Resources/img/item/item_248.png similarity index 100% rename from Resources/img/item/item_248.png rename to PKHeX/Resources/img/item/item_248.png diff --git a/Resources/img/item/item_249.png b/PKHeX/Resources/img/item/item_249.png similarity index 100% rename from Resources/img/item/item_249.png rename to PKHeX/Resources/img/item/item_249.png diff --git a/Resources/img/item/item_25.png b/PKHeX/Resources/img/item/item_25.png similarity index 100% rename from Resources/img/item/item_25.png rename to PKHeX/Resources/img/item/item_25.png diff --git a/Resources/img/item/item_250.png b/PKHeX/Resources/img/item/item_250.png similarity index 100% rename from Resources/img/item/item_250.png rename to PKHeX/Resources/img/item/item_250.png diff --git a/Resources/img/item/item_251.png b/PKHeX/Resources/img/item/item_251.png similarity index 100% rename from Resources/img/item/item_251.png rename to PKHeX/Resources/img/item/item_251.png diff --git a/Resources/img/item/item_252.png b/PKHeX/Resources/img/item/item_252.png similarity index 100% rename from Resources/img/item/item_252.png rename to PKHeX/Resources/img/item/item_252.png diff --git a/Resources/img/item/item_253.png b/PKHeX/Resources/img/item/item_253.png similarity index 100% rename from Resources/img/item/item_253.png rename to PKHeX/Resources/img/item/item_253.png diff --git a/Resources/img/item/item_254.png b/PKHeX/Resources/img/item/item_254.png similarity index 100% rename from Resources/img/item/item_254.png rename to PKHeX/Resources/img/item/item_254.png diff --git a/Resources/img/item/item_255.png b/PKHeX/Resources/img/item/item_255.png similarity index 100% rename from Resources/img/item/item_255.png rename to PKHeX/Resources/img/item/item_255.png diff --git a/Resources/img/item/item_256.png b/PKHeX/Resources/img/item/item_256.png similarity index 100% rename from Resources/img/item/item_256.png rename to PKHeX/Resources/img/item/item_256.png diff --git a/Resources/img/item/item_257.png b/PKHeX/Resources/img/item/item_257.png similarity index 100% rename from Resources/img/item/item_257.png rename to PKHeX/Resources/img/item/item_257.png diff --git a/Resources/img/item/item_258.png b/PKHeX/Resources/img/item/item_258.png similarity index 100% rename from Resources/img/item/item_258.png rename to PKHeX/Resources/img/item/item_258.png diff --git a/Resources/img/item/item_259.png b/PKHeX/Resources/img/item/item_259.png similarity index 100% rename from Resources/img/item/item_259.png rename to PKHeX/Resources/img/item/item_259.png diff --git a/Resources/img/item/item_26.png b/PKHeX/Resources/img/item/item_26.png similarity index 100% rename from Resources/img/item/item_26.png rename to PKHeX/Resources/img/item/item_26.png diff --git a/Resources/img/item/item_260.png b/PKHeX/Resources/img/item/item_260.png similarity index 100% rename from Resources/img/item/item_260.png rename to PKHeX/Resources/img/item/item_260.png diff --git a/Resources/img/item/item_261.png b/PKHeX/Resources/img/item/item_261.png similarity index 100% rename from Resources/img/item/item_261.png rename to PKHeX/Resources/img/item/item_261.png diff --git a/Resources/img/item/item_262.png b/PKHeX/Resources/img/item/item_262.png similarity index 100% rename from Resources/img/item/item_262.png rename to PKHeX/Resources/img/item/item_262.png diff --git a/Resources/img/item/item_263.png b/PKHeX/Resources/img/item/item_263.png similarity index 100% rename from Resources/img/item/item_263.png rename to PKHeX/Resources/img/item/item_263.png diff --git a/Resources/img/item/item_264.png b/PKHeX/Resources/img/item/item_264.png similarity index 100% rename from Resources/img/item/item_264.png rename to PKHeX/Resources/img/item/item_264.png diff --git a/Resources/img/item/item_265.png b/PKHeX/Resources/img/item/item_265.png similarity index 100% rename from Resources/img/item/item_265.png rename to PKHeX/Resources/img/item/item_265.png diff --git a/Resources/img/item/item_266.png b/PKHeX/Resources/img/item/item_266.png similarity index 100% rename from Resources/img/item/item_266.png rename to PKHeX/Resources/img/item/item_266.png diff --git a/Resources/img/item/item_267.png b/PKHeX/Resources/img/item/item_267.png similarity index 100% rename from Resources/img/item/item_267.png rename to PKHeX/Resources/img/item/item_267.png diff --git a/Resources/img/item/item_268.png b/PKHeX/Resources/img/item/item_268.png similarity index 100% rename from Resources/img/item/item_268.png rename to PKHeX/Resources/img/item/item_268.png diff --git a/Resources/img/item/item_269.png b/PKHeX/Resources/img/item/item_269.png similarity index 100% rename from Resources/img/item/item_269.png rename to PKHeX/Resources/img/item/item_269.png diff --git a/Resources/img/item/item_27.png b/PKHeX/Resources/img/item/item_27.png similarity index 100% rename from Resources/img/item/item_27.png rename to PKHeX/Resources/img/item/item_27.png diff --git a/Resources/img/item/item_270.png b/PKHeX/Resources/img/item/item_270.png similarity index 100% rename from Resources/img/item/item_270.png rename to PKHeX/Resources/img/item/item_270.png diff --git a/Resources/img/item/item_271.png b/PKHeX/Resources/img/item/item_271.png similarity index 100% rename from Resources/img/item/item_271.png rename to PKHeX/Resources/img/item/item_271.png diff --git a/Resources/img/item/item_272.png b/PKHeX/Resources/img/item/item_272.png similarity index 100% rename from Resources/img/item/item_272.png rename to PKHeX/Resources/img/item/item_272.png diff --git a/Resources/img/item/item_273.png b/PKHeX/Resources/img/item/item_273.png similarity index 100% rename from Resources/img/item/item_273.png rename to PKHeX/Resources/img/item/item_273.png diff --git a/Resources/img/item/item_274.png b/PKHeX/Resources/img/item/item_274.png similarity index 100% rename from Resources/img/item/item_274.png rename to PKHeX/Resources/img/item/item_274.png diff --git a/Resources/img/item/item_275.png b/PKHeX/Resources/img/item/item_275.png similarity index 100% rename from Resources/img/item/item_275.png rename to PKHeX/Resources/img/item/item_275.png diff --git a/Resources/img/item/item_276.png b/PKHeX/Resources/img/item/item_276.png similarity index 100% rename from Resources/img/item/item_276.png rename to PKHeX/Resources/img/item/item_276.png diff --git a/Resources/img/item/item_277.png b/PKHeX/Resources/img/item/item_277.png similarity index 100% rename from Resources/img/item/item_277.png rename to PKHeX/Resources/img/item/item_277.png diff --git a/Resources/img/item/item_278.png b/PKHeX/Resources/img/item/item_278.png similarity index 100% rename from Resources/img/item/item_278.png rename to PKHeX/Resources/img/item/item_278.png diff --git a/Resources/img/item/item_279.png b/PKHeX/Resources/img/item/item_279.png similarity index 100% rename from Resources/img/item/item_279.png rename to PKHeX/Resources/img/item/item_279.png diff --git a/Resources/img/item/item_28.png b/PKHeX/Resources/img/item/item_28.png similarity index 100% rename from Resources/img/item/item_28.png rename to PKHeX/Resources/img/item/item_28.png diff --git a/Resources/img/item/item_280.png b/PKHeX/Resources/img/item/item_280.png similarity index 100% rename from Resources/img/item/item_280.png rename to PKHeX/Resources/img/item/item_280.png diff --git a/Resources/img/item/item_281.png b/PKHeX/Resources/img/item/item_281.png similarity index 100% rename from Resources/img/item/item_281.png rename to PKHeX/Resources/img/item/item_281.png diff --git a/Resources/img/item/item_282.png b/PKHeX/Resources/img/item/item_282.png similarity index 100% rename from Resources/img/item/item_282.png rename to PKHeX/Resources/img/item/item_282.png diff --git a/Resources/img/item/item_283.png b/PKHeX/Resources/img/item/item_283.png similarity index 100% rename from Resources/img/item/item_283.png rename to PKHeX/Resources/img/item/item_283.png diff --git a/Resources/img/item/item_284.png b/PKHeX/Resources/img/item/item_284.png similarity index 100% rename from Resources/img/item/item_284.png rename to PKHeX/Resources/img/item/item_284.png diff --git a/Resources/img/item/item_285.png b/PKHeX/Resources/img/item/item_285.png similarity index 100% rename from Resources/img/item/item_285.png rename to PKHeX/Resources/img/item/item_285.png diff --git a/Resources/img/item/item_286.png b/PKHeX/Resources/img/item/item_286.png similarity index 100% rename from Resources/img/item/item_286.png rename to PKHeX/Resources/img/item/item_286.png diff --git a/Resources/img/item/item_287.png b/PKHeX/Resources/img/item/item_287.png similarity index 100% rename from Resources/img/item/item_287.png rename to PKHeX/Resources/img/item/item_287.png diff --git a/Resources/img/item/item_288.png b/PKHeX/Resources/img/item/item_288.png similarity index 100% rename from Resources/img/item/item_288.png rename to PKHeX/Resources/img/item/item_288.png diff --git a/Resources/img/item/item_289.png b/PKHeX/Resources/img/item/item_289.png similarity index 100% rename from Resources/img/item/item_289.png rename to PKHeX/Resources/img/item/item_289.png diff --git a/Resources/img/item/item_29.png b/PKHeX/Resources/img/item/item_29.png similarity index 100% rename from Resources/img/item/item_29.png rename to PKHeX/Resources/img/item/item_29.png diff --git a/Resources/img/item/item_290.png b/PKHeX/Resources/img/item/item_290.png similarity index 100% rename from Resources/img/item/item_290.png rename to PKHeX/Resources/img/item/item_290.png diff --git a/Resources/img/item/item_291.png b/PKHeX/Resources/img/item/item_291.png similarity index 100% rename from Resources/img/item/item_291.png rename to PKHeX/Resources/img/item/item_291.png diff --git a/Resources/img/item/item_292.png b/PKHeX/Resources/img/item/item_292.png similarity index 100% rename from Resources/img/item/item_292.png rename to PKHeX/Resources/img/item/item_292.png diff --git a/Resources/img/item/item_293.png b/PKHeX/Resources/img/item/item_293.png similarity index 100% rename from Resources/img/item/item_293.png rename to PKHeX/Resources/img/item/item_293.png diff --git a/Resources/img/item/item_294.png b/PKHeX/Resources/img/item/item_294.png similarity index 100% rename from Resources/img/item/item_294.png rename to PKHeX/Resources/img/item/item_294.png diff --git a/Resources/img/item/item_295.png b/PKHeX/Resources/img/item/item_295.png similarity index 100% rename from Resources/img/item/item_295.png rename to PKHeX/Resources/img/item/item_295.png diff --git a/Resources/img/item/item_296.png b/PKHeX/Resources/img/item/item_296.png similarity index 100% rename from Resources/img/item/item_296.png rename to PKHeX/Resources/img/item/item_296.png diff --git a/Resources/img/item/item_297.png b/PKHeX/Resources/img/item/item_297.png similarity index 100% rename from Resources/img/item/item_297.png rename to PKHeX/Resources/img/item/item_297.png diff --git a/Resources/img/item/item_298.png b/PKHeX/Resources/img/item/item_298.png similarity index 100% rename from Resources/img/item/item_298.png rename to PKHeX/Resources/img/item/item_298.png diff --git a/Resources/img/item/item_299.png b/PKHeX/Resources/img/item/item_299.png similarity index 100% rename from Resources/img/item/item_299.png rename to PKHeX/Resources/img/item/item_299.png diff --git a/Resources/img/item/item_3.png b/PKHeX/Resources/img/item/item_3.png similarity index 100% rename from Resources/img/item/item_3.png rename to PKHeX/Resources/img/item/item_3.png diff --git a/Resources/img/item/item_30.png b/PKHeX/Resources/img/item/item_30.png similarity index 100% rename from Resources/img/item/item_30.png rename to PKHeX/Resources/img/item/item_30.png diff --git a/Resources/img/item/item_300.png b/PKHeX/Resources/img/item/item_300.png similarity index 100% rename from Resources/img/item/item_300.png rename to PKHeX/Resources/img/item/item_300.png diff --git a/Resources/img/item/item_301.png b/PKHeX/Resources/img/item/item_301.png similarity index 100% rename from Resources/img/item/item_301.png rename to PKHeX/Resources/img/item/item_301.png diff --git a/Resources/img/item/item_302.png b/PKHeX/Resources/img/item/item_302.png similarity index 100% rename from Resources/img/item/item_302.png rename to PKHeX/Resources/img/item/item_302.png diff --git a/Resources/img/item/item_303.png b/PKHeX/Resources/img/item/item_303.png similarity index 100% rename from Resources/img/item/item_303.png rename to PKHeX/Resources/img/item/item_303.png diff --git a/Resources/img/item/item_304.png b/PKHeX/Resources/img/item/item_304.png similarity index 100% rename from Resources/img/item/item_304.png rename to PKHeX/Resources/img/item/item_304.png diff --git a/Resources/img/item/item_305.png b/PKHeX/Resources/img/item/item_305.png similarity index 100% rename from Resources/img/item/item_305.png rename to PKHeX/Resources/img/item/item_305.png diff --git a/Resources/img/item/item_306.png b/PKHeX/Resources/img/item/item_306.png similarity index 100% rename from Resources/img/item/item_306.png rename to PKHeX/Resources/img/item/item_306.png diff --git a/Resources/img/item/item_307.png b/PKHeX/Resources/img/item/item_307.png similarity index 100% rename from Resources/img/item/item_307.png rename to PKHeX/Resources/img/item/item_307.png diff --git a/Resources/img/item/item_308.png b/PKHeX/Resources/img/item/item_308.png similarity index 100% rename from Resources/img/item/item_308.png rename to PKHeX/Resources/img/item/item_308.png diff --git a/Resources/img/item/item_309.png b/PKHeX/Resources/img/item/item_309.png similarity index 100% rename from Resources/img/item/item_309.png rename to PKHeX/Resources/img/item/item_309.png diff --git a/Resources/img/item/item_31.png b/PKHeX/Resources/img/item/item_31.png similarity index 100% rename from Resources/img/item/item_31.png rename to PKHeX/Resources/img/item/item_31.png diff --git a/Resources/img/item/item_310.png b/PKHeX/Resources/img/item/item_310.png similarity index 100% rename from Resources/img/item/item_310.png rename to PKHeX/Resources/img/item/item_310.png diff --git a/Resources/img/item/item_311.png b/PKHeX/Resources/img/item/item_311.png similarity index 100% rename from Resources/img/item/item_311.png rename to PKHeX/Resources/img/item/item_311.png diff --git a/Resources/img/item/item_312.png b/PKHeX/Resources/img/item/item_312.png similarity index 100% rename from Resources/img/item/item_312.png rename to PKHeX/Resources/img/item/item_312.png diff --git a/Resources/img/item/item_313.png b/PKHeX/Resources/img/item/item_313.png similarity index 100% rename from Resources/img/item/item_313.png rename to PKHeX/Resources/img/item/item_313.png diff --git a/Resources/img/item/item_314.png b/PKHeX/Resources/img/item/item_314.png similarity index 100% rename from Resources/img/item/item_314.png rename to PKHeX/Resources/img/item/item_314.png diff --git a/Resources/img/item/item_315.png b/PKHeX/Resources/img/item/item_315.png similarity index 100% rename from Resources/img/item/item_315.png rename to PKHeX/Resources/img/item/item_315.png diff --git a/Resources/img/item/item_316.png b/PKHeX/Resources/img/item/item_316.png similarity index 100% rename from Resources/img/item/item_316.png rename to PKHeX/Resources/img/item/item_316.png diff --git a/Resources/img/item/item_317.png b/PKHeX/Resources/img/item/item_317.png similarity index 100% rename from Resources/img/item/item_317.png rename to PKHeX/Resources/img/item/item_317.png diff --git a/Resources/img/item/item_318.png b/PKHeX/Resources/img/item/item_318.png similarity index 100% rename from Resources/img/item/item_318.png rename to PKHeX/Resources/img/item/item_318.png diff --git a/Resources/img/item/item_319.png b/PKHeX/Resources/img/item/item_319.png similarity index 100% rename from Resources/img/item/item_319.png rename to PKHeX/Resources/img/item/item_319.png diff --git a/Resources/img/item/item_32.png b/PKHeX/Resources/img/item/item_32.png similarity index 100% rename from Resources/img/item/item_32.png rename to PKHeX/Resources/img/item/item_32.png diff --git a/Resources/img/item/item_320.png b/PKHeX/Resources/img/item/item_320.png similarity index 100% rename from Resources/img/item/item_320.png rename to PKHeX/Resources/img/item/item_320.png diff --git a/Resources/img/item/item_321.png b/PKHeX/Resources/img/item/item_321.png similarity index 100% rename from Resources/img/item/item_321.png rename to PKHeX/Resources/img/item/item_321.png diff --git a/Resources/img/item/item_322.png b/PKHeX/Resources/img/item/item_322.png similarity index 100% rename from Resources/img/item/item_322.png rename to PKHeX/Resources/img/item/item_322.png diff --git a/Resources/img/item/item_323.png b/PKHeX/Resources/img/item/item_323.png similarity index 100% rename from Resources/img/item/item_323.png rename to PKHeX/Resources/img/item/item_323.png diff --git a/Resources/img/item/item_324.png b/PKHeX/Resources/img/item/item_324.png similarity index 100% rename from Resources/img/item/item_324.png rename to PKHeX/Resources/img/item/item_324.png diff --git a/Resources/img/item/item_325.png b/PKHeX/Resources/img/item/item_325.png similarity index 100% rename from Resources/img/item/item_325.png rename to PKHeX/Resources/img/item/item_325.png diff --git a/Resources/img/item/item_326.png b/PKHeX/Resources/img/item/item_326.png similarity index 100% rename from Resources/img/item/item_326.png rename to PKHeX/Resources/img/item/item_326.png diff --git a/Resources/img/item/item_327.png b/PKHeX/Resources/img/item/item_327.png similarity index 100% rename from Resources/img/item/item_327.png rename to PKHeX/Resources/img/item/item_327.png diff --git a/Resources/img/item/item_33.png b/PKHeX/Resources/img/item/item_33.png similarity index 100% rename from Resources/img/item/item_33.png rename to PKHeX/Resources/img/item/item_33.png diff --git a/Resources/img/item/item_34.png b/PKHeX/Resources/img/item/item_34.png similarity index 100% rename from Resources/img/item/item_34.png rename to PKHeX/Resources/img/item/item_34.png diff --git a/Resources/img/item/item_35.png b/PKHeX/Resources/img/item/item_35.png similarity index 100% rename from Resources/img/item/item_35.png rename to PKHeX/Resources/img/item/item_35.png diff --git a/Resources/img/item/item_36.png b/PKHeX/Resources/img/item/item_36.png similarity index 100% rename from Resources/img/item/item_36.png rename to PKHeX/Resources/img/item/item_36.png diff --git a/Resources/img/item/item_37.png b/PKHeX/Resources/img/item/item_37.png similarity index 100% rename from Resources/img/item/item_37.png rename to PKHeX/Resources/img/item/item_37.png diff --git a/Resources/img/item/item_38.png b/PKHeX/Resources/img/item/item_38.png similarity index 100% rename from Resources/img/item/item_38.png rename to PKHeX/Resources/img/item/item_38.png diff --git a/Resources/img/item/item_39.png b/PKHeX/Resources/img/item/item_39.png similarity index 100% rename from Resources/img/item/item_39.png rename to PKHeX/Resources/img/item/item_39.png diff --git a/Resources/img/item/item_4.png b/PKHeX/Resources/img/item/item_4.png similarity index 100% rename from Resources/img/item/item_4.png rename to PKHeX/Resources/img/item/item_4.png diff --git a/Resources/img/item/item_40.png b/PKHeX/Resources/img/item/item_40.png similarity index 100% rename from Resources/img/item/item_40.png rename to PKHeX/Resources/img/item/item_40.png diff --git a/Resources/img/item/item_41.png b/PKHeX/Resources/img/item/item_41.png similarity index 100% rename from Resources/img/item/item_41.png rename to PKHeX/Resources/img/item/item_41.png diff --git a/Resources/img/item/item_42.png b/PKHeX/Resources/img/item/item_42.png similarity index 100% rename from Resources/img/item/item_42.png rename to PKHeX/Resources/img/item/item_42.png diff --git a/Resources/img/item/item_43.png b/PKHeX/Resources/img/item/item_43.png similarity index 100% rename from Resources/img/item/item_43.png rename to PKHeX/Resources/img/item/item_43.png diff --git a/Resources/img/item/item_44.png b/PKHeX/Resources/img/item/item_44.png similarity index 100% rename from Resources/img/item/item_44.png rename to PKHeX/Resources/img/item/item_44.png diff --git a/Resources/img/item/item_45.png b/PKHeX/Resources/img/item/item_45.png similarity index 100% rename from Resources/img/item/item_45.png rename to PKHeX/Resources/img/item/item_45.png diff --git a/Resources/img/item/item_46.png b/PKHeX/Resources/img/item/item_46.png similarity index 100% rename from Resources/img/item/item_46.png rename to PKHeX/Resources/img/item/item_46.png diff --git a/Resources/img/item/item_47.png b/PKHeX/Resources/img/item/item_47.png similarity index 100% rename from Resources/img/item/item_47.png rename to PKHeX/Resources/img/item/item_47.png diff --git a/Resources/img/item/item_48.png b/PKHeX/Resources/img/item/item_48.png similarity index 100% rename from Resources/img/item/item_48.png rename to PKHeX/Resources/img/item/item_48.png diff --git a/Resources/img/item/item_49.png b/PKHeX/Resources/img/item/item_49.png similarity index 100% rename from Resources/img/item/item_49.png rename to PKHeX/Resources/img/item/item_49.png diff --git a/Resources/img/item/item_5.png b/PKHeX/Resources/img/item/item_5.png similarity index 100% rename from Resources/img/item/item_5.png rename to PKHeX/Resources/img/item/item_5.png diff --git a/Resources/img/item/item_50.png b/PKHeX/Resources/img/item/item_50.png similarity index 100% rename from Resources/img/item/item_50.png rename to PKHeX/Resources/img/item/item_50.png diff --git a/Resources/img/item/item_504.png b/PKHeX/Resources/img/item/item_504.png similarity index 100% rename from Resources/img/item/item_504.png rename to PKHeX/Resources/img/item/item_504.png diff --git a/Resources/img/item/item_51.png b/PKHeX/Resources/img/item/item_51.png similarity index 100% rename from Resources/img/item/item_51.png rename to PKHeX/Resources/img/item/item_51.png diff --git a/Resources/img/item/item_52.png b/PKHeX/Resources/img/item/item_52.png similarity index 100% rename from Resources/img/item/item_52.png rename to PKHeX/Resources/img/item/item_52.png diff --git a/Resources/img/item/item_53.png b/PKHeX/Resources/img/item/item_53.png similarity index 100% rename from Resources/img/item/item_53.png rename to PKHeX/Resources/img/item/item_53.png diff --git a/Resources/img/item/item_534.png b/PKHeX/Resources/img/item/item_534.png similarity index 100% rename from Resources/img/item/item_534.png rename to PKHeX/Resources/img/item/item_534.png diff --git a/Resources/img/item/item_535.png b/PKHeX/Resources/img/item/item_535.png similarity index 100% rename from Resources/img/item/item_535.png rename to PKHeX/Resources/img/item/item_535.png diff --git a/Resources/img/item/item_537.png b/PKHeX/Resources/img/item/item_537.png similarity index 100% rename from Resources/img/item/item_537.png rename to PKHeX/Resources/img/item/item_537.png diff --git a/Resources/img/item/item_538.png b/PKHeX/Resources/img/item/item_538.png similarity index 100% rename from Resources/img/item/item_538.png rename to PKHeX/Resources/img/item/item_538.png diff --git a/Resources/img/item/item_539.png b/PKHeX/Resources/img/item/item_539.png similarity index 100% rename from Resources/img/item/item_539.png rename to PKHeX/Resources/img/item/item_539.png diff --git a/Resources/img/item/item_54.png b/PKHeX/Resources/img/item/item_54.png similarity index 100% rename from Resources/img/item/item_54.png rename to PKHeX/Resources/img/item/item_54.png diff --git a/Resources/img/item/item_540.png b/PKHeX/Resources/img/item/item_540.png similarity index 100% rename from Resources/img/item/item_540.png rename to PKHeX/Resources/img/item/item_540.png diff --git a/Resources/img/item/item_541.png b/PKHeX/Resources/img/item/item_541.png similarity index 100% rename from Resources/img/item/item_541.png rename to PKHeX/Resources/img/item/item_541.png diff --git a/Resources/img/item/item_542.png b/PKHeX/Resources/img/item/item_542.png similarity index 100% rename from Resources/img/item/item_542.png rename to PKHeX/Resources/img/item/item_542.png diff --git a/Resources/img/item/item_543.png b/PKHeX/Resources/img/item/item_543.png similarity index 100% rename from Resources/img/item/item_543.png rename to PKHeX/Resources/img/item/item_543.png diff --git a/Resources/img/item/item_544.png b/PKHeX/Resources/img/item/item_544.png similarity index 100% rename from Resources/img/item/item_544.png rename to PKHeX/Resources/img/item/item_544.png diff --git a/Resources/img/item/item_545.png b/PKHeX/Resources/img/item/item_545.png similarity index 100% rename from Resources/img/item/item_545.png rename to PKHeX/Resources/img/item/item_545.png diff --git a/Resources/img/item/item_546.png b/PKHeX/Resources/img/item/item_546.png similarity index 100% rename from Resources/img/item/item_546.png rename to PKHeX/Resources/img/item/item_546.png diff --git a/Resources/img/item/item_547.png b/PKHeX/Resources/img/item/item_547.png similarity index 100% rename from Resources/img/item/item_547.png rename to PKHeX/Resources/img/item/item_547.png diff --git a/Resources/img/item/item_548.png b/PKHeX/Resources/img/item/item_548.png similarity index 100% rename from Resources/img/item/item_548.png rename to PKHeX/Resources/img/item/item_548.png diff --git a/Resources/img/item/item_549.png b/PKHeX/Resources/img/item/item_549.png similarity index 100% rename from Resources/img/item/item_549.png rename to PKHeX/Resources/img/item/item_549.png diff --git a/Resources/img/item/item_55.png b/PKHeX/Resources/img/item/item_55.png similarity index 100% rename from Resources/img/item/item_55.png rename to PKHeX/Resources/img/item/item_55.png diff --git a/Resources/img/item/item_550.png b/PKHeX/Resources/img/item/item_550.png similarity index 100% rename from Resources/img/item/item_550.png rename to PKHeX/Resources/img/item/item_550.png diff --git a/Resources/img/item/item_551.png b/PKHeX/Resources/img/item/item_551.png similarity index 100% rename from Resources/img/item/item_551.png rename to PKHeX/Resources/img/item/item_551.png diff --git a/Resources/img/item/item_552.png b/PKHeX/Resources/img/item/item_552.png similarity index 100% rename from Resources/img/item/item_552.png rename to PKHeX/Resources/img/item/item_552.png diff --git a/Resources/img/item/item_553.png b/PKHeX/Resources/img/item/item_553.png similarity index 100% rename from Resources/img/item/item_553.png rename to PKHeX/Resources/img/item/item_553.png diff --git a/Resources/img/item/item_554.png b/PKHeX/Resources/img/item/item_554.png similarity index 100% rename from Resources/img/item/item_554.png rename to PKHeX/Resources/img/item/item_554.png diff --git a/Resources/img/item/item_555.png b/PKHeX/Resources/img/item/item_555.png similarity index 100% rename from Resources/img/item/item_555.png rename to PKHeX/Resources/img/item/item_555.png diff --git a/Resources/img/item/item_556.png b/PKHeX/Resources/img/item/item_556.png similarity index 100% rename from Resources/img/item/item_556.png rename to PKHeX/Resources/img/item/item_556.png diff --git a/Resources/img/item/item_557.png b/PKHeX/Resources/img/item/item_557.png similarity index 100% rename from Resources/img/item/item_557.png rename to PKHeX/Resources/img/item/item_557.png diff --git a/Resources/img/item/item_558.png b/PKHeX/Resources/img/item/item_558.png similarity index 100% rename from Resources/img/item/item_558.png rename to PKHeX/Resources/img/item/item_558.png diff --git a/Resources/img/item/item_559.png b/PKHeX/Resources/img/item/item_559.png similarity index 100% rename from Resources/img/item/item_559.png rename to PKHeX/Resources/img/item/item_559.png diff --git a/Resources/img/item/item_56.png b/PKHeX/Resources/img/item/item_56.png similarity index 100% rename from Resources/img/item/item_56.png rename to PKHeX/Resources/img/item/item_56.png diff --git a/Resources/img/item/item_560.png b/PKHeX/Resources/img/item/item_560.png similarity index 100% rename from Resources/img/item/item_560.png rename to PKHeX/Resources/img/item/item_560.png diff --git a/Resources/img/item/item_561.png b/PKHeX/Resources/img/item/item_561.png similarity index 100% rename from Resources/img/item/item_561.png rename to PKHeX/Resources/img/item/item_561.png diff --git a/Resources/img/item/item_562.png b/PKHeX/Resources/img/item/item_562.png similarity index 100% rename from Resources/img/item/item_562.png rename to PKHeX/Resources/img/item/item_562.png diff --git a/Resources/img/item/item_563.png b/PKHeX/Resources/img/item/item_563.png similarity index 100% rename from Resources/img/item/item_563.png rename to PKHeX/Resources/img/item/item_563.png diff --git a/Resources/img/item/item_564.png b/PKHeX/Resources/img/item/item_564.png similarity index 100% rename from Resources/img/item/item_564.png rename to PKHeX/Resources/img/item/item_564.png diff --git a/Resources/img/item/item_565.png b/PKHeX/Resources/img/item/item_565.png similarity index 100% rename from Resources/img/item/item_565.png rename to PKHeX/Resources/img/item/item_565.png diff --git a/Resources/img/item/item_566.png b/PKHeX/Resources/img/item/item_566.png similarity index 100% rename from Resources/img/item/item_566.png rename to PKHeX/Resources/img/item/item_566.png diff --git a/Resources/img/item/item_567.png b/PKHeX/Resources/img/item/item_567.png similarity index 100% rename from Resources/img/item/item_567.png rename to PKHeX/Resources/img/item/item_567.png diff --git a/Resources/img/item/item_568.png b/PKHeX/Resources/img/item/item_568.png similarity index 100% rename from Resources/img/item/item_568.png rename to PKHeX/Resources/img/item/item_568.png diff --git a/Resources/img/item/item_569.png b/PKHeX/Resources/img/item/item_569.png similarity index 100% rename from Resources/img/item/item_569.png rename to PKHeX/Resources/img/item/item_569.png diff --git a/Resources/img/item/item_57.png b/PKHeX/Resources/img/item/item_57.png similarity index 100% rename from Resources/img/item/item_57.png rename to PKHeX/Resources/img/item/item_57.png diff --git a/Resources/img/item/item_570.png b/PKHeX/Resources/img/item/item_570.png similarity index 100% rename from Resources/img/item/item_570.png rename to PKHeX/Resources/img/item/item_570.png diff --git a/Resources/img/item/item_571.png b/PKHeX/Resources/img/item/item_571.png similarity index 100% rename from Resources/img/item/item_571.png rename to PKHeX/Resources/img/item/item_571.png diff --git a/Resources/img/item/item_572.png b/PKHeX/Resources/img/item/item_572.png similarity index 100% rename from Resources/img/item/item_572.png rename to PKHeX/Resources/img/item/item_572.png diff --git a/Resources/img/item/item_573.png b/PKHeX/Resources/img/item/item_573.png similarity index 100% rename from Resources/img/item/item_573.png rename to PKHeX/Resources/img/item/item_573.png diff --git a/Resources/img/item/item_577.png b/PKHeX/Resources/img/item/item_577.png similarity index 100% rename from Resources/img/item/item_577.png rename to PKHeX/Resources/img/item/item_577.png diff --git a/Resources/img/item/item_58.png b/PKHeX/Resources/img/item/item_58.png similarity index 100% rename from Resources/img/item/item_58.png rename to PKHeX/Resources/img/item/item_58.png diff --git a/Resources/img/item/item_580.png b/PKHeX/Resources/img/item/item_580.png similarity index 100% rename from Resources/img/item/item_580.png rename to PKHeX/Resources/img/item/item_580.png diff --git a/Resources/img/item/item_581.png b/PKHeX/Resources/img/item/item_581.png similarity index 100% rename from Resources/img/item/item_581.png rename to PKHeX/Resources/img/item/item_581.png diff --git a/Resources/img/item/item_582.png b/PKHeX/Resources/img/item/item_582.png similarity index 100% rename from Resources/img/item/item_582.png rename to PKHeX/Resources/img/item/item_582.png diff --git a/Resources/img/item/item_583.png b/PKHeX/Resources/img/item/item_583.png similarity index 100% rename from Resources/img/item/item_583.png rename to PKHeX/Resources/img/item/item_583.png diff --git a/Resources/img/item/item_584.png b/PKHeX/Resources/img/item/item_584.png similarity index 100% rename from Resources/img/item/item_584.png rename to PKHeX/Resources/img/item/item_584.png diff --git a/Resources/img/item/item_585.png b/PKHeX/Resources/img/item/item_585.png similarity index 100% rename from Resources/img/item/item_585.png rename to PKHeX/Resources/img/item/item_585.png diff --git a/Resources/img/item/item_586.png b/PKHeX/Resources/img/item/item_586.png similarity index 100% rename from Resources/img/item/item_586.png rename to PKHeX/Resources/img/item/item_586.png diff --git a/Resources/img/item/item_587.png b/PKHeX/Resources/img/item/item_587.png similarity index 100% rename from Resources/img/item/item_587.png rename to PKHeX/Resources/img/item/item_587.png diff --git a/Resources/img/item/item_588.png b/PKHeX/Resources/img/item/item_588.png similarity index 100% rename from Resources/img/item/item_588.png rename to PKHeX/Resources/img/item/item_588.png diff --git a/Resources/img/item/item_589.png b/PKHeX/Resources/img/item/item_589.png similarity index 100% rename from Resources/img/item/item_589.png rename to PKHeX/Resources/img/item/item_589.png diff --git a/Resources/img/item/item_59.png b/PKHeX/Resources/img/item/item_59.png similarity index 100% rename from Resources/img/item/item_59.png rename to PKHeX/Resources/img/item/item_59.png diff --git a/Resources/img/item/item_590.png b/PKHeX/Resources/img/item/item_590.png similarity index 100% rename from Resources/img/item/item_590.png rename to PKHeX/Resources/img/item/item_590.png diff --git a/Resources/img/item/item_591.png b/PKHeX/Resources/img/item/item_591.png similarity index 100% rename from Resources/img/item/item_591.png rename to PKHeX/Resources/img/item/item_591.png diff --git a/Resources/img/item/item_6.png b/PKHeX/Resources/img/item/item_6.png similarity index 100% rename from Resources/img/item/item_6.png rename to PKHeX/Resources/img/item/item_6.png diff --git a/Resources/img/item/item_60.png b/PKHeX/Resources/img/item/item_60.png similarity index 100% rename from Resources/img/item/item_60.png rename to PKHeX/Resources/img/item/item_60.png diff --git a/Resources/img/item/item_61.png b/PKHeX/Resources/img/item/item_61.png similarity index 100% rename from Resources/img/item/item_61.png rename to PKHeX/Resources/img/item/item_61.png diff --git a/Resources/img/item/item_62.png b/PKHeX/Resources/img/item/item_62.png similarity index 100% rename from Resources/img/item/item_62.png rename to PKHeX/Resources/img/item/item_62.png diff --git a/Resources/img/item/item_63.png b/PKHeX/Resources/img/item/item_63.png similarity index 100% rename from Resources/img/item/item_63.png rename to PKHeX/Resources/img/item/item_63.png diff --git a/Resources/img/item/item_639.png b/PKHeX/Resources/img/item/item_639.png similarity index 100% rename from Resources/img/item/item_639.png rename to PKHeX/Resources/img/item/item_639.png diff --git a/Resources/img/item/item_64.png b/PKHeX/Resources/img/item/item_64.png similarity index 100% rename from Resources/img/item/item_64.png rename to PKHeX/Resources/img/item/item_64.png diff --git a/Resources/img/item/item_640.png b/PKHeX/Resources/img/item/item_640.png similarity index 100% rename from Resources/img/item/item_640.png rename to PKHeX/Resources/img/item/item_640.png diff --git a/Resources/img/item/item_644.png b/PKHeX/Resources/img/item/item_644.png similarity index 100% rename from Resources/img/item/item_644.png rename to PKHeX/Resources/img/item/item_644.png diff --git a/Resources/img/item/item_645.png b/PKHeX/Resources/img/item/item_645.png similarity index 100% rename from Resources/img/item/item_645.png rename to PKHeX/Resources/img/item/item_645.png diff --git a/Resources/img/item/item_646.png b/PKHeX/Resources/img/item/item_646.png similarity index 100% rename from Resources/img/item/item_646.png rename to PKHeX/Resources/img/item/item_646.png diff --git a/Resources/img/item/item_647.png b/PKHeX/Resources/img/item/item_647.png similarity index 100% rename from Resources/img/item/item_647.png rename to PKHeX/Resources/img/item/item_647.png diff --git a/Resources/img/item/item_648.png b/PKHeX/Resources/img/item/item_648.png similarity index 100% rename from Resources/img/item/item_648.png rename to PKHeX/Resources/img/item/item_648.png diff --git a/Resources/img/item/item_649.png b/PKHeX/Resources/img/item/item_649.png similarity index 100% rename from Resources/img/item/item_649.png rename to PKHeX/Resources/img/item/item_649.png diff --git a/Resources/img/item/item_65.png b/PKHeX/Resources/img/item/item_65.png similarity index 100% rename from Resources/img/item/item_65.png rename to PKHeX/Resources/img/item/item_65.png diff --git a/Resources/img/item/item_650.png b/PKHeX/Resources/img/item/item_650.png similarity index 100% rename from Resources/img/item/item_650.png rename to PKHeX/Resources/img/item/item_650.png diff --git a/Resources/img/item/item_652.png b/PKHeX/Resources/img/item/item_652.png similarity index 100% rename from Resources/img/item/item_652.png rename to PKHeX/Resources/img/item/item_652.png diff --git a/Resources/img/item/item_653.png b/PKHeX/Resources/img/item/item_653.png similarity index 100% rename from Resources/img/item/item_653.png rename to PKHeX/Resources/img/item/item_653.png diff --git a/Resources/img/item/item_654.png b/PKHeX/Resources/img/item/item_654.png similarity index 100% rename from Resources/img/item/item_654.png rename to PKHeX/Resources/img/item/item_654.png diff --git a/Resources/img/item/item_655.png b/PKHeX/Resources/img/item/item_655.png similarity index 100% rename from Resources/img/item/item_655.png rename to PKHeX/Resources/img/item/item_655.png diff --git a/Resources/img/item/item_656.png b/PKHeX/Resources/img/item/item_656.png similarity index 100% rename from Resources/img/item/item_656.png rename to PKHeX/Resources/img/item/item_656.png diff --git a/Resources/img/item/item_657.png b/PKHeX/Resources/img/item/item_657.png similarity index 100% rename from Resources/img/item/item_657.png rename to PKHeX/Resources/img/item/item_657.png diff --git a/Resources/img/item/item_658.png b/PKHeX/Resources/img/item/item_658.png similarity index 100% rename from Resources/img/item/item_658.png rename to PKHeX/Resources/img/item/item_658.png diff --git a/Resources/img/item/item_659.png b/PKHeX/Resources/img/item/item_659.png similarity index 100% rename from Resources/img/item/item_659.png rename to PKHeX/Resources/img/item/item_659.png diff --git a/Resources/img/item/item_66.png b/PKHeX/Resources/img/item/item_66.png similarity index 100% rename from Resources/img/item/item_66.png rename to PKHeX/Resources/img/item/item_66.png diff --git a/Resources/img/item/item_660.png b/PKHeX/Resources/img/item/item_660.png similarity index 100% rename from Resources/img/item/item_660.png rename to PKHeX/Resources/img/item/item_660.png diff --git a/Resources/img/item/item_661.png b/PKHeX/Resources/img/item/item_661.png similarity index 100% rename from Resources/img/item/item_661.png rename to PKHeX/Resources/img/item/item_661.png diff --git a/Resources/img/item/item_662.png b/PKHeX/Resources/img/item/item_662.png similarity index 100% rename from Resources/img/item/item_662.png rename to PKHeX/Resources/img/item/item_662.png diff --git a/Resources/img/item/item_663.png b/PKHeX/Resources/img/item/item_663.png similarity index 100% rename from Resources/img/item/item_663.png rename to PKHeX/Resources/img/item/item_663.png diff --git a/Resources/img/item/item_664.png b/PKHeX/Resources/img/item/item_664.png similarity index 100% rename from Resources/img/item/item_664.png rename to PKHeX/Resources/img/item/item_664.png diff --git a/Resources/img/item/item_665.png b/PKHeX/Resources/img/item/item_665.png similarity index 100% rename from Resources/img/item/item_665.png rename to PKHeX/Resources/img/item/item_665.png diff --git a/Resources/img/item/item_666.png b/PKHeX/Resources/img/item/item_666.png similarity index 100% rename from Resources/img/item/item_666.png rename to PKHeX/Resources/img/item/item_666.png diff --git a/Resources/img/item/item_667.png b/PKHeX/Resources/img/item/item_667.png similarity index 100% rename from Resources/img/item/item_667.png rename to PKHeX/Resources/img/item/item_667.png diff --git a/Resources/img/item/item_668.png b/PKHeX/Resources/img/item/item_668.png similarity index 100% rename from Resources/img/item/item_668.png rename to PKHeX/Resources/img/item/item_668.png diff --git a/Resources/img/item/item_669.png b/PKHeX/Resources/img/item/item_669.png similarity index 100% rename from Resources/img/item/item_669.png rename to PKHeX/Resources/img/item/item_669.png diff --git a/Resources/img/item/item_67.png b/PKHeX/Resources/img/item/item_67.png similarity index 100% rename from Resources/img/item/item_67.png rename to PKHeX/Resources/img/item/item_67.png diff --git a/Resources/img/item/item_670.png b/PKHeX/Resources/img/item/item_670.png similarity index 100% rename from Resources/img/item/item_670.png rename to PKHeX/Resources/img/item/item_670.png diff --git a/Resources/img/item/item_671.png b/PKHeX/Resources/img/item/item_671.png similarity index 100% rename from Resources/img/item/item_671.png rename to PKHeX/Resources/img/item/item_671.png diff --git a/Resources/img/item/item_672.png b/PKHeX/Resources/img/item/item_672.png similarity index 100% rename from Resources/img/item/item_672.png rename to PKHeX/Resources/img/item/item_672.png diff --git a/Resources/img/item/item_673.png b/PKHeX/Resources/img/item/item_673.png similarity index 100% rename from Resources/img/item/item_673.png rename to PKHeX/Resources/img/item/item_673.png diff --git a/Resources/img/item/item_674.png b/PKHeX/Resources/img/item/item_674.png similarity index 100% rename from Resources/img/item/item_674.png rename to PKHeX/Resources/img/item/item_674.png diff --git a/Resources/img/item/item_675.png b/PKHeX/Resources/img/item/item_675.png similarity index 100% rename from Resources/img/item/item_675.png rename to PKHeX/Resources/img/item/item_675.png diff --git a/Resources/img/item/item_676.png b/PKHeX/Resources/img/item/item_676.png similarity index 100% rename from Resources/img/item/item_676.png rename to PKHeX/Resources/img/item/item_676.png diff --git a/Resources/img/item/item_677.png b/PKHeX/Resources/img/item/item_677.png similarity index 100% rename from Resources/img/item/item_677.png rename to PKHeX/Resources/img/item/item_677.png diff --git a/Resources/img/item/item_678.png b/PKHeX/Resources/img/item/item_678.png similarity index 100% rename from Resources/img/item/item_678.png rename to PKHeX/Resources/img/item/item_678.png diff --git a/Resources/img/item/item_679.png b/PKHeX/Resources/img/item/item_679.png similarity index 100% rename from Resources/img/item/item_679.png rename to PKHeX/Resources/img/item/item_679.png diff --git a/Resources/img/item/item_68.png b/PKHeX/Resources/img/item/item_68.png similarity index 100% rename from Resources/img/item/item_68.png rename to PKHeX/Resources/img/item/item_68.png diff --git a/Resources/img/item/item_680.png b/PKHeX/Resources/img/item/item_680.png similarity index 100% rename from Resources/img/item/item_680.png rename to PKHeX/Resources/img/item/item_680.png diff --git a/Resources/img/item/item_681.png b/PKHeX/Resources/img/item/item_681.png similarity index 100% rename from Resources/img/item/item_681.png rename to PKHeX/Resources/img/item/item_681.png diff --git a/Resources/img/item/item_682.png b/PKHeX/Resources/img/item/item_682.png similarity index 100% rename from Resources/img/item/item_682.png rename to PKHeX/Resources/img/item/item_682.png diff --git a/Resources/img/item/item_683.png b/PKHeX/Resources/img/item/item_683.png similarity index 100% rename from Resources/img/item/item_683.png rename to PKHeX/Resources/img/item/item_683.png diff --git a/Resources/img/item/item_684.png b/PKHeX/Resources/img/item/item_684.png similarity index 100% rename from Resources/img/item/item_684.png rename to PKHeX/Resources/img/item/item_684.png diff --git a/Resources/img/item/item_685.png b/PKHeX/Resources/img/item/item_685.png similarity index 100% rename from Resources/img/item/item_685.png rename to PKHeX/Resources/img/item/item_685.png diff --git a/Resources/img/item/item_686.png b/PKHeX/Resources/img/item/item_686.png similarity index 100% rename from Resources/img/item/item_686.png rename to PKHeX/Resources/img/item/item_686.png diff --git a/Resources/img/item/item_687.png b/PKHeX/Resources/img/item/item_687.png similarity index 100% rename from Resources/img/item/item_687.png rename to PKHeX/Resources/img/item/item_687.png diff --git a/Resources/img/item/item_688.png b/PKHeX/Resources/img/item/item_688.png similarity index 100% rename from Resources/img/item/item_688.png rename to PKHeX/Resources/img/item/item_688.png diff --git a/Resources/img/item/item_69.png b/PKHeX/Resources/img/item/item_69.png similarity index 100% rename from Resources/img/item/item_69.png rename to PKHeX/Resources/img/item/item_69.png diff --git a/Resources/img/item/item_699.png b/PKHeX/Resources/img/item/item_699.png similarity index 100% rename from Resources/img/item/item_699.png rename to PKHeX/Resources/img/item/item_699.png diff --git a/Resources/img/item/item_7.png b/PKHeX/Resources/img/item/item_7.png similarity index 100% rename from Resources/img/item/item_7.png rename to PKHeX/Resources/img/item/item_7.png diff --git a/Resources/img/item/item_70.png b/PKHeX/Resources/img/item/item_70.png similarity index 100% rename from Resources/img/item/item_70.png rename to PKHeX/Resources/img/item/item_70.png diff --git a/Resources/img/item/item_704.png b/PKHeX/Resources/img/item/item_704.png similarity index 100% rename from Resources/img/item/item_704.png rename to PKHeX/Resources/img/item/item_704.png diff --git a/Resources/img/item/item_708.png b/PKHeX/Resources/img/item/item_708.png similarity index 100% rename from Resources/img/item/item_708.png rename to PKHeX/Resources/img/item/item_708.png diff --git a/Resources/img/item/item_709.png b/PKHeX/Resources/img/item/item_709.png similarity index 100% rename from Resources/img/item/item_709.png rename to PKHeX/Resources/img/item/item_709.png diff --git a/Resources/img/item/item_71.png b/PKHeX/Resources/img/item/item_71.png similarity index 100% rename from Resources/img/item/item_71.png rename to PKHeX/Resources/img/item/item_71.png diff --git a/Resources/img/item/item_710.png b/PKHeX/Resources/img/item/item_710.png similarity index 100% rename from Resources/img/item/item_710.png rename to PKHeX/Resources/img/item/item_710.png diff --git a/Resources/img/item/item_711.png b/PKHeX/Resources/img/item/item_711.png similarity index 100% rename from Resources/img/item/item_711.png rename to PKHeX/Resources/img/item/item_711.png diff --git a/Resources/img/item/item_715.png b/PKHeX/Resources/img/item/item_715.png similarity index 100% rename from Resources/img/item/item_715.png rename to PKHeX/Resources/img/item/item_715.png diff --git a/Resources/img/item/item_72.png b/PKHeX/Resources/img/item/item_72.png similarity index 100% rename from Resources/img/item/item_72.png rename to PKHeX/Resources/img/item/item_72.png diff --git a/Resources/img/item/item_73.png b/PKHeX/Resources/img/item/item_73.png similarity index 100% rename from Resources/img/item/item_73.png rename to PKHeX/Resources/img/item/item_73.png diff --git a/Resources/img/item/item_74.png b/PKHeX/Resources/img/item/item_74.png similarity index 100% rename from Resources/img/item/item_74.png rename to PKHeX/Resources/img/item/item_74.png diff --git a/Resources/img/item/item_75.png b/PKHeX/Resources/img/item/item_75.png similarity index 100% rename from Resources/img/item/item_75.png rename to PKHeX/Resources/img/item/item_75.png diff --git a/Resources/img/item/item_752.png b/PKHeX/Resources/img/item/item_752.png similarity index 100% rename from Resources/img/item/item_752.png rename to PKHeX/Resources/img/item/item_752.png diff --git a/Resources/img/item/item_753.png b/PKHeX/Resources/img/item/item_753.png similarity index 100% rename from Resources/img/item/item_753.png rename to PKHeX/Resources/img/item/item_753.png diff --git a/Resources/img/item/item_754.png b/PKHeX/Resources/img/item/item_754.png similarity index 100% rename from Resources/img/item/item_754.png rename to PKHeX/Resources/img/item/item_754.png diff --git a/Resources/img/item/item_755.png b/PKHeX/Resources/img/item/item_755.png similarity index 100% rename from Resources/img/item/item_755.png rename to PKHeX/Resources/img/item/item_755.png diff --git a/Resources/img/item/item_756.png b/PKHeX/Resources/img/item/item_756.png similarity index 100% rename from Resources/img/item/item_756.png rename to PKHeX/Resources/img/item/item_756.png diff --git a/Resources/img/item/item_757.png b/PKHeX/Resources/img/item/item_757.png similarity index 100% rename from Resources/img/item/item_757.png rename to PKHeX/Resources/img/item/item_757.png diff --git a/Resources/img/item/item_758.png b/PKHeX/Resources/img/item/item_758.png similarity index 100% rename from Resources/img/item/item_758.png rename to PKHeX/Resources/img/item/item_758.png diff --git a/Resources/img/item/item_759.png b/PKHeX/Resources/img/item/item_759.png similarity index 100% rename from Resources/img/item/item_759.png rename to PKHeX/Resources/img/item/item_759.png diff --git a/Resources/img/item/item_76.png b/PKHeX/Resources/img/item/item_76.png similarity index 100% rename from Resources/img/item/item_76.png rename to PKHeX/Resources/img/item/item_76.png diff --git a/Resources/img/item/item_760.png b/PKHeX/Resources/img/item/item_760.png similarity index 100% rename from Resources/img/item/item_760.png rename to PKHeX/Resources/img/item/item_760.png diff --git a/Resources/img/item/item_761.png b/PKHeX/Resources/img/item/item_761.png similarity index 100% rename from Resources/img/item/item_761.png rename to PKHeX/Resources/img/item/item_761.png diff --git a/Resources/img/item/item_762.png b/PKHeX/Resources/img/item/item_762.png similarity index 100% rename from Resources/img/item/item_762.png rename to PKHeX/Resources/img/item/item_762.png diff --git a/Resources/img/item/item_763.png b/PKHeX/Resources/img/item/item_763.png similarity index 100% rename from Resources/img/item/item_763.png rename to PKHeX/Resources/img/item/item_763.png diff --git a/Resources/img/item/item_764.png b/PKHeX/Resources/img/item/item_764.png similarity index 100% rename from Resources/img/item/item_764.png rename to PKHeX/Resources/img/item/item_764.png diff --git a/Resources/img/item/item_767.png b/PKHeX/Resources/img/item/item_767.png similarity index 100% rename from Resources/img/item/item_767.png rename to PKHeX/Resources/img/item/item_767.png diff --git a/Resources/img/item/item_768.png b/PKHeX/Resources/img/item/item_768.png similarity index 100% rename from Resources/img/item/item_768.png rename to PKHeX/Resources/img/item/item_768.png diff --git a/Resources/img/item/item_769.png b/PKHeX/Resources/img/item/item_769.png similarity index 100% rename from Resources/img/item/item_769.png rename to PKHeX/Resources/img/item/item_769.png diff --git a/Resources/img/item/item_77.png b/PKHeX/Resources/img/item/item_77.png similarity index 100% rename from Resources/img/item/item_77.png rename to PKHeX/Resources/img/item/item_77.png diff --git a/Resources/img/item/item_770.png b/PKHeX/Resources/img/item/item_770.png similarity index 100% rename from Resources/img/item/item_770.png rename to PKHeX/Resources/img/item/item_770.png diff --git a/Resources/img/item/item_78.png b/PKHeX/Resources/img/item/item_78.png similarity index 100% rename from Resources/img/item/item_78.png rename to PKHeX/Resources/img/item/item_78.png diff --git a/Resources/img/item/item_79.png b/PKHeX/Resources/img/item/item_79.png similarity index 100% rename from Resources/img/item/item_79.png rename to PKHeX/Resources/img/item/item_79.png diff --git a/Resources/img/item/item_8.png b/PKHeX/Resources/img/item/item_8.png similarity index 100% rename from Resources/img/item/item_8.png rename to PKHeX/Resources/img/item/item_8.png diff --git a/Resources/img/item/item_80.png b/PKHeX/Resources/img/item/item_80.png similarity index 100% rename from Resources/img/item/item_80.png rename to PKHeX/Resources/img/item/item_80.png diff --git a/Resources/img/item/item_81.png b/PKHeX/Resources/img/item/item_81.png similarity index 100% rename from Resources/img/item/item_81.png rename to PKHeX/Resources/img/item/item_81.png diff --git a/Resources/img/item/item_82.png b/PKHeX/Resources/img/item/item_82.png similarity index 100% rename from Resources/img/item/item_82.png rename to PKHeX/Resources/img/item/item_82.png diff --git a/Resources/img/item/item_83.png b/PKHeX/Resources/img/item/item_83.png similarity index 100% rename from Resources/img/item/item_83.png rename to PKHeX/Resources/img/item/item_83.png diff --git a/Resources/img/item/item_84.png b/PKHeX/Resources/img/item/item_84.png similarity index 100% rename from Resources/img/item/item_84.png rename to PKHeX/Resources/img/item/item_84.png diff --git a/Resources/img/item/item_85.png b/PKHeX/Resources/img/item/item_85.png similarity index 100% rename from Resources/img/item/item_85.png rename to PKHeX/Resources/img/item/item_85.png diff --git a/Resources/img/item/item_86.png b/PKHeX/Resources/img/item/item_86.png similarity index 100% rename from Resources/img/item/item_86.png rename to PKHeX/Resources/img/item/item_86.png diff --git a/Resources/img/item/item_87.png b/PKHeX/Resources/img/item/item_87.png similarity index 100% rename from Resources/img/item/item_87.png rename to PKHeX/Resources/img/item/item_87.png diff --git a/Resources/img/item/item_88.png b/PKHeX/Resources/img/item/item_88.png similarity index 100% rename from Resources/img/item/item_88.png rename to PKHeX/Resources/img/item/item_88.png diff --git a/Resources/img/item/item_89.png b/PKHeX/Resources/img/item/item_89.png similarity index 100% rename from Resources/img/item/item_89.png rename to PKHeX/Resources/img/item/item_89.png diff --git a/Resources/img/item/item_9.png b/PKHeX/Resources/img/item/item_9.png similarity index 100% rename from Resources/img/item/item_9.png rename to PKHeX/Resources/img/item/item_9.png diff --git a/Resources/img/item/item_90.png b/PKHeX/Resources/img/item/item_90.png similarity index 100% rename from Resources/img/item/item_90.png rename to PKHeX/Resources/img/item/item_90.png diff --git a/Resources/img/item/item_91.png b/PKHeX/Resources/img/item/item_91.png similarity index 100% rename from Resources/img/item/item_91.png rename to PKHeX/Resources/img/item/item_91.png diff --git a/Resources/img/item/item_92.png b/PKHeX/Resources/img/item/item_92.png similarity index 100% rename from Resources/img/item/item_92.png rename to PKHeX/Resources/img/item/item_92.png diff --git a/Resources/img/item/item_93.png b/PKHeX/Resources/img/item/item_93.png similarity index 100% rename from Resources/img/item/item_93.png rename to PKHeX/Resources/img/item/item_93.png diff --git a/Resources/img/item/item_94.png b/PKHeX/Resources/img/item/item_94.png similarity index 100% rename from Resources/img/item/item_94.png rename to PKHeX/Resources/img/item/item_94.png diff --git a/Resources/img/item/item_95.png b/PKHeX/Resources/img/item/item_95.png similarity index 100% rename from Resources/img/item/item_95.png rename to PKHeX/Resources/img/item/item_95.png diff --git a/Resources/img/item/item_96.png b/PKHeX/Resources/img/item/item_96.png similarity index 100% rename from Resources/img/item/item_96.png rename to PKHeX/Resources/img/item/item_96.png diff --git a/Resources/img/item/item_97.png b/PKHeX/Resources/img/item/item_97.png similarity index 100% rename from Resources/img/item/item_97.png rename to PKHeX/Resources/img/item/item_97.png diff --git a/Resources/img/item/item_98.png b/PKHeX/Resources/img/item/item_98.png similarity index 100% rename from Resources/img/item/item_98.png rename to PKHeX/Resources/img/item/item_98.png diff --git a/Resources/img/item/item_99.png b/PKHeX/Resources/img/item/item_99.png similarity index 100% rename from Resources/img/item/item_99.png rename to PKHeX/Resources/img/item/item_99.png diff --git a/Resources/img/item/item_tm.png b/PKHeX/Resources/img/item/item_tm.png similarity index 100% rename from Resources/img/item/item_tm.png rename to PKHeX/Resources/img/item/item_tm.png diff --git a/Resources/img/misc/anti_pokerus_icon.png b/PKHeX/Resources/img/misc/anti_pokerus_icon.png similarity index 100% rename from Resources/img/misc/anti_pokerus_icon.png rename to PKHeX/Resources/img/misc/anti_pokerus_icon.png diff --git a/Resources/img/misc/box_mark_01.png b/PKHeX/Resources/img/misc/box_mark_01.png similarity index 100% rename from Resources/img/misc/box_mark_01.png rename to PKHeX/Resources/img/misc/box_mark_01.png diff --git a/Resources/img/misc/box_mark_02.png b/PKHeX/Resources/img/misc/box_mark_02.png similarity index 100% rename from Resources/img/misc/box_mark_02.png rename to PKHeX/Resources/img/misc/box_mark_02.png diff --git a/Resources/img/misc/box_mark_03.png b/PKHeX/Resources/img/misc/box_mark_03.png similarity index 100% rename from Resources/img/misc/box_mark_03.png rename to PKHeX/Resources/img/misc/box_mark_03.png diff --git a/Resources/img/misc/box_mark_04.png b/PKHeX/Resources/img/misc/box_mark_04.png similarity index 100% rename from Resources/img/misc/box_mark_04.png rename to PKHeX/Resources/img/misc/box_mark_04.png diff --git a/Resources/img/misc/box_mark_05.png b/PKHeX/Resources/img/misc/box_mark_05.png similarity index 100% rename from Resources/img/misc/box_mark_05.png rename to PKHeX/Resources/img/misc/box_mark_05.png diff --git a/Resources/img/misc/box_mark_06.png b/PKHeX/Resources/img/misc/box_mark_06.png similarity index 100% rename from Resources/img/misc/box_mark_06.png rename to PKHeX/Resources/img/misc/box_mark_06.png diff --git a/Resources/img/misc/else_icon.png b/PKHeX/Resources/img/misc/else_icon.png similarity index 100% rename from Resources/img/misc/else_icon.png rename to PKHeX/Resources/img/misc/else_icon.png diff --git a/Resources/img/misc/helditem.png b/PKHeX/Resources/img/misc/helditem.png similarity index 100% rename from Resources/img/misc/helditem.png rename to PKHeX/Resources/img/misc/helditem.png diff --git a/Resources/img/misc/locked.png b/PKHeX/Resources/img/misc/locked.png similarity index 100% rename from Resources/img/misc/locked.png rename to PKHeX/Resources/img/misc/locked.png diff --git a/Resources/img/misc/party.png b/PKHeX/Resources/img/misc/party.png similarity index 100% rename from Resources/img/misc/party.png rename to PKHeX/Resources/img/misc/party.png diff --git a/Resources/img/misc/rare_icon.png b/PKHeX/Resources/img/misc/rare_icon.png similarity index 100% rename from Resources/img/misc/rare_icon.png rename to PKHeX/Resources/img/misc/rare_icon.png diff --git a/Resources/img/misc/trainingmedal.png b/PKHeX/Resources/img/misc/trainingmedal.png similarity index 100% rename from Resources/img/misc/trainingmedal.png rename to PKHeX/Resources/img/misc/trainingmedal.png diff --git a/Resources/img/ribbons/ribbonability.png b/PKHeX/Resources/img/ribbons/ribbonability.png similarity index 100% rename from Resources/img/ribbons/ribbonability.png rename to PKHeX/Resources/img/ribbons/ribbonability.png diff --git a/Resources/img/ribbons/ribbonabilitydouble.png b/PKHeX/Resources/img/ribbons/ribbonabilitydouble.png similarity index 100% rename from Resources/img/ribbons/ribbonabilitydouble.png rename to PKHeX/Resources/img/ribbons/ribbonabilitydouble.png diff --git a/Resources/img/ribbons/ribbonabilitygreat.png b/PKHeX/Resources/img/ribbons/ribbonabilitygreat.png similarity index 100% rename from Resources/img/ribbons/ribbonabilitygreat.png rename to PKHeX/Resources/img/ribbons/ribbonabilitygreat.png diff --git a/Resources/img/ribbons/ribbonabilitymulti.png b/PKHeX/Resources/img/ribbons/ribbonabilitymulti.png similarity index 100% rename from Resources/img/ribbons/ribbonabilitymulti.png rename to PKHeX/Resources/img/ribbons/ribbonabilitymulti.png diff --git a/Resources/img/ribbons/ribbonabilitypair.png b/PKHeX/Resources/img/ribbons/ribbonabilitypair.png similarity index 100% rename from Resources/img/ribbons/ribbonabilitypair.png rename to PKHeX/Resources/img/ribbons/ribbonabilitypair.png diff --git a/Resources/img/ribbons/ribbonabilityworld.png b/PKHeX/Resources/img/ribbons/ribbonabilityworld.png similarity index 100% rename from Resources/img/ribbons/ribbonabilityworld.png rename to PKHeX/Resources/img/ribbons/ribbonabilityworld.png diff --git a/Resources/img/ribbons/ribbonalert.png b/PKHeX/Resources/img/ribbons/ribbonalert.png similarity index 100% rename from Resources/img/ribbons/ribbonalert.png rename to PKHeX/Resources/img/ribbons/ribbonalert.png diff --git a/Resources/img/ribbons/ribbonartist.png b/PKHeX/Resources/img/ribbons/ribbonartist.png similarity index 100% rename from Resources/img/ribbons/ribbonartist.png rename to PKHeX/Resources/img/ribbons/ribbonartist.png diff --git a/Resources/img/ribbons/ribbonbattlerexpert.png b/PKHeX/Resources/img/ribbons/ribbonbattlerexpert.png similarity index 100% rename from Resources/img/ribbons/ribbonbattlerexpert.png rename to PKHeX/Resources/img/ribbons/ribbonbattlerexpert.png diff --git a/Resources/img/ribbons/ribbonbattlerskillful.png b/PKHeX/Resources/img/ribbons/ribbonbattlerskillful.png similarity index 100% rename from Resources/img/ribbons/ribbonbattlerskillful.png rename to PKHeX/Resources/img/ribbons/ribbonbattlerskillful.png diff --git a/Resources/img/ribbons/ribbonbestfriends.png b/PKHeX/Resources/img/ribbons/ribbonbestfriends.png similarity index 100% rename from Resources/img/ribbons/ribbonbestfriends.png rename to PKHeX/Resources/img/ribbons/ribbonbestfriends.png diff --git a/Resources/img/ribbons/ribbonbirthday.png b/PKHeX/Resources/img/ribbons/ribbonbirthday.png similarity index 100% rename from Resources/img/ribbons/ribbonbirthday.png rename to PKHeX/Resources/img/ribbons/ribbonbirthday.png diff --git a/Resources/img/ribbons/ribboncareless.png b/PKHeX/Resources/img/ribbons/ribboncareless.png similarity index 100% rename from Resources/img/ribbons/ribboncareless.png rename to PKHeX/Resources/img/ribbons/ribboncareless.png diff --git a/Resources/img/ribbons/ribbonchampionbattle.png b/PKHeX/Resources/img/ribbons/ribbonchampionbattle.png similarity index 100% rename from Resources/img/ribbons/ribbonchampionbattle.png rename to PKHeX/Resources/img/ribbons/ribbonchampionbattle.png diff --git a/Resources/img/ribbons/ribbonchampiong3hoenn.png b/PKHeX/Resources/img/ribbons/ribbonchampiong3hoenn.png similarity index 100% rename from Resources/img/ribbons/ribbonchampiong3hoenn.png rename to PKHeX/Resources/img/ribbons/ribbonchampiong3hoenn.png diff --git a/Resources/img/ribbons/ribbonchampiong6hoenn.png b/PKHeX/Resources/img/ribbons/ribbonchampiong6hoenn.png similarity index 100% rename from Resources/img/ribbons/ribbonchampiong6hoenn.png rename to PKHeX/Resources/img/ribbons/ribbonchampiong6hoenn.png diff --git a/Resources/img/ribbons/ribbonchampionkalos.png b/PKHeX/Resources/img/ribbons/ribbonchampionkalos.png similarity index 100% rename from Resources/img/ribbons/ribbonchampionkalos.png rename to PKHeX/Resources/img/ribbons/ribbonchampionkalos.png diff --git a/Resources/img/ribbons/ribbonchampionnational.png b/PKHeX/Resources/img/ribbons/ribbonchampionnational.png similarity index 100% rename from Resources/img/ribbons/ribbonchampionnational.png rename to PKHeX/Resources/img/ribbons/ribbonchampionnational.png diff --git a/Resources/img/ribbons/ribbonchampionregional.png b/PKHeX/Resources/img/ribbons/ribbonchampionregional.png similarity index 100% rename from Resources/img/ribbons/ribbonchampionregional.png rename to PKHeX/Resources/img/ribbons/ribbonchampionregional.png diff --git a/Resources/img/ribbons/ribbonchampionsinnoh.png b/PKHeX/Resources/img/ribbons/ribbonchampionsinnoh.png similarity index 100% rename from Resources/img/ribbons/ribbonchampionsinnoh.png rename to PKHeX/Resources/img/ribbons/ribbonchampionsinnoh.png diff --git a/Resources/img/ribbons/ribbonchampionworld.png b/PKHeX/Resources/img/ribbons/ribbonchampionworld.png similarity index 100% rename from Resources/img/ribbons/ribbonchampionworld.png rename to PKHeX/Resources/img/ribbons/ribbonchampionworld.png diff --git a/Resources/img/ribbons/ribbonclassic.png b/PKHeX/Resources/img/ribbons/ribbonclassic.png similarity index 100% rename from Resources/img/ribbons/ribbonclassic.png rename to PKHeX/Resources/img/ribbons/ribbonclassic.png diff --git a/Resources/img/ribbons/ribbonconteststar.png b/PKHeX/Resources/img/ribbons/ribbonconteststar.png similarity index 100% rename from Resources/img/ribbons/ribbonconteststar.png rename to PKHeX/Resources/img/ribbons/ribbonconteststar.png diff --git a/Resources/img/ribbons/ribboncountmemorybattle.png b/PKHeX/Resources/img/ribbons/ribboncountmemorybattle.png similarity index 100% rename from Resources/img/ribbons/ribboncountmemorybattle.png rename to PKHeX/Resources/img/ribbons/ribboncountmemorybattle.png diff --git a/Resources/img/ribbons/ribboncountmemorybattle2.png b/PKHeX/Resources/img/ribbons/ribboncountmemorybattle2.png similarity index 100% rename from Resources/img/ribbons/ribboncountmemorybattle2.png rename to PKHeX/Resources/img/ribbons/ribboncountmemorybattle2.png diff --git a/Resources/img/ribbons/ribboncountmemorycontest.png b/PKHeX/Resources/img/ribbons/ribboncountmemorycontest.png similarity index 100% rename from Resources/img/ribbons/ribboncountmemorycontest.png rename to PKHeX/Resources/img/ribbons/ribboncountmemorycontest.png diff --git a/Resources/img/ribbons/ribboncountmemorycontest2.png b/PKHeX/Resources/img/ribbons/ribboncountmemorycontest2.png similarity index 100% rename from Resources/img/ribbons/ribboncountmemorycontest2.png rename to PKHeX/Resources/img/ribbons/ribboncountmemorycontest2.png diff --git a/Resources/img/ribbons/ribboncountry.png b/PKHeX/Resources/img/ribbons/ribboncountry.png similarity index 100% rename from Resources/img/ribbons/ribboncountry.png rename to PKHeX/Resources/img/ribbons/ribboncountry.png diff --git a/Resources/img/ribbons/ribbondowncast.png b/PKHeX/Resources/img/ribbons/ribbondowncast.png similarity index 100% rename from Resources/img/ribbons/ribbondowncast.png rename to PKHeX/Resources/img/ribbons/ribbondowncast.png diff --git a/Resources/img/ribbons/ribbonearth.png b/PKHeX/Resources/img/ribbons/ribbonearth.png similarity index 100% rename from Resources/img/ribbons/ribbonearth.png rename to PKHeX/Resources/img/ribbons/ribbonearth.png diff --git a/Resources/img/ribbons/ribboneffort.png b/PKHeX/Resources/img/ribbons/ribboneffort.png similarity index 100% rename from Resources/img/ribbons/ribboneffort.png rename to PKHeX/Resources/img/ribbons/ribboneffort.png diff --git a/Resources/img/ribbons/ribbonevent.png b/PKHeX/Resources/img/ribbons/ribbonevent.png similarity index 100% rename from Resources/img/ribbons/ribbonevent.png rename to PKHeX/Resources/img/ribbons/ribbonevent.png diff --git a/Resources/img/ribbons/ribbonfootprint.png b/PKHeX/Resources/img/ribbons/ribbonfootprint.png similarity index 100% rename from Resources/img/ribbons/ribbonfootprint.png rename to PKHeX/Resources/img/ribbons/ribbonfootprint.png diff --git a/Resources/img/ribbons/ribbong3beauty.png b/PKHeX/Resources/img/ribbons/ribbong3beauty.png similarity index 100% rename from Resources/img/ribbons/ribbong3beauty.png rename to PKHeX/Resources/img/ribbons/ribbong3beauty.png diff --git a/Resources/img/ribbons/ribbong3beautyhyper.png b/PKHeX/Resources/img/ribbons/ribbong3beautyhyper.png similarity index 100% rename from Resources/img/ribbons/ribbong3beautyhyper.png rename to PKHeX/Resources/img/ribbons/ribbong3beautyhyper.png diff --git a/Resources/img/ribbons/ribbong3beautymaster.png b/PKHeX/Resources/img/ribbons/ribbong3beautymaster.png similarity index 100% rename from Resources/img/ribbons/ribbong3beautymaster.png rename to PKHeX/Resources/img/ribbons/ribbong3beautymaster.png diff --git a/Resources/img/ribbons/ribbong3beautysuper.png b/PKHeX/Resources/img/ribbons/ribbong3beautysuper.png similarity index 100% rename from Resources/img/ribbons/ribbong3beautysuper.png rename to PKHeX/Resources/img/ribbons/ribbong3beautysuper.png diff --git a/Resources/img/ribbons/ribbong3cool.png b/PKHeX/Resources/img/ribbons/ribbong3cool.png similarity index 100% rename from Resources/img/ribbons/ribbong3cool.png rename to PKHeX/Resources/img/ribbons/ribbong3cool.png diff --git a/Resources/img/ribbons/ribbong3coolhyper.png b/PKHeX/Resources/img/ribbons/ribbong3coolhyper.png similarity index 100% rename from Resources/img/ribbons/ribbong3coolhyper.png rename to PKHeX/Resources/img/ribbons/ribbong3coolhyper.png diff --git a/Resources/img/ribbons/ribbong3coolmaster.png b/PKHeX/Resources/img/ribbons/ribbong3coolmaster.png similarity index 100% rename from Resources/img/ribbons/ribbong3coolmaster.png rename to PKHeX/Resources/img/ribbons/ribbong3coolmaster.png diff --git a/Resources/img/ribbons/ribbong3coolsuper.png b/PKHeX/Resources/img/ribbons/ribbong3coolsuper.png similarity index 100% rename from Resources/img/ribbons/ribbong3coolsuper.png rename to PKHeX/Resources/img/ribbons/ribbong3coolsuper.png diff --git a/Resources/img/ribbons/ribbong3cute.png b/PKHeX/Resources/img/ribbons/ribbong3cute.png similarity index 100% rename from Resources/img/ribbons/ribbong3cute.png rename to PKHeX/Resources/img/ribbons/ribbong3cute.png diff --git a/Resources/img/ribbons/ribbong3cutehyper.png b/PKHeX/Resources/img/ribbons/ribbong3cutehyper.png similarity index 100% rename from Resources/img/ribbons/ribbong3cutehyper.png rename to PKHeX/Resources/img/ribbons/ribbong3cutehyper.png diff --git a/Resources/img/ribbons/ribbong3cutemaster.png b/PKHeX/Resources/img/ribbons/ribbong3cutemaster.png similarity index 100% rename from Resources/img/ribbons/ribbong3cutemaster.png rename to PKHeX/Resources/img/ribbons/ribbong3cutemaster.png diff --git a/Resources/img/ribbons/ribbong3cutesuper.png b/PKHeX/Resources/img/ribbons/ribbong3cutesuper.png similarity index 100% rename from Resources/img/ribbons/ribbong3cutesuper.png rename to PKHeX/Resources/img/ribbons/ribbong3cutesuper.png diff --git a/Resources/img/ribbons/ribbong3smart.png b/PKHeX/Resources/img/ribbons/ribbong3smart.png similarity index 100% rename from Resources/img/ribbons/ribbong3smart.png rename to PKHeX/Resources/img/ribbons/ribbong3smart.png diff --git a/Resources/img/ribbons/ribbong3smarthyper.png b/PKHeX/Resources/img/ribbons/ribbong3smarthyper.png similarity index 100% rename from Resources/img/ribbons/ribbong3smarthyper.png rename to PKHeX/Resources/img/ribbons/ribbong3smarthyper.png diff --git a/Resources/img/ribbons/ribbong3smartmaster.png b/PKHeX/Resources/img/ribbons/ribbong3smartmaster.png similarity index 100% rename from Resources/img/ribbons/ribbong3smartmaster.png rename to PKHeX/Resources/img/ribbons/ribbong3smartmaster.png diff --git a/Resources/img/ribbons/ribbong3smartsuper.png b/PKHeX/Resources/img/ribbons/ribbong3smartsuper.png similarity index 100% rename from Resources/img/ribbons/ribbong3smartsuper.png rename to PKHeX/Resources/img/ribbons/ribbong3smartsuper.png diff --git a/Resources/img/ribbons/ribbong3tough.png b/PKHeX/Resources/img/ribbons/ribbong3tough.png similarity index 100% rename from Resources/img/ribbons/ribbong3tough.png rename to PKHeX/Resources/img/ribbons/ribbong3tough.png diff --git a/Resources/img/ribbons/ribbong3toughhyper.png b/PKHeX/Resources/img/ribbons/ribbong3toughhyper.png similarity index 100% rename from Resources/img/ribbons/ribbong3toughhyper.png rename to PKHeX/Resources/img/ribbons/ribbong3toughhyper.png diff --git a/Resources/img/ribbons/ribbong3toughmaster.png b/PKHeX/Resources/img/ribbons/ribbong3toughmaster.png similarity index 100% rename from Resources/img/ribbons/ribbong3toughmaster.png rename to PKHeX/Resources/img/ribbons/ribbong3toughmaster.png diff --git a/Resources/img/ribbons/ribbong3toughsuper.png b/PKHeX/Resources/img/ribbons/ribbong3toughsuper.png similarity index 100% rename from Resources/img/ribbons/ribbong3toughsuper.png rename to PKHeX/Resources/img/ribbons/ribbong3toughsuper.png diff --git a/Resources/img/ribbons/ribbong4beauty.png b/PKHeX/Resources/img/ribbons/ribbong4beauty.png similarity index 100% rename from Resources/img/ribbons/ribbong4beauty.png rename to PKHeX/Resources/img/ribbons/ribbong4beauty.png diff --git a/Resources/img/ribbons/ribbong4beautygreat.png b/PKHeX/Resources/img/ribbons/ribbong4beautygreat.png similarity index 100% rename from Resources/img/ribbons/ribbong4beautygreat.png rename to PKHeX/Resources/img/ribbons/ribbong4beautygreat.png diff --git a/Resources/img/ribbons/ribbong4beautymaster.png b/PKHeX/Resources/img/ribbons/ribbong4beautymaster.png similarity index 100% rename from Resources/img/ribbons/ribbong4beautymaster.png rename to PKHeX/Resources/img/ribbons/ribbong4beautymaster.png diff --git a/Resources/img/ribbons/ribbong4beautyultra.png b/PKHeX/Resources/img/ribbons/ribbong4beautyultra.png similarity index 100% rename from Resources/img/ribbons/ribbong4beautyultra.png rename to PKHeX/Resources/img/ribbons/ribbong4beautyultra.png diff --git a/Resources/img/ribbons/ribbong4cool.png b/PKHeX/Resources/img/ribbons/ribbong4cool.png similarity index 100% rename from Resources/img/ribbons/ribbong4cool.png rename to PKHeX/Resources/img/ribbons/ribbong4cool.png diff --git a/Resources/img/ribbons/ribbong4coolgreat.png b/PKHeX/Resources/img/ribbons/ribbong4coolgreat.png similarity index 100% rename from Resources/img/ribbons/ribbong4coolgreat.png rename to PKHeX/Resources/img/ribbons/ribbong4coolgreat.png diff --git a/Resources/img/ribbons/ribbong4coolmaster.png b/PKHeX/Resources/img/ribbons/ribbong4coolmaster.png similarity index 100% rename from Resources/img/ribbons/ribbong4coolmaster.png rename to PKHeX/Resources/img/ribbons/ribbong4coolmaster.png diff --git a/Resources/img/ribbons/ribbong4coolultra.png b/PKHeX/Resources/img/ribbons/ribbong4coolultra.png similarity index 100% rename from Resources/img/ribbons/ribbong4coolultra.png rename to PKHeX/Resources/img/ribbons/ribbong4coolultra.png diff --git a/Resources/img/ribbons/ribbong4cute.png b/PKHeX/Resources/img/ribbons/ribbong4cute.png similarity index 100% rename from Resources/img/ribbons/ribbong4cute.png rename to PKHeX/Resources/img/ribbons/ribbong4cute.png diff --git a/Resources/img/ribbons/ribbong4cutegreat.png b/PKHeX/Resources/img/ribbons/ribbong4cutegreat.png similarity index 100% rename from Resources/img/ribbons/ribbong4cutegreat.png rename to PKHeX/Resources/img/ribbons/ribbong4cutegreat.png diff --git a/Resources/img/ribbons/ribbong4cutemaster.png b/PKHeX/Resources/img/ribbons/ribbong4cutemaster.png similarity index 100% rename from Resources/img/ribbons/ribbong4cutemaster.png rename to PKHeX/Resources/img/ribbons/ribbong4cutemaster.png diff --git a/Resources/img/ribbons/ribbong4cuteultra.png b/PKHeX/Resources/img/ribbons/ribbong4cuteultra.png similarity index 100% rename from Resources/img/ribbons/ribbong4cuteultra.png rename to PKHeX/Resources/img/ribbons/ribbong4cuteultra.png diff --git a/Resources/img/ribbons/ribbong4smart.png b/PKHeX/Resources/img/ribbons/ribbong4smart.png similarity index 100% rename from Resources/img/ribbons/ribbong4smart.png rename to PKHeX/Resources/img/ribbons/ribbong4smart.png diff --git a/Resources/img/ribbons/ribbong4smartgreat.png b/PKHeX/Resources/img/ribbons/ribbong4smartgreat.png similarity index 100% rename from Resources/img/ribbons/ribbong4smartgreat.png rename to PKHeX/Resources/img/ribbons/ribbong4smartgreat.png diff --git a/Resources/img/ribbons/ribbong4smartmaster.png b/PKHeX/Resources/img/ribbons/ribbong4smartmaster.png similarity index 100% rename from Resources/img/ribbons/ribbong4smartmaster.png rename to PKHeX/Resources/img/ribbons/ribbong4smartmaster.png diff --git a/Resources/img/ribbons/ribbong4smartultra.png b/PKHeX/Resources/img/ribbons/ribbong4smartultra.png similarity index 100% rename from Resources/img/ribbons/ribbong4smartultra.png rename to PKHeX/Resources/img/ribbons/ribbong4smartultra.png diff --git a/Resources/img/ribbons/ribbong4tough.png b/PKHeX/Resources/img/ribbons/ribbong4tough.png similarity index 100% rename from Resources/img/ribbons/ribbong4tough.png rename to PKHeX/Resources/img/ribbons/ribbong4tough.png diff --git a/Resources/img/ribbons/ribbong4toughgreat.png b/PKHeX/Resources/img/ribbons/ribbong4toughgreat.png similarity index 100% rename from Resources/img/ribbons/ribbong4toughgreat.png rename to PKHeX/Resources/img/ribbons/ribbong4toughgreat.png diff --git a/Resources/img/ribbons/ribbong4toughmaster.png b/PKHeX/Resources/img/ribbons/ribbong4toughmaster.png similarity index 100% rename from Resources/img/ribbons/ribbong4toughmaster.png rename to PKHeX/Resources/img/ribbons/ribbong4toughmaster.png diff --git a/Resources/img/ribbons/ribbong4toughultra.png b/PKHeX/Resources/img/ribbons/ribbong4toughultra.png similarity index 100% rename from Resources/img/ribbons/ribbong4toughultra.png rename to PKHeX/Resources/img/ribbons/ribbong4toughultra.png diff --git a/Resources/img/ribbons/ribbongorgeous.png b/PKHeX/Resources/img/ribbons/ribbongorgeous.png similarity index 100% rename from Resources/img/ribbons/ribbongorgeous.png rename to PKHeX/Resources/img/ribbons/ribbongorgeous.png diff --git a/Resources/img/ribbons/ribbongorgeousroyal.png b/PKHeX/Resources/img/ribbons/ribbongorgeousroyal.png similarity index 100% rename from Resources/img/ribbons/ribbongorgeousroyal.png rename to PKHeX/Resources/img/ribbons/ribbongorgeousroyal.png diff --git a/Resources/img/ribbons/ribbonlegend.png b/PKHeX/Resources/img/ribbons/ribbonlegend.png similarity index 100% rename from Resources/img/ribbons/ribbonlegend.png rename to PKHeX/Resources/img/ribbons/ribbonlegend.png diff --git a/Resources/img/ribbons/ribbonmasterbeauty.png b/PKHeX/Resources/img/ribbons/ribbonmasterbeauty.png similarity index 100% rename from Resources/img/ribbons/ribbonmasterbeauty.png rename to PKHeX/Resources/img/ribbons/ribbonmasterbeauty.png diff --git a/Resources/img/ribbons/ribbonmastercleverness.png b/PKHeX/Resources/img/ribbons/ribbonmastercleverness.png similarity index 100% rename from Resources/img/ribbons/ribbonmastercleverness.png rename to PKHeX/Resources/img/ribbons/ribbonmastercleverness.png diff --git a/Resources/img/ribbons/ribbonmastercoolness.png b/PKHeX/Resources/img/ribbons/ribbonmastercoolness.png similarity index 100% rename from Resources/img/ribbons/ribbonmastercoolness.png rename to PKHeX/Resources/img/ribbons/ribbonmastercoolness.png diff --git a/Resources/img/ribbons/ribbonmastercuteness.png b/PKHeX/Resources/img/ribbons/ribbonmastercuteness.png similarity index 100% rename from Resources/img/ribbons/ribbonmastercuteness.png rename to PKHeX/Resources/img/ribbons/ribbonmastercuteness.png diff --git a/Resources/img/ribbons/ribbonmastertoughness.png b/PKHeX/Resources/img/ribbons/ribbonmastertoughness.png similarity index 100% rename from Resources/img/ribbons/ribbonmastertoughness.png rename to PKHeX/Resources/img/ribbons/ribbonmastertoughness.png diff --git a/Resources/img/ribbons/ribbonnational.png b/PKHeX/Resources/img/ribbons/ribbonnational.png similarity index 100% rename from Resources/img/ribbons/ribbonnational.png rename to PKHeX/Resources/img/ribbons/ribbonnational.png diff --git a/Resources/img/ribbons/ribbonpremier.png b/PKHeX/Resources/img/ribbons/ribbonpremier.png similarity index 100% rename from Resources/img/ribbons/ribbonpremier.png rename to PKHeX/Resources/img/ribbons/ribbonpremier.png diff --git a/Resources/img/ribbons/ribbonrecord.png b/PKHeX/Resources/img/ribbons/ribbonrecord.png similarity index 100% rename from Resources/img/ribbons/ribbonrecord.png rename to PKHeX/Resources/img/ribbons/ribbonrecord.png diff --git a/Resources/img/ribbons/ribbonrelax.png b/PKHeX/Resources/img/ribbons/ribbonrelax.png similarity index 100% rename from Resources/img/ribbons/ribbonrelax.png rename to PKHeX/Resources/img/ribbons/ribbonrelax.png diff --git a/Resources/img/ribbons/ribbonroyal.png b/PKHeX/Resources/img/ribbons/ribbonroyal.png similarity index 100% rename from Resources/img/ribbons/ribbonroyal.png rename to PKHeX/Resources/img/ribbons/ribbonroyal.png diff --git a/Resources/img/ribbons/ribbonshock.png b/PKHeX/Resources/img/ribbons/ribbonshock.png similarity index 100% rename from Resources/img/ribbons/ribbonshock.png rename to PKHeX/Resources/img/ribbons/ribbonshock.png diff --git a/Resources/img/ribbons/ribbonsmile.png b/PKHeX/Resources/img/ribbons/ribbonsmile.png similarity index 100% rename from Resources/img/ribbons/ribbonsmile.png rename to PKHeX/Resources/img/ribbons/ribbonsmile.png diff --git a/Resources/img/ribbons/ribbonsnooze.png b/PKHeX/Resources/img/ribbons/ribbonsnooze.png similarity index 100% rename from Resources/img/ribbons/ribbonsnooze.png rename to PKHeX/Resources/img/ribbons/ribbonsnooze.png diff --git a/Resources/img/ribbons/ribbonsouvenir.png b/PKHeX/Resources/img/ribbons/ribbonsouvenir.png similarity index 100% rename from Resources/img/ribbons/ribbonsouvenir.png rename to PKHeX/Resources/img/ribbons/ribbonsouvenir.png diff --git a/Resources/img/ribbons/ribbonspecial.png b/PKHeX/Resources/img/ribbons/ribbonspecial.png similarity index 100% rename from Resources/img/ribbons/ribbonspecial.png rename to PKHeX/Resources/img/ribbons/ribbonspecial.png diff --git a/Resources/img/ribbons/ribbontraining.png b/PKHeX/Resources/img/ribbons/ribbontraining.png similarity index 100% rename from Resources/img/ribbons/ribbontraining.png rename to PKHeX/Resources/img/ribbons/ribbontraining.png diff --git a/Resources/img/ribbons/ribbonvictory.png b/PKHeX/Resources/img/ribbons/ribbonvictory.png similarity index 100% rename from Resources/img/ribbons/ribbonvictory.png rename to PKHeX/Resources/img/ribbons/ribbonvictory.png diff --git a/Resources/img/ribbons/ribbonwinning.png b/PKHeX/Resources/img/ribbons/ribbonwinning.png similarity index 100% rename from Resources/img/ribbons/ribbonwinning.png rename to PKHeX/Resources/img/ribbons/ribbonwinning.png diff --git a/Resources/img/ribbons/ribbonwishing.png b/PKHeX/Resources/img/ribbons/ribbonwishing.png similarity index 100% rename from Resources/img/ribbons/ribbonwishing.png rename to PKHeX/Resources/img/ribbons/ribbonwishing.png diff --git a/Resources/img/ribbons/ribbonworld.png b/PKHeX/Resources/img/ribbons/ribbonworld.png similarity index 100% rename from Resources/img/ribbons/ribbonworld.png rename to PKHeX/Resources/img/ribbons/ribbonworld.png diff --git a/Resources/img/valid.png b/PKHeX/Resources/img/valid.png similarity index 100% rename from Resources/img/valid.png rename to PKHeX/Resources/img/valid.png diff --git a/Resources/img/warn.png b/PKHeX/Resources/img/warn.png similarity index 100% rename from Resources/img/warn.png rename to PKHeX/Resources/img/warn.png diff --git a/Resources/text/changelog.txt b/PKHeX/Resources/text/changelog.txt similarity index 100% rename from Resources/text/changelog.txt rename to PKHeX/Resources/text/changelog.txt diff --git a/Resources/text/de/lang_de.txt b/PKHeX/Resources/text/de/lang_de.txt similarity index 100% rename from Resources/text/de/lang_de.txt rename to PKHeX/Resources/text/de/lang_de.txt diff --git a/Resources/text/de/text_Abilities_de.txt b/PKHeX/Resources/text/de/text_Abilities_de.txt similarity index 100% rename from Resources/text/de/text_Abilities_de.txt rename to PKHeX/Resources/text/de/text_Abilities_de.txt diff --git a/Resources/text/de/text_Character_de.txt b/PKHeX/Resources/text/de/text_Character_de.txt similarity index 100% rename from Resources/text/de/text_Character_de.txt rename to PKHeX/Resources/text/de/text_Character_de.txt diff --git a/Resources/text/de/text_EncounterType_de.txt b/PKHeX/Resources/text/de/text_EncounterType_de.txt similarity index 100% rename from Resources/text/de/text_EncounterType_de.txt rename to PKHeX/Resources/text/de/text_EncounterType_de.txt diff --git a/Resources/text/de/text_Forms_de.txt b/PKHeX/Resources/text/de/text_Forms_de.txt similarity index 100% rename from Resources/text/de/text_Forms_de.txt rename to PKHeX/Resources/text/de/text_Forms_de.txt diff --git a/Resources/text/de/text_Games_de.txt b/PKHeX/Resources/text/de/text_Games_de.txt similarity index 100% rename from Resources/text/de/text_Games_de.txt rename to PKHeX/Resources/text/de/text_Games_de.txt diff --git a/Resources/text/de/text_GenLoc_de.txt b/PKHeX/Resources/text/de/text_GenLoc_de.txt similarity index 100% rename from Resources/text/de/text_GenLoc_de.txt rename to PKHeX/Resources/text/de/text_GenLoc_de.txt diff --git a/Resources/text/de/text_Items_de.txt b/PKHeX/Resources/text/de/text_Items_de.txt similarity index 100% rename from Resources/text/de/text_Items_de.txt rename to PKHeX/Resources/text/de/text_Items_de.txt diff --git a/Resources/text/de/text_Memories_de.txt b/PKHeX/Resources/text/de/text_Memories_de.txt similarity index 100% rename from Resources/text/de/text_Memories_de.txt rename to PKHeX/Resources/text/de/text_Memories_de.txt diff --git a/Resources/text/de/text_Moves_de.txt b/PKHeX/Resources/text/de/text_Moves_de.txt similarity index 100% rename from Resources/text/de/text_Moves_de.txt rename to PKHeX/Resources/text/de/text_Moves_de.txt diff --git a/Resources/text/de/text_Natures_de.txt b/PKHeX/Resources/text/de/text_Natures_de.txt similarity index 100% rename from Resources/text/de/text_Natures_de.txt rename to PKHeX/Resources/text/de/text_Natures_de.txt diff --git a/Resources/text/de/text_Pokeblock_de.txt b/PKHeX/Resources/text/de/text_Pokeblock_de.txt similarity index 100% rename from Resources/text/de/text_Pokeblock_de.txt rename to PKHeX/Resources/text/de/text_Pokeblock_de.txt diff --git a/Resources/text/de/text_Puff_de.txt b/PKHeX/Resources/text/de/text_Puff_de.txt similarity index 100% rename from Resources/text/de/text_Puff_de.txt rename to PKHeX/Resources/text/de/text_Puff_de.txt diff --git a/Resources/text/de/text_Species_de.txt b/PKHeX/Resources/text/de/text_Species_de.txt similarity index 100% rename from Resources/text/de/text_Species_de.txt rename to PKHeX/Resources/text/de/text_Species_de.txt diff --git a/Resources/text/de/text_SuperTraining_de.txt b/PKHeX/Resources/text/de/text_SuperTraining_de.txt similarity index 100% rename from Resources/text/de/text_SuperTraining_de.txt rename to PKHeX/Resources/text/de/text_SuperTraining_de.txt diff --git a/Resources/text/de/text_TrainingBag_de.txt b/PKHeX/Resources/text/de/text_TrainingBag_de.txt similarity index 100% rename from Resources/text/de/text_TrainingBag_de.txt rename to PKHeX/Resources/text/de/text_TrainingBag_de.txt diff --git a/Resources/text/de/text_Types_de.txt b/PKHeX/Resources/text/de/text_Types_de.txt similarity index 100% rename from Resources/text/de/text_Types_de.txt rename to PKHeX/Resources/text/de/text_Types_de.txt diff --git a/Resources/text/de/text_Wallpaper_de.txt b/PKHeX/Resources/text/de/text_Wallpaper_de.txt similarity index 100% rename from Resources/text/de/text_Wallpaper_de.txt rename to PKHeX/Resources/text/de/text_Wallpaper_de.txt diff --git a/Resources/text/de/text_bw2_00000_de.txt b/PKHeX/Resources/text/de/text_bw2_00000_de.txt similarity index 100% rename from Resources/text/de/text_bw2_00000_de.txt rename to PKHeX/Resources/text/de/text_bw2_00000_de.txt diff --git a/Resources/text/de/text_bw2_30000_de.txt b/PKHeX/Resources/text/de/text_bw2_30000_de.txt similarity index 100% rename from Resources/text/de/text_bw2_30000_de.txt rename to PKHeX/Resources/text/de/text_bw2_30000_de.txt diff --git a/Resources/text/de/text_bw2_40000_de.txt b/PKHeX/Resources/text/de/text_bw2_40000_de.txt similarity index 100% rename from Resources/text/de/text_bw2_40000_de.txt rename to PKHeX/Resources/text/de/text_bw2_40000_de.txt diff --git a/Resources/text/de/text_bw2_60000_de.txt b/PKHeX/Resources/text/de/text_bw2_60000_de.txt similarity index 100% rename from Resources/text/de/text_bw2_60000_de.txt rename to PKHeX/Resources/text/de/text_bw2_60000_de.txt diff --git a/Resources/text/de/text_hgss_00000_de.txt b/PKHeX/Resources/text/de/text_hgss_00000_de.txt similarity index 100% rename from Resources/text/de/text_hgss_00000_de.txt rename to PKHeX/Resources/text/de/text_hgss_00000_de.txt diff --git a/Resources/text/de/text_hgss_02000_de.txt b/PKHeX/Resources/text/de/text_hgss_02000_de.txt similarity index 100% rename from Resources/text/de/text_hgss_02000_de.txt rename to PKHeX/Resources/text/de/text_hgss_02000_de.txt diff --git a/Resources/text/de/text_hgss_03000_de.txt b/PKHeX/Resources/text/de/text_hgss_03000_de.txt similarity index 100% rename from Resources/text/de/text_hgss_03000_de.txt rename to PKHeX/Resources/text/de/text_hgss_03000_de.txt diff --git a/Resources/text/de/text_tradeao_de.txt b/PKHeX/Resources/text/de/text_tradeao_de.txt similarity index 100% rename from Resources/text/de/text_tradeao_de.txt rename to PKHeX/Resources/text/de/text_tradeao_de.txt diff --git a/Resources/text/de/text_tradexy_de.txt b/PKHeX/Resources/text/de/text_tradexy_de.txt similarity index 100% rename from Resources/text/de/text_tradexy_de.txt rename to PKHeX/Resources/text/de/text_tradexy_de.txt diff --git a/Resources/text/de/text_xy_00000_de.txt b/PKHeX/Resources/text/de/text_xy_00000_de.txt similarity index 100% rename from Resources/text/de/text_xy_00000_de.txt rename to PKHeX/Resources/text/de/text_xy_00000_de.txt diff --git a/Resources/text/de/text_xy_30000_de.txt b/PKHeX/Resources/text/de/text_xy_30000_de.txt similarity index 100% rename from Resources/text/de/text_xy_30000_de.txt rename to PKHeX/Resources/text/de/text_xy_30000_de.txt diff --git a/Resources/text/de/text_xy_40000_de.txt b/PKHeX/Resources/text/de/text_xy_40000_de.txt similarity index 100% rename from Resources/text/de/text_xy_40000_de.txt rename to PKHeX/Resources/text/de/text_xy_40000_de.txt diff --git a/Resources/text/de/text_xy_60000_de.txt b/PKHeX/Resources/text/de/text_xy_60000_de.txt similarity index 100% rename from Resources/text/de/text_xy_60000_de.txt rename to PKHeX/Resources/text/de/text_xy_60000_de.txt diff --git a/Resources/text/en/lang_en.txt b/PKHeX/Resources/text/en/lang_en.txt similarity index 100% rename from Resources/text/en/lang_en.txt rename to PKHeX/Resources/text/en/lang_en.txt diff --git a/Resources/text/en/text_Abilities_en.txt b/PKHeX/Resources/text/en/text_Abilities_en.txt similarity index 100% rename from Resources/text/en/text_Abilities_en.txt rename to PKHeX/Resources/text/en/text_Abilities_en.txt diff --git a/Resources/text/en/text_Character_en.txt b/PKHeX/Resources/text/en/text_Character_en.txt similarity index 100% rename from Resources/text/en/text_Character_en.txt rename to PKHeX/Resources/text/en/text_Character_en.txt diff --git a/Resources/text/en/text_EncounterType_en.txt b/PKHeX/Resources/text/en/text_EncounterType_en.txt similarity index 100% rename from Resources/text/en/text_EncounterType_en.txt rename to PKHeX/Resources/text/en/text_EncounterType_en.txt diff --git a/Resources/text/en/text_Forms_en.txt b/PKHeX/Resources/text/en/text_Forms_en.txt similarity index 100% rename from Resources/text/en/text_Forms_en.txt rename to PKHeX/Resources/text/en/text_Forms_en.txt diff --git a/Resources/text/en/text_Games_en.txt b/PKHeX/Resources/text/en/text_Games_en.txt similarity index 100% rename from Resources/text/en/text_Games_en.txt rename to PKHeX/Resources/text/en/text_Games_en.txt diff --git a/Resources/text/en/text_GenLoc_en.txt b/PKHeX/Resources/text/en/text_GenLoc_en.txt similarity index 100% rename from Resources/text/en/text_GenLoc_en.txt rename to PKHeX/Resources/text/en/text_GenLoc_en.txt diff --git a/Resources/text/en/text_Items_en.txt b/PKHeX/Resources/text/en/text_Items_en.txt similarity index 100% rename from Resources/text/en/text_Items_en.txt rename to PKHeX/Resources/text/en/text_Items_en.txt diff --git a/Resources/text/en/text_Memories_en.txt b/PKHeX/Resources/text/en/text_Memories_en.txt similarity index 100% rename from Resources/text/en/text_Memories_en.txt rename to PKHeX/Resources/text/en/text_Memories_en.txt diff --git a/Resources/text/en/text_Moves_en.txt b/PKHeX/Resources/text/en/text_Moves_en.txt similarity index 100% rename from Resources/text/en/text_Moves_en.txt rename to PKHeX/Resources/text/en/text_Moves_en.txt diff --git a/Resources/text/en/text_Natures_en.txt b/PKHeX/Resources/text/en/text_Natures_en.txt similarity index 100% rename from Resources/text/en/text_Natures_en.txt rename to PKHeX/Resources/text/en/text_Natures_en.txt diff --git a/Resources/text/en/text_Pokeblock_en.txt b/PKHeX/Resources/text/en/text_Pokeblock_en.txt similarity index 100% rename from Resources/text/en/text_Pokeblock_en.txt rename to PKHeX/Resources/text/en/text_Pokeblock_en.txt diff --git a/Resources/text/en/text_Puff_en.txt b/PKHeX/Resources/text/en/text_Puff_en.txt similarity index 100% rename from Resources/text/en/text_Puff_en.txt rename to PKHeX/Resources/text/en/text_Puff_en.txt diff --git a/Resources/text/en/text_Species_en.txt b/PKHeX/Resources/text/en/text_Species_en.txt similarity index 100% rename from Resources/text/en/text_Species_en.txt rename to PKHeX/Resources/text/en/text_Species_en.txt diff --git a/Resources/text/en/text_SuperTraining_en.txt b/PKHeX/Resources/text/en/text_SuperTraining_en.txt similarity index 100% rename from Resources/text/en/text_SuperTraining_en.txt rename to PKHeX/Resources/text/en/text_SuperTraining_en.txt diff --git a/Resources/text/en/text_TrainingBag_en.txt b/PKHeX/Resources/text/en/text_TrainingBag_en.txt similarity index 100% rename from Resources/text/en/text_TrainingBag_en.txt rename to PKHeX/Resources/text/en/text_TrainingBag_en.txt diff --git a/Resources/text/en/text_Types_en.txt b/PKHeX/Resources/text/en/text_Types_en.txt similarity index 100% rename from Resources/text/en/text_Types_en.txt rename to PKHeX/Resources/text/en/text_Types_en.txt diff --git a/Resources/text/en/text_Wallpaper_en.txt b/PKHeX/Resources/text/en/text_Wallpaper_en.txt similarity index 100% rename from Resources/text/en/text_Wallpaper_en.txt rename to PKHeX/Resources/text/en/text_Wallpaper_en.txt diff --git a/Resources/text/en/text_bw2_00000_en.txt b/PKHeX/Resources/text/en/text_bw2_00000_en.txt similarity index 100% rename from Resources/text/en/text_bw2_00000_en.txt rename to PKHeX/Resources/text/en/text_bw2_00000_en.txt diff --git a/Resources/text/en/text_bw2_30000_en.txt b/PKHeX/Resources/text/en/text_bw2_30000_en.txt similarity index 100% rename from Resources/text/en/text_bw2_30000_en.txt rename to PKHeX/Resources/text/en/text_bw2_30000_en.txt diff --git a/Resources/text/en/text_bw2_40000_en.txt b/PKHeX/Resources/text/en/text_bw2_40000_en.txt similarity index 100% rename from Resources/text/en/text_bw2_40000_en.txt rename to PKHeX/Resources/text/en/text_bw2_40000_en.txt diff --git a/Resources/text/en/text_bw2_60000_en.txt b/PKHeX/Resources/text/en/text_bw2_60000_en.txt similarity index 100% rename from Resources/text/en/text_bw2_60000_en.txt rename to PKHeX/Resources/text/en/text_bw2_60000_en.txt diff --git a/Resources/text/en/text_hgss_00000_en.txt b/PKHeX/Resources/text/en/text_hgss_00000_en.txt similarity index 100% rename from Resources/text/en/text_hgss_00000_en.txt rename to PKHeX/Resources/text/en/text_hgss_00000_en.txt diff --git a/Resources/text/en/text_hgss_02000_en.txt b/PKHeX/Resources/text/en/text_hgss_02000_en.txt similarity index 100% rename from Resources/text/en/text_hgss_02000_en.txt rename to PKHeX/Resources/text/en/text_hgss_02000_en.txt diff --git a/Resources/text/en/text_hgss_03000_en.txt b/PKHeX/Resources/text/en/text_hgss_03000_en.txt similarity index 100% rename from Resources/text/en/text_hgss_03000_en.txt rename to PKHeX/Resources/text/en/text_hgss_03000_en.txt diff --git a/Resources/text/en/text_tradeao_en.txt b/PKHeX/Resources/text/en/text_tradeao_en.txt similarity index 100% rename from Resources/text/en/text_tradeao_en.txt rename to PKHeX/Resources/text/en/text_tradeao_en.txt diff --git a/Resources/text/en/text_tradexy_en.txt b/PKHeX/Resources/text/en/text_tradexy_en.txt similarity index 100% rename from Resources/text/en/text_tradexy_en.txt rename to PKHeX/Resources/text/en/text_tradexy_en.txt diff --git a/Resources/text/en/text_xy_00000_en.txt b/PKHeX/Resources/text/en/text_xy_00000_en.txt similarity index 100% rename from Resources/text/en/text_xy_00000_en.txt rename to PKHeX/Resources/text/en/text_xy_00000_en.txt diff --git a/Resources/text/en/text_xy_30000_en.txt b/PKHeX/Resources/text/en/text_xy_30000_en.txt similarity index 100% rename from Resources/text/en/text_xy_30000_en.txt rename to PKHeX/Resources/text/en/text_xy_30000_en.txt diff --git a/Resources/text/en/text_xy_40000_en.txt b/PKHeX/Resources/text/en/text_xy_40000_en.txt similarity index 100% rename from Resources/text/en/text_xy_40000_en.txt rename to PKHeX/Resources/text/en/text_xy_40000_en.txt diff --git a/Resources/text/en/text_xy_60000_en.txt b/PKHeX/Resources/text/en/text_xy_60000_en.txt similarity index 100% rename from Resources/text/en/text_xy_60000_en.txt rename to PKHeX/Resources/text/en/text_xy_60000_en.txt diff --git a/Resources/text/es/lang_es.txt b/PKHeX/Resources/text/es/lang_es.txt similarity index 100% rename from Resources/text/es/lang_es.txt rename to PKHeX/Resources/text/es/lang_es.txt diff --git a/Resources/text/es/text_Abilities_es.txt b/PKHeX/Resources/text/es/text_Abilities_es.txt similarity index 100% rename from Resources/text/es/text_Abilities_es.txt rename to PKHeX/Resources/text/es/text_Abilities_es.txt diff --git a/Resources/text/es/text_Character_es.txt b/PKHeX/Resources/text/es/text_Character_es.txt similarity index 100% rename from Resources/text/es/text_Character_es.txt rename to PKHeX/Resources/text/es/text_Character_es.txt diff --git a/Resources/text/es/text_EncounterType_es.txt b/PKHeX/Resources/text/es/text_EncounterType_es.txt similarity index 100% rename from Resources/text/es/text_EncounterType_es.txt rename to PKHeX/Resources/text/es/text_EncounterType_es.txt diff --git a/Resources/text/es/text_Forms_es.txt b/PKHeX/Resources/text/es/text_Forms_es.txt similarity index 100% rename from Resources/text/es/text_Forms_es.txt rename to PKHeX/Resources/text/es/text_Forms_es.txt diff --git a/Resources/text/es/text_Games_es.txt b/PKHeX/Resources/text/es/text_Games_es.txt similarity index 100% rename from Resources/text/es/text_Games_es.txt rename to PKHeX/Resources/text/es/text_Games_es.txt diff --git a/Resources/text/es/text_GenLoc_es.txt b/PKHeX/Resources/text/es/text_GenLoc_es.txt similarity index 100% rename from Resources/text/es/text_GenLoc_es.txt rename to PKHeX/Resources/text/es/text_GenLoc_es.txt diff --git a/Resources/text/es/text_Items_es.txt b/PKHeX/Resources/text/es/text_Items_es.txt similarity index 100% rename from Resources/text/es/text_Items_es.txt rename to PKHeX/Resources/text/es/text_Items_es.txt diff --git a/Resources/text/es/text_Memories_es.txt b/PKHeX/Resources/text/es/text_Memories_es.txt similarity index 100% rename from Resources/text/es/text_Memories_es.txt rename to PKHeX/Resources/text/es/text_Memories_es.txt diff --git a/Resources/text/es/text_Moves_es.txt b/PKHeX/Resources/text/es/text_Moves_es.txt similarity index 100% rename from Resources/text/es/text_Moves_es.txt rename to PKHeX/Resources/text/es/text_Moves_es.txt diff --git a/Resources/text/es/text_Natures_es.txt b/PKHeX/Resources/text/es/text_Natures_es.txt similarity index 100% rename from Resources/text/es/text_Natures_es.txt rename to PKHeX/Resources/text/es/text_Natures_es.txt diff --git a/Resources/text/es/text_Pokeblock_es.txt b/PKHeX/Resources/text/es/text_Pokeblock_es.txt similarity index 100% rename from Resources/text/es/text_Pokeblock_es.txt rename to PKHeX/Resources/text/es/text_Pokeblock_es.txt diff --git a/Resources/text/es/text_Puff_es.txt b/PKHeX/Resources/text/es/text_Puff_es.txt similarity index 100% rename from Resources/text/es/text_Puff_es.txt rename to PKHeX/Resources/text/es/text_Puff_es.txt diff --git a/Resources/text/es/text_Species_es.txt b/PKHeX/Resources/text/es/text_Species_es.txt similarity index 100% rename from Resources/text/es/text_Species_es.txt rename to PKHeX/Resources/text/es/text_Species_es.txt diff --git a/Resources/text/es/text_SuperTraining_es.txt b/PKHeX/Resources/text/es/text_SuperTraining_es.txt similarity index 100% rename from Resources/text/es/text_SuperTraining_es.txt rename to PKHeX/Resources/text/es/text_SuperTraining_es.txt diff --git a/Resources/text/es/text_TrainingBag_es.txt b/PKHeX/Resources/text/es/text_TrainingBag_es.txt similarity index 100% rename from Resources/text/es/text_TrainingBag_es.txt rename to PKHeX/Resources/text/es/text_TrainingBag_es.txt diff --git a/Resources/text/es/text_Types_es.txt b/PKHeX/Resources/text/es/text_Types_es.txt similarity index 100% rename from Resources/text/es/text_Types_es.txt rename to PKHeX/Resources/text/es/text_Types_es.txt diff --git a/Resources/text/es/text_Wallpaper_es.txt b/PKHeX/Resources/text/es/text_Wallpaper_es.txt similarity index 100% rename from Resources/text/es/text_Wallpaper_es.txt rename to PKHeX/Resources/text/es/text_Wallpaper_es.txt diff --git a/Resources/text/es/text_bw2_00000_es.txt b/PKHeX/Resources/text/es/text_bw2_00000_es.txt similarity index 100% rename from Resources/text/es/text_bw2_00000_es.txt rename to PKHeX/Resources/text/es/text_bw2_00000_es.txt diff --git a/Resources/text/es/text_bw2_30000_es.txt b/PKHeX/Resources/text/es/text_bw2_30000_es.txt similarity index 100% rename from Resources/text/es/text_bw2_30000_es.txt rename to PKHeX/Resources/text/es/text_bw2_30000_es.txt diff --git a/Resources/text/es/text_bw2_40000_es.txt b/PKHeX/Resources/text/es/text_bw2_40000_es.txt similarity index 100% rename from Resources/text/es/text_bw2_40000_es.txt rename to PKHeX/Resources/text/es/text_bw2_40000_es.txt diff --git a/Resources/text/es/text_bw2_60000_es.txt b/PKHeX/Resources/text/es/text_bw2_60000_es.txt similarity index 100% rename from Resources/text/es/text_bw2_60000_es.txt rename to PKHeX/Resources/text/es/text_bw2_60000_es.txt diff --git a/Resources/text/es/text_hgss_00000_es.txt b/PKHeX/Resources/text/es/text_hgss_00000_es.txt similarity index 100% rename from Resources/text/es/text_hgss_00000_es.txt rename to PKHeX/Resources/text/es/text_hgss_00000_es.txt diff --git a/Resources/text/es/text_hgss_02000_es.txt b/PKHeX/Resources/text/es/text_hgss_02000_es.txt similarity index 100% rename from Resources/text/es/text_hgss_02000_es.txt rename to PKHeX/Resources/text/es/text_hgss_02000_es.txt diff --git a/Resources/text/es/text_hgss_03000_es.txt b/PKHeX/Resources/text/es/text_hgss_03000_es.txt similarity index 100% rename from Resources/text/es/text_hgss_03000_es.txt rename to PKHeX/Resources/text/es/text_hgss_03000_es.txt diff --git a/Resources/text/es/text_tradeao_es.txt b/PKHeX/Resources/text/es/text_tradeao_es.txt similarity index 100% rename from Resources/text/es/text_tradeao_es.txt rename to PKHeX/Resources/text/es/text_tradeao_es.txt diff --git a/Resources/text/es/text_tradexy_es.txt b/PKHeX/Resources/text/es/text_tradexy_es.txt similarity index 100% rename from Resources/text/es/text_tradexy_es.txt rename to PKHeX/Resources/text/es/text_tradexy_es.txt diff --git a/Resources/text/es/text_xy_00000_es.txt b/PKHeX/Resources/text/es/text_xy_00000_es.txt similarity index 100% rename from Resources/text/es/text_xy_00000_es.txt rename to PKHeX/Resources/text/es/text_xy_00000_es.txt diff --git a/Resources/text/es/text_xy_30000_es.txt b/PKHeX/Resources/text/es/text_xy_30000_es.txt similarity index 100% rename from Resources/text/es/text_xy_30000_es.txt rename to PKHeX/Resources/text/es/text_xy_30000_es.txt diff --git a/Resources/text/es/text_xy_40000_es.txt b/PKHeX/Resources/text/es/text_xy_40000_es.txt similarity index 100% rename from Resources/text/es/text_xy_40000_es.txt rename to PKHeX/Resources/text/es/text_xy_40000_es.txt diff --git a/Resources/text/es/text_xy_60000_es.txt b/PKHeX/Resources/text/es/text_xy_60000_es.txt similarity index 100% rename from Resources/text/es/text_xy_60000_es.txt rename to PKHeX/Resources/text/es/text_xy_60000_es.txt diff --git a/Resources/text/fr/lang_fr.txt b/PKHeX/Resources/text/fr/lang_fr.txt similarity index 100% rename from Resources/text/fr/lang_fr.txt rename to PKHeX/Resources/text/fr/lang_fr.txt diff --git a/Resources/text/fr/text_Abilities_fr.txt b/PKHeX/Resources/text/fr/text_Abilities_fr.txt similarity index 100% rename from Resources/text/fr/text_Abilities_fr.txt rename to PKHeX/Resources/text/fr/text_Abilities_fr.txt diff --git a/Resources/text/fr/text_Character_fr.txt b/PKHeX/Resources/text/fr/text_Character_fr.txt similarity index 100% rename from Resources/text/fr/text_Character_fr.txt rename to PKHeX/Resources/text/fr/text_Character_fr.txt diff --git a/Resources/text/fr/text_EncounterType_fr.txt b/PKHeX/Resources/text/fr/text_EncounterType_fr.txt similarity index 100% rename from Resources/text/fr/text_EncounterType_fr.txt rename to PKHeX/Resources/text/fr/text_EncounterType_fr.txt diff --git a/Resources/text/fr/text_Forms_fr.txt b/PKHeX/Resources/text/fr/text_Forms_fr.txt similarity index 100% rename from Resources/text/fr/text_Forms_fr.txt rename to PKHeX/Resources/text/fr/text_Forms_fr.txt diff --git a/Resources/text/fr/text_Games_fr.txt b/PKHeX/Resources/text/fr/text_Games_fr.txt similarity index 100% rename from Resources/text/fr/text_Games_fr.txt rename to PKHeX/Resources/text/fr/text_Games_fr.txt diff --git a/Resources/text/fr/text_GenLoc_fr.txt b/PKHeX/Resources/text/fr/text_GenLoc_fr.txt similarity index 100% rename from Resources/text/fr/text_GenLoc_fr.txt rename to PKHeX/Resources/text/fr/text_GenLoc_fr.txt diff --git a/Resources/text/fr/text_Items_fr.txt b/PKHeX/Resources/text/fr/text_Items_fr.txt similarity index 100% rename from Resources/text/fr/text_Items_fr.txt rename to PKHeX/Resources/text/fr/text_Items_fr.txt diff --git a/Resources/text/fr/text_Memories_fr.txt b/PKHeX/Resources/text/fr/text_Memories_fr.txt similarity index 100% rename from Resources/text/fr/text_Memories_fr.txt rename to PKHeX/Resources/text/fr/text_Memories_fr.txt diff --git a/Resources/text/fr/text_Moves_fr.txt b/PKHeX/Resources/text/fr/text_Moves_fr.txt similarity index 100% rename from Resources/text/fr/text_Moves_fr.txt rename to PKHeX/Resources/text/fr/text_Moves_fr.txt diff --git a/Resources/text/fr/text_Natures_fr.txt b/PKHeX/Resources/text/fr/text_Natures_fr.txt similarity index 100% rename from Resources/text/fr/text_Natures_fr.txt rename to PKHeX/Resources/text/fr/text_Natures_fr.txt diff --git a/Resources/text/fr/text_Pokeblock_fr.txt b/PKHeX/Resources/text/fr/text_Pokeblock_fr.txt similarity index 100% rename from Resources/text/fr/text_Pokeblock_fr.txt rename to PKHeX/Resources/text/fr/text_Pokeblock_fr.txt diff --git a/Resources/text/fr/text_Puff_fr.txt b/PKHeX/Resources/text/fr/text_Puff_fr.txt similarity index 100% rename from Resources/text/fr/text_Puff_fr.txt rename to PKHeX/Resources/text/fr/text_Puff_fr.txt diff --git a/Resources/text/fr/text_Species_fr.txt b/PKHeX/Resources/text/fr/text_Species_fr.txt similarity index 100% rename from Resources/text/fr/text_Species_fr.txt rename to PKHeX/Resources/text/fr/text_Species_fr.txt diff --git a/Resources/text/fr/text_SuperTraining_fr.txt b/PKHeX/Resources/text/fr/text_SuperTraining_fr.txt similarity index 100% rename from Resources/text/fr/text_SuperTraining_fr.txt rename to PKHeX/Resources/text/fr/text_SuperTraining_fr.txt diff --git a/Resources/text/fr/text_TrainingBag_fr.txt b/PKHeX/Resources/text/fr/text_TrainingBag_fr.txt similarity index 100% rename from Resources/text/fr/text_TrainingBag_fr.txt rename to PKHeX/Resources/text/fr/text_TrainingBag_fr.txt diff --git a/Resources/text/fr/text_Types_fr.txt b/PKHeX/Resources/text/fr/text_Types_fr.txt similarity index 100% rename from Resources/text/fr/text_Types_fr.txt rename to PKHeX/Resources/text/fr/text_Types_fr.txt diff --git a/Resources/text/fr/text_Wallpaper_fr.txt b/PKHeX/Resources/text/fr/text_Wallpaper_fr.txt similarity index 100% rename from Resources/text/fr/text_Wallpaper_fr.txt rename to PKHeX/Resources/text/fr/text_Wallpaper_fr.txt diff --git a/Resources/text/fr/text_bw2_00000_fr.txt b/PKHeX/Resources/text/fr/text_bw2_00000_fr.txt similarity index 100% rename from Resources/text/fr/text_bw2_00000_fr.txt rename to PKHeX/Resources/text/fr/text_bw2_00000_fr.txt diff --git a/Resources/text/fr/text_bw2_30000_fr.txt b/PKHeX/Resources/text/fr/text_bw2_30000_fr.txt similarity index 100% rename from Resources/text/fr/text_bw2_30000_fr.txt rename to PKHeX/Resources/text/fr/text_bw2_30000_fr.txt diff --git a/Resources/text/fr/text_bw2_40000_fr.txt b/PKHeX/Resources/text/fr/text_bw2_40000_fr.txt similarity index 100% rename from Resources/text/fr/text_bw2_40000_fr.txt rename to PKHeX/Resources/text/fr/text_bw2_40000_fr.txt diff --git a/Resources/text/fr/text_bw2_60000_fr.txt b/PKHeX/Resources/text/fr/text_bw2_60000_fr.txt similarity index 100% rename from Resources/text/fr/text_bw2_60000_fr.txt rename to PKHeX/Resources/text/fr/text_bw2_60000_fr.txt diff --git a/Resources/text/fr/text_hgss_00000_fr.txt b/PKHeX/Resources/text/fr/text_hgss_00000_fr.txt similarity index 100% rename from Resources/text/fr/text_hgss_00000_fr.txt rename to PKHeX/Resources/text/fr/text_hgss_00000_fr.txt diff --git a/Resources/text/fr/text_hgss_02000_fr.txt b/PKHeX/Resources/text/fr/text_hgss_02000_fr.txt similarity index 100% rename from Resources/text/fr/text_hgss_02000_fr.txt rename to PKHeX/Resources/text/fr/text_hgss_02000_fr.txt diff --git a/Resources/text/fr/text_hgss_03000_fr.txt b/PKHeX/Resources/text/fr/text_hgss_03000_fr.txt similarity index 100% rename from Resources/text/fr/text_hgss_03000_fr.txt rename to PKHeX/Resources/text/fr/text_hgss_03000_fr.txt diff --git a/Resources/text/fr/text_tradeao_fr.txt b/PKHeX/Resources/text/fr/text_tradeao_fr.txt similarity index 100% rename from Resources/text/fr/text_tradeao_fr.txt rename to PKHeX/Resources/text/fr/text_tradeao_fr.txt diff --git a/Resources/text/fr/text_tradexy_fr.txt b/PKHeX/Resources/text/fr/text_tradexy_fr.txt similarity index 100% rename from Resources/text/fr/text_tradexy_fr.txt rename to PKHeX/Resources/text/fr/text_tradexy_fr.txt diff --git a/Resources/text/fr/text_xy_00000_fr.txt b/PKHeX/Resources/text/fr/text_xy_00000_fr.txt similarity index 100% rename from Resources/text/fr/text_xy_00000_fr.txt rename to PKHeX/Resources/text/fr/text_xy_00000_fr.txt diff --git a/Resources/text/fr/text_xy_30000_fr.txt b/PKHeX/Resources/text/fr/text_xy_30000_fr.txt similarity index 100% rename from Resources/text/fr/text_xy_30000_fr.txt rename to PKHeX/Resources/text/fr/text_xy_30000_fr.txt diff --git a/Resources/text/fr/text_xy_40000_fr.txt b/PKHeX/Resources/text/fr/text_xy_40000_fr.txt similarity index 100% rename from Resources/text/fr/text_xy_40000_fr.txt rename to PKHeX/Resources/text/fr/text_xy_40000_fr.txt diff --git a/Resources/text/fr/text_xy_60000_fr.txt b/PKHeX/Resources/text/fr/text_xy_60000_fr.txt similarity index 100% rename from Resources/text/fr/text_xy_60000_fr.txt rename to PKHeX/Resources/text/fr/text_xy_60000_fr.txt diff --git a/Resources/text/gen3/text_ItemsG3_en.txt b/PKHeX/Resources/text/gen3/text_ItemsG3_en.txt similarity index 100% rename from Resources/text/gen3/text_ItemsG3_en.txt rename to PKHeX/Resources/text/gen3/text_ItemsG3_en.txt diff --git a/Resources/text/gen3/text_rsefrlg_00000_en.txt b/PKHeX/Resources/text/gen3/text_rsefrlg_00000_en.txt similarity index 100% rename from Resources/text/gen3/text_rsefrlg_00000_en.txt rename to PKHeX/Resources/text/gen3/text_rsefrlg_00000_en.txt diff --git a/Resources/text/it/lang_it.txt b/PKHeX/Resources/text/it/lang_it.txt similarity index 100% rename from Resources/text/it/lang_it.txt rename to PKHeX/Resources/text/it/lang_it.txt diff --git a/Resources/text/it/text_Abilities_it.txt b/PKHeX/Resources/text/it/text_Abilities_it.txt similarity index 100% rename from Resources/text/it/text_Abilities_it.txt rename to PKHeX/Resources/text/it/text_Abilities_it.txt diff --git a/Resources/text/it/text_Character_it.txt b/PKHeX/Resources/text/it/text_Character_it.txt similarity index 100% rename from Resources/text/it/text_Character_it.txt rename to PKHeX/Resources/text/it/text_Character_it.txt diff --git a/Resources/text/it/text_EncounterType_it.txt b/PKHeX/Resources/text/it/text_EncounterType_it.txt similarity index 100% rename from Resources/text/it/text_EncounterType_it.txt rename to PKHeX/Resources/text/it/text_EncounterType_it.txt diff --git a/Resources/text/it/text_Forms_it.txt b/PKHeX/Resources/text/it/text_Forms_it.txt similarity index 100% rename from Resources/text/it/text_Forms_it.txt rename to PKHeX/Resources/text/it/text_Forms_it.txt diff --git a/Resources/text/it/text_Games_it.txt b/PKHeX/Resources/text/it/text_Games_it.txt similarity index 100% rename from Resources/text/it/text_Games_it.txt rename to PKHeX/Resources/text/it/text_Games_it.txt diff --git a/Resources/text/it/text_GenLoc_it.txt b/PKHeX/Resources/text/it/text_GenLoc_it.txt similarity index 100% rename from Resources/text/it/text_GenLoc_it.txt rename to PKHeX/Resources/text/it/text_GenLoc_it.txt diff --git a/Resources/text/it/text_Items_it.txt b/PKHeX/Resources/text/it/text_Items_it.txt similarity index 100% rename from Resources/text/it/text_Items_it.txt rename to PKHeX/Resources/text/it/text_Items_it.txt diff --git a/Resources/text/it/text_Memories_it.txt b/PKHeX/Resources/text/it/text_Memories_it.txt similarity index 100% rename from Resources/text/it/text_Memories_it.txt rename to PKHeX/Resources/text/it/text_Memories_it.txt diff --git a/Resources/text/it/text_Moves_it.txt b/PKHeX/Resources/text/it/text_Moves_it.txt similarity index 100% rename from Resources/text/it/text_Moves_it.txt rename to PKHeX/Resources/text/it/text_Moves_it.txt diff --git a/Resources/text/it/text_Natures_it.txt b/PKHeX/Resources/text/it/text_Natures_it.txt similarity index 100% rename from Resources/text/it/text_Natures_it.txt rename to PKHeX/Resources/text/it/text_Natures_it.txt diff --git a/Resources/text/it/text_Pokeblock_it.txt b/PKHeX/Resources/text/it/text_Pokeblock_it.txt similarity index 100% rename from Resources/text/it/text_Pokeblock_it.txt rename to PKHeX/Resources/text/it/text_Pokeblock_it.txt diff --git a/Resources/text/it/text_Puff_it.txt b/PKHeX/Resources/text/it/text_Puff_it.txt similarity index 100% rename from Resources/text/it/text_Puff_it.txt rename to PKHeX/Resources/text/it/text_Puff_it.txt diff --git a/Resources/text/it/text_Species_it.txt b/PKHeX/Resources/text/it/text_Species_it.txt similarity index 100% rename from Resources/text/it/text_Species_it.txt rename to PKHeX/Resources/text/it/text_Species_it.txt diff --git a/Resources/text/it/text_SuperTraining_it.txt b/PKHeX/Resources/text/it/text_SuperTraining_it.txt similarity index 100% rename from Resources/text/it/text_SuperTraining_it.txt rename to PKHeX/Resources/text/it/text_SuperTraining_it.txt diff --git a/Resources/text/it/text_TrainingBag_it.txt b/PKHeX/Resources/text/it/text_TrainingBag_it.txt similarity index 100% rename from Resources/text/it/text_TrainingBag_it.txt rename to PKHeX/Resources/text/it/text_TrainingBag_it.txt diff --git a/Resources/text/it/text_Types_it.txt b/PKHeX/Resources/text/it/text_Types_it.txt similarity index 100% rename from Resources/text/it/text_Types_it.txt rename to PKHeX/Resources/text/it/text_Types_it.txt diff --git a/Resources/text/it/text_Wallpaper_it.txt b/PKHeX/Resources/text/it/text_Wallpaper_it.txt similarity index 100% rename from Resources/text/it/text_Wallpaper_it.txt rename to PKHeX/Resources/text/it/text_Wallpaper_it.txt diff --git a/Resources/text/it/text_bw2_00000_it.txt b/PKHeX/Resources/text/it/text_bw2_00000_it.txt similarity index 100% rename from Resources/text/it/text_bw2_00000_it.txt rename to PKHeX/Resources/text/it/text_bw2_00000_it.txt diff --git a/Resources/text/it/text_bw2_30000_it.txt b/PKHeX/Resources/text/it/text_bw2_30000_it.txt similarity index 100% rename from Resources/text/it/text_bw2_30000_it.txt rename to PKHeX/Resources/text/it/text_bw2_30000_it.txt diff --git a/Resources/text/it/text_bw2_40000_it.txt b/PKHeX/Resources/text/it/text_bw2_40000_it.txt similarity index 100% rename from Resources/text/it/text_bw2_40000_it.txt rename to PKHeX/Resources/text/it/text_bw2_40000_it.txt diff --git a/Resources/text/it/text_bw2_60000_it.txt b/PKHeX/Resources/text/it/text_bw2_60000_it.txt similarity index 100% rename from Resources/text/it/text_bw2_60000_it.txt rename to PKHeX/Resources/text/it/text_bw2_60000_it.txt diff --git a/Resources/text/it/text_hgss_00000_it.txt b/PKHeX/Resources/text/it/text_hgss_00000_it.txt similarity index 100% rename from Resources/text/it/text_hgss_00000_it.txt rename to PKHeX/Resources/text/it/text_hgss_00000_it.txt diff --git a/Resources/text/it/text_hgss_02000_it.txt b/PKHeX/Resources/text/it/text_hgss_02000_it.txt similarity index 100% rename from Resources/text/it/text_hgss_02000_it.txt rename to PKHeX/Resources/text/it/text_hgss_02000_it.txt diff --git a/Resources/text/it/text_hgss_03000_it.txt b/PKHeX/Resources/text/it/text_hgss_03000_it.txt similarity index 100% rename from Resources/text/it/text_hgss_03000_it.txt rename to PKHeX/Resources/text/it/text_hgss_03000_it.txt diff --git a/Resources/text/it/text_tradeao_it.txt b/PKHeX/Resources/text/it/text_tradeao_it.txt similarity index 100% rename from Resources/text/it/text_tradeao_it.txt rename to PKHeX/Resources/text/it/text_tradeao_it.txt diff --git a/Resources/text/it/text_tradexy_it.txt b/PKHeX/Resources/text/it/text_tradexy_it.txt similarity index 100% rename from Resources/text/it/text_tradexy_it.txt rename to PKHeX/Resources/text/it/text_tradexy_it.txt diff --git a/Resources/text/it/text_xy_00000_it.txt b/PKHeX/Resources/text/it/text_xy_00000_it.txt similarity index 100% rename from Resources/text/it/text_xy_00000_it.txt rename to PKHeX/Resources/text/it/text_xy_00000_it.txt diff --git a/Resources/text/it/text_xy_30000_it.txt b/PKHeX/Resources/text/it/text_xy_30000_it.txt similarity index 100% rename from Resources/text/it/text_xy_30000_it.txt rename to PKHeX/Resources/text/it/text_xy_30000_it.txt diff --git a/Resources/text/it/text_xy_40000_it.txt b/PKHeX/Resources/text/it/text_xy_40000_it.txt similarity index 100% rename from Resources/text/it/text_xy_40000_it.txt rename to PKHeX/Resources/text/it/text_xy_40000_it.txt diff --git a/Resources/text/it/text_xy_60000_it.txt b/PKHeX/Resources/text/it/text_xy_60000_it.txt similarity index 100% rename from Resources/text/it/text_xy_60000_it.txt rename to PKHeX/Resources/text/it/text_xy_60000_it.txt diff --git a/Resources/text/ja/lang_ja.txt b/PKHeX/Resources/text/ja/lang_ja.txt similarity index 100% rename from Resources/text/ja/lang_ja.txt rename to PKHeX/Resources/text/ja/lang_ja.txt diff --git a/Resources/text/ja/text_Abilities_ja.txt b/PKHeX/Resources/text/ja/text_Abilities_ja.txt similarity index 100% rename from Resources/text/ja/text_Abilities_ja.txt rename to PKHeX/Resources/text/ja/text_Abilities_ja.txt diff --git a/Resources/text/ja/text_Character_ja.txt b/PKHeX/Resources/text/ja/text_Character_ja.txt similarity index 100% rename from Resources/text/ja/text_Character_ja.txt rename to PKHeX/Resources/text/ja/text_Character_ja.txt diff --git a/Resources/text/ja/text_EncounterType_ja.txt b/PKHeX/Resources/text/ja/text_EncounterType_ja.txt similarity index 100% rename from Resources/text/ja/text_EncounterType_ja.txt rename to PKHeX/Resources/text/ja/text_EncounterType_ja.txt diff --git a/Resources/text/ja/text_Forms_ja.txt b/PKHeX/Resources/text/ja/text_Forms_ja.txt similarity index 100% rename from Resources/text/ja/text_Forms_ja.txt rename to PKHeX/Resources/text/ja/text_Forms_ja.txt diff --git a/Resources/text/ja/text_Games_ja.txt b/PKHeX/Resources/text/ja/text_Games_ja.txt similarity index 100% rename from Resources/text/ja/text_Games_ja.txt rename to PKHeX/Resources/text/ja/text_Games_ja.txt diff --git a/Resources/text/ja/text_GenLoc_ja.txt b/PKHeX/Resources/text/ja/text_GenLoc_ja.txt similarity index 100% rename from Resources/text/ja/text_GenLoc_ja.txt rename to PKHeX/Resources/text/ja/text_GenLoc_ja.txt diff --git a/Resources/text/ja/text_Items_ja.txt b/PKHeX/Resources/text/ja/text_Items_ja.txt similarity index 100% rename from Resources/text/ja/text_Items_ja.txt rename to PKHeX/Resources/text/ja/text_Items_ja.txt diff --git a/Resources/text/ja/text_Memories_ja.txt b/PKHeX/Resources/text/ja/text_Memories_ja.txt similarity index 100% rename from Resources/text/ja/text_Memories_ja.txt rename to PKHeX/Resources/text/ja/text_Memories_ja.txt diff --git a/Resources/text/ja/text_Moves_ja.txt b/PKHeX/Resources/text/ja/text_Moves_ja.txt similarity index 100% rename from Resources/text/ja/text_Moves_ja.txt rename to PKHeX/Resources/text/ja/text_Moves_ja.txt diff --git a/Resources/text/ja/text_Natures_ja.txt b/PKHeX/Resources/text/ja/text_Natures_ja.txt similarity index 100% rename from Resources/text/ja/text_Natures_ja.txt rename to PKHeX/Resources/text/ja/text_Natures_ja.txt diff --git a/Resources/text/ja/text_Pokeblock_ja.txt b/PKHeX/Resources/text/ja/text_Pokeblock_ja.txt similarity index 100% rename from Resources/text/ja/text_Pokeblock_ja.txt rename to PKHeX/Resources/text/ja/text_Pokeblock_ja.txt diff --git a/Resources/text/ja/text_Puff_ja.txt b/PKHeX/Resources/text/ja/text_Puff_ja.txt similarity index 100% rename from Resources/text/ja/text_Puff_ja.txt rename to PKHeX/Resources/text/ja/text_Puff_ja.txt diff --git a/Resources/text/ja/text_Species_ja.txt b/PKHeX/Resources/text/ja/text_Species_ja.txt similarity index 100% rename from Resources/text/ja/text_Species_ja.txt rename to PKHeX/Resources/text/ja/text_Species_ja.txt diff --git a/Resources/text/ja/text_SuperTraining_ja.txt b/PKHeX/Resources/text/ja/text_SuperTraining_ja.txt similarity index 100% rename from Resources/text/ja/text_SuperTraining_ja.txt rename to PKHeX/Resources/text/ja/text_SuperTraining_ja.txt diff --git a/Resources/text/ja/text_TrainingBag_ja.txt b/PKHeX/Resources/text/ja/text_TrainingBag_ja.txt similarity index 100% rename from Resources/text/ja/text_TrainingBag_ja.txt rename to PKHeX/Resources/text/ja/text_TrainingBag_ja.txt diff --git a/Resources/text/ja/text_Types_ja.txt b/PKHeX/Resources/text/ja/text_Types_ja.txt similarity index 100% rename from Resources/text/ja/text_Types_ja.txt rename to PKHeX/Resources/text/ja/text_Types_ja.txt diff --git a/Resources/text/ja/text_Wallpaper_ja.txt b/PKHeX/Resources/text/ja/text_Wallpaper_ja.txt similarity index 100% rename from Resources/text/ja/text_Wallpaper_ja.txt rename to PKHeX/Resources/text/ja/text_Wallpaper_ja.txt diff --git a/Resources/text/ja/text_bw2_00000_ja.txt b/PKHeX/Resources/text/ja/text_bw2_00000_ja.txt similarity index 100% rename from Resources/text/ja/text_bw2_00000_ja.txt rename to PKHeX/Resources/text/ja/text_bw2_00000_ja.txt diff --git a/Resources/text/ja/text_bw2_30000_ja.txt b/PKHeX/Resources/text/ja/text_bw2_30000_ja.txt similarity index 100% rename from Resources/text/ja/text_bw2_30000_ja.txt rename to PKHeX/Resources/text/ja/text_bw2_30000_ja.txt diff --git a/Resources/text/ja/text_bw2_40000_ja.txt b/PKHeX/Resources/text/ja/text_bw2_40000_ja.txt similarity index 100% rename from Resources/text/ja/text_bw2_40000_ja.txt rename to PKHeX/Resources/text/ja/text_bw2_40000_ja.txt diff --git a/Resources/text/ja/text_bw2_60000_ja.txt b/PKHeX/Resources/text/ja/text_bw2_60000_ja.txt similarity index 100% rename from Resources/text/ja/text_bw2_60000_ja.txt rename to PKHeX/Resources/text/ja/text_bw2_60000_ja.txt diff --git a/Resources/text/ja/text_hgss_00000_ja.txt b/PKHeX/Resources/text/ja/text_hgss_00000_ja.txt similarity index 100% rename from Resources/text/ja/text_hgss_00000_ja.txt rename to PKHeX/Resources/text/ja/text_hgss_00000_ja.txt diff --git a/Resources/text/ja/text_hgss_02000_ja.txt b/PKHeX/Resources/text/ja/text_hgss_02000_ja.txt similarity index 100% rename from Resources/text/ja/text_hgss_02000_ja.txt rename to PKHeX/Resources/text/ja/text_hgss_02000_ja.txt diff --git a/Resources/text/ja/text_hgss_03000_ja.txt b/PKHeX/Resources/text/ja/text_hgss_03000_ja.txt similarity index 100% rename from Resources/text/ja/text_hgss_03000_ja.txt rename to PKHeX/Resources/text/ja/text_hgss_03000_ja.txt diff --git a/Resources/text/ja/text_tradeao_ja.txt b/PKHeX/Resources/text/ja/text_tradeao_ja.txt similarity index 100% rename from Resources/text/ja/text_tradeao_ja.txt rename to PKHeX/Resources/text/ja/text_tradeao_ja.txt diff --git a/Resources/text/ja/text_tradexy_ja.txt b/PKHeX/Resources/text/ja/text_tradexy_ja.txt similarity index 100% rename from Resources/text/ja/text_tradexy_ja.txt rename to PKHeX/Resources/text/ja/text_tradexy_ja.txt diff --git a/Resources/text/ja/text_xy_00000_ja.txt b/PKHeX/Resources/text/ja/text_xy_00000_ja.txt similarity index 100% rename from Resources/text/ja/text_xy_00000_ja.txt rename to PKHeX/Resources/text/ja/text_xy_00000_ja.txt diff --git a/Resources/text/ja/text_xy_30000_ja.txt b/PKHeX/Resources/text/ja/text_xy_30000_ja.txt similarity index 100% rename from Resources/text/ja/text_xy_30000_ja.txt rename to PKHeX/Resources/text/ja/text_xy_30000_ja.txt diff --git a/Resources/text/ja/text_xy_40000_ja.txt b/PKHeX/Resources/text/ja/text_xy_40000_ja.txt similarity index 100% rename from Resources/text/ja/text_xy_40000_ja.txt rename to PKHeX/Resources/text/ja/text_xy_40000_ja.txt diff --git a/Resources/text/ja/text_xy_60000_ja.txt b/PKHeX/Resources/text/ja/text_xy_60000_ja.txt similarity index 100% rename from Resources/text/ja/text_xy_60000_ja.txt rename to PKHeX/Resources/text/ja/text_xy_60000_ja.txt diff --git a/Resources/text/ko/lang_ko.txt b/PKHeX/Resources/text/ko/lang_ko.txt similarity index 100% rename from Resources/text/ko/lang_ko.txt rename to PKHeX/Resources/text/ko/lang_ko.txt diff --git a/Resources/text/ko/text_Abilities_ko.txt b/PKHeX/Resources/text/ko/text_Abilities_ko.txt similarity index 100% rename from Resources/text/ko/text_Abilities_ko.txt rename to PKHeX/Resources/text/ko/text_Abilities_ko.txt diff --git a/Resources/text/ko/text_Character_ko.txt b/PKHeX/Resources/text/ko/text_Character_ko.txt similarity index 100% rename from Resources/text/ko/text_Character_ko.txt rename to PKHeX/Resources/text/ko/text_Character_ko.txt diff --git a/Resources/text/ko/text_EncounterType_ko.txt b/PKHeX/Resources/text/ko/text_EncounterType_ko.txt similarity index 100% rename from Resources/text/ko/text_EncounterType_ko.txt rename to PKHeX/Resources/text/ko/text_EncounterType_ko.txt diff --git a/Resources/text/ko/text_Forms_ko.txt b/PKHeX/Resources/text/ko/text_Forms_ko.txt similarity index 100% rename from Resources/text/ko/text_Forms_ko.txt rename to PKHeX/Resources/text/ko/text_Forms_ko.txt diff --git a/Resources/text/ko/text_Games_ko.txt b/PKHeX/Resources/text/ko/text_Games_ko.txt similarity index 100% rename from Resources/text/ko/text_Games_ko.txt rename to PKHeX/Resources/text/ko/text_Games_ko.txt diff --git a/Resources/text/ko/text_GenLoc_ko.txt b/PKHeX/Resources/text/ko/text_GenLoc_ko.txt similarity index 100% rename from Resources/text/ko/text_GenLoc_ko.txt rename to PKHeX/Resources/text/ko/text_GenLoc_ko.txt diff --git a/Resources/text/ko/text_Items_ko.txt b/PKHeX/Resources/text/ko/text_Items_ko.txt similarity index 100% rename from Resources/text/ko/text_Items_ko.txt rename to PKHeX/Resources/text/ko/text_Items_ko.txt diff --git a/Resources/text/ko/text_Memories_ko.txt b/PKHeX/Resources/text/ko/text_Memories_ko.txt similarity index 100% rename from Resources/text/ko/text_Memories_ko.txt rename to PKHeX/Resources/text/ko/text_Memories_ko.txt diff --git a/Resources/text/ko/text_Moves_ko.txt b/PKHeX/Resources/text/ko/text_Moves_ko.txt similarity index 100% rename from Resources/text/ko/text_Moves_ko.txt rename to PKHeX/Resources/text/ko/text_Moves_ko.txt diff --git a/Resources/text/ko/text_Natures_ko.txt b/PKHeX/Resources/text/ko/text_Natures_ko.txt similarity index 100% rename from Resources/text/ko/text_Natures_ko.txt rename to PKHeX/Resources/text/ko/text_Natures_ko.txt diff --git a/Resources/text/ko/text_Pokeblock_ko.txt b/PKHeX/Resources/text/ko/text_Pokeblock_ko.txt similarity index 100% rename from Resources/text/ko/text_Pokeblock_ko.txt rename to PKHeX/Resources/text/ko/text_Pokeblock_ko.txt diff --git a/Resources/text/ko/text_Puff_ko.txt b/PKHeX/Resources/text/ko/text_Puff_ko.txt similarity index 100% rename from Resources/text/ko/text_Puff_ko.txt rename to PKHeX/Resources/text/ko/text_Puff_ko.txt diff --git a/Resources/text/ko/text_Species_ko.txt b/PKHeX/Resources/text/ko/text_Species_ko.txt similarity index 100% rename from Resources/text/ko/text_Species_ko.txt rename to PKHeX/Resources/text/ko/text_Species_ko.txt diff --git a/Resources/text/ko/text_SuperTraining_ko.txt b/PKHeX/Resources/text/ko/text_SuperTraining_ko.txt similarity index 100% rename from Resources/text/ko/text_SuperTraining_ko.txt rename to PKHeX/Resources/text/ko/text_SuperTraining_ko.txt diff --git a/Resources/text/ko/text_TrainingBag_ko.txt b/PKHeX/Resources/text/ko/text_TrainingBag_ko.txt similarity index 100% rename from Resources/text/ko/text_TrainingBag_ko.txt rename to PKHeX/Resources/text/ko/text_TrainingBag_ko.txt diff --git a/Resources/text/ko/text_Types_ko.txt b/PKHeX/Resources/text/ko/text_Types_ko.txt similarity index 100% rename from Resources/text/ko/text_Types_ko.txt rename to PKHeX/Resources/text/ko/text_Types_ko.txt diff --git a/Resources/text/ko/text_Wallpaper_ko.txt b/PKHeX/Resources/text/ko/text_Wallpaper_ko.txt similarity index 100% rename from Resources/text/ko/text_Wallpaper_ko.txt rename to PKHeX/Resources/text/ko/text_Wallpaper_ko.txt diff --git a/Resources/text/ko/text_bw2_00000_ko.txt b/PKHeX/Resources/text/ko/text_bw2_00000_ko.txt similarity index 100% rename from Resources/text/ko/text_bw2_00000_ko.txt rename to PKHeX/Resources/text/ko/text_bw2_00000_ko.txt diff --git a/Resources/text/ko/text_bw2_30000_ko.txt b/PKHeX/Resources/text/ko/text_bw2_30000_ko.txt similarity index 100% rename from Resources/text/ko/text_bw2_30000_ko.txt rename to PKHeX/Resources/text/ko/text_bw2_30000_ko.txt diff --git a/Resources/text/ko/text_bw2_40000_ko.txt b/PKHeX/Resources/text/ko/text_bw2_40000_ko.txt similarity index 100% rename from Resources/text/ko/text_bw2_40000_ko.txt rename to PKHeX/Resources/text/ko/text_bw2_40000_ko.txt diff --git a/Resources/text/ko/text_bw2_60000_ko.txt b/PKHeX/Resources/text/ko/text_bw2_60000_ko.txt similarity index 100% rename from Resources/text/ko/text_bw2_60000_ko.txt rename to PKHeX/Resources/text/ko/text_bw2_60000_ko.txt diff --git a/Resources/text/ko/text_hgss_00000_ko.txt b/PKHeX/Resources/text/ko/text_hgss_00000_ko.txt similarity index 100% rename from Resources/text/ko/text_hgss_00000_ko.txt rename to PKHeX/Resources/text/ko/text_hgss_00000_ko.txt diff --git a/Resources/text/ko/text_hgss_02000_ko.txt b/PKHeX/Resources/text/ko/text_hgss_02000_ko.txt similarity index 100% rename from Resources/text/ko/text_hgss_02000_ko.txt rename to PKHeX/Resources/text/ko/text_hgss_02000_ko.txt diff --git a/Resources/text/ko/text_hgss_03000_ko.txt b/PKHeX/Resources/text/ko/text_hgss_03000_ko.txt similarity index 100% rename from Resources/text/ko/text_hgss_03000_ko.txt rename to PKHeX/Resources/text/ko/text_hgss_03000_ko.txt diff --git a/Resources/text/ko/text_tradeao_ko.txt b/PKHeX/Resources/text/ko/text_tradeao_ko.txt similarity index 100% rename from Resources/text/ko/text_tradeao_ko.txt rename to PKHeX/Resources/text/ko/text_tradeao_ko.txt diff --git a/Resources/text/ko/text_tradexy_ko.txt b/PKHeX/Resources/text/ko/text_tradexy_ko.txt similarity index 100% rename from Resources/text/ko/text_tradexy_ko.txt rename to PKHeX/Resources/text/ko/text_tradexy_ko.txt diff --git a/Resources/text/ko/text_xy_00000_ko.txt b/PKHeX/Resources/text/ko/text_xy_00000_ko.txt similarity index 100% rename from Resources/text/ko/text_xy_00000_ko.txt rename to PKHeX/Resources/text/ko/text_xy_00000_ko.txt diff --git a/Resources/text/ko/text_xy_30000_ko.txt b/PKHeX/Resources/text/ko/text_xy_30000_ko.txt similarity index 100% rename from Resources/text/ko/text_xy_30000_ko.txt rename to PKHeX/Resources/text/ko/text_xy_30000_ko.txt diff --git a/Resources/text/ko/text_xy_40000_ko.txt b/PKHeX/Resources/text/ko/text_xy_40000_ko.txt similarity index 100% rename from Resources/text/ko/text_xy_40000_ko.txt rename to PKHeX/Resources/text/ko/text_xy_40000_ko.txt diff --git a/Resources/text/ko/text_xy_60000_ko.txt b/PKHeX/Resources/text/ko/text_xy_60000_ko.txt similarity index 100% rename from Resources/text/ko/text_xy_60000_ko.txt rename to PKHeX/Resources/text/ko/text_xy_60000_ko.txt diff --git a/Resources/text/locale/countries.txt b/PKHeX/Resources/text/locale/countries.txt similarity index 100% rename from Resources/text/locale/countries.txt rename to PKHeX/Resources/text/locale/countries.txt diff --git a/Resources/text/locale/countryMap.txt b/PKHeX/Resources/text/locale/countryMap.txt similarity index 100% rename from Resources/text/locale/countryMap.txt rename to PKHeX/Resources/text/locale/countryMap.txt diff --git a/Resources/text/locale/languages.txt b/PKHeX/Resources/text/locale/languages.txt similarity index 100% rename from Resources/text/locale/languages.txt rename to PKHeX/Resources/text/locale/languages.txt diff --git a/Resources/text/locale/regions3ds.txt b/PKHeX/Resources/text/locale/regions3ds.txt similarity index 100% rename from Resources/text/locale/regions3ds.txt rename to PKHeX/Resources/text/locale/regions3ds.txt diff --git a/Resources/text/locale/sr_ID/sr_001.txt b/PKHeX/Resources/text/locale/sr_ID/sr_001.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_001.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_001.txt diff --git a/Resources/text/locale/sr_ID/sr_008.txt b/PKHeX/Resources/text/locale/sr_ID/sr_008.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_008.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_008.txt diff --git a/Resources/text/locale/sr_ID/sr_009.txt b/PKHeX/Resources/text/locale/sr_ID/sr_009.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_009.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_009.txt diff --git a/Resources/text/locale/sr_ID/sr_010.txt b/PKHeX/Resources/text/locale/sr_ID/sr_010.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_010.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_010.txt diff --git a/Resources/text/locale/sr_ID/sr_011.txt b/PKHeX/Resources/text/locale/sr_ID/sr_011.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_011.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_011.txt diff --git a/Resources/text/locale/sr_ID/sr_012.txt b/PKHeX/Resources/text/locale/sr_ID/sr_012.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_012.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_012.txt diff --git a/Resources/text/locale/sr_ID/sr_013.txt b/PKHeX/Resources/text/locale/sr_ID/sr_013.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_013.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_013.txt diff --git a/Resources/text/locale/sr_ID/sr_014.txt b/PKHeX/Resources/text/locale/sr_ID/sr_014.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_014.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_014.txt diff --git a/Resources/text/locale/sr_ID/sr_015.txt b/PKHeX/Resources/text/locale/sr_ID/sr_015.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_015.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_015.txt diff --git a/Resources/text/locale/sr_ID/sr_016.txt b/PKHeX/Resources/text/locale/sr_ID/sr_016.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_016.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_016.txt diff --git a/Resources/text/locale/sr_ID/sr_017.txt b/PKHeX/Resources/text/locale/sr_ID/sr_017.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_017.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_017.txt diff --git a/Resources/text/locale/sr_ID/sr_018.txt b/PKHeX/Resources/text/locale/sr_ID/sr_018.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_018.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_018.txt diff --git a/Resources/text/locale/sr_ID/sr_019.txt b/PKHeX/Resources/text/locale/sr_ID/sr_019.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_019.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_019.txt diff --git a/Resources/text/locale/sr_ID/sr_020.txt b/PKHeX/Resources/text/locale/sr_ID/sr_020.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_020.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_020.txt diff --git a/Resources/text/locale/sr_ID/sr_021.txt b/PKHeX/Resources/text/locale/sr_ID/sr_021.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_021.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_021.txt diff --git a/Resources/text/locale/sr_ID/sr_022.txt b/PKHeX/Resources/text/locale/sr_ID/sr_022.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_022.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_022.txt diff --git a/Resources/text/locale/sr_ID/sr_023.txt b/PKHeX/Resources/text/locale/sr_ID/sr_023.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_023.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_023.txt diff --git a/Resources/text/locale/sr_ID/sr_024.txt b/PKHeX/Resources/text/locale/sr_ID/sr_024.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_024.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_024.txt diff --git a/Resources/text/locale/sr_ID/sr_025.txt b/PKHeX/Resources/text/locale/sr_ID/sr_025.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_025.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_025.txt diff --git a/Resources/text/locale/sr_ID/sr_026.txt b/PKHeX/Resources/text/locale/sr_ID/sr_026.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_026.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_026.txt diff --git a/Resources/text/locale/sr_ID/sr_027.txt b/PKHeX/Resources/text/locale/sr_ID/sr_027.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_027.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_027.txt diff --git a/Resources/text/locale/sr_ID/sr_028.txt b/PKHeX/Resources/text/locale/sr_ID/sr_028.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_028.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_028.txt diff --git a/Resources/text/locale/sr_ID/sr_029.txt b/PKHeX/Resources/text/locale/sr_ID/sr_029.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_029.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_029.txt diff --git a/Resources/text/locale/sr_ID/sr_030.txt b/PKHeX/Resources/text/locale/sr_ID/sr_030.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_030.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_030.txt diff --git a/Resources/text/locale/sr_ID/sr_031.txt b/PKHeX/Resources/text/locale/sr_ID/sr_031.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_031.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_031.txt diff --git a/Resources/text/locale/sr_ID/sr_032.txt b/PKHeX/Resources/text/locale/sr_ID/sr_032.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_032.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_032.txt diff --git a/Resources/text/locale/sr_ID/sr_033.txt b/PKHeX/Resources/text/locale/sr_ID/sr_033.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_033.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_033.txt diff --git a/Resources/text/locale/sr_ID/sr_034.txt b/PKHeX/Resources/text/locale/sr_ID/sr_034.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_034.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_034.txt diff --git a/Resources/text/locale/sr_ID/sr_035.txt b/PKHeX/Resources/text/locale/sr_ID/sr_035.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_035.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_035.txt diff --git a/Resources/text/locale/sr_ID/sr_036.txt b/PKHeX/Resources/text/locale/sr_ID/sr_036.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_036.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_036.txt diff --git a/Resources/text/locale/sr_ID/sr_037.txt b/PKHeX/Resources/text/locale/sr_ID/sr_037.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_037.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_037.txt diff --git a/Resources/text/locale/sr_ID/sr_038.txt b/PKHeX/Resources/text/locale/sr_ID/sr_038.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_038.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_038.txt diff --git a/Resources/text/locale/sr_ID/sr_039.txt b/PKHeX/Resources/text/locale/sr_ID/sr_039.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_039.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_039.txt diff --git a/Resources/text/locale/sr_ID/sr_040.txt b/PKHeX/Resources/text/locale/sr_ID/sr_040.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_040.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_040.txt diff --git a/Resources/text/locale/sr_ID/sr_041.txt b/PKHeX/Resources/text/locale/sr_ID/sr_041.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_041.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_041.txt diff --git a/Resources/text/locale/sr_ID/sr_042.txt b/PKHeX/Resources/text/locale/sr_ID/sr_042.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_042.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_042.txt diff --git a/Resources/text/locale/sr_ID/sr_043.txt b/PKHeX/Resources/text/locale/sr_ID/sr_043.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_043.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_043.txt diff --git a/Resources/text/locale/sr_ID/sr_044.txt b/PKHeX/Resources/text/locale/sr_ID/sr_044.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_044.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_044.txt diff --git a/Resources/text/locale/sr_ID/sr_045.txt b/PKHeX/Resources/text/locale/sr_ID/sr_045.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_045.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_045.txt diff --git a/Resources/text/locale/sr_ID/sr_046.txt b/PKHeX/Resources/text/locale/sr_ID/sr_046.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_046.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_046.txt diff --git a/Resources/text/locale/sr_ID/sr_047.txt b/PKHeX/Resources/text/locale/sr_ID/sr_047.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_047.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_047.txt diff --git a/Resources/text/locale/sr_ID/sr_048.txt b/PKHeX/Resources/text/locale/sr_ID/sr_048.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_048.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_048.txt diff --git a/Resources/text/locale/sr_ID/sr_049.txt b/PKHeX/Resources/text/locale/sr_ID/sr_049.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_049.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_049.txt diff --git a/Resources/text/locale/sr_ID/sr_050.txt b/PKHeX/Resources/text/locale/sr_ID/sr_050.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_050.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_050.txt diff --git a/Resources/text/locale/sr_ID/sr_051.txt b/PKHeX/Resources/text/locale/sr_ID/sr_051.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_051.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_051.txt diff --git a/Resources/text/locale/sr_ID/sr_052.txt b/PKHeX/Resources/text/locale/sr_ID/sr_052.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_052.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_052.txt diff --git a/Resources/text/locale/sr_ID/sr_064.txt b/PKHeX/Resources/text/locale/sr_ID/sr_064.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_064.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_064.txt diff --git a/Resources/text/locale/sr_ID/sr_065.txt b/PKHeX/Resources/text/locale/sr_ID/sr_065.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_065.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_065.txt diff --git a/Resources/text/locale/sr_ID/sr_066.txt b/PKHeX/Resources/text/locale/sr_ID/sr_066.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_066.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_066.txt diff --git a/Resources/text/locale/sr_ID/sr_067.txt b/PKHeX/Resources/text/locale/sr_ID/sr_067.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_067.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_067.txt diff --git a/Resources/text/locale/sr_ID/sr_068.txt b/PKHeX/Resources/text/locale/sr_ID/sr_068.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_068.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_068.txt diff --git a/Resources/text/locale/sr_ID/sr_069.txt b/PKHeX/Resources/text/locale/sr_ID/sr_069.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_069.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_069.txt diff --git a/Resources/text/locale/sr_ID/sr_070.txt b/PKHeX/Resources/text/locale/sr_ID/sr_070.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_070.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_070.txt diff --git a/Resources/text/locale/sr_ID/sr_071.txt b/PKHeX/Resources/text/locale/sr_ID/sr_071.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_071.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_071.txt diff --git a/Resources/text/locale/sr_ID/sr_072.txt b/PKHeX/Resources/text/locale/sr_ID/sr_072.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_072.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_072.txt diff --git a/Resources/text/locale/sr_ID/sr_073.txt b/PKHeX/Resources/text/locale/sr_ID/sr_073.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_073.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_073.txt diff --git a/Resources/text/locale/sr_ID/sr_074.txt b/PKHeX/Resources/text/locale/sr_ID/sr_074.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_074.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_074.txt diff --git a/Resources/text/locale/sr_ID/sr_075.txt b/PKHeX/Resources/text/locale/sr_ID/sr_075.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_075.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_075.txt diff --git a/Resources/text/locale/sr_ID/sr_076.txt b/PKHeX/Resources/text/locale/sr_ID/sr_076.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_076.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_076.txt diff --git a/Resources/text/locale/sr_ID/sr_077.txt b/PKHeX/Resources/text/locale/sr_ID/sr_077.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_077.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_077.txt diff --git a/Resources/text/locale/sr_ID/sr_078.txt b/PKHeX/Resources/text/locale/sr_ID/sr_078.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_078.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_078.txt diff --git a/Resources/text/locale/sr_ID/sr_079.txt b/PKHeX/Resources/text/locale/sr_ID/sr_079.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_079.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_079.txt diff --git a/Resources/text/locale/sr_ID/sr_080.txt b/PKHeX/Resources/text/locale/sr_ID/sr_080.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_080.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_080.txt diff --git a/Resources/text/locale/sr_ID/sr_081.txt b/PKHeX/Resources/text/locale/sr_ID/sr_081.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_081.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_081.txt diff --git a/Resources/text/locale/sr_ID/sr_082.txt b/PKHeX/Resources/text/locale/sr_ID/sr_082.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_082.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_082.txt diff --git a/Resources/text/locale/sr_ID/sr_083.txt b/PKHeX/Resources/text/locale/sr_ID/sr_083.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_083.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_083.txt diff --git a/Resources/text/locale/sr_ID/sr_084.txt b/PKHeX/Resources/text/locale/sr_ID/sr_084.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_084.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_084.txt diff --git a/Resources/text/locale/sr_ID/sr_085.txt b/PKHeX/Resources/text/locale/sr_ID/sr_085.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_085.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_085.txt diff --git a/Resources/text/locale/sr_ID/sr_086.txt b/PKHeX/Resources/text/locale/sr_ID/sr_086.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_086.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_086.txt diff --git a/Resources/text/locale/sr_ID/sr_087.txt b/PKHeX/Resources/text/locale/sr_ID/sr_087.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_087.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_087.txt diff --git a/Resources/text/locale/sr_ID/sr_088.txt b/PKHeX/Resources/text/locale/sr_ID/sr_088.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_088.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_088.txt diff --git a/Resources/text/locale/sr_ID/sr_089.txt b/PKHeX/Resources/text/locale/sr_ID/sr_089.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_089.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_089.txt diff --git a/Resources/text/locale/sr_ID/sr_090.txt b/PKHeX/Resources/text/locale/sr_ID/sr_090.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_090.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_090.txt diff --git a/Resources/text/locale/sr_ID/sr_091.txt b/PKHeX/Resources/text/locale/sr_ID/sr_091.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_091.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_091.txt diff --git a/Resources/text/locale/sr_ID/sr_092.txt b/PKHeX/Resources/text/locale/sr_ID/sr_092.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_092.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_092.txt diff --git a/Resources/text/locale/sr_ID/sr_093.txt b/PKHeX/Resources/text/locale/sr_ID/sr_093.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_093.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_093.txt diff --git a/Resources/text/locale/sr_ID/sr_094.txt b/PKHeX/Resources/text/locale/sr_ID/sr_094.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_094.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_094.txt diff --git a/Resources/text/locale/sr_ID/sr_095.txt b/PKHeX/Resources/text/locale/sr_ID/sr_095.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_095.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_095.txt diff --git a/Resources/text/locale/sr_ID/sr_096.txt b/PKHeX/Resources/text/locale/sr_ID/sr_096.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_096.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_096.txt diff --git a/Resources/text/locale/sr_ID/sr_097.txt b/PKHeX/Resources/text/locale/sr_ID/sr_097.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_097.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_097.txt diff --git a/Resources/text/locale/sr_ID/sr_098.txt b/PKHeX/Resources/text/locale/sr_ID/sr_098.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_098.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_098.txt diff --git a/Resources/text/locale/sr_ID/sr_099.txt b/PKHeX/Resources/text/locale/sr_ID/sr_099.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_099.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_099.txt diff --git a/Resources/text/locale/sr_ID/sr_100.txt b/PKHeX/Resources/text/locale/sr_ID/sr_100.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_100.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_100.txt diff --git a/Resources/text/locale/sr_ID/sr_101.txt b/PKHeX/Resources/text/locale/sr_ID/sr_101.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_101.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_101.txt diff --git a/Resources/text/locale/sr_ID/sr_102.txt b/PKHeX/Resources/text/locale/sr_ID/sr_102.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_102.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_102.txt diff --git a/Resources/text/locale/sr_ID/sr_103.txt b/PKHeX/Resources/text/locale/sr_ID/sr_103.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_103.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_103.txt diff --git a/Resources/text/locale/sr_ID/sr_104.txt b/PKHeX/Resources/text/locale/sr_ID/sr_104.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_104.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_104.txt diff --git a/Resources/text/locale/sr_ID/sr_105.txt b/PKHeX/Resources/text/locale/sr_ID/sr_105.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_105.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_105.txt diff --git a/Resources/text/locale/sr_ID/sr_106.txt b/PKHeX/Resources/text/locale/sr_ID/sr_106.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_106.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_106.txt diff --git a/Resources/text/locale/sr_ID/sr_107.txt b/PKHeX/Resources/text/locale/sr_ID/sr_107.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_107.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_107.txt diff --git a/Resources/text/locale/sr_ID/sr_108.txt b/PKHeX/Resources/text/locale/sr_ID/sr_108.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_108.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_108.txt diff --git a/Resources/text/locale/sr_ID/sr_109.txt b/PKHeX/Resources/text/locale/sr_ID/sr_109.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_109.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_109.txt diff --git a/Resources/text/locale/sr_ID/sr_110.txt b/PKHeX/Resources/text/locale/sr_ID/sr_110.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_110.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_110.txt diff --git a/Resources/text/locale/sr_ID/sr_111.txt b/PKHeX/Resources/text/locale/sr_ID/sr_111.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_111.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_111.txt diff --git a/Resources/text/locale/sr_ID/sr_112.txt b/PKHeX/Resources/text/locale/sr_ID/sr_112.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_112.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_112.txt diff --git a/Resources/text/locale/sr_ID/sr_113.txt b/PKHeX/Resources/text/locale/sr_ID/sr_113.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_113.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_113.txt diff --git a/Resources/text/locale/sr_ID/sr_114.txt b/PKHeX/Resources/text/locale/sr_ID/sr_114.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_114.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_114.txt diff --git a/Resources/text/locale/sr_ID/sr_115.txt b/PKHeX/Resources/text/locale/sr_ID/sr_115.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_115.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_115.txt diff --git a/Resources/text/locale/sr_ID/sr_116.txt b/PKHeX/Resources/text/locale/sr_ID/sr_116.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_116.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_116.txt diff --git a/Resources/text/locale/sr_ID/sr_117.txt b/PKHeX/Resources/text/locale/sr_ID/sr_117.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_117.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_117.txt diff --git a/Resources/text/locale/sr_ID/sr_118.txt b/PKHeX/Resources/text/locale/sr_ID/sr_118.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_118.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_118.txt diff --git a/Resources/text/locale/sr_ID/sr_119.txt b/PKHeX/Resources/text/locale/sr_ID/sr_119.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_119.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_119.txt diff --git a/Resources/text/locale/sr_ID/sr_120.txt b/PKHeX/Resources/text/locale/sr_ID/sr_120.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_120.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_120.txt diff --git a/Resources/text/locale/sr_ID/sr_121.txt b/PKHeX/Resources/text/locale/sr_ID/sr_121.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_121.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_121.txt diff --git a/Resources/text/locale/sr_ID/sr_122.txt b/PKHeX/Resources/text/locale/sr_ID/sr_122.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_122.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_122.txt diff --git a/Resources/text/locale/sr_ID/sr_123.txt b/PKHeX/Resources/text/locale/sr_ID/sr_123.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_123.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_123.txt diff --git a/Resources/text/locale/sr_ID/sr_124.txt b/PKHeX/Resources/text/locale/sr_ID/sr_124.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_124.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_124.txt diff --git a/Resources/text/locale/sr_ID/sr_125.txt b/PKHeX/Resources/text/locale/sr_ID/sr_125.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_125.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_125.txt diff --git a/Resources/text/locale/sr_ID/sr_126.txt b/PKHeX/Resources/text/locale/sr_ID/sr_126.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_126.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_126.txt diff --git a/Resources/text/locale/sr_ID/sr_127.txt b/PKHeX/Resources/text/locale/sr_ID/sr_127.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_127.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_127.txt diff --git a/Resources/text/locale/sr_ID/sr_128.txt b/PKHeX/Resources/text/locale/sr_ID/sr_128.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_128.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_128.txt diff --git a/Resources/text/locale/sr_ID/sr_136.txt b/PKHeX/Resources/text/locale/sr_ID/sr_136.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_136.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_136.txt diff --git a/Resources/text/locale/sr_ID/sr_144.txt b/PKHeX/Resources/text/locale/sr_ID/sr_144.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_144.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_144.txt diff --git a/Resources/text/locale/sr_ID/sr_153.txt b/PKHeX/Resources/text/locale/sr_ID/sr_153.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_153.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_153.txt diff --git a/Resources/text/locale/sr_ID/sr_156.txt b/PKHeX/Resources/text/locale/sr_ID/sr_156.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_156.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_156.txt diff --git a/Resources/text/locale/sr_ID/sr_160.txt b/PKHeX/Resources/text/locale/sr_ID/sr_160.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_160.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_160.txt diff --git a/Resources/text/locale/sr_ID/sr_168.txt b/PKHeX/Resources/text/locale/sr_ID/sr_168.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_168.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_168.txt diff --git a/Resources/text/locale/sr_ID/sr_169.txt b/PKHeX/Resources/text/locale/sr_ID/sr_169.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_169.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_169.txt diff --git a/Resources/text/locale/sr_ID/sr_174.txt b/PKHeX/Resources/text/locale/sr_ID/sr_174.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_174.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_174.txt diff --git a/Resources/text/locale/sr_ID/sr_184.txt b/PKHeX/Resources/text/locale/sr_ID/sr_184.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_184.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_184.txt diff --git a/Resources/text/locale/sr_ID/sr_185.txt b/PKHeX/Resources/text/locale/sr_ID/sr_185.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_185.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_185.txt diff --git a/Resources/text/locale/sr_ID/sr_186.txt b/PKHeX/Resources/text/locale/sr_ID/sr_186.txt similarity index 100% rename from Resources/text/locale/sr_ID/sr_186.txt rename to PKHeX/Resources/text/locale/sr_ID/sr_186.txt diff --git a/Resources/text/other/const_oras.txt b/PKHeX/Resources/text/other/const_oras.txt similarity index 100% rename from Resources/text/other/const_oras.txt rename to PKHeX/Resources/text/other/const_oras.txt diff --git a/Resources/text/other/flags_oras.txt b/PKHeX/Resources/text/other/flags_oras.txt similarity index 100% rename from Resources/text/other/flags_oras.txt rename to PKHeX/Resources/text/other/flags_oras.txt diff --git a/Resources/text/other/flags_xy.txt b/PKHeX/Resources/text/other/flags_xy.txt similarity index 100% rename from Resources/text/other/flags_xy.txt rename to PKHeX/Resources/text/other/flags_xy.txt diff --git a/Resources/text/other/lang_pt.txt b/PKHeX/Resources/text/other/lang_pt.txt similarity index 100% rename from Resources/text/other/lang_pt.txt rename to PKHeX/Resources/text/other/lang_pt.txt diff --git a/Resources/text/shortcuts.txt b/PKHeX/Resources/text/shortcuts.txt similarity index 100% rename from Resources/text/shortcuts.txt rename to PKHeX/Resources/text/shortcuts.txt diff --git a/Resources/text/zh/lang_zh.txt b/PKHeX/Resources/text/zh/lang_zh.txt similarity index 100% rename from Resources/text/zh/lang_zh.txt rename to PKHeX/Resources/text/zh/lang_zh.txt diff --git a/Resources/text/zh/text_Abilities_zh.txt b/PKHeX/Resources/text/zh/text_Abilities_zh.txt similarity index 100% rename from Resources/text/zh/text_Abilities_zh.txt rename to PKHeX/Resources/text/zh/text_Abilities_zh.txt diff --git a/Resources/text/zh/text_Character_zh.txt b/PKHeX/Resources/text/zh/text_Character_zh.txt similarity index 100% rename from Resources/text/zh/text_Character_zh.txt rename to PKHeX/Resources/text/zh/text_Character_zh.txt diff --git a/Resources/text/zh/text_EncounterType_zh.txt b/PKHeX/Resources/text/zh/text_EncounterType_zh.txt similarity index 100% rename from Resources/text/zh/text_EncounterType_zh.txt rename to PKHeX/Resources/text/zh/text_EncounterType_zh.txt diff --git a/Resources/text/zh/text_Forms_zh.txt b/PKHeX/Resources/text/zh/text_Forms_zh.txt similarity index 100% rename from Resources/text/zh/text_Forms_zh.txt rename to PKHeX/Resources/text/zh/text_Forms_zh.txt diff --git a/Resources/text/zh/text_Games_zh.txt b/PKHeX/Resources/text/zh/text_Games_zh.txt similarity index 100% rename from Resources/text/zh/text_Games_zh.txt rename to PKHeX/Resources/text/zh/text_Games_zh.txt diff --git a/Resources/text/zh/text_GenLoc_zh.txt b/PKHeX/Resources/text/zh/text_GenLoc_zh.txt similarity index 100% rename from Resources/text/zh/text_GenLoc_zh.txt rename to PKHeX/Resources/text/zh/text_GenLoc_zh.txt diff --git a/Resources/text/zh/text_Items_zh.txt b/PKHeX/Resources/text/zh/text_Items_zh.txt similarity index 100% rename from Resources/text/zh/text_Items_zh.txt rename to PKHeX/Resources/text/zh/text_Items_zh.txt diff --git a/Resources/text/zh/text_Memories_zh.txt b/PKHeX/Resources/text/zh/text_Memories_zh.txt similarity index 100% rename from Resources/text/zh/text_Memories_zh.txt rename to PKHeX/Resources/text/zh/text_Memories_zh.txt diff --git a/Resources/text/zh/text_Moves_zh.txt b/PKHeX/Resources/text/zh/text_Moves_zh.txt similarity index 100% rename from Resources/text/zh/text_Moves_zh.txt rename to PKHeX/Resources/text/zh/text_Moves_zh.txt diff --git a/Resources/text/zh/text_Natures_zh.txt b/PKHeX/Resources/text/zh/text_Natures_zh.txt similarity index 100% rename from Resources/text/zh/text_Natures_zh.txt rename to PKHeX/Resources/text/zh/text_Natures_zh.txt diff --git a/Resources/text/zh/text_Pokeblock_zh.txt b/PKHeX/Resources/text/zh/text_Pokeblock_zh.txt similarity index 100% rename from Resources/text/zh/text_Pokeblock_zh.txt rename to PKHeX/Resources/text/zh/text_Pokeblock_zh.txt diff --git a/Resources/text/zh/text_Puff_zh.txt b/PKHeX/Resources/text/zh/text_Puff_zh.txt similarity index 100% rename from Resources/text/zh/text_Puff_zh.txt rename to PKHeX/Resources/text/zh/text_Puff_zh.txt diff --git a/Resources/text/zh/text_Species_zh.txt b/PKHeX/Resources/text/zh/text_Species_zh.txt similarity index 100% rename from Resources/text/zh/text_Species_zh.txt rename to PKHeX/Resources/text/zh/text_Species_zh.txt diff --git a/Resources/text/zh/text_SuperTraining_zh.txt b/PKHeX/Resources/text/zh/text_SuperTraining_zh.txt similarity index 100% rename from Resources/text/zh/text_SuperTraining_zh.txt rename to PKHeX/Resources/text/zh/text_SuperTraining_zh.txt diff --git a/Resources/text/zh/text_TrainingBag_zh.txt b/PKHeX/Resources/text/zh/text_TrainingBag_zh.txt similarity index 100% rename from Resources/text/zh/text_TrainingBag_zh.txt rename to PKHeX/Resources/text/zh/text_TrainingBag_zh.txt diff --git a/Resources/text/zh/text_Types_zh.txt b/PKHeX/Resources/text/zh/text_Types_zh.txt similarity index 100% rename from Resources/text/zh/text_Types_zh.txt rename to PKHeX/Resources/text/zh/text_Types_zh.txt diff --git a/Resources/text/zh/text_Wallpaper_zh.txt b/PKHeX/Resources/text/zh/text_Wallpaper_zh.txt similarity index 100% rename from Resources/text/zh/text_Wallpaper_zh.txt rename to PKHeX/Resources/text/zh/text_Wallpaper_zh.txt diff --git a/Resources/text/zh/text_bw2_00000_zh.txt b/PKHeX/Resources/text/zh/text_bw2_00000_zh.txt similarity index 100% rename from Resources/text/zh/text_bw2_00000_zh.txt rename to PKHeX/Resources/text/zh/text_bw2_00000_zh.txt diff --git a/Resources/text/zh/text_bw2_30000_zh.txt b/PKHeX/Resources/text/zh/text_bw2_30000_zh.txt similarity index 100% rename from Resources/text/zh/text_bw2_30000_zh.txt rename to PKHeX/Resources/text/zh/text_bw2_30000_zh.txt diff --git a/Resources/text/zh/text_bw2_40000_zh.txt b/PKHeX/Resources/text/zh/text_bw2_40000_zh.txt similarity index 100% rename from Resources/text/zh/text_bw2_40000_zh.txt rename to PKHeX/Resources/text/zh/text_bw2_40000_zh.txt diff --git a/Resources/text/zh/text_bw2_60000_zh.txt b/PKHeX/Resources/text/zh/text_bw2_60000_zh.txt similarity index 100% rename from Resources/text/zh/text_bw2_60000_zh.txt rename to PKHeX/Resources/text/zh/text_bw2_60000_zh.txt diff --git a/Resources/text/zh/text_hgss_00000_zh.txt b/PKHeX/Resources/text/zh/text_hgss_00000_zh.txt similarity index 100% rename from Resources/text/zh/text_hgss_00000_zh.txt rename to PKHeX/Resources/text/zh/text_hgss_00000_zh.txt diff --git a/Resources/text/zh/text_hgss_02000_zh.txt b/PKHeX/Resources/text/zh/text_hgss_02000_zh.txt similarity index 100% rename from Resources/text/zh/text_hgss_02000_zh.txt rename to PKHeX/Resources/text/zh/text_hgss_02000_zh.txt diff --git a/Resources/text/zh/text_hgss_03000_zh.txt b/PKHeX/Resources/text/zh/text_hgss_03000_zh.txt similarity index 100% rename from Resources/text/zh/text_hgss_03000_zh.txt rename to PKHeX/Resources/text/zh/text_hgss_03000_zh.txt diff --git a/Resources/text/zh/text_tradeao_zh.txt b/PKHeX/Resources/text/zh/text_tradeao_zh.txt similarity index 100% rename from Resources/text/zh/text_tradeao_zh.txt rename to PKHeX/Resources/text/zh/text_tradeao_zh.txt diff --git a/Resources/text/zh/text_tradexy_zh.txt b/PKHeX/Resources/text/zh/text_tradexy_zh.txt similarity index 100% rename from Resources/text/zh/text_tradexy_zh.txt rename to PKHeX/Resources/text/zh/text_tradexy_zh.txt diff --git a/Resources/text/zh/text_xy_00000_zh.txt b/PKHeX/Resources/text/zh/text_xy_00000_zh.txt similarity index 100% rename from Resources/text/zh/text_xy_00000_zh.txt rename to PKHeX/Resources/text/zh/text_xy_00000_zh.txt diff --git a/Resources/text/zh/text_xy_30000_zh.txt b/PKHeX/Resources/text/zh/text_xy_30000_zh.txt similarity index 100% rename from Resources/text/zh/text_xy_30000_zh.txt rename to PKHeX/Resources/text/zh/text_xy_30000_zh.txt diff --git a/Resources/text/zh/text_xy_40000_zh.txt b/PKHeX/Resources/text/zh/text_xy_40000_zh.txt similarity index 100% rename from Resources/text/zh/text_xy_40000_zh.txt rename to PKHeX/Resources/text/zh/text_xy_40000_zh.txt diff --git a/Resources/text/zh/text_xy_60000_zh.txt b/PKHeX/Resources/text/zh/text_xy_60000_zh.txt similarity index 100% rename from Resources/text/zh/text_xy_60000_zh.txt rename to PKHeX/Resources/text/zh/text_xy_60000_zh.txt diff --git a/Saves/BlockInfo.cs b/PKHeX/Saves/BlockInfo.cs similarity index 100% rename from Saves/BlockInfo.cs rename to PKHeX/Saves/BlockInfo.cs diff --git a/Saves/BoxWallpaper.cs b/PKHeX/Saves/BoxWallpaper.cs similarity index 100% rename from Saves/BoxWallpaper.cs rename to PKHeX/Saves/BoxWallpaper.cs diff --git a/Saves/Inventory.cs b/PKHeX/Saves/Inventory.cs similarity index 100% rename from Saves/Inventory.cs rename to PKHeX/Saves/Inventory.cs diff --git a/Saves/SAV3.cs b/PKHeX/Saves/SAV3.cs similarity index 100% rename from Saves/SAV3.cs rename to PKHeX/Saves/SAV3.cs diff --git a/Saves/SAV4.cs b/PKHeX/Saves/SAV4.cs similarity index 100% rename from Saves/SAV4.cs rename to PKHeX/Saves/SAV4.cs diff --git a/Saves/SAV5.cs b/PKHeX/Saves/SAV5.cs similarity index 99% rename from Saves/SAV5.cs rename to PKHeX/Saves/SAV5.cs index 9d2b68d0d..068006099 100644 --- a/Saves/SAV5.cs +++ b/PKHeX/Saves/SAV5.cs @@ -619,7 +619,7 @@ protected override void setDex(PKM pkm) int lang = pkm.Language - 1; if (lang > 5) lang--; // 0-6 language vals int gender = pkm.Gender % 2; // genderless -> male int shiny = pkm.IsShiny ? 1 : 0; - int shiftoff = shiny * 0x54 * 2 + gender * 0x60 + 0x60; + int shiftoff = shiny * brSize * 2 + gender * brSize + brSize; // Set the Species Owned Flag Data[PokeDex + bit / 8 + 0x8] |= (byte)(1 << (bit % 8)); diff --git a/Saves/SAV6.cs b/PKHeX/Saves/SAV6.cs similarity index 98% rename from Saves/SAV6.cs rename to PKHeX/Saves/SAV6.cs index df076efb0..bc9ec6b64 100644 --- a/Saves/SAV6.cs +++ b/PKHeX/Saves/SAV6.cs @@ -697,12 +697,13 @@ protected override void setDex(PKM pkm) if (Version == GameVersion.Unknown) return; + const int brSize = 0x60; int bit = pkm.Species - 1; int lang = pkm.Language - 1; if (lang > 5) lang--; // 0-6 language vals int origin = pkm.Version; int gender = pkm.Gender % 2; // genderless -> male int shiny = pkm.IsShiny ? 1 : 0; - int shiftoff = shiny * 0x60 * 2 + gender * 0x60 + 0x60; + int shiftoff = shiny * brSize * 2 + gender * brSize + brSize; // Set the [Species/Gender/Shiny] Owned Flag Data[PokeDex + shiftoff + bit / 8 + 0x8] |= (byte)(1 << (bit % 8)); @@ -715,12 +716,12 @@ protected override void setDex(PKM pkm) // Set the Display flag if none are set bool Displayed = false; - Displayed |= (Data[PokeDex + 0x60 * 5 + bit / 8 + 0x8] & (byte)(1 << (bit % 8))) != 0; - Displayed |= (Data[PokeDex + 0x60 * 6 + bit / 8 + 0x8] & (byte)(1 << (bit % 8))) != 0; - Displayed |= (Data[PokeDex + 0x60 * 7 + bit / 8 + 0x8] & (byte)(1 << (bit % 8))) != 0; - Displayed |= (Data[PokeDex + 0x60 * 8 + bit / 8 + 0x8] & (byte)(1 << (bit % 8))) != 0; - if (!Displayed) // offset is already biased by 0x60, reuse shiftoff but for the display flags. - Data[PokeDex + shiftoff + 0x60 * 4 + bit / 8 + 0x8] |= (byte)(1 << (bit % 8)); + Displayed |= (Data[PokeDex + brSize * 5 + bit / 8 + 0x8] & (byte)(1 << (bit % 8))) != 0; + Displayed |= (Data[PokeDex + brSize * 6 + bit / 8 + 0x8] & (byte)(1 << (bit % 8))) != 0; + Displayed |= (Data[PokeDex + brSize * 7 + bit / 8 + 0x8] & (byte)(1 << (bit % 8))) != 0; + Displayed |= (Data[PokeDex + brSize * 8 + bit / 8 + 0x8] & (byte)(1 << (bit % 8))) != 0; + if (!Displayed) // offset is already biased by brSize, reuse shiftoff but for the display flags. + Data[PokeDex + shiftoff + brSize * 4 + bit / 8 + 0x8] |= (byte)(1 << (bit % 8)); // Set the Language if (lang < 0) lang = 1; diff --git a/Saves/SaveFile.cs b/PKHeX/Saves/SaveFile.cs similarity index 100% rename from Saves/SaveFile.cs rename to PKHeX/Saves/SaveFile.cs diff --git a/Saves/SaveObjects.cs b/PKHeX/Saves/SaveObjects.cs similarity index 100% rename from Saves/SaveObjects.cs rename to PKHeX/Saves/SaveObjects.cs diff --git a/Saves/SaveUtil.cs b/PKHeX/Saves/SaveUtil.cs similarity index 98% rename from Saves/SaveUtil.cs rename to PKHeX/Saves/SaveUtil.cs index 0a2b8aad4..9ad69d911 100644 --- a/Saves/SaveUtil.cs +++ b/PKHeX/Saves/SaveUtil.cs @@ -204,6 +204,10 @@ public static string detectSaveFile() if (path3DS != null && Directory.Exists(path = Path.Combine(path3DS, "TWLSaveTool"))) possiblePaths.AddRange(getSavesFromFolder(path, false)); + // FBI + if (path3DS != null && Directory.Exists(path = Path.Combine(path3DS, "fbi", "save"))) + possiblePaths.AddRange(getSavesFromFolder(path, false)); + // CyberGadget (Cache) string pathCache = Util.GetCacheFolder(); if (Directory.Exists(pathCache)) diff --git a/Subforms/PKM Editors/BatchEditor.Designer.cs b/PKHeX/Subforms/PKM Editors/BatchEditor.Designer.cs similarity index 100% rename from Subforms/PKM Editors/BatchEditor.Designer.cs rename to PKHeX/Subforms/PKM Editors/BatchEditor.Designer.cs diff --git a/Subforms/PKM Editors/BatchEditor.cs b/PKHeX/Subforms/PKM Editors/BatchEditor.cs similarity index 100% rename from Subforms/PKM Editors/BatchEditor.cs rename to PKHeX/Subforms/PKM Editors/BatchEditor.cs diff --git a/Subforms/PKM Editors/BatchEditor.resx b/PKHeX/Subforms/PKM Editors/BatchEditor.resx similarity index 100% rename from Subforms/PKM Editors/BatchEditor.resx rename to PKHeX/Subforms/PKM Editors/BatchEditor.resx diff --git a/Subforms/PKM Editors/MemoryAmie.Designer.cs b/PKHeX/Subforms/PKM Editors/MemoryAmie.Designer.cs similarity index 100% rename from Subforms/PKM Editors/MemoryAmie.Designer.cs rename to PKHeX/Subforms/PKM Editors/MemoryAmie.Designer.cs diff --git a/Subforms/PKM Editors/MemoryAmie.cs b/PKHeX/Subforms/PKM Editors/MemoryAmie.cs similarity index 100% rename from Subforms/PKM Editors/MemoryAmie.cs rename to PKHeX/Subforms/PKM Editors/MemoryAmie.cs diff --git a/Subforms/PKM Editors/MemoryAmie.resx b/PKHeX/Subforms/PKM Editors/MemoryAmie.resx similarity index 100% rename from Subforms/PKM Editors/MemoryAmie.resx rename to PKHeX/Subforms/PKM Editors/MemoryAmie.resx diff --git a/Subforms/PKM Editors/RibbonEditor.Designer.cs b/PKHeX/Subforms/PKM Editors/RibbonEditor.Designer.cs similarity index 100% rename from Subforms/PKM Editors/RibbonEditor.Designer.cs rename to PKHeX/Subforms/PKM Editors/RibbonEditor.Designer.cs diff --git a/Subforms/PKM Editors/RibbonEditor.cs b/PKHeX/Subforms/PKM Editors/RibbonEditor.cs similarity index 100% rename from Subforms/PKM Editors/RibbonEditor.cs rename to PKHeX/Subforms/PKM Editors/RibbonEditor.cs diff --git a/Subforms/PKM Editors/RibbonEditor.resx b/PKHeX/Subforms/PKM Editors/RibbonEditor.resx similarity index 100% rename from Subforms/PKM Editors/RibbonEditor.resx rename to PKHeX/Subforms/PKM Editors/RibbonEditor.resx diff --git a/Subforms/PKM Editors/SuperTrainingEditor.Designer.cs b/PKHeX/Subforms/PKM Editors/SuperTrainingEditor.Designer.cs similarity index 100% rename from Subforms/PKM Editors/SuperTrainingEditor.Designer.cs rename to PKHeX/Subforms/PKM Editors/SuperTrainingEditor.Designer.cs diff --git a/Subforms/PKM Editors/SuperTrainingEditor.cs b/PKHeX/Subforms/PKM Editors/SuperTrainingEditor.cs similarity index 100% rename from Subforms/PKM Editors/SuperTrainingEditor.cs rename to PKHeX/Subforms/PKM Editors/SuperTrainingEditor.cs diff --git a/Subforms/PKM Editors/SuperTrainingEditor.resx b/PKHeX/Subforms/PKM Editors/SuperTrainingEditor.resx similarity index 100% rename from Subforms/PKM Editors/SuperTrainingEditor.resx rename to PKHeX/Subforms/PKM Editors/SuperTrainingEditor.resx diff --git a/Subforms/PKM Editors/Text.Designer.cs b/PKHeX/Subforms/PKM Editors/Text.Designer.cs similarity index 100% rename from Subforms/PKM Editors/Text.Designer.cs rename to PKHeX/Subforms/PKM Editors/Text.Designer.cs diff --git a/Subforms/PKM Editors/Text.cs b/PKHeX/Subforms/PKM Editors/Text.cs similarity index 100% rename from Subforms/PKM Editors/Text.cs rename to PKHeX/Subforms/PKM Editors/Text.cs diff --git a/Subforms/PKM Editors/Text.resx b/PKHeX/Subforms/PKM Editors/Text.resx similarity index 100% rename from Subforms/PKM Editors/Text.resx rename to PKHeX/Subforms/PKM Editors/Text.resx diff --git a/Subforms/SAV_Database.Designer.cs b/PKHeX/Subforms/SAV_Database.Designer.cs similarity index 100% rename from Subforms/SAV_Database.Designer.cs rename to PKHeX/Subforms/SAV_Database.Designer.cs diff --git a/Subforms/SAV_Database.cs b/PKHeX/Subforms/SAV_Database.cs similarity index 100% rename from Subforms/SAV_Database.cs rename to PKHeX/Subforms/SAV_Database.cs diff --git a/Subforms/SAV_Database.resx b/PKHeX/Subforms/SAV_Database.resx similarity index 100% rename from Subforms/SAV_Database.resx rename to PKHeX/Subforms/SAV_Database.resx diff --git a/Subforms/Save Editors/Gen5/CGearBackground.cs b/PKHeX/Subforms/Save Editors/Gen5/CGearBackground.cs similarity index 100% rename from Subforms/Save Editors/Gen5/CGearBackground.cs rename to PKHeX/Subforms/Save Editors/Gen5/CGearBackground.cs diff --git a/Subforms/Save Editors/Gen5/SAV_CGearSkin.Designer.cs b/PKHeX/Subforms/Save Editors/Gen5/SAV_CGearSkin.Designer.cs similarity index 100% rename from Subforms/Save Editors/Gen5/SAV_CGearSkin.Designer.cs rename to PKHeX/Subforms/Save Editors/Gen5/SAV_CGearSkin.Designer.cs diff --git a/Subforms/Save Editors/Gen5/SAV_CGearSkin.cs b/PKHeX/Subforms/Save Editors/Gen5/SAV_CGearSkin.cs similarity index 100% rename from Subforms/Save Editors/Gen5/SAV_CGearSkin.cs rename to PKHeX/Subforms/Save Editors/Gen5/SAV_CGearSkin.cs diff --git a/Subforms/Save Editors/Gen5/SAV_CGearSkin.resx b/PKHeX/Subforms/Save Editors/Gen5/SAV_CGearSkin.resx similarity index 100% rename from Subforms/Save Editors/Gen5/SAV_CGearSkin.resx rename to PKHeX/Subforms/Save Editors/Gen5/SAV_CGearSkin.resx diff --git a/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.Designer.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_BerryFieldXY.Designer.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.Designer.cs diff --git a/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_BerryFieldXY.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.cs diff --git a/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.resx b/PKHeX/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.resx similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_BerryFieldXY.resx rename to PKHeX/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.resx diff --git a/Subforms/Save Editors/Gen6/SAV_BoxLayout.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.Designer.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_BoxLayout.Designer.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.Designer.cs diff --git a/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_BoxLayout.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs diff --git a/Subforms/Save Editors/Gen6/SAV_BoxLayout.resx b/PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.resx similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_BoxLayout.resx rename to PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.resx diff --git a/Subforms/Save Editors/Gen6/SAV_HallOfFame.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_HallOfFame.Designer.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_HallOfFame.Designer.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_HallOfFame.Designer.cs diff --git a/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_HallOfFame.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs diff --git a/Subforms/Save Editors/Gen6/SAV_HallOfFame.resx b/PKHeX/Subforms/Save Editors/Gen6/SAV_HallOfFame.resx similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_HallOfFame.resx rename to PKHeX/Subforms/Save Editors/Gen6/SAV_HallOfFame.resx diff --git a/Subforms/Save Editors/Gen6/SAV_Link6.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_Link6.Designer.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_Link6.Designer.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_Link6.Designer.cs diff --git a/Subforms/Save Editors/Gen6/SAV_Link6.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_Link6.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_Link6.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_Link6.cs diff --git a/Subforms/Save Editors/Gen6/SAV_Link6.resx b/PKHeX/Subforms/Save Editors/Gen6/SAV_Link6.resx similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_Link6.resx rename to PKHeX/Subforms/Save Editors/Gen6/SAV_Link6.resx diff --git a/Subforms/Save Editors/Gen6/SAV_OPower.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_OPower.Designer.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_OPower.Designer.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_OPower.Designer.cs diff --git a/Subforms/Save Editors/Gen6/SAV_OPower.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_OPower.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_OPower.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_OPower.cs diff --git a/Subforms/Save Editors/Gen6/SAV_OPower.resx b/PKHeX/Subforms/Save Editors/Gen6/SAV_OPower.resx similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_OPower.resx rename to PKHeX/Subforms/Save Editors/Gen6/SAV_OPower.resx diff --git a/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.Designer.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.Designer.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.Designer.cs diff --git a/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.cs diff --git a/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.resx b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.resx similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.resx rename to PKHeX/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.resx diff --git a/Subforms/Save Editors/Gen6/SAV_PokedexORAS.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.Designer.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_PokedexORAS.Designer.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.Designer.cs diff --git a/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs diff --git a/Subforms/Save Editors/Gen6/SAV_PokedexORAS.resx b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.resx similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_PokedexORAS.resx rename to PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.resx diff --git a/Subforms/Save Editors/Gen6/SAV_PokedexXY.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.Designer.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_PokedexXY.Designer.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.Designer.cs diff --git a/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_PokedexXY.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs diff --git a/Subforms/Save Editors/Gen6/SAV_PokedexXY.resx b/PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.resx similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_PokedexXY.resx rename to PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.resx diff --git a/Subforms/Save Editors/Gen6/SAV_Pokepuff.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.Designer.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_Pokepuff.Designer.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.Designer.cs diff --git a/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_Pokepuff.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs diff --git a/Subforms/Save Editors/Gen6/SAV_Pokepuff.resx b/PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.resx similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_Pokepuff.resx rename to PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.resx diff --git a/Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs diff --git a/Subforms/Save Editors/Gen6/SAV_SecretBase.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_SecretBase.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.cs diff --git a/Subforms/Save Editors/Gen6/SAV_SecretBase.resx b/PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.resx similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_SecretBase.resx rename to PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.resx diff --git a/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs diff --git a/Subforms/Save Editors/Gen6/SAV_SuperTrain.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_SuperTrain.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.cs diff --git a/Subforms/Save Editors/Gen6/SAV_SuperTrain.resx b/PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.resx similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_SuperTrain.resx rename to PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.resx diff --git a/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs diff --git a/Subforms/Save Editors/Gen6/SAV_Trainer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.cs similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_Trainer.cs rename to PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.cs diff --git a/Subforms/Save Editors/Gen6/SAV_Trainer.resx b/PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.resx similarity index 100% rename from Subforms/Save Editors/Gen6/SAV_Trainer.resx rename to PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.resx diff --git a/Subforms/Save Editors/SAV_EventFlags.Designer.cs b/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs similarity index 100% rename from Subforms/Save Editors/SAV_EventFlags.Designer.cs rename to PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs diff --git a/Subforms/Save Editors/SAV_EventFlags.cs b/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs similarity index 100% rename from Subforms/Save Editors/SAV_EventFlags.cs rename to PKHeX/Subforms/Save Editors/SAV_EventFlags.cs diff --git a/Subforms/Save Editors/SAV_EventFlags.resx b/PKHeX/Subforms/Save Editors/SAV_EventFlags.resx similarity index 100% rename from Subforms/Save Editors/SAV_EventFlags.resx rename to PKHeX/Subforms/Save Editors/SAV_EventFlags.resx diff --git a/Subforms/Save Editors/SAV_Inventory.Designer.cs b/PKHeX/Subforms/Save Editors/SAV_Inventory.Designer.cs similarity index 100% rename from Subforms/Save Editors/SAV_Inventory.Designer.cs rename to PKHeX/Subforms/Save Editors/SAV_Inventory.Designer.cs diff --git a/Subforms/Save Editors/SAV_Inventory.cs b/PKHeX/Subforms/Save Editors/SAV_Inventory.cs similarity index 100% rename from Subforms/Save Editors/SAV_Inventory.cs rename to PKHeX/Subforms/Save Editors/SAV_Inventory.cs diff --git a/Subforms/Save Editors/SAV_Inventory.resx b/PKHeX/Subforms/Save Editors/SAV_Inventory.resx similarity index 100% rename from Subforms/Save Editors/SAV_Inventory.resx rename to PKHeX/Subforms/Save Editors/SAV_Inventory.resx diff --git a/Subforms/Save Editors/SAV_SimpleTrainer.Designer.cs b/PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.Designer.cs similarity index 100% rename from Subforms/Save Editors/SAV_SimpleTrainer.Designer.cs rename to PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.Designer.cs diff --git a/Subforms/Save Editors/SAV_SimpleTrainer.cs b/PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs similarity index 100% rename from Subforms/Save Editors/SAV_SimpleTrainer.cs rename to PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs diff --git a/Subforms/Save Editors/SAV_SimpleTrainer.resx b/PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.resx similarity index 100% rename from Subforms/Save Editors/SAV_SimpleTrainer.resx rename to PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.resx diff --git a/Subforms/Save Editors/SAV_Wondercard.Designer.cs b/PKHeX/Subforms/Save Editors/SAV_Wondercard.Designer.cs similarity index 100% rename from Subforms/Save Editors/SAV_Wondercard.Designer.cs rename to PKHeX/Subforms/Save Editors/SAV_Wondercard.Designer.cs diff --git a/Subforms/Save Editors/SAV_Wondercard.cs b/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs similarity index 100% rename from Subforms/Save Editors/SAV_Wondercard.cs rename to PKHeX/Subforms/Save Editors/SAV_Wondercard.cs diff --git a/Subforms/Save Editors/SAV_Wondercard.resx b/PKHeX/Subforms/Save Editors/SAV_Wondercard.resx similarity index 100% rename from Subforms/Save Editors/SAV_Wondercard.resx rename to PKHeX/Subforms/Save Editors/SAV_Wondercard.resx diff --git a/Subforms/frmReport.Designer.cs b/PKHeX/Subforms/frmReport.Designer.cs similarity index 100% rename from Subforms/frmReport.Designer.cs rename to PKHeX/Subforms/frmReport.Designer.cs diff --git a/Subforms/frmReport.cs b/PKHeX/Subforms/frmReport.cs similarity index 96% rename from Subforms/frmReport.cs rename to PKHeX/Subforms/frmReport.cs index 7004595a4..2b0203bc1 100644 --- a/Subforms/frmReport.cs +++ b/PKHeX/Subforms/frmReport.cs @@ -98,12 +98,12 @@ public class Preview public ushort Checksum => pkm.Checksum; public int mFriendship => pkm.OT_Friendship; public int OT_Affection => pkm.OT_Affection; - public int Egg_Year => pkm.Egg_Year; - public int Egg_Month => pkm.Egg_Month; - public int Egg_Day => pkm.Egg_Day; - public int Met_Year => pkm.Met_Year; - public int Met_Month => pkm.Met_Month; - public int Met_Day => pkm.Met_Day; + public int Egg_Year => pkm.EggMetDate.GetValueOrDefault().Year; + public int Egg_Month => pkm.EggMetDate.GetValueOrDefault().Month; + public int Egg_Day => pkm.EggMetDate.GetValueOrDefault().Day; + public int Met_Year => pkm.MetDate.GetValueOrDefault().Year; + public int Met_Month => pkm.MetDate.GetValueOrDefault().Month; + public int Met_Day => pkm.MetDate.GetValueOrDefault().Day; public int Encounter => pkm.EncounterType; #endregion diff --git a/Subforms/frmReport.resx b/PKHeX/Subforms/frmReport.resx similarity index 100% rename from Subforms/frmReport.resx rename to PKHeX/Subforms/frmReport.resx diff --git a/Util/DataUtil.cs b/PKHeX/Util/DataUtil.cs similarity index 100% rename from Util/DataUtil.cs rename to PKHeX/Util/DataUtil.cs diff --git a/PKHeX/Util/DateUtil.cs b/PKHeX/Util/DateUtil.cs new file mode 100644 index 000000000..0cff93c7f --- /dev/null +++ b/PKHeX/Util/DateUtil.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace PKHeX +{ + public static partial class Util + { + /// + /// Determines whether or not the given date components are valid. + /// + /// The year of the date of which to check the validity. + /// The month of the date of which to check the validity. + /// The day of the date of which to check the validity. + /// A boolean indicating whether or not the date is valid. + public static bool IsDateValid(int year, int month, int day) + { + return !(year <= 0 || year > DateTime.MaxValue.Year || month < 1 || month > 12 || day < 1 || day > DateTime.DaysInMonth(year, month)); + } + + /// + /// Determines whether or not the given date components are valid. + /// + /// The year of the date of which to check the validity. + /// The month of the date of which to check the validity. + /// The day of the date of which to check the validity. + /// A boolean indicating whether or not the date is valid. + public static bool IsDateValid(uint year, uint month, uint day) + { + return year < int.MaxValue && month < int.MaxValue && day < int.MaxValue && IsDateValid((int)year, (int)month, (int)day); + } + } +} diff --git a/Util/FormUtil.cs b/PKHeX/Util/FormUtil.cs similarity index 100% rename from Util/FormUtil.cs rename to PKHeX/Util/FormUtil.cs diff --git a/Util/ImageUtil.cs b/PKHeX/Util/ImageUtil.cs similarity index 97% rename from Util/ImageUtil.cs rename to PKHeX/Util/ImageUtil.cs index cf6db53bf..84a0d29a9 100644 --- a/Util/ImageUtil.cs +++ b/PKHeX/Util/ImageUtil.cs @@ -5,7 +5,7 @@ namespace PKHeX { - public partial class Util + public static partial class Util { // Image Layering/Blending Utility internal static Bitmap LayerImage(Image baseLayer, Image overLayer, int x, int y, double trans) diff --git a/Util/PathUtil.cs b/PKHeX/Util/PathUtil.cs similarity index 100% rename from Util/PathUtil.cs rename to PKHeX/Util/PathUtil.cs diff --git a/Util/RandUtil.cs b/PKHeX/Util/RandUtil.cs similarity index 100% rename from Util/RandUtil.cs rename to PKHeX/Util/RandUtil.cs diff --git a/Util/ReflectUtil.cs b/PKHeX/Util/ReflectUtil.cs similarity index 64% rename from Util/ReflectUtil.cs rename to PKHeX/Util/ReflectUtil.cs index f90a32dd2..4af27060e 100644 --- a/Util/ReflectUtil.cs +++ b/PKHeX/Util/ReflectUtil.cs @@ -1,23 +1,24 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Reflection; namespace PKHeX { - public static class ReflectUtil + public static partial class ReflectUtil { internal static bool GetValueEquals(object obj, string propertyName, object value) { PropertyInfo pi = obj.GetType().GetProperty(propertyName); var v = pi.GetValue(obj, null); - var c = Convert.ChangeType(value, pi.PropertyType); + var c = ConvertValue(value, pi.PropertyType); return v.Equals(c); } internal static void SetValue(object obj, string propertyName, object value) { PropertyInfo pi = obj.GetType().GetProperty(propertyName); - pi.SetValue(obj, Convert.ChangeType(value, pi.PropertyType), null); + pi.SetValue(obj, ConvertValue(value, pi.PropertyType), null); } internal static object GetValue(object obj, string propertyName) { @@ -38,5 +39,19 @@ internal static bool HasProperty(this Type type, string name) { return type.GetProperties(BindingFlags.Public | BindingFlags.Instance).Any(p => p.Name == name); } + + private static object ConvertValue(object value, Type type) + { + if (type == typeof(DateTime?)) // Used for PKM.MetDate and other similar properties + { + DateTime dateValue; + return DateTime.TryParseExact(value.ToString(), "yyyyMMdd", CultureInfo.InvariantCulture, DateTimeStyles.None, out dateValue) + ? new DateTime?(dateValue) + : null; + } + + // Convert.ChangeType is suitable for most things + return Convert.ChangeType(value, type); + } } } diff --git a/Util/StringUtil.cs b/PKHeX/Util/StringUtil.cs similarity index 100% rename from Util/StringUtil.cs rename to PKHeX/Util/StringUtil.cs diff --git a/app.config b/PKHeX/app.config similarity index 100% rename from app.config rename to PKHeX/app.config diff --git a/Tests/PKHeX.Tests/PKHeX.Tests.csproj b/Tests/PKHeX.Tests/PKHeX.Tests.csproj new file mode 100644 index 000000000..4633f1236 --- /dev/null +++ b/Tests/PKHeX.Tests/PKHeX.Tests.csproj @@ -0,0 +1,93 @@ + + + + Debug + AnyCPU + {8E2499BC-C11A-4809-8737-66D35A625425} + Library + Properties + PKHeX.Tests + PKHeX.Tests + v4.0 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + + + + + + + + + + + + + + + + + + + + + + + {b4eff030-c75a-49f9-a4bc-738d1b61c4af} + PKHeX + + + + + + + False + + + False + + + False + + + False + + + + + + + + \ No newline at end of file diff --git a/Tests/PKHeX.Tests/PKM/DateTestPKM.cs b/Tests/PKHeX.Tests/PKM/DateTestPKM.cs new file mode 100644 index 000000000..8617f8ab0 --- /dev/null +++ b/Tests/PKHeX.Tests/PKM/DateTestPKM.cs @@ -0,0 +1,1059 @@ +using System; + +namespace PKHeX.Tests.PKM +{ + /// + /// A implementation designed to test and . + /// + class DateTestPKM : PKHeX.PKM + { + public int MetYear { get; set; } + public int MetMonth { get; set; } + public int MetDay { get; set; } + public int EggMetYear { get; set; } + public int EggMetMonth { get; set; } + public int EggMetDay { get; set; } + + protected override int Met_Year + { + get + { + return MetYear; + } + + set + { + MetYear = value; + } + } + + protected override int Met_Month + { + get + { + return MetMonth; + } + + set + { + MetMonth = value; + } + } + + protected override int Met_Day + { + get + { + return MetDay; + } + + set + { + MetDay = value; + } + } + + protected override int Egg_Year + { + get + { + return EggMetYear; + } + + set + { + EggMetYear = value; + } + } + + protected override int Egg_Month + { + get + { + return EggMetMonth; + } + + set + { + EggMetMonth = value; + } + } + + protected override int Egg_Day + { + get + { + return EggMetDay; + } + + set + { + EggMetDay = value; + } + } + + + #region NotImplemented Properties + + public override int Ability + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int AltForm + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Ball + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Characteristic + { + get + { + throw new NotImplementedException(); + } + } + + public override ushort Checksum + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int CNT_Beauty + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int CNT_Cool + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int CNT_Cute + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int CNT_Sheen + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int CNT_Smart + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int CNT_Tough + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int CurrentFriendship + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int CurrentHandler + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Egg_Location + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override uint EncryptionConstant + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int EV_ATK + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int EV_DEF + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int EV_HP + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int EV_SPA + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int EV_SPD + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int EV_SPE + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override uint EXP + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override bool FatefulEncounter + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Format + { + get + { + throw new NotImplementedException(); + } + } + + public override int Gender + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int HeldItem + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override bool IsEgg + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override bool IsNicknamed + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int IV_ATK + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int IV_DEF + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int IV_HP + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int IV_SPA + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int IV_SPD + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int IV_SPE + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Language + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override byte MarkByte + { + get + { + throw new NotImplementedException(); + } + + protected set + { + throw new NotImplementedException(); + } + } + + public override int Met_Level + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Met_Location + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Move1 + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Move1_PP + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Move1_PPUps + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Move2 + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Move2_PP + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Move2_PPUps + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Move3 + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Move3_PP + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Move3_PPUps + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Move4 + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Move4_PP + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Move4_PPUps + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Nature + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override string Nickname + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int OT_Friendship + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int OT_Gender + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override string OT_Name + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override uint PID + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int PKRS_Days + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int PKRS_Strain + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int PSV + { + get + { + throw new NotImplementedException(); + } + } + + public override ushort Sanity + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int SID + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int SIZE_PARTY + { + get + { + throw new NotImplementedException(); + } + } + + public override int SIZE_STORED + { + get + { + throw new NotImplementedException(); + } + } + + public override int Species + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Stat_ATK + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Stat_DEF + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Stat_HPCurrent + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Stat_HPMax + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Stat_Level + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Stat_SPA + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Stat_SPD + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int Stat_SPE + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int TID + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override int TSV + { + get + { + throw new NotImplementedException(); + } + } + + public override int Version + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + + public override PKHeX.PKM Clone() + { + throw new NotImplementedException(); + } + + public override byte[] Encrypt() + { + throw new NotImplementedException(); + } + + public override bool getGenderIsValid() + { + throw new NotImplementedException(); + } + #endregion + } +} diff --git a/Tests/PKHeX.Tests/PKM/PKMTests.cs b/Tests/PKHeX.Tests/PKM/PKMTests.cs new file mode 100644 index 000000000..022b377be --- /dev/null +++ b/Tests/PKHeX.Tests/PKM/PKMTests.cs @@ -0,0 +1,129 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; + +namespace PKHeX.Tests.PKM +{ + [TestClass] + public class PKMTests + { + const string DateTestCategory = "PKM Date Tests"; + + [TestMethod] + [TestCategory(DateTestCategory)] + public void MetDateGetterTest() + { + var pk = new DateTestPKM(); + + // Ensure MetDate is null when components are all 0 + pk.MetDay = 0; + pk.MetMonth = 0; + pk.MetYear = 0; + Assert.IsFalse(pk.MetDate.HasValue, "MetDate should be null when date components are all 0."); + + // Ensure MetDate gives correct date + pk.MetDay = 10; + pk.MetMonth = 8; + pk.MetYear = 16; + Assert.AreEqual(new DateTime(2016, 8, 10).Date, pk.MetDate.Value.Date, "Met date does not return correct date."); + + // Ensure 0 year is calculated correctly + pk.MetDay = 1; + pk.MetMonth = 1; + pk.MetYear = 0; + Assert.AreEqual(2000, pk.MetDate.Value.Date.Year, "Year is not calculated correctly."); + } + + [TestMethod] + [TestCategory(DateTestCategory)] + public void MetDateSetterTest() + { + var pk = new DateTestPKM(); + + // Ensure setting to null zeros the components + // -- Set to something else first + pk.MetDay = 12; + pk.MetMonth = 12; + pk.MetYear = 12; + // -- Act + pk.MetDate = null; + // -- Assert + Assert.AreEqual(0, pk.MetDay, "Met_Day was not zeroed when MetDate is set to null"); + Assert.AreEqual(0, pk.MetMonth, "Met_Month was not zeroed when MetDate is set to null"); + Assert.AreEqual(0, pk.MetYear, "Met_Year was not zeroed when MetDate is set to null"); + + // Ensure setting to a date sets the components + var now = DateTime.Now; + // -- Set to something else first + pk.MetDay = 12; + pk.MetMonth = 12; + pk.MetYear = 12; + if (now.Month == 12) + { + // We don't want the test to work just because it's 12/12 right now. + pk.MetMonth = 11; + } + // -- Act + pk.MetDate = now; + // -- Assert + Assert.AreEqual(now.Day, pk.MetDay, "Met_Day was not correctly set"); + Assert.AreEqual(now.Month, pk.MetMonth, "Met_Month was not correctly set"); + Assert.AreEqual(now.Year - 2000, pk.MetYear, "Met_Year was not correctly set"); + } + + [TestMethod] + [TestCategory(DateTestCategory)] + public void EggMetDateGetterTest() + { + var pk = new DateTestPKM(); + + // Ensure MetDate is null when components are all 0 + pk.EggMetDay = 0; + pk.EggMetMonth = 0; + pk.EggMetYear = 0; + Assert.IsFalse(pk.MetDate.HasValue, "EggMetDate should be null when date components are all 0."); + + // Ensure MetDate gives correct date + pk.EggMetDay = 10; + pk.EggMetMonth = 8; + pk.EggMetYear = 16; + Assert.AreEqual(new DateTime(2016, 8, 10).Date, pk.EggMetDate.Value.Date, "Egg met date does not return correct date."); + } + + [TestMethod] + [TestCategory(DateTestCategory)] + public void EggMetDateSetterTest() + { + var pk = new DateTestPKM(); + + // Ensure setting to null zeros the components + // -- Set to something else first + pk.EggMetDay = 12; + pk.EggMetMonth = 12; + pk.EggMetYear = 12; + // -- Act + pk.EggMetDate = null; + // -- Assert + Assert.AreEqual(0, pk.EggMetDay, "Egg_Day was not zeroed when EggMetDate is set to null"); + Assert.AreEqual(0, pk.EggMetMonth, "Egg_Month was not zeroed when EggMetDate is set to null"); + Assert.AreEqual(0, pk.EggMetYear, "Egg_Year was not zeroed when EggMetDate is set to null"); + + // Ensure setting to a date sets the components + var now = DateTime.Now; + // -- Set to something else first + pk.EggMetDay = 12; + pk.EggMetMonth = 12; + pk.EggMetYear = 12; + if (now.Month == 12) + { + // We don't want the test to work just because it's 12/12 right now. + pk.EggMetMonth = 11; + } + // -- Act + pk.EggMetDate = now; + // -- Assert + Assert.AreEqual(now.Day, pk.EggMetDay, "Egg_Day was not correctly set"); + Assert.AreEqual(now.Month, pk.EggMetMonth, "Egg_Month was not correctly set"); + Assert.AreEqual(now.Year - 2000, pk.EggMetYear, "Egg_Year was not correctly set"); + } + } +} diff --git a/Tests/PKHeX.Tests/Properties/AssemblyInfo.cs b/Tests/PKHeX.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..24b24f48a --- /dev/null +++ b/Tests/PKHeX.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("PKHeX.Tests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("PKHeX.Tests")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("8e2499bc-c11a-4809-8737-66d35a625425")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Tests/PKHeX.Tests/Util/DateUtilTests.cs b/Tests/PKHeX.Tests/Util/DateUtilTests.cs new file mode 100644 index 000000000..c6ac91477 --- /dev/null +++ b/Tests/PKHeX.Tests/Util/DateUtilTests.cs @@ -0,0 +1,114 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace PKHeX.Tests.Util +{ + [TestClass] + public class DateUtilTests + { + const string DateUtilCategory = "Date Util Tests"; + + [TestMethod] + [TestCategory(DateUtilCategory)] + public void RecognizesCorrectDates() + { + Assert.IsTrue(PKHeX.Util.IsDateValid(2000, 1, 1), "Failed to recognize 1/1/2000"); + Assert.IsTrue(PKHeX.Util.IsDateValid(2001, 1, 31), "Failed to recognize 1/31/2001"); + } + + [TestMethod] + [TestCategory(DateUtilCategory)] + public void MonthBoundaries() + { + Assert.IsTrue(PKHeX.Util.IsDateValid(2016, 1, 31), "Incorrect month boundary for January"); + Assert.IsTrue(PKHeX.Util.IsDateValid(2016, 2, 28), "Incorrect month boundary for February"); + Assert.IsTrue(PKHeX.Util.IsDateValid(2016, 3, 31), "Incorrect month boundary for March"); + Assert.IsTrue(PKHeX.Util.IsDateValid(2016, 4, 30), "Incorrect month boundary for April"); + Assert.IsTrue(PKHeX.Util.IsDateValid(2016, 5, 31), "Incorrect month boundary for May"); + Assert.IsTrue(PKHeX.Util.IsDateValid(2016, 6, 30), "Incorrect month boundary for June"); + Assert.IsTrue(PKHeX.Util.IsDateValid(2016, 7, 31), "Incorrect month boundary for July"); + Assert.IsTrue(PKHeX.Util.IsDateValid(2016, 8, 31), "Incorrect month boundary for August"); + Assert.IsTrue(PKHeX.Util.IsDateValid(2016, 9, 30), "Incorrect month boundary for September"); + Assert.IsTrue(PKHeX.Util.IsDateValid(2016, 10, 31), "Incorrect month boundary for October"); + Assert.IsTrue(PKHeX.Util.IsDateValid(2016, 11, 30), "Incorrect month boundary for November"); + Assert.IsTrue(PKHeX.Util.IsDateValid(2016, 12, 31), "Incorrect month boundary for December"); + } + + [TestMethod] + [TestCategory(DateUtilCategory)] + public void RecognizeCorrectLeapYear() + { + Assert.IsTrue(PKHeX.Util.IsDateValid(2004, 2, 29)); + } + + [TestMethod] + [TestCategory(DateUtilCategory)] + public void FailsWithIncorrectLeapYear() + { + Assert.IsFalse(PKHeX.Util.IsDateValid(2005, 2, 29)); + } + + [TestMethod] + [TestCategory(DateUtilCategory)] + public void FailsWithZeroDate() + { + Assert.IsFalse(PKHeX.Util.IsDateValid(0, 0, 0)); + } + + [TestMethod] + [TestCategory(DateUtilCategory)] + public void FailsWithNegativeDate() + { + Assert.IsFalse(PKHeX.Util.IsDateValid(-1, -1, -1)); + } + + [TestMethod] + [TestCategory(DateUtilCategory)] + public void FailsWithBigDay() + { + Assert.IsFalse(PKHeX.Util.IsDateValid(2000, 1, 32)); + } + + [TestMethod] + [TestCategory(DateUtilCategory)] + public void FailsWithBigMonth() + { + Assert.IsFalse(PKHeX.Util.IsDateValid(2000, 13, 1)); + } + + [TestMethod] + [TestCategory(DateUtilCategory)] + public void FailsWithBigYear() + { + Assert.IsFalse(PKHeX.Util.IsDateValid(10000, 1, 1)); + } + + [TestMethod] + [TestCategory(DateUtilCategory)] + public void FailsWithZeroDay() + { + Assert.IsFalse(PKHeX.Util.IsDateValid(2000, 1, 0)); + } + + [TestMethod] + [TestCategory(DateUtilCategory)] + public void FailsWithZeroMonth() + { + Assert.IsFalse(PKHeX.Util.IsDateValid(2000, 0, 1)); + } + + [TestMethod] + [TestCategory(DateUtilCategory)] + public void FailsWithZeroYear() + { + Assert.IsFalse(PKHeX.Util.IsDateValid(0, 1, 1)); + } + + [TestMethod] + [TestCategory(DateUtilCategory)] + public void TestUIntOverload() + { + Assert.IsTrue(PKHeX.Util.IsDateValid((uint)2000, (uint)1, (uint)1), "Failed 1/1/2000"); + Assert.IsFalse(PKHeX.Util.IsDateValid(uint.MaxValue, uint.MaxValue, uint.MaxValue), "Failed with uint.MaxValue"); + } + } +}