From 116840b32e65e0565f302894d38a4a0dca9dc275 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Tue, 2 Aug 2016 17:40:20 -0700 Subject: [PATCH 01/67] Cleanup Remove unnecessary complexity Fix exporting pk* (DecryptedBoxData instead of 0xE8) --- Subforms/SAV_Database.cs | 128 +++------------------------------------ 1 file changed, 9 insertions(+), 119 deletions(-) diff --git a/Subforms/SAV_Database.cs b/Subforms/SAV_Database.cs index f9c0f5b2d..abcc6bef1 100644 --- a/Subforms/SAV_Database.cs +++ b/Subforms/SAV_Database.cs @@ -4,7 +4,6 @@ using System.Drawing; using System.IO; using System.Linq; -using System.Text; using System.Windows.Forms; namespace PKHeX @@ -80,41 +79,33 @@ public SAV_Database(Main f1) foreach (PictureBox p in PKXBOXES) p.ContextMenuStrip = mnu; - // Load initial database - Database.Add(new DatabaseList - { - Version = 0, - Title = "Misc", - Description = "Individual pkm files present in the db/sav.", - }); - - // Load databases + // Load Data + RawDB = new List(); foreach (string file in Directory.GetFiles(DatabasePath, "*", SearchOption.AllDirectories)) { FileInfo fi = new FileInfo(file); if (fi.Extension.Contains(".pk") && PKX.getIsPKM(fi.Length)) - Database[0].Slot.Add(PKMConverter.getPKMfromBytes(File.ReadAllBytes(file), file)); - else - loadDatabase(File.ReadAllBytes(file)); + RawDB.Add(PKMConverter.getPKMfromBytes(File.ReadAllBytes(file), file)); } // Fetch from save file foreach (var pkm in Main.SAV.BoxData.Where(pk => pk.Species != 0)) - Database[0].Slot.Add(pkm); + RawDB.Add(pkm); // Prepare Database - prepareDBForSearch(); + RawDB = new List(RawDB.Where(pk => pk.ChecksumValid && pk.Species != 0 && pk.Sanity == 0)); + RawDB = new List(RawDB.Distinct()); + setResults(RawDB); + Menu_SearchSettings.DropDown.Closing += (sender, e) => { if (e.CloseReason == ToolStripDropDownCloseReason.ItemClicked) e.Cancel = true; }; - B_Search.PerformClick(); CenterToParent(); } private readonly Main m_parent; private readonly PictureBox[] PKXBOXES; private readonly string DatabasePath = Main.DatabasePath; - private readonly List Database = new List(); private List Results; private List RawDB; private int slotSelected = -1; // = null; @@ -323,80 +314,6 @@ private void generateDBReport(object sender, EventArgs e) } // IO Usage - private class DatabaseList - { - public readonly List Slot = new List(); - public int Version; - private readonly bool Unicode; - private readonly byte[] Unused; - public string Title; - public string Description; - - public DatabaseList() { } - public DatabaseList(byte[] data) - { - if ((data.Length < 0x100 + 0xE8) || (data.Length - 0x100)%0xE8 != 0) - return; - - Version = BitConverter.ToInt32(data, 0); - Unicode = data[0x5] == 1; - Unused = data.Skip(4).Take(0xB).ToArray(); - - if (Unicode) - { - Title = Encoding.Unicode.GetString(data, 0x10, 0x30).Trim(); - Description = Encoding.Unicode.GetString(data, 0x40, 0x60).Trim(); - } - else - { - Title = Encoding.ASCII.GetString(data, 0x10, 0x30).Trim(); - Description = Encoding.ASCII.GetString(data, 0x40, 0x60).Trim(); - } - - int count = (data.Length - 0x100)/0xE8; - for (int i = 0; i < count; i++) - Slot.Add(new PK6(data.Skip(0x100 + i * 0xE8).Take(0xE8).ToArray())); - } - public byte[] Write() - { - using (MemoryStream ms = new MemoryStream()) - using (BinaryWriter bw = new BinaryWriter(ms)) - { - bw.Write(Version); - bw.Write(Unused); - - byte[] title = Unicode ? Encoding.Unicode.GetBytes(Title) : Encoding.ASCII.GetBytes(Title); - Array.Resize(ref title, 0x30); - bw.Write(title); - - byte[] desc = Unicode ? Encoding.Unicode.GetBytes(Description) : Encoding.ASCII.GetBytes(Description); - Array.Resize(ref title, 0x60); - bw.Write(desc); - - foreach (var pk6 in Slot) - bw.Write(pk6.Data.Take(0xE8).ToArray()); - - return ms.ToArray(); - } - } - } - private void loadDatabase(byte[] data) - { - var db = new DatabaseList(data); - if (db.Slot.Count > 0) - Database.Add(db); - } - private void prepareDBForSearch() - { - RawDB = new List(); - - foreach (var db in Database) - RawDB.AddRange(db.Slot); - - RawDB = new List(RawDB.Where(pk => pk.ChecksumValid && pk.Species != 0 && pk.Sanity == 0)); - RawDB = new List(RawDB.Distinct()); - setResults(RawDB); - } private void openDB(object sender, EventArgs e) { if (Directory.Exists(DatabasePath)) @@ -419,8 +336,7 @@ private void Menu_Export_Click(object sender, EventArgs e) Directory.CreateDirectory(path); foreach (PKM pkm in Results) - File.WriteAllBytes(Path.Combine(path, Util.CleanFileName(pkm.FileName)), - pkm.Data.Take(0xE8).ToArray()); + File.WriteAllBytes(Path.Combine(path, Util.CleanFileName(pkm.FileName)), pkm.DecryptedBoxData); } // View Updates @@ -644,32 +560,6 @@ private void changeGeneration(object sender, EventArgs e) CB_GameOrigin.SelectedIndex = 0; } - // Debug - private void testQuery() - { - var query = from db in Database - select db.Slot.Where(p => p.Move1 == 1).ToArray(); - - var result = query.ToArray(); - if (!result[0].Any()) - return; - - var any = result[0][0]; - m_parent.populateFields(any); - } - private void testUnique() - { - var query = from db in Database - select db.Slot.GroupBy(p => p.Checksum + p.EncryptionConstant + p.Species) // Unique criteria - .Select(grp => grp.First()).ToArray(); - - var result = query.ToArray(); - if (!result[0].Any()) - return; - - var any = result[0][0]; - m_parent.populateFields(any); - } private void Menu_SearchAdvanced_Click(object sender, EventArgs e) { if (!Menu_SearchAdvanced.Checked) From a7d188894304262441f038defecd7dd4c71053e3 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Tue, 2 Aug 2016 18:46:41 -0700 Subject: [PATCH 02/67] Fix Open/Save filters Filter for opening allows past gen pkm files to be selected. Removes old 'pokemon.ekx' injection method which nobody should be using (use QRs!) --- MainWindow/Main.cs | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/MainWindow/Main.cs b/MainWindow/Main.cs index e4c911af4..a4dd545c2 100644 --- a/MainWindow/Main.cs +++ b/MainWindow/Main.cs @@ -188,11 +188,22 @@ public Main() // Main Menu Strip UI Functions private void mainMenuOpen(object sender, EventArgs e) { + string pkx = pkm.Extension; + string ekx = 'e' + pkx.Substring(1, pkx.Length-1); + + string supported = "*.pkm;"; + for (int i = 3; i <= SAV.Generation; i++) + { + supported += $"*.pk{i}"; + if (i != pkm.Format) + supported += ";"; + } + OpenFileDialog ofd = new OpenFileDialog { - Filter = "PKX File|*.pk6;*.pkx" + - "|EKX File|*.ek6;*.ekx" + - "|BIN File|*.bin" + + Filter = $"Decrypted PKM File|{supported}" + + $"|Encrypted PKM File|*.{ekx}" + + "|Binary File|*.bin" + "|All Files|*.*", RestoreDirectory = true, FilterIndex = 4, @@ -219,32 +230,32 @@ private void mainMenuSave(object sender, EventArgs e) { if (!verifiedPKM()) return; PKM pk = preparePKM(); + string pkx = pk.Extension; + string ekx = 'e' + pkx.Substring(1, pkx.Length - 1); SaveFileDialog sfd = new SaveFileDialog { - Filter = "PKX File|*.pk6;*.pkx" + - "|EKX File|*.ek6;*.ekx" + - "|BIN File|*.bin" + + Filter = $"Decrypted PKM File|*.{pkx}" + + $"|Encrypted PKM File|*.{ekx}" + + "|Binary File|*.bin" + "|All Files|*.*", - DefaultExt = "pk6", + DefaultExt = pkx, FileName = Util.CleanFileName(pk.FileName) }; if (sfd.ShowDialog() != DialogResult.OK) return; string path = sfd.FileName; - // Injection Dummy Override - if (path.Contains("pokemon.ekx")) path = Path.Combine(Path.GetDirectoryName(path), "pokemon.ekx"); string ext = Path.GetExtension(path); - if (File.Exists(path) && !path.Contains("pokemon.ekx")) + if (File.Exists(path)) { // File already exists, save a .bak byte[] backupfile = File.ReadAllBytes(path); File.WriteAllBytes(path + ".bak", backupfile); } - if (new[] {".ekx", ".ek6", ".bin"}.Contains(ext)) + if (new[] {".ekx", ekx, ".bin"}.Contains(ext)) File.WriteAllBytes(path, pk.EncryptedPartyData); - else if (new[] { ".pkx", ".pk6" }.Contains(ext)) - File.WriteAllBytes(path, pk.Data); + else if (new[] { pkx }.Contains(ext)) + File.WriteAllBytes(path, pk.DecryptedBoxData); else { Util.Error($"Foreign File Extension: {ext}", "Exporting as encrypted."); From 3e7d694128a030f4ad64a413cbe0599eaa4a3d22 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Tue, 2 Aug 2016 23:51:58 -0700 Subject: [PATCH 03/67] Fix party disappearing Thanks ashrobb & MichiS97 ! --- MainWindow/Main.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MainWindow/Main.cs b/MainWindow/Main.cs index a4dd545c2..af65bcbdc 100644 --- a/MainWindow/Main.cs +++ b/MainWindow/Main.cs @@ -2798,7 +2798,7 @@ private void setParty() for (int i = 0; i < battle.Length; i++) getQuickFiller(SlotPictureBoxes[i + 36], battle[i]); for (int i = battle.Length; i < 6; i++) - SlotPictureBoxes[i + 30].Image = null; + SlotPictureBoxes[i + 36].Image = null; } } private int getPKXOffset(int slot) From 8d6525dfe9ef844a923ad12c45c8202a128a65f5 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 3 Aug 2016 00:10:38 -0700 Subject: [PATCH 04/67] Add hot spring wynaut OT memory case Adding 60004 to the "WasEgg" check qualifies the pkm to be checked for having egg relearn moves; since this was a gift egg it wasn't a daycareEgg. --- Legality/Checks.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Legality/Checks.cs b/Legality/Checks.cs index 5c33a70c4..69d08b97a 100644 --- a/Legality/Checks.cs +++ b/Legality/Checks.cs @@ -710,7 +710,7 @@ private LegalityCheck verifyOTMemory() switch (pk6.OT_Memory) { case 2: // {0} hatched from an Egg and saw {1} for the first time at... {2}. {4} that {3}. - if (!pk6.WasEgg) + if (!pk6.WasEgg && pk6.Egg_Location != 60004) return new LegalityCheck(Severity.Invalid, "OT Memory: OT did not hatch this."); return new LegalityCheck(Severity.Valid, "OT Memory is valid."); case 4: // {0} became {1}’s friend when it arrived via Link Trade at... {2}. {4} that {3}. From e6a8e9fed6c162a5185c840455d0c07a96bf1cd7 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 3 Aug 2016 08:35:13 -0700 Subject: [PATCH 05/67] Fix gen3 Met Level 70 & 0x3F = 6 Thanks Destinyy! --- PKM/PK3.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKM/PK3.cs b/PKM/PK3.cs index 46d11ded7..4f647dd2a 100644 --- a/PKM/PK3.cs +++ b/PKM/PK3.cs @@ -105,7 +105,7 @@ public PK3(byte[] decryptedData = null, string ident = null) public override int Met_Location { get { return Data[0x45]; } set { Data[0x45] = (byte)value; } } // Origins private ushort Origins { get { return BitConverter.ToUInt16(Data, 0x46); } set { BitConverter.GetBytes(value).CopyTo(Data, 0x46); } } - public override int Met_Level { get { return Origins & 0x3F; } set { Origins = (ushort)((Origins & ~0x3F) | value); } } + public override int Met_Level { get { return Origins & 0x7F; } set { Origins = (ushort)((Origins & ~0x7F) | value); } } public override int Version { get { return (Origins >> 7) & 0xF; } set { Origins = (ushort)((Origins & ~0x780) | ((value & 0xF) << 7));} } public override int Ball { get { return (Origins >> 11) & 0xF; } set { Origins = (ushort)((Origins & ~0x7800) | ((value & 0xF) << 11)); } } public override int OT_Gender { get { return (Origins >> 15) & 1; } set { Origins = (ushort)(Origins & ~(1 << 15) | ((value & 1) << 15)); } } From 3f5d8fad953e05a65cad02b54aa43acd40bbe723 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 3 Aug 2016 17:48:13 -0700 Subject: [PATCH 06/67] Fix pk* save extension detection A period is before the extension. Fixes #163, thanks @JHorbach ! --- MainWindow/Main.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MainWindow/Main.cs b/MainWindow/Main.cs index af65bcbdc..dd5cf8184 100644 --- a/MainWindow/Main.cs +++ b/MainWindow/Main.cs @@ -252,9 +252,9 @@ private void mainMenuSave(object sender, EventArgs e) File.WriteAllBytes(path + ".bak", backupfile); } - if (new[] {".ekx", ekx, ".bin"}.Contains(ext)) + if (new[] {".ekx", "."+ekx, ".bin"}.Contains(ext)) File.WriteAllBytes(path, pk.EncryptedPartyData); - else if (new[] { pkx }.Contains(ext)) + else if (new[] { "."+pkx }.Contains(ext)) File.WriteAllBytes(path, pk.DecryptedBoxData); else { From 0dd6b05f1d00e3cd1ce7a81dd85324677e14c069 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 3 Aug 2016 17:56:15 -0700 Subject: [PATCH 07/67] Fix event flag retrieval Thanks CaliberDR! --- Saves/SaveFile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Saves/SaveFile.cs b/Saves/SaveFile.cs index bd6c70f09..6775c7716 100644 --- a/Saves/SaveFile.cs +++ b/Saves/SaveFile.cs @@ -235,7 +235,7 @@ public ushort[] EventConsts ushort[] Constants = new ushort[EventConstMax]; for (int i = 0; i < Constants.Length; i++) - Constants[i] = BitConverter.ToUInt16(Data, EventConst + i); + Constants[i] = BitConverter.ToUInt16(Data, EventConst + i * 2); return Constants; } set From 8924dd09401b69f8281041885a8d45c2ed251008 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Thu, 4 Aug 2016 19:16:13 -0700 Subject: [PATCH 08/67] Fix fateful celebi transfer Don't assign as crown unless it was received in gen4 (movie celebi only). --- PKM/PK4.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKM/PK4.cs b/PKM/PK4.cs index f7e450e31..877a0b76e 100644 --- a/PKM/PK4.cs +++ b/PKM/PK4.cs @@ -392,7 +392,7 @@ public PK5 convertToPK5() BitConverter.GetBytes((uint)0).CopyTo(pk5.Data, 0x44); // Met / Crown Data Detection - pk5.Met_Location = pk5.FatefulEncounter && Array.IndexOf(new[] {251, 243, 244, 245}, pk5.Species) >= 0 + pk5.Met_Location = pk5.Gen4 && pk5.FatefulEncounter && Array.IndexOf(new[] {251, 243, 244, 245}, pk5.Species) >= 0 ? (pk5.Species == 251 ? 30010 : 30012) // Celebi : Beast : 30001; // Pokétransfer (not Crown) From 30047a1cb6dfd4bc48207005b5a8eb10b1520dd5 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Thu, 4 Aug 2016 19:18:32 -0700 Subject: [PATCH 09/67] Fix manaphy hatching from egg Can't receive a manaphy egg from Daycare or other non-Mystery Gift source. A wc6 Manaphy egg would not satisfy "WasEgg" anyway. So far no manaphy eggs have been given out, and none will be (probably). Thanks RustInPeace! --- Legality/Tables.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Legality/Tables.cs b/Legality/Tables.cs index 4ab3f3d22..8bb92c9bb 100644 --- a/Legality/Tables.cs +++ b/Legality/Tables.cs @@ -444,6 +444,7 @@ public static partial class Legal 486, // Regigigas 487, // Giratina 488, // Cresselia + 490, // Manaphy 491, // Darkrai 492, // Shaymin 493, // Arceus From 2acd1c5d21bd31725a5a3d06e9a28440aeb200ab Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Thu, 4 Aug 2016 20:48:52 -0700 Subject: [PATCH 10/67] Tweak savefile detection Remove old cybergadget temp folder (interrupt is no longer used, now using Cache), fix/modify current methods for a more maintainable method. If GameFreak changes the filename, it'd only have to be changed in one place. --- MainWindow/Main.cs | 39 +++++++------------------------------ Saves/SAV6.cs | 1 + Saves/SaveUtil.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++++ Util/PathUtil.cs | 37 ----------------------------------- 4 files changed, 56 insertions(+), 69 deletions(-) diff --git a/MainWindow/Main.cs b/MainWindow/Main.cs index dd5cf8184..932f5e086 100644 --- a/MainWindow/Main.cs +++ b/MainWindow/Main.cs @@ -115,7 +115,7 @@ public Main() } if (!SAV.Exportable) // No SAV loaded from exe args { - string path = detectSaveFile(); + string path = SaveUtil.detectSaveFile(); if (path != null && File.Exists(path)) openQuick(path, force: true); else @@ -215,7 +215,7 @@ private void mainMenuOpen(object sender, EventArgs e) ofd.InitialDirectory = WorkingDirectory; // Detect main - string path = detectSaveFile(); + string path = SaveUtil.detectSaveFile(); if (path != null) { ofd.InitialDirectory = Path.GetDirectoryName(path); } else if (File.Exists(Path.Combine(ofd.InitialDirectory, "main"))) @@ -499,17 +499,17 @@ private void clickOpenCacheFolder(object sender, EventArgs e) } private void clickOpenSDFFolder(object sender, EventArgs e) { - string path; - if (Util.get3DSLocation() != null && Directory.Exists(path = Util.GetSDFLocation())) + string path = Path.GetPathRoot(Util.get3DSLocation()); + if (path != null && Directory.Exists(path = Path.Combine(path, "filer", "UserSaveData"))) Process.Start("explorer.exe", path); else Util.Alert("Can't find the SaveDataFiler folder."); } private void clickOpenSDBFolder(object sender, EventArgs e) { - string path3DS = Util.get3DSLocation(); + string path3DS = Path.GetPathRoot(Util.get3DSLocation()); string path; - if (path3DS != null && Directory.Exists(path = Path.Combine(Path.GetPathRoot(path3DS), "SaveDataBackup"))) + if (path3DS != null && Directory.Exists(path = Path.Combine(path3DS, "SaveDataBackup"))) Process.Start("explorer.exe", path); else Util.Alert("Can't find the SaveDataBackup folder."); @@ -3248,36 +3248,11 @@ private void B_JPEG_Click(object sender, EventArgs e) // Save Folder Related private void clickSaveFileName(object sender, EventArgs e) { - string path = detectSaveFile(); + string path = SaveUtil.detectSaveFile(); if (path == null || !File.Exists(path)) return; if (Util.Prompt(MessageBoxButtons.YesNo, "Open save file from the following location?", path) == DialogResult.Yes) openQuick(path); // load save } - private static string detectSaveFile() - { - string pathSDF = Util.GetSDFLocation(); - string path3DS = Util.get3DSLocation(); - string pathCache = Util.GetCacheFolder(); - - if (path3DS != null && Directory.Exists(Path.Combine(path3DS, "SaveDataBackup")) && ModifierKeys != Keys.Control) - return Path.Combine(Path.GetPathRoot(path3DS), "SaveDataBackup", "main"); - if (pathSDF != null && ModifierKeys != Keys.Shift) // if we have a result - return Path.Combine(pathSDF, "main"); - if (path3DS != null && Directory.Exists(Path.Combine(Path.GetPathRoot(path3DS), "JKSV", "Saves"))) - return Directory.GetFiles(Path.Combine(Path.GetPathRoot(path3DS), "JKSV", "Saves"), "main", SearchOption.AllDirectories) - .Where(f => SaveUtil.SizeValidSAV6((int)new FileInfo(f).Length)) // filter - .OrderByDescending(f => new FileInfo(f).LastWriteTime).FirstOrDefault(); - if (Directory.Exists(pathCache)) - return Directory.GetFiles(pathCache).Where(f => SaveUtil.SizeValidSAV6((int)new FileInfo(f).Length)) // filter - .OrderByDescending(f => new FileInfo(f).LastWriteTime).FirstOrDefault(); - try - { - if (File.Exists(Util.NormalizePath(Path.Combine(Util.GetTempFolder(), "root", "main")))) // if cgse exists - return Util.NormalizePath(Path.Combine(Util.GetTempFolder(), "root", "main")); - } catch { } - - return null; - } // Drag & Drop within Box private void pbBoxSlot_MouseDown(object sender, MouseEventArgs e) diff --git a/Saves/SAV6.cs b/Saves/SAV6.cs index df076efb0..0e1064940 100644 --- a/Saves/SAV6.cs +++ b/Saves/SAV6.cs @@ -7,6 +7,7 @@ namespace PKHeX public sealed class SAV6 : SaveFile { // Save Data Attributes + public const string DefaultFileName = "main"; public override string BAKName => $"{FileName} [{OT} ({Version}) - {LastSavedTime}].bak"; public override string Filter => "Main SAV|*.*"; public override string Extension => ""; diff --git a/Saves/SaveUtil.cs b/Saves/SaveUtil.cs index 0413eab07..e4fc2cea9 100644 --- a/Saves/SaveUtil.cs +++ b/Saves/SaveUtil.cs @@ -1,4 +1,5 @@ using System; +using System.IO; using System.Linq; using System.Text; @@ -176,6 +177,53 @@ public static SaveFile getVariantSAV(byte[] data) } } + /// + /// Detects a save file. + /// + /// File Name to look for. + /// Full path of a save file. Returns null if unable to find any. + public static string detectSaveFile(string fileName = SAV6.DefaultFileName) + { + string path; + string path3DS = Path.GetPathRoot(Util.get3DSLocation()); + + // save_manager + if (path3DS != null && Directory.Exists(path = Path.Combine(path3DS, "saveDataBackup"))) + if (File.Exists(path = Path.Combine(path, fileName))) + return path; + + // SaveDataFiler + if (path3DS != null && Directory.Exists(Path.Combine(path3DS, "filer", "UserSaveData"))) + return getNewestSavePath(Path.Combine(path3DS, "filer", "UserSaveData"), fileName); + + // JKSV + if (path3DS != null && Directory.Exists(Path.Combine(path3DS, "JKSV", "Saves"))) + return getNewestSavePath(Path.Combine(path3DS, "JKSV", "Saves"), "main"); + + // CyberGadget (Cache) + string pathCache = Util.GetCacheFolder(); + if (Directory.Exists(pathCache)) + return Directory.GetFiles(pathCache).Where(f => SizeValidSAV6((int)new FileInfo(f).Length)) // filter + .OrderByDescending(f => new FileInfo(f).LastWriteTime).FirstOrDefault(); + + return null; + } + /// + /// Retrieves the full path of the most recent file based on LastWriteTime. + /// + /// Folder to look within + /// Filename to look for, if null can be named anything + /// Search all subfolders + /// Full path of a save file. Returns null if unable to find any. + public static string getNewestSavePath(string folderPath, string fileName, bool deep = true) + { + if (!Directory.Exists(folderPath)) + return null; + return Directory.GetFiles(folderPath, fileName ?? "*", deep ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly) + .Where(f => SizeValidSAV6((int)new FileInfo(f).Length)) // filter + .OrderByDescending(f => new FileInfo(f).LastWriteTime).FirstOrDefault(); + } + /// /// Determines whether the save data size is valid for 6th generation saves. /// diff --git a/Util/PathUtil.cs b/Util/PathUtil.cs index 741f16d21..6159fc92b 100644 --- a/Util/PathUtil.cs +++ b/Util/PathUtil.cs @@ -6,11 +6,6 @@ namespace PKHeX { public partial class Util { - internal static string NormalizePath(string path) - { - return Path.GetFullPath(new Uri(path).LocalPath) - .TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); - } internal static string GetTempFolder() { return Path.Combine(Path.GetTempPath(), "3DSSE"); @@ -62,38 +57,6 @@ internal static string get3DSLocation() catch { } return null; } - internal static string GetSDFLocation() - { - try - { - // Start by checking if the 3DS file path exists or not. - string path_SDF = null; - string[] DriveList = Environment.GetLogicalDrives(); - for (int i = 1; i < DriveList.Length; i++) // Skip first drive (some users still have floppy drives and would chew up time!) - { - string potentialPath_SDF = NormalizePath(Path.Combine(DriveList[i], "filer", "UserSaveData")); - if (!Directory.Exists(potentialPath_SDF)) continue; - - path_SDF = potentialPath_SDF; break; - } - if (path_SDF == null) - return null; - // 3DS data found in SD card reader. Let's get the title folder location! - string[] folders = Directory.GetDirectories(path_SDF, "*", SearchOption.TopDirectoryOnly); - Array.Sort(folders); // Don't need Modified Date, sort by path names just in case. - - // Loop through all the folders in the Nintendo 3DS folder to see if any of them contain 'title'. - for (int i = folders.Length - 1; i >= 0; i--) - { - if (File.Exists(Path.Combine(folders[i], "000011c4", "main"))) return Path.Combine(folders[i], "000011c4"); // OR - if (File.Exists(Path.Combine(folders[i], "000011c5", "main"))) return Path.Combine(folders[i], "000011c5"); // AS - if (File.Exists(Path.Combine(folders[i], "0000055d", "main"))) return Path.Combine(folders[i], "0000055d"); // X - if (File.Exists(Path.Combine(folders[i], "0000055e", "main"))) return Path.Combine(folders[i], "0000055e"); // Y - } - return null; // Fallthrough - } - catch { return null; } - } internal static string CleanFileName(string fileName) { return Path.GetInvalidFileNameChars().Aggregate(fileName, (current, c) => current.Replace(c.ToString(), string.Empty)); From 5ceafc21e17aa168d8f10a384260f35945af7008 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Thu, 4 Aug 2016 21:12:16 -0700 Subject: [PATCH 11/67] Add TWLSaveTool support A little more computationally intensive, but checking for the first valid save file after checking for valid save paths seems legit. --- Saves/SaveUtil.cs | 50 +++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/Saves/SaveUtil.cs b/Saves/SaveUtil.cs index e4fc2cea9..5b7976b7b 100644 --- a/Saves/SaveUtil.cs +++ b/Saves/SaveUtil.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; @@ -139,7 +140,7 @@ public static GameVersion getIsG5SAV(byte[] data) /// Version Identifier or Invalid if type cannot be determined. public static GameVersion getIsG6SAV(byte[] data) { - if (!SizeValidSAV6(data.Length)) + if (!new []{SIZE_G6XY, SIZE_G6ORAS, SIZE_G6ORASDEMO}.Contains(data.Length)) return GameVersion.Invalid; if (BitConverter.ToUInt32(data, data.Length - 0x1F0) != BEEF) @@ -180,48 +181,50 @@ public static SaveFile getVariantSAV(byte[] data) /// /// Detects a save file. /// - /// File Name to look for. /// Full path of a save file. Returns null if unable to find any. - public static string detectSaveFile(string fileName = SAV6.DefaultFileName) + public static string detectSaveFile() { string path; string path3DS = Path.GetPathRoot(Util.get3DSLocation()); - + List possiblePaths = new List(); + // save_manager if (path3DS != null && Directory.Exists(path = Path.Combine(path3DS, "saveDataBackup"))) - if (File.Exists(path = Path.Combine(path, fileName))) - return path; + if (File.Exists(path = Path.Combine(path))) + possiblePaths.Add(path); // SaveDataFiler - if (path3DS != null && Directory.Exists(Path.Combine(path3DS, "filer", "UserSaveData"))) - return getNewestSavePath(Path.Combine(path3DS, "filer", "UserSaveData"), fileName); + if (path3DS != null && Directory.Exists(path = Path.Combine(path3DS, "filer", "UserSaveData"))) + possiblePaths.AddRange(getSavesFromFolder(path, true)); // JKSV - if (path3DS != null && Directory.Exists(Path.Combine(path3DS, "JKSV", "Saves"))) - return getNewestSavePath(Path.Combine(path3DS, "JKSV", "Saves"), "main"); + if (path3DS != null && Directory.Exists(path = Path.Combine(path3DS, "JKSV", "Saves"))) + possiblePaths.AddRange(getSavesFromFolder(path, true)); + + // TWL Save Tool + if (path3DS != null && Directory.Exists(path = Path.Combine(path3DS, "TWLSaveTool"))) + possiblePaths.AddRange(getSavesFromFolder(path, false)); // CyberGadget (Cache) string pathCache = Util.GetCacheFolder(); if (Directory.Exists(pathCache)) - return Directory.GetFiles(pathCache).Where(f => SizeValidSAV6((int)new FileInfo(f).Length)) // filter - .OrderByDescending(f => new FileInfo(f).LastWriteTime).FirstOrDefault(); + possiblePaths.AddRange(getSavesFromFolder(Path.Combine(pathCache), false)); - return null; + // return newest save file path that is valid (oh man) + return possiblePaths.OrderByDescending(f => new FileInfo(f).LastWriteTime).FirstOrDefault(p => getVariantSAV(File.ReadAllBytes(p)).ChecksumsValid); } /// /// Retrieves the full path of the most recent file based on LastWriteTime. /// /// Folder to look within - /// Filename to look for, if null can be named anything /// Search all subfolders - /// Full path of a save file. Returns null if unable to find any. - public static string getNewestSavePath(string folderPath, string fileName, bool deep = true) + /// Full path of all save files that match criteria. + public static IEnumerable getSavesFromFolder(string folderPath, bool deep) { if (!Directory.Exists(folderPath)) return null; - return Directory.GetFiles(folderPath, fileName ?? "*", deep ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly) - .Where(f => SizeValidSAV6((int)new FileInfo(f).Length)) // filter - .OrderByDescending(f => new FileInfo(f).LastWriteTime).FirstOrDefault(); + return Directory.GetFiles(folderPath, "*", deep ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly) + .Where(f => SizeValidSAV((int)new FileInfo(f).Length)); } /// @@ -229,16 +232,21 @@ public static string getNewestSavePath(string folderPath, string fileName, bool /// /// Size in bytes of the save data /// A boolean indicating whether or not the save data size is valid. - public static bool SizeValidSAV6(int size) + public static bool SizeValidSAV(int size) { switch (size) { case SIZE_G6XY: case SIZE_G6ORASDEMO: case SIZE_G6ORAS: + case SIZE_G5B2W2: + case SIZE_G4RAW: + case SIZE_G3RAW: + case SIZE_G3RAWHALF: return true; + default: + return false; } - return false; } // SAV Manipulation From a8d76fa9fb0fc092e91ce13108d2809d476e60d8 Mon Sep 17 00:00:00 2001 From: Elias Carrillo Date: Fri, 5 Aug 2016 04:04:56 -0700 Subject: [PATCH 12/67] Improved the way drag and drop is initiated. Temp pkx file is not generated until user left-clicks and moves. Prevents drag and drop of blank pokemon from slots previously held by dragged pokemon. Response for left-click actions moved into left-click event. --- MainWindow/Main.Designer.cs | 188 ++++++++++++++++++++++++++++++++++++ MainWindow/Main.cs | 178 ++++++++++++++++++++++------------ 2 files changed, 303 insertions(+), 63 deletions(-) diff --git a/MainWindow/Main.Designer.cs b/MainWindow/Main.Designer.cs index 2f84afa00..91bf1f5d5 100644 --- a/MainWindow/Main.Designer.cs +++ b/MainWindow/Main.Designer.cs @@ -3072,7 +3072,11 @@ public void InitializeComponent() this.bpkx30.TabStop = false; this.bpkx30.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx30.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx30.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx30.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx30.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx30.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx30.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // mnuVSD // @@ -3116,7 +3120,11 @@ public void InitializeComponent() this.bpkx29.TabStop = false; this.bpkx29.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx29.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx29.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx29.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx29.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx29.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx29.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx28 // @@ -3130,7 +3138,11 @@ public void InitializeComponent() this.bpkx28.TabStop = false; this.bpkx28.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx28.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx28.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx28.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx28.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx28.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx28.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx27 // @@ -3144,7 +3156,11 @@ public void InitializeComponent() this.bpkx27.TabStop = false; this.bpkx27.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx27.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx27.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx27.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx27.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx27.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx27.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx26 // @@ -3158,7 +3174,11 @@ public void InitializeComponent() this.bpkx26.TabStop = false; this.bpkx26.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx26.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx26.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx26.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx26.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx26.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx26.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx25 // @@ -3172,7 +3192,11 @@ public void InitializeComponent() this.bpkx25.TabStop = false; this.bpkx25.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx25.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx25.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx25.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx25.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx25.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx25.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx24 // @@ -3186,7 +3210,11 @@ public void InitializeComponent() this.bpkx24.TabStop = false; this.bpkx24.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx24.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx24.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx24.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx24.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx24.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx24.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx23 // @@ -3200,7 +3228,11 @@ public void InitializeComponent() this.bpkx23.TabStop = false; this.bpkx23.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx23.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx23.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx23.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx23.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx23.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx23.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx22 // @@ -3214,7 +3246,11 @@ public void InitializeComponent() this.bpkx22.TabStop = false; this.bpkx22.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx22.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx22.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx22.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx22.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx22.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx22.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx21 // @@ -3228,7 +3264,11 @@ public void InitializeComponent() this.bpkx21.TabStop = false; this.bpkx21.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx21.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx21.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx21.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx21.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx21.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx21.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx20 // @@ -3242,7 +3282,11 @@ public void InitializeComponent() this.bpkx20.TabStop = false; this.bpkx20.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx20.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx20.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx20.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx20.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx20.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx20.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx19 // @@ -3256,7 +3300,11 @@ public void InitializeComponent() this.bpkx19.TabStop = false; this.bpkx19.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx19.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx19.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx19.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx19.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx19.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx19.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx18 // @@ -3270,7 +3318,11 @@ public void InitializeComponent() this.bpkx18.TabStop = false; this.bpkx18.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx18.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx18.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx18.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx18.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx18.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx18.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx17 // @@ -3284,7 +3336,11 @@ public void InitializeComponent() this.bpkx17.TabStop = false; this.bpkx17.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx17.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx17.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx17.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx17.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx17.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx17.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx16 // @@ -3298,7 +3354,11 @@ public void InitializeComponent() this.bpkx16.TabStop = false; this.bpkx16.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx16.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx16.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx16.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx16.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx16.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx16.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx15 // @@ -3312,7 +3372,11 @@ public void InitializeComponent() this.bpkx15.TabStop = false; this.bpkx15.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx15.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx15.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx15.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx15.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx15.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx15.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx14 // @@ -3326,7 +3390,11 @@ public void InitializeComponent() this.bpkx14.TabStop = false; this.bpkx14.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx14.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx14.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx14.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx14.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx14.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx14.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx13 // @@ -3340,7 +3408,11 @@ public void InitializeComponent() this.bpkx13.TabStop = false; this.bpkx13.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx13.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx13.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx13.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx13.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx13.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx13.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx12 // @@ -3354,7 +3426,11 @@ public void InitializeComponent() this.bpkx12.TabStop = false; this.bpkx12.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx12.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx12.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx12.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx12.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx12.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx12.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx11 // @@ -3368,7 +3444,11 @@ public void InitializeComponent() this.bpkx11.TabStop = false; this.bpkx11.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx11.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx11.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx11.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx11.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx11.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx11.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx10 // @@ -3382,7 +3462,11 @@ public void InitializeComponent() this.bpkx10.TabStop = false; this.bpkx10.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx10.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx10.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx10.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx10.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx10.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx10.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx9 // @@ -3396,7 +3480,11 @@ public void InitializeComponent() this.bpkx9.TabStop = false; this.bpkx9.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx9.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx9.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx9.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx9.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx9.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx9.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx8 // @@ -3410,7 +3498,11 @@ public void InitializeComponent() this.bpkx8.TabStop = false; this.bpkx8.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx8.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx8.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx8.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx8.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx8.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx8.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx7 // @@ -3424,7 +3516,11 @@ public void InitializeComponent() this.bpkx7.TabStop = false; this.bpkx7.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx7.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx7.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx7.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx7.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx7.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx6 // @@ -3438,7 +3534,11 @@ public void InitializeComponent() this.bpkx6.TabStop = false; this.bpkx6.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx6.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx6.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx6.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx6.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx6.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx6.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx5 // @@ -3452,7 +3552,11 @@ public void InitializeComponent() this.bpkx5.TabStop = false; this.bpkx5.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx5.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx5.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx5.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx5.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx5.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx4 // @@ -3466,7 +3570,11 @@ public void InitializeComponent() this.bpkx4.TabStop = false; this.bpkx4.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx4.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx4.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx4.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx4.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx4.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx3 // @@ -3480,7 +3588,11 @@ public void InitializeComponent() this.bpkx3.TabStop = false; this.bpkx3.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx3.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx3.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx3.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx3.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx3.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx2 // @@ -3494,7 +3606,11 @@ public void InitializeComponent() this.bpkx2.TabStop = false; this.bpkx2.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx2.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx2.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx2.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx2.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bpkx1 // @@ -3508,7 +3624,11 @@ public void InitializeComponent() this.bpkx1.TabStop = false; this.bpkx1.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx1.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); + this.bpkx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bpkx1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bpkx1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bpkx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bpkx1.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // B_BoxRight // @@ -3624,7 +3744,11 @@ public void InitializeComponent() this.bbpkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.bbpkx1.TabIndex = 8; this.bbpkx1.TabStop = false; + this.bbpkx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bbpkx1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bbpkx1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bbpkx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bbpkx1.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // mnuV // @@ -3649,7 +3773,11 @@ public void InitializeComponent() this.bbpkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.bbpkx2.TabIndex = 9; this.bbpkx2.TabStop = false; + this.bbpkx2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bbpkx2.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bbpkx2.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bbpkx2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bbpkx2.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bbpkx3 // @@ -3660,7 +3788,11 @@ public void InitializeComponent() this.bbpkx3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.bbpkx3.TabIndex = 10; this.bbpkx3.TabStop = false; + this.bbpkx3.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bbpkx3.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bbpkx3.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bbpkx3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bbpkx3.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bbpkx4 // @@ -3671,7 +3803,11 @@ public void InitializeComponent() this.bbpkx4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.bbpkx4.TabIndex = 11; this.bbpkx4.TabStop = false; + this.bbpkx4.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bbpkx4.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bbpkx4.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bbpkx4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bbpkx4.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bbpkx5 // @@ -3682,7 +3818,11 @@ public void InitializeComponent() this.bbpkx5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.bbpkx5.TabIndex = 12; this.bbpkx5.TabStop = false; + this.bbpkx5.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bbpkx5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bbpkx5.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bbpkx5.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bbpkx5.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // bbpkx6 // @@ -3693,7 +3833,11 @@ public void InitializeComponent() this.bbpkx6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.bbpkx6.TabIndex = 13; this.bbpkx6.TabStop = false; + this.bbpkx6.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.bbpkx6.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.bbpkx6.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.bbpkx6.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.bbpkx6.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // L_ReadOnlyPBB // @@ -3749,7 +3893,11 @@ public void InitializeComponent() this.ppkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.ppkx1.TabIndex = 2; this.ppkx1.TabStop = false; + this.ppkx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.ppkx1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.ppkx1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.ppkx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.ppkx1.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // ppkx2 // @@ -3760,7 +3908,11 @@ public void InitializeComponent() this.ppkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.ppkx2.TabIndex = 3; this.ppkx2.TabStop = false; + this.ppkx2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.ppkx2.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.ppkx2.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.ppkx2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.ppkx2.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // ppkx3 // @@ -3771,7 +3923,11 @@ public void InitializeComponent() this.ppkx3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.ppkx3.TabIndex = 4; this.ppkx3.TabStop = false; + this.ppkx3.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.ppkx3.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.ppkx3.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.ppkx3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.ppkx3.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // ppkx4 // @@ -3782,7 +3938,11 @@ public void InitializeComponent() this.ppkx4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.ppkx4.TabIndex = 5; this.ppkx4.TabStop = false; + this.ppkx4.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.ppkx4.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.ppkx4.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.ppkx4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.ppkx4.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // ppkx5 // @@ -3793,7 +3953,11 @@ public void InitializeComponent() this.ppkx5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.ppkx5.TabIndex = 6; this.ppkx5.TabStop = false; + this.ppkx5.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.ppkx5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.ppkx5.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.ppkx5.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.ppkx5.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // ppkx6 // @@ -3804,7 +3968,11 @@ public void InitializeComponent() this.ppkx6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.ppkx6.TabIndex = 7; this.ppkx6.TabStop = false; + this.ppkx6.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.ppkx6.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.ppkx6.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.ppkx6.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.ppkx6.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // Tab_Other // @@ -3922,7 +4090,11 @@ public void InitializeComponent() this.dcpkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.dcpkx2.TabIndex = 11; this.dcpkx2.TabStop = false; + this.dcpkx2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.dcpkx2.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.dcpkx2.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.dcpkx2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.dcpkx2.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // dcpkx1 // @@ -3934,7 +4106,11 @@ public void InitializeComponent() this.dcpkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.dcpkx1.TabIndex = 10; this.dcpkx1.TabStop = false; + this.dcpkx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.dcpkx1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.dcpkx1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.dcpkx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.dcpkx1.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // DayCare_HasEgg // @@ -3967,7 +4143,11 @@ public void InitializeComponent() this.gtspkx.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.gtspkx.TabIndex = 23; this.gtspkx.TabStop = false; + this.gtspkx.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.gtspkx.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.gtspkx.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.gtspkx.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.gtspkx.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // GB_Fused // @@ -3989,7 +4169,11 @@ public void InitializeComponent() this.fusedpkx.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.fusedpkx.TabIndex = 24; this.fusedpkx.TabStop = false; + this.fusedpkx.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.fusedpkx.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.fusedpkx.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.fusedpkx.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.fusedpkx.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // L_ReadOnlyOther // @@ -4023,7 +4207,11 @@ public void InitializeComponent() this.subepkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.subepkx1.TabIndex = 18; this.subepkx1.TabStop = false; + this.subepkx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); this.subepkx1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + this.subepkx1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); + this.subepkx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); + this.subepkx1.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); // // subepkx2 // diff --git a/MainWindow/Main.cs b/MainWindow/Main.cs index dd5cf8184..d48cbcf08 100644 --- a/MainWindow/Main.cs +++ b/MainWindow/Main.cs @@ -18,7 +18,7 @@ public Main() { #region Initialize Form new Thread(() => new SplashScreen().ShowDialog()).Start(); - pkm_from = SAV.BlankPKM.EncryptedPartyData; + slotPkmSource = SAV.BlankPKM.EncryptedPartyData; InitializeComponent(); CB_ExtraBytes.SelectedIndex = 0; SaveFile.SetUpdateDex = Menu_ModifyDex.Checked; @@ -3279,60 +3279,91 @@ private static string detectSaveFile() return null; } - // Drag & Drop within Box + // Drag and drop related functions + private void pbBoxSlot_MouseClick(object sender, MouseEventArgs e) + { + if (slotDragDropInProgress) + return; + + clickSlot(sender, e); + } + private void pbBoxSlot_MouseUp(object sender, MouseEventArgs e) + { + if (e.Button == MouseButtons.Left) + slotLeftMouseIsDown = false; + if (e.Button == MouseButtons.Right) + slotRightMouseIsDown = false; + } private void pbBoxSlot_MouseDown(object sender, MouseEventArgs e) { - if (e.Button != MouseButtons.Left || e.Clicks != 1) return; - if (ModifierKeys == Keys.Control || ModifierKeys == Keys.Alt || ModifierKeys == Keys.Shift || ModifierKeys == (Keys.Control | Keys.Alt)) - { clickSlot(sender, e); return; } - PictureBox pb = (PictureBox)sender; - if (pb.Image == null) + if (e.Button == MouseButtons.Left) + slotLeftMouseIsDown = true; + if (e.Button == MouseButtons.Right) + slotRightMouseIsDown = true; + } + private void pbBoxSlot_MouseMove(object sender, MouseEventArgs e) + { + if (slotDragDropInProgress) return; - pkm_from_slot = getSlot(sender); - int offset = getPKXOffset(pkm_from_slot); - // Create Temp File to Drag - Cursor.Current = Cursors.Hand; - - // Prepare Data - pkm_from = SAV.getData(offset, SAV.SIZE_STORED); - pkm_from_offset = offset; - - // Make a new file name based off the PID - byte[] dragdata = SAV.decryptPKM(pkm_from); - Array.Resize(ref dragdata, SAV.SIZE_STORED); - PKM pkx = SAV.getPKM(dragdata); - string filename = pkx.FileName; - - // Make File - string newfile = Path.Combine(Path.GetTempPath(), Util.CleanFileName(filename)); - try + if (slotLeftMouseIsDown) { - File.WriteAllBytes(newfile, dragdata); - DoDragDrop(new DataObject(DataFormats.FileDrop, new[] { newfile }), DragDropEffects.Move); + // The goal is to create a temporary PKX file for the underlying Pokemon + // and use that file to perform a drag drop operation. + + // Abort if there is no Pokemon in the given slot. + if (((PictureBox)sender).Image == null) + return; + + // Set flag to prevent re-entering. + slotDragDropInProgress = true; + + slotSourceSlotNumber = getSlot(sender); + int offset = getPKXOffset(slotSourceSlotNumber); + + // Prepare Data + slotPkmSource = SAV.getData(offset, SAV.SIZE_STORED); + slotSourceOffset = offset; + + // Make a new file name based off the PID + byte[] dragdata = SAV.decryptPKM(slotPkmSource); + Array.Resize(ref dragdata, SAV.SIZE_STORED); + PKM pkx = SAV.getPKM(dragdata); + string filename = pkx.FileName; + + // Make File + string newfile = Path.Combine(Path.GetTempPath(), Util.CleanFileName(filename)); + try + { + File.WriteAllBytes(newfile, dragdata); + // Thread Blocks on DoDragDrop + ((PictureBox)sender).DoDragDrop(new DataObject(DataFormats.FileDrop, new[] { newfile }), DragDropEffects.Move); + } + catch (Exception x) + { + Util.Error("Drag & Drop Error:", x.ToString()); + } + slotSourceOffset = 0; + + // Browser apps need time to load data since the file isn't moved to a location on the user's local storage. + // Tested 10ms -> too quick, 100ms was fine. 500ms should be safe? + new Thread(() => + { + Thread.Sleep(500); + if (File.Exists(newfile)) + File.Delete(newfile); + }).Start(); } - catch (ArgumentException x) - { Util.Error("Drag & Drop Error:", x.ToString()); } - pkm_from_offset = 0; - - // Browser apps need time to load data since the file isn't moved to a location on the user's local storage. - // Tested 10ms -> too quick, 100ms was fine. 500ms should be safe? - new Thread(() => - { - Thread.Sleep(500); - if (File.Exists(newfile)) - File.Delete(newfile); - }).Start(); } private void pbBoxSlot_DragDrop(object sender, DragEventArgs e) { - int slot = getSlot(sender); - int offset = getPKXOffset(slot); + int slotDestinationSlotNumber = getSlot(sender); + int slotDestinationOffset = getPKXOffset(slotDestinationSlotNumber); // Check for In-Dropped files (PKX,SAV,ETC) string[] files = (string[])e.Data.GetData(DataFormats.FileDrop); if (Directory.Exists(files[0])) { loadBoxesFromDB(files[0]); return; } - if (pkm_from_offset == 0) + if (slotSourceOffset == 0) { if (files.Length <= 0) return; @@ -3358,36 +3389,45 @@ private void pbBoxSlot_DragDrop(object sender, DragEventArgs e) { Console.WriteLine(c); Console.WriteLine(concat); return; } } - SAV.setStoredSlot(pk, offset); - getQuickFiller(SlotPictureBoxes[slot], pk); - getSlotColor(slot, Properties.Resources.slotSet); + SAV.setStoredSlot(pk, slotDestinationOffset); + getQuickFiller(SlotPictureBoxes[slotDestinationSlotNumber], pk); + getSlotColor(slotDestinationSlotNumber, Properties.Resources.slotSet); Console.WriteLine(c); } else { - PKM pkz = SAV.getStoredSlot(pkm_from_offset); - if (ModifierKeys == Keys.Alt && slot > -1) // overwrite delete old slot + PKM pkz = SAV.getStoredSlot(slotSourceOffset); + if (ModifierKeys == Keys.Alt && slotDestinationSlotNumber > -1) // overwrite delete old slot { // Clear from slot - getQuickFiller(SlotPictureBoxes[pkm_from_slot], SAV.BlankPKM); // picturebox - SAV.setStoredSlot(SAV.BlankPKM, pkm_from_offset); // savefile + getQuickFiller(SlotPictureBoxes[slotSourceSlotNumber], SAV.BlankPKM); // picturebox + SAV.setStoredSlot(SAV.BlankPKM, slotSourceOffset); // savefile } - else if (ModifierKeys != Keys.Control && slot > -1) + else if (ModifierKeys != Keys.Control && slotDestinationSlotNumber > -1) { - // Load data from destination - PKM pk = SAV.getStoredSlot(offset); + if (((PictureBox)sender).Image != null) + { + // Load data from destination + PKM pk = SAV.getStoredSlot(slotDestinationOffset); - // Swap slot picture - getQuickFiller(SlotPictureBoxes[pkm_from_slot], pk); + // Set destination pokemon image to source picture box + getQuickFiller(SlotPictureBoxes[slotSourceSlotNumber], pk); - // Swap slot data to source - SAV.setStoredSlot(pk, pkm_from_offset); + // Set destination pokemon data to source slot + SAV.setStoredSlot(pk, slotSourceOffset); + } + else + { + // Set blank to source slot + SAV.setStoredSlot(SAV.BlankPKM, slotSourceOffset); + SlotPictureBoxes[slotSourceSlotNumber].Image = null; + } } - // Copy from temp slot to new. - SAV.setStoredSlot(pkz, offset); - getQuickFiller(SlotPictureBoxes[slot], pkz); + // Copy from temp to destination slot. + SAV.setStoredSlot(pkz, slotDestinationOffset); + getQuickFiller(SlotPictureBoxes[slotDestinationSlotNumber], pkz); - pkm_from_offset = 0; // Clear offset value + slotSourceOffset = 0; // Clear offset value } } private void pbBoxSlot_DragEnter(object sender, DragEventArgs e) @@ -3397,10 +3437,22 @@ private void pbBoxSlot_DragEnter(object sender, DragEventArgs e) else if (e.Data != null) // within e.Effect = DragDropEffects.Move; } + private void pbBoxSlot_QueryContinueDrag(object sender, QueryContinueDragEventArgs e) + { + if (e.Action == DragAction.Cancel || e.Action == DragAction.Drop) + { + slotLeftMouseIsDown = false; + slotRightMouseIsDown = false; + slotDragDropInProgress = false; + } + } - private byte[] pkm_from; - private int pkm_from_offset; - private int pkm_from_slot = -1; + private static bool slotLeftMouseIsDown = false; + private static bool slotRightMouseIsDown = false; + private static bool slotDragDropInProgress = false; + private byte[] slotPkmSource; + private int slotSourceOffset; + private int slotSourceSlotNumber = -1; #endregion } } From fdbeada3b767c5c65dc63929a876e775228ad579 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 5 Aug 2016 05:51:55 -0700 Subject: [PATCH 13/67] Improve dragdrop from box to tabs Previously only allowed dragging to the Preview box to load to tabs, now if a box slot is dragged to anywhere in the window it will load. Unrelated to previous pull request :) --- MainWindow/Main.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MainWindow/Main.cs b/MainWindow/Main.cs index 7273f2462..51b675fd5 100644 --- a/MainWindow/Main.cs +++ b/MainWindow/Main.cs @@ -2402,7 +2402,7 @@ public PKM preparePKM(bool click = true) // Drag & Drop Events private void tabMain_DragEnter(object sender, DragEventArgs e) { - if (e.Data.GetDataPresent(DataFormats.FileDrop)) e.Effect = DragDropEffects.Copy; + if (e.Data.GetDataPresent(DataFormats.FileDrop)) e.Effect = DragDropEffects.Move; } private void tabMain_DragDrop(object sender, DragEventArgs e) { From 034da95ff4986fc4795e379cef6a2fe3deeb071c Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 5 Aug 2016 16:21:15 -0700 Subject: [PATCH 14/67] Re-enable Vivillon form editing Dunno why it was disabled. Thanks Majickhat55! --- Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs b/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs index 736bf6990..401b769f7 100644 --- a/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs +++ b/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs @@ -1669,7 +1669,6 @@ private void InitializeComponent() // CB_Vivillon // this.CB_Vivillon.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_Vivillon.Enabled = false; this.CB_Vivillon.FormattingEnabled = true; this.CB_Vivillon.Location = new System.Drawing.Point(287, 73); this.CB_Vivillon.Name = "CB_Vivillon"; From 61573301d6cc9af3d29acfe1dd65d80f26c35641 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 5 Aug 2016 21:02:54 -0700 Subject: [PATCH 15/67] Fix Ho-Oh fullwidth MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gen3 changes to gen4: － to - Just display as short width Fix unknown character (0xFF => early termination) throwing an exception Chartables were not spaced correctly (hex table), fixed now. --- PKM/PKX.cs | 69 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/PKM/PKX.cs b/PKM/PKX.cs index 05d988355..76b26ba21 100644 --- a/PKM/PKX.cs +++ b/PKM/PKX.cs @@ -1043,7 +1043,8 @@ internal static byte[] setG3Str(string str, bool jp) { Array.Resize(ref strdata, i); break; } strdata[i] = val; } - strdata[str.Length] = 0xFF; + if (strdata.Length > 0) + strdata[strdata.Length - 1] = 0xFF; return strdata; } @@ -1469,44 +1470,42 @@ internal static int getGender(int species, uint PID) internal static readonly ushort[] G34_4E = { - 478, 351, 352, 353, 358, 359, 360, 361, 362, 363, 020, 365, 366, 369, 370, - 371, 415, 376, 377, 378, 368, 382, 383, 384, 046, 358, 359, 392, 393, 394, - 395, 396, 397, 398, 401, 402, 403, 416, 408, 409, 410, 400, 420, 419, 479, - 450, 445, 003, 004, 006, 008, 010, 068, 449, 072, 013, 015, 017, 019, 021, - 023, 025, 027, 029, 031, 033, 035, 038, 040, 042, 049, 052, 055, 058, 061, - 050, 053, 056, 059, 062, 036, 426, 425, 480, 481, 091, 092, 094, 096, 098, - 364, 100, 102, 106, 108, 110, 112, 114, 117, 119, 121, 123, 124, 125, 385, - 127, 128, 131, 134, 137, 140, 396, 144, 145, 146, 147, 149, 151, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 082, 084, 086, 088, 090, 148, 150, 152, - 093, 095, 097, 099, 101, 103, 105, 107, 109, 111, 113, 115, 118, 120, 122, - 129, 132, 135, 138, 141, 130, 133, 136, 139, 142, 116, 289, 290, 291, 292, - 293, 294, 295, 296, 297, 298, 427, 428, 430, 241, 230, 431, 436, 437, 434, - 435, 443, 444, 424, 429, 242, 433, 299, 300, 301, 302, 303, 304, 305, 306, - 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, - 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, - 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 289, - 452, 355, 373, 379, 387, 405, 411 + 478, 351, 352, 353, 358, 359, 360, 361, 362, 363, 020, 365, 366, 369, 370, 371, // 0 + 415, 376, 377, 378, 368, 382, 383, 384, 046, 358, 359, 392, 393, 394, 395, 396, // 1 + 397, 398, 401, 402, 403, 416, 408, 409, 410, 400, 420, 419, 479, 450, 445, 003, // 2 + 004, 006, 008, 010, 068, 449, 072, 013, 015, 017, 019, 021, 023, 025, 027, 029, // 3 + 031, 033, 035, 038, 040, 042, 049, 052, 055, 058, 061, 050, 053, 056, 059, 062, // 4 + 036, 426, 425, 480, 481, 091, 092, 094, 096, 098, 364, 100, 102, 106, 108, 110, // 5 + 112, 114, 117, 119, 121, 123, 124, 125, 385, 127, 128, 131, 134, 137, 140, 396, // 6 + 144, 145, 146, 147, 149, 151, 153, 154, 155, 156, 157, 158, 159, 160, 161, 082, // 7 + 084, 086, 088, 090, 148, 150, 152, 093, 095, 097, 099, 101, 103, 105, 107, 109, // 8 + 111, 113, 115, 118, 120, 122, 129, 132, 135, 138, 141, 130, 133, 136, 139, 142, // 9 + 116, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 427, 428, 430, 446, 230, // A + 431, 436, 437, 434, 435, 443, 444, 424, 429, 242, 433, 299, 300, 301, 302, 303, // B + 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, // C + 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, // D + 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 289, // E + 452, 355, 373, 379, 387, 405, 411 // F }; internal static readonly ushort[] G34_4J = { - 001, 003, 005, 007, 009, 011, 012, 014, 016, 018, 020, 022, 024, 026, 028, - 030, 032, 034, 037, 039, 041, 043, 044, 045, 046, 047, 048, 051, 054, 057, - 060, 063, 064, 065, 066, 067, 069, 071, 073, 074, 075, 076, 077, 078, 079, - 080, 081, 002, 004, 006, 008, 010, 068, 070, 072, 013, 015, 017, 019, 021, - 023, 025, 027, 029, 031, 033, 035, 038, 040, 042, 049, 052, 055, 058, 061, - 050, 053, 056, 059, 062, 036, 083, 085, 087, 089, 091, 092, 094, 096, 098, - 100, 102, 104, 106, 108, 110, 112, 114, 117, 119, 121, 123, 124, 125, 126, - 127, 128, 131, 134, 137, 140, 143, 144, 145, 146, 147, 149, 151, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 082, 084, 086, 088, 090, 148, 150, 152, - 093, 095, 097, 099, 101, 103, 105, 107, 109, 111, 113, 115, 118, 120, 122, - 129, 132, 135, 138, 141, 130, 133, 136, 139, 142, 116, 162, 163, 164, 165, - 166, 167, 168, 169, 170, 171, 225, 226, 228, 241, 230, 229, 234, 235, 232, - 233, 443, 444, 424, 430, 242, 433, 172, 173, 174, 175, 176, 177, 178, 179, - 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, - 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, - 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 289, - 452, 355, 373, 379, 387, 405, 411 + 001, 003, 005, 007, 009, 011, 012, 014, 016, 018, 020, 022, 024, 026, 028, 030, // 0 + 032, 034, 037, 039, 041, 043, 044, 045, 046, 047, 048, 051, 054, 057, 060, 063, // 1 + 064, 065, 066, 067, 069, 071, 073, 074, 075, 076, 077, 078, 079, 080, 081, 002, // 2 + 004, 006, 008, 010, 068, 070, 072, 013, 015, 017, 019, 021, 023, 025, 027, 029, // 3 + 031, 033, 035, 038, 040, 042, 049, 052, 055, 058, 061, 050, 053, 056, 059, 062, // 4 + 036, 083, 085, 087, 089, 091, 092, 094, 096, 098, 100, 102, 104, 106, 108, 110, // 5 + 112, 114, 117, 119, 121, 123, 124, 125, 126, 127, 128, 131, 134, 137, 140, 143, // 6 + 144, 145, 146, 147, 149, 151, 153, 154, 155, 156, 157, 158, 159, 160, 161, 082, // 7 + 084, 086, 088, 090, 148, 150, 152, 093, 095, 097, 099, 101, 103, 105, 107, 109, // 8 + 111, 113, 115, 118, 120, 122, 129, 132, 135, 138, 141, 130, 133, 136, 139, 142, // 9 + 116, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 225, 226, 228, 446, 230, // A + 229, 234, 235, 232, 233, 443, 444, 424, 430, 242, 433, 172, 173, 174, 175, 176, // B + 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, // C + 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, // D + 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 289, // E + 452, 355, 373, 379, 387, 405, 411 // F }; #endregion From 98e72aefc813ebdd2d1c6c19f6f0a8a8e3445156 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 5 Aug 2016 21:36:51 -0700 Subject: [PATCH 16/67] Fix gen3 unknown game data setting Grab the original data, not the expanded data. Could always call 'clone' but the data hasn't been modified, so get the original data. --- MainWindow/Main.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MainWindow/Main.cs b/MainWindow/Main.cs index 51b675fd5..546a41676 100644 --- a/MainWindow/Main.cs +++ b/MainWindow/Main.cs @@ -720,11 +720,11 @@ private void openSAV(byte[] input, string path) "Cancel: FireRed / LeafGreen"); if (drGame == DialogResult.Yes) - sav = new SAV3(sav.Data, GameVersion.RS); + sav = new SAV3(sav.BAK, GameVersion.RS); else if (drGame == DialogResult.No) - sav = new SAV3(sav.Data, GameVersion.E); + sav = new SAV3(sav.BAK, GameVersion.E); else - sav = new SAV3(sav.Data, GameVersion.FRLG); + sav = new SAV3(sav.BAK, GameVersion.FRLG); } var drJP = Util.Prompt(MessageBoxButtons.YesNoCancel, $"Generation 3 ({sav.Version}) Save File detected. Select Origins:", "Yes: International" + Environment.NewLine + "No: Japanese"); if (drJP == DialogResult.Cancel) From fcd28937365dbfa829e6783618b8f27c51c76c4d Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 5 Aug 2016 22:59:02 -0700 Subject: [PATCH 17/67] Remove unused property Was used in the save detection method which was redesigned to not need a filename. --- Saves/SAV6.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Saves/SAV6.cs b/Saves/SAV6.cs index 0e1064940..df076efb0 100644 --- a/Saves/SAV6.cs +++ b/Saves/SAV6.cs @@ -7,7 +7,6 @@ namespace PKHeX public sealed class SAV6 : SaveFile { // Save Data Attributes - public const string DefaultFileName = "main"; public override string BAKName => $"{FileName} [{OT} ({Version}) - {LastSavedTime}].bak"; public override string Filter => "Main SAV|*.*"; public override string Extension => ""; From a8a0060c2e31dfe21f5a994c14a310f4a428d302 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 5 Aug 2016 23:21:27 -0700 Subject: [PATCH 18/67] Fix gen4 pkm location/ball interaction Met Location fixed from Daycare Couple to "Faraway Place" (2000 -> 3002) Check no egg location before writing faraway place. HGSSBall handled directly by Ball property (like met location) Constrain balls and met locations for DP Thanks BeyondTheHorizon for the initial bug report prompting this improvement. --- PKM/PK4.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++-------- PKM/PKM.cs | 3 ++- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/PKM/PK4.cs b/PKM/PK4.cs index 877a0b76e..bc0a04c36 100644 --- a/PKM/PK4.cs +++ b/PKM/PK4.cs @@ -261,10 +261,21 @@ public override int Egg_Location } set { - if (PtHGSS) + if (value == 0) + { + BitConverter.GetBytes((ushort)0).CopyTo(Data, 0x44); + BitConverter.GetBytes((ushort)0).CopyTo(Data, 0x7E); + } + else if (PtHGSS) { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x44); - BitConverter.GetBytes(0x7D0).CopyTo(Data, 0x7E); + BitConverter.GetBytes(0xBBA).CopyTo(Data, 0x7E); // Faraway Place (for DP display) + } + else if ((value < 2000 && value > 111) || (value < 3000 && value > 2010)) + { + // Met location not in DP, set to Mystery Zone (0, illegal) as opposed to Faraway Place + BitConverter.GetBytes((ushort)0).CopyTo(Data, 0x44); + BitConverter.GetBytes((ushort)0).CopyTo(Data, 0x7E); } else { @@ -284,10 +295,21 @@ public override int Met_Location } set { - if (PtHGSS) + if (value == 0) + { + BitConverter.GetBytes((ushort)0).CopyTo(Data, 0x46); + BitConverter.GetBytes((ushort)0).CopyTo(Data, 0x80); + } + else if (PtHGSS) { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x46); - BitConverter.GetBytes(0x7D0).CopyTo(Data, 0x80); + BitConverter.GetBytes(0xBBA).CopyTo(Data, 0x80); // Faraway Place (for DP display) + } + else if ((value < 2000 && value > 111) || (value < 3000 && value > 2010)) + { + // Met location not in DP, set to Mystery Zone (0, illegal) as opposed to Faraway Place + BitConverter.GetBytes((ushort)0).CopyTo(Data, 0x46); + BitConverter.GetBytes((ushort)0).CopyTo(Data, 0x80); } else { @@ -299,11 +321,26 @@ public override int Met_Location private byte PKRS { get { return Data[0x82]; } set { Data[0x82] = value; } } public override int PKRS_Days { get { return PKRS & 0xF; } set { PKRS = (byte)(PKRS & ~0xF | value); } } public override int PKRS_Strain { get { return PKRS >> 4; } set { PKRS = (byte)(PKRS & 0xF | (value << 4)); } } - public override int Ball { get { return Data[0x83]; } set { Data[0x83] = (byte)value; } } + public override int Ball + { + get { return Data[HGSS ? 0x86 : 0x83]; } + set + { + if (HGSS) + { + Data[0x83] = (byte)(value <= 0x10 ? value : 4); // Ball to display in DP (cap at Cherish) + Data[0x86] = (byte)(value <= 0x18 ? value : 4); // Cap at Comp Ball + } + else + { + Data[0x83] = (byte)(value <= 0x10 ? value : 4); // Cap at Cherish Ball + Data[0x86] = 0; // Unused + } + } + } public override int Met_Level { get { return Data[0x84] & ~0x80; } set { Data[0x84] = (byte)((Data[0x84] & 0x80) | value); } } public override int OT_Gender { get { return Data[0x84] >> 7; } set { Data[0x84] = (byte)((Data[0x84] & ~0x80) | value << 7); } } public override int EncounterType { get { return Data[0x85]; } set { Data[0x85] = (byte)value; } } - public int HGSSBall { get { return Data[0x86]; } set { Data[0x86] = (byte)value; } } // Unused 0x87 #endregion @@ -398,8 +435,7 @@ public PK5 convertToPK5() // Delete HGSS Data BitConverter.GetBytes((ushort)0).CopyTo(pk5.Data, 0x86); - if (HGSSBall > 0 && HGSSBall != 4) - pk5.Ball = HGSSBall; + pk5.Ball = Ball; // Transfer Nickname and OT Name pk5.Nickname = Nickname; diff --git a/PKM/PKM.cs b/PKM/PKM.cs index d5b946a8e..2b5f121bf 100644 --- a/PKM/PKM.cs +++ b/PKM/PKM.cs @@ -147,7 +147,8 @@ public byte[] Write() public bool XY => Version == (int)GameVersion.X || Version == (int)GameVersion.Y; public bool AO => Version == (int)GameVersion.AS || Version == (int)GameVersion.OR; public bool SM => Version == (int)GameVersion.SN || Version == (int)GameVersion.MN; - public bool PtHGSS => new[] {GameVersion.Pt, GameVersion.HG, GameVersion.SS}.Contains((GameVersion)Version); + protected bool PtHGSS => GameVersion.Pt == (GameVersion)Version || HGSS; + public bool HGSS => new[] {GameVersion.HG, GameVersion.SS}.Contains((GameVersion)Version); public bool Gen5 => Version >= 20 && Version <= 23; public bool Gen4 => Version >= 10 && Version < 12 || Version >= 7 && Version <= 8; public bool Gen3 => Version >= 1 && Version <= 5 || Version == 15; From 01051d7b9f8a52c6548af8746e2d25d212fc0919 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 6 Aug 2016 09:34:41 -0700 Subject: [PATCH 19/67] Allow TMs to be held in gen4 saves Thanks javier_himura! --- Legality/Tables4.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Legality/Tables4.cs b/Legality/Tables4.cs index 5ac132dc5..f3fe5724b 100644 --- a/Legality/Tables4.cs +++ b/Legality/Tables4.cs @@ -30,7 +30,7 @@ public static partial class Legal internal static readonly ushort[] Pouch_Battle_DP = { 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67 }; - internal static readonly ushort[] HeldItems_DP = new ushort[1].Concat(Pouch_Items_DP).Concat(Pouch_Mail_DP).Concat(Pouch_Medicine_DP).Concat(Pouch_Berries_DP).Concat(Pouch_Ball_DP).ToArray(); + internal static readonly ushort[] HeldItems_DP = new ushort[1].Concat(Pouch_Items_DP).Concat(Pouch_Mail_DP).Concat(Pouch_Medicine_DP).Concat(Pouch_Berries_DP).Concat(Pouch_Ball_DP).Concat(Pouch_TMHM_DP.Take(Pouch_TMHM_DP.Length - 8)).ToArray(); #endregion #region Pt @@ -47,7 +47,7 @@ public static partial class Legal internal static readonly ushort[] Pouch_Ball_Pt = Pouch_Ball_DP; internal static readonly ushort[] Pouch_Battle_Pt = Pouch_Battle_DP; - internal static readonly ushort[] HeldItems_Pt = new ushort[1].Concat(Pouch_Items_Pt).Concat(Pouch_Mail_Pt).Concat(Pouch_Medicine_Pt).Concat(Pouch_Berries_Pt).Concat(Pouch_Ball_Pt).ToArray(); + internal static readonly ushort[] HeldItems_Pt = new ushort[1].Concat(Pouch_Items_Pt).Concat(Pouch_Mail_Pt).Concat(Pouch_Medicine_Pt).Concat(Pouch_Berries_Pt).Concat(Pouch_Ball_Pt).Concat(Pouch_TMHM_Pt.Take(Pouch_TMHM_Pt.Length - 8)).ToArray(); #endregion #region HGSS @@ -64,7 +64,7 @@ public static partial class Legal }; internal static readonly ushort[] Pouch_Battle_HGSS = Pouch_Battle_DP; - internal static readonly ushort[] HeldItems_HGSS = new ushort[1].Concat(Pouch_Items_HGSS).Concat(Pouch_Mail_HGSS).Concat(Pouch_Medicine_HGSS).Concat(Pouch_Berries_HGSS).Concat(Pouch_Ball_Pt).ToArray(); + internal static readonly ushort[] HeldItems_HGSS = new ushort[1].Concat(Pouch_Items_HGSS).Concat(Pouch_Mail_HGSS).Concat(Pouch_Medicine_HGSS).Concat(Pouch_Berries_HGSS).Concat(Pouch_Ball_Pt).Concat(Pouch_TMHM_HGSS.Take(Pouch_TMHM_HGSS.Length - 8)).ToArray(); #endregion internal static readonly int[] MovePP_DP = From 08a58964db12152a5801105d4c84fbf41954bc2a Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 6 Aug 2016 09:35:05 -0700 Subject: [PATCH 20/67] Allow gen3 item transfer 3->4 Thanks javier_himura! --- PKM/PK3.cs | 4 ++++ PKM/PKX.cs | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/PKM/PK3.cs b/PKM/PK3.cs index 4f647dd2a..2dfebeb80 100644 --- a/PKM/PK3.cs +++ b/PKM/PK3.cs @@ -296,6 +296,10 @@ public PK4 convertToPK4() // Unown Form pk4.AltForm = AltForm; + int item = HeldItem; + if (HeldItem > 0) + pk4.HeldItem = item; + // Remove HM moves int[] banned = { 15, 19, 57, 70, 148, 249, 127, 291 }; int[] newMoves = pk4.Moves; diff --git a/PKM/PKX.cs b/PKM/PKX.cs index 76b26ba21..b06ffdc95 100644 --- a/PKM/PKX.cs +++ b/PKM/PKX.cs @@ -1576,7 +1576,7 @@ internal static ushort getG4Item(ushort g3val) 66,67,68,69,43,44,70,71,72,73, 74,75,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,45,46,47,48,49,50,51, - 52,53,0xFFFF,55,56,57,58,59,60,0xFFFF, + 52,53,0xFFFF,55,56,57,58,59,60,61, 63,64,0xFFFF,76,77,78,79,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,80,81,82,83,84,85,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,86,87,0xFFFF,88,89,90,91, @@ -1595,6 +1595,15 @@ internal static ushort getG4Item(ushort g3val) 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,260,261,262,263,264, + + 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF, + 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF, + 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF, + 328,329,330,331,332,333,334,335,336,337, + 338,339,340,341,342,343,344,345,346,347, + 348,349,350,351,352,353,354,355,356,357, + 358,359,360,361,362,363,364,365,366,367, + 368,369,370,371,372,373,374,375,376,377, }; if (g3val > arr.Length) return 0xFFFF; From 8410ea4b9e0faea53bf8b61bbf2269a13f86dd68 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 6 Aug 2016 09:41:46 -0700 Subject: [PATCH 21/67] Tweak transfer HM banlist for clarity No change in functionality, easier to understand --- PKM/PK4.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PKM/PK4.cs b/PKM/PK4.cs index bc0a04c36..f5a73b823 100644 --- a/PKM/PK4.cs +++ b/PKM/PK4.cs @@ -445,9 +445,9 @@ public PK5 convertToPK5() pk5.Met_Level = PKX.getLevel(pk5.Species, pk5.EXP); // Remove HM moves; Defog should be kept if both are learned. - int[] banned = Moves.Contains(250) /*Whirlpool*/ && !Moves.Contains(432) /*Defog*/ - ? new[] {15, 19, 57, 70, 432, 249, 127, 431} // No Defog - : new[] {15, 19, 57, 70, 250, 249, 127, 431};// No Whirlpool + int[] banned = Moves.Contains(250) && Moves.Contains(432) // Whirlpool & Defog + ? new[] {15, 19, 57, 70, 250, 249, 127, 431} // No Whirlpool + : new[] {15, 19, 57, 70, 249, 127, 431};// Transfer via advantageous game int[] newMoves = pk5.Moves; for (int i = 0; i < 4; i++) From dab1bf44aede86c81a5cdc9214e5eba4a41df239 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 6 Aug 2016 10:01:40 -0700 Subject: [PATCH 22/67] Add tm sprite for held item No longer uses the generic 'unknown' item sprite --- PKHeX.csproj | 1 + PKM/PKX.cs | 7 ++- Properties/Resources.Designer.cs | 98 ++++++++++++++----------------- Properties/Resources.resx | 3 + Resources/img/item/item_tm.png | Bin 0 -> 777 bytes 5 files changed, 53 insertions(+), 56 deletions(-) create mode 100644 Resources/img/item/item_tm.png diff --git a/PKHeX.csproj b/PKHeX.csproj index b01803dcf..9e8f5b4d6 100644 --- a/PKHeX.csproj +++ b/PKHeX.csproj @@ -708,6 +708,7 @@ + diff --git a/PKM/PKX.cs b/PKM/PKX.cs index b06ffdc95..7ba8fffa6 100644 --- a/PKM/PKX.cs +++ b/PKM/PKX.cs @@ -457,7 +457,7 @@ internal static uint getRandomPID(int species, int cg, int origin, int nature, i } // Data Requests - internal static Image getSprite(int species, int form, int gender, int item, bool isegg, bool shiny) + internal static Image getSprite(int species, int form, int gender, int item, bool isegg, bool shiny, int generation = -1) { if (species == 0) return (Image)Resources.ResourceManager.GetObject("_0"); @@ -499,6 +499,9 @@ internal static Image getSprite(int species, int form, int gender, int item, boo if (item > 0) { Image itemimg = (Image)Resources.ResourceManager.GetObject("item_" + item) ?? Resources.helditem; + if ((generation == 3 || generation == 4) && 328 <= item && item <= 419) // gen3/4 TM + itemimg = Resources.item_tm; + // Redraw baseImage = Util.LayerImage(baseImage, itemimg, 22 + (15 - itemimg.Width) / 2, 15 + (15 - itemimg.Height), 1); } @@ -506,7 +509,7 @@ internal static Image getSprite(int species, int form, int gender, int item, boo } internal static Image getSprite(PKM pkm) { - return getSprite(pkm.Species, pkm.AltForm, pkm.Gender, pkm.HeldItem, pkm.IsEgg, pkm.IsShiny); + return getSprite(pkm.Species, pkm.AltForm, pkm.Gender, pkm.HeldItem, pkm.IsEgg, pkm.IsShiny, pkm.Format); } // Font Related diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 131bc6ca5..3e10c76ee 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -15132,6 +15132,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_tm { + get { + object obj = ResourceManager.GetObject("item_tm", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized string similar to ! PKHeX Interface Customization File ///! Languages: Save this file accordingly and put it in the same folder as PKHeX's executable. @@ -15181,11 +15191,11 @@ internal class Resources { /// /// Looks up a localized string similar to ! PKHeX Interface Customization File ///! Languages: Save this file accordingly and put it in the same folder as PKHeX's executable. - ///! lang_en.txt = English - ///! lang_jp.txt = Japanese + ///! lang_en.txt = Inglés + ///! lang_jp.txt = Japonés ///! lang_fr.txt = French - ///! lang_de.txt = German - ///! lang_es.txt = Spanish + ///! lang_de.txt = Alemán + ///! lang_es.txt = Español ///! lang_it.txt = Italian ///! lang_ko.txt = Korean ///! lang_zh.txt = Chinese @@ -15193,7 +15203,7 @@ internal class Resources { ///! Make sure that each edit has a ' = ' between Control name and new Text! ///! ///! ----------------------------------------------------- - ///- DO NOT CHANGE THI [rest of string was truncated]";. + ///- DO NOT CHANGE THIS [rest of string was truncated]";. /// internal static string lang_es { get { @@ -20500,18 +20510,18 @@ internal class Resources { /// /// Looks up a localized string similar to None - ///Rock Smash (HGSS) - ///Tall Grass + ///Golpe roca (HGSS) + ///Hierba Alta /// ///Dialga/Palkia - ///Cave/Hall of Origin + ///Cueva/Sala del Origen /// - ///Surfing/Fishing + ///Surfeando/Pescando /// - ///Building/Enigma Stone - ///Marsh/Safari + ///Edificio/Misticristal + ///Pantano/Safari /// - ///Starter/Fossil/Gift (DP) + ///Inicial/Fosil/Regalo (DP) /// /// /// @@ -20522,8 +20532,8 @@ internal class Resources { /// /// /// - ///Distortion World (Pt) - ///Starter/Fossil/Gift (Pt/DP Trio). + ///Mundo Distorsion (Pt) + ///Inicial/Fosil/Regalo (Pt/DP Trio). /// internal static string text_encountertype_es { get { @@ -20697,7 +20707,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to + /// Looks up a localized string similar to Spiky /// /// /// @@ -20949,9 +20959,7 @@ internal class Resources { /// /// /// - /// - /// - /// /// [rest of string was truncated]";. + /// [rest of string was truncated]";. /// internal static string text_forms_de { get { @@ -20960,7 +20968,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to + /// Looks up a localized string similar to Spiky /// /// /// @@ -21212,9 +21220,7 @@ internal class Resources { /// /// /// - /// - /// - /// /// [rest of string was truncated]";. + /// [rest of string was truncated]";. /// internal static string text_forms_en { get { @@ -21223,7 +21229,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to + /// Looks up a localized string similar to Spiky /// /// /// @@ -21474,10 +21480,7 @@ internal class Resources { /// /// /// - /// - /// - /// - /// [rest of string was truncated]";. + /// /// [rest of string was truncated]";. /// internal static string text_forms_es { get { @@ -21486,7 +21489,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to + /// Looks up a localized string similar to Spiky /// /// /// @@ -21736,10 +21739,7 @@ internal class Resources { /// /// /// - /// - /// - /// - /// [rest of string was truncated]";. + /// /// [rest of string was truncated]";. /// internal static string text_forms_fr { get { @@ -21748,7 +21748,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to + /// Looks up a localized string similar to Spiky /// /// /// @@ -21999,10 +21999,7 @@ internal class Resources { /// /// /// - /// - /// - /// - /// [rest of string was truncated]";. + /// /// [rest of string was truncated]";. /// internal static string text_forms_it { get { @@ -22011,7 +22008,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to + /// Looks up a localized string similar to Spiky /// /// /// @@ -22262,9 +22259,7 @@ internal class Resources { /// /// /// - /// - /// - /// /// [rest of string was truncated]";. + /// [rest of string was truncated]";. /// internal static string text_forms_ja { get { @@ -22273,7 +22268,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to + /// Looks up a localized string similar to Spiky /// /// /// @@ -22525,9 +22520,7 @@ internal class Resources { /// /// /// - /// - /// - /// /// [rest of string was truncated]";. + /// [rest of string was truncated]";. /// internal static string text_forms_ko { get { @@ -22536,7 +22529,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to + /// Looks up a localized string similar to Spiky /// /// /// @@ -22787,10 +22780,7 @@ internal class Resources { /// /// /// - /// - /// - /// - /// [rest of string was truncated]";. + /// /// [rest of string was truncated]";. /// internal static string text_forms_zh { get { @@ -22878,8 +22868,8 @@ internal class Resources { ///RojoFuego ///VerdeHoja /// - ///HeartGold - ///SoulSilver + ///Oro HeartGold + ///Plata SoulSilver /// ///Diamante ///Perla @@ -22897,8 +22887,8 @@ internal class Resources { ///Negra2 ///X ///Y - ///AS - ///OR. + ///Zafiro Alfa + ///Rubí Omega. /// internal static string text_games_es { get { diff --git a/Properties/Resources.resx b/Properties/Resources.resx index da26da620..10d5e449e 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -6382,4 +6382,7 @@ ..\Resources\img\box\slotView.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\item\item_tm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Resources/img/item/item_tm.png b/Resources/img/item/item_tm.png new file mode 100644 index 0000000000000000000000000000000000000000..1d170e8b7dd1f19e594f5332522ee465ee6b28f3 GIT binary patch literal 777 zcmV+k1NQuhP)pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%heMIczh2P5=M`heK8m7FE%!OSY6%0`1p4y%3BzX6{lHQS&y%gt7>a&Q;o)F{L|Lf4uZiD&d>iLoldhZ zE-s*HM;IFVin6j7Nm-WfGe{i?92js4a0{xc3Rn~HUj{EPFA8vc z`$(1?4#z3k*xcOAsIPDM3a+lU!R7iPQr%#`6jXhE3$8)C)9Fm_?(Sk~X(^+wu0EJd zW=O@wX3@zFzu(V3qtPf%PU5JntUMhV8A-D0$`;)k^5;QkAzobkg zx>Y(kx|~4Zh`Zjvkw`?0u3>t54xOF747Rto^A<8iw@N2hRaJ-H-p?2wcJVrTdiv4Y z`kp<~sF{v;i*B{Cu~D{KZOF@ef}EUOUI(R0;jqVBB}xAQ5tSue<)qV%00000NkvXX Hu0mjfNv2!v literal 0 HcmV?d00001 From be41727a6e8dee7848e64a4a8206d9bd02943db1 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 6 Aug 2016 11:37:16 -0700 Subject: [PATCH 23/67] Fix numpad typo Pal park transfer friendship is 70 not 40 789 456 123 Fixes #165 --- PKM/PK3.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKM/PK3.cs b/PKM/PK3.cs index 2dfebeb80..a6f20bc4c 100644 --- a/PKM/PK3.cs +++ b/PKM/PK3.cs @@ -196,7 +196,7 @@ public PK4 convertToPK4() SID = SID, EXP = IsEgg ? PKX.getEXP(5, Species) : EXP, IsEgg = false, - OT_Friendship = 40, + OT_Friendship = 70, MarkCircle = MarkCircle, MarkSquare = MarkSquare, MarkTriangle = MarkTriangle, From 29c4497603bdb2910292d3232c35003b967e1ba9 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 6 Aug 2016 12:30:00 -0700 Subject: [PATCH 24/67] Only write pkm out if species is not zero (empty) --- Subforms/PKM Editors/BatchEditor.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Subforms/PKM Editors/BatchEditor.cs b/Subforms/PKM Editors/BatchEditor.cs index c3a4ed7ea..67613c4d5 100644 --- a/Subforms/PKM Editors/BatchEditor.cs +++ b/Subforms/PKM Editors/BatchEditor.cs @@ -194,8 +194,11 @@ private void processFolder(string[] files, List Filters, List err++; if (r == ModifyResult.Modified) { - ctr++; - File.WriteAllBytes(Path.Combine(destPath, Path.GetFileName(file)), pkm.DecryptedBoxData); + if (pkm.Species > 0) + { + ctr++; + File.WriteAllBytes(Path.Combine(destPath, Path.GetFileName(file)), pkm.DecryptedBoxData); + } } b.ReportProgress(i); From f83cfbaae10ccf6a61d7761de5ccb6dd62ea11b3 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 6 Aug 2016 12:57:53 -0700 Subject: [PATCH 25/67] Add mystery gift file drag&drop to slot pgt was a pkm size, check all sizes --- MainWindow/Main.cs | 2 +- MysteryGifts/MysteryGift.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/MainWindow/Main.cs b/MainWindow/Main.cs index 546a41676..d9f6a1c08 100644 --- a/MainWindow/Main.cs +++ b/MainWindow/Main.cs @@ -3344,7 +3344,7 @@ private void pbBoxSlot_DragDrop(object sender, DragEventArgs e) return; string file = files[0]; FileInfo fi = new FileInfo(file); - if (!PKX.getIsPKM(fi.Length)) + if (!PKX.getIsPKM(fi.Length) && !MysteryGift.getIsMysteryGift(fi.Length)) { openQuick(file); return; } byte[] data = File.ReadAllBytes(file); diff --git a/MysteryGifts/MysteryGift.cs b/MysteryGifts/MysteryGift.cs index cff746126..e7a82211d 100644 --- a/MysteryGifts/MysteryGift.cs +++ b/MysteryGifts/MysteryGift.cs @@ -5,6 +5,10 @@ namespace PKHeX { public abstract class MysteryGift { + internal static bool getIsMysteryGift(long len) + { + return new[] { WC6.SizeFull, WC6.Size, PGF.Size, PGT.Size, PCD.Size }.Contains((int)len); + } internal static MysteryGift getMysteryGift(byte[] data, string ext) { if (data.Length == WC6.SizeFull && ext == ".wc6full") From ecfb5626eab2baa02112c0303cd70b63812f64c6 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 6 Aug 2016 13:18:23 -0700 Subject: [PATCH 26/67] Release 08-07-16 Updated with latest event contributions. --- Resources/byte/wc6.pkl | Bin 244728 -> 247368 bytes Resources/byte/wc6full.pkl | Bin 186592 -> 192080 bytes Resources/text/changelog.txt | 16 ++++++++++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Resources/byte/wc6.pkl b/Resources/byte/wc6.pkl index 741fee4e69ab6ba1f5fda89c6361071de24e68ba..e29dc62e28b92d4f3b219a1f1ebcec59e03edd83 100644 GIT binary patch delta 5384 zcmd^?dvMcL7RP&kzqXW6FqVg<6b#6tDB!R1uBZ`w&>Ap8b!(|?bb*#qAPQ=ExCBKW zwQ3;9Egggu6-q%3{YfuKz<`e_oz5DSb)my(WLzu-H7Y9B3j6&AT_4Lo&d%)a%)-ov zlXLDp_uO;OJ-^G@Z#&hOUm{M)`)l+89VW-kjGKeMbK{CuXLe8MQ#DkK^i^3d>yedy zDk1KtKQ?RJ#yBbNj!PAOvCns)S5FzSip0^yabqtGId`6a#JHHZ`QW`jP5tp-j?*$` zefFahxET1q5yHLI`ruz@q4U3=g?r;>BL^k;`|CVhBn#b6B}5MPeajY?Yu>cq7B{Lf zZin%bbEogXh@nZy+3!1$F26mH4S@}ft24V@a*>5EJ(Zx0uZ$XFixD!~jQ5N-`NeMi z+TXePuD@MT8J`*rzTUmNUTn>drxJcqaB_PU{w@_1g6GJK+%aHPhF%1880vZr<^Bx_H?AAGcr_K%T(o=-o5zx=6 zS4}FK6o-I`LOBcQa{Ls!ADd4(>u&OzJPlUl40_9CYW|rs$jBM2o*SvZK=%zCS$sV; z`C}MhP8I?*!y9e!0QTvx$VgDu?=)LHiDB-MjQ0YaLn%j|){t5dviEUNx|V2(>ZxT~ zyikumhBc-05zQe>9@h4&w1+foYs>=eoVv1<;-H7Mb24k8mZQoSX>VaWi#P#(9CF7J zOvwK;M=f583B?|YB}=q6WqpwAMCM?WW1hBOHqF*@CMI zeOxRMTU$>HT%c0|p&VJqa&oT%Wx%aFWchvioih7&eWpsghcy=3!BxZ0aF}ZaxGrC> zlG~=}h02pnrR_S-4H=jlZ|Fhkd>r=m3t{(`&>sB*?Y1rmZ%=22=Q%GdLS}s{Xs(PK(@0T2rvPbpL?R+y5Y*7SjHeSgQ7X$qjivfVTSw)JB^{ zi)#Ip8w#vuPK>2wjwL|x`jP|+c*sg}V|sHUq}Qw;-IQ?`j5?dn1rSF=4BPUK9b zIH(yriL~4XN)TDh5kb?o5>2XP>CuH`!E)WbimQ}?ZBgJVu3{8Bg1bqYLNa9QR8`&8W3~* zy5>+_+EY9euLaGb_bw=ted#wP$;L$Oj6@4?$Z4Hn48Ml%V?`f1dKvqOyBkjj#Ahc= z7b^8A9YtEi1lg|zo#e>N_-&4V8z$##SlYDKGo_{2y|le6(&eiYe*Iu7JM_P|+FireGz3{dwD+5%+TozX^La@P7wNv0AEM%0^htP4+>EYfy_V|0kXUgJ zW_*Qd9PObrOx zp6y1KCW254^Xof9_hd<$|0Yhj+Yf)QdNAK z6{@_OxXGj}(m#kadXdqtq&oqW?!CC8<@-fE4&w!$r{7N+Ye@S%zAghU%Bd4r7CDo7 z$5J^HPp==>vEN94kzp*erlBme(gD;s`*0jqi&v++=vV=ZL0w%%R%{}hSAsJ9xELWn z@QA~*#v_Kw#O2~$6)mFObr&L7mm^Z8^9~U;lh}9NMJ(L#WYV}HCSSv)8#1}HyFcaP zew1zLv_?9|0!zWQQ0XZQ3B-p|r#fHbK<{f@Z1;1dyOJ9%UXP8|m5VN#YAX{?{4b;o zmtgn3VpKcj%*D8XMeO9az%_%HE`K`R1a7BXGg03v6lxJ27%WuIaa<{9EQZvLrr0`? zv5XnXSU@~(ujItCfxNkm8Bo}5RAgNq^V(5Q(^aKK@1`qndnVR?9{-7w=z0!$<{-kV z2r=-YSIOpWpbTt=t#7r!e|ENt9F@M6%C^mXA5?IA`I6Ur!#b)#e2l%^YWmaMYQa-b zL{`uS4v~o~M3eG9A`nH{Vlh^%DX^-xrQ)!zN*Bg*Rm$#>I)}xQR6Zv{;+KG~*cEnq8TO%vAXK+-fIkY^;;j)l;CeTrrt OzYbE<7@*ajDEED#GP=m{%fx)6kMurk#B^$2dFxT~Tuqit=6uA@&e^uXvD*PGt@8 zi%f^C_>)bAq8g3A4r2o}UeP(>tg) zYBE)Op6)Yj+4U3Y>>wSd$?SHp_7u(bAIQu}vgLa+eS&QKj!b39hHuGOE4zyP$3P(< zl<+Z7dXE@oGX13y)xo3KEb`S}qCloE5m75V$gekk!N|2~My@zw6v*V~Mze+m6_Mb= z&uGtWX2h&dv3*?kq9Y0V<q#vNU4aGKiny+Bg1LU8RW=*+Z{(NW}*LNYSa<`J?YNqSZb)D+*qEO4vP z*R6vsi-O{F?Ri?nvvhQxh+)~w7?_;JKoF_X8C1d{QIsWL3?bY*m4Yis0r{ocJBe}W zEzAL7yK>3+F)FS*Sa9}4D$d(UhacSD0I2Lu*`nqZ818DowH0t~0UVnVmsu(>VDEP3 zgOI}t3z~EZzuY@QBs469xi4ZsYz%A(R>_fLM5!v9iTKP-fah9fKK3gdSGuxl#yO0d zaZpnE-fSIAP4sWwAqKWaw%$M?P|uc~<9NC~y*^+ZYe} z<-#7KUKaNhy`_7UnUP+H$d|LOHiyVH7mIq0M1*^S=fZR4n%B%TI&%Y0ABbZf+G_U2 zYHnc}ldmM(Cz~U>>GUw#flWC6672;$U*00LEB1^lg7~$!Q^DG_f%)au5 z^=7M1ZR3{0H`?C+nt|R^&zt?SWYbV{nCv>#Jfu4+&EBTYyvPWsT`{YcIZ*z%#%$8C zkliqt%-naL>3d8Z#e#dyq)x0hv#`F;LC|f_nhio1{Dw;MRd(FT=t|yNk>zHdq4!TR zyBj)QO>ZY-TX?S9wixyL9S`Tn)dxMvI}LgFms-PNpuP-pOP) zv?+@_uscdli8k%&OWJ&j@H8VEC-H-|gL;8DI!2m9Da8A6;x^(yeOQC*8&7 zXuS|By*p1>t-GZ)d-rs!?(BMN>9JBP`Ad~Led1AJ1;4MdmhPEuwSKwYg0Q)z6)Dk1 zbdcGD$0oDKcB|GevF?FUMwK-^U8-T^2+No8$6;|?y?NiAkIYKS?7;_Qb zg|VsBE;N(c1?R5mx_C5JK*fGScHuYct;;^1t_r_FP~B(OAgH-jmH!LTb%{<_T>@k7 z7=#oVZpK+#(~cuj{uxiyv@<-yP;=!9r^uFTKNlx;;4~)_A{M;Qah%K8ZVK@(m@muo zwO_WGM!i*C=d%q}*@0R-Un3%R6z5k}f6AiMEIND$8R0`!s%R(XD892w7IiU{Y&(iZ zqb0mUBELRJ_t*s8~gwp(-UxTm1sC?0FlgKmA8|Qzh{3{{yslih;WOZO}W0-cj@x z(mRrl5jNnBIN*(-1XbPx+IfU7!l#WXxv*>$UkK|Qm^%rdWp^QWW`MzWGVTuSgJ2Z% z+(*<~#n1XQjD13H=)=)eUJlB-D}+z2UA0e0d}HsfO6c&7a9G|Iez|ri@_Z|CcMcb4 zb@4Fjh0A@mu6!%et#<`_EL_fo%4efXE)%`*vO5u8ekp~Sy+Ji(8DiZ_5!-JGtmK?t z!a6hGYvs-jsi)>WWM^bs&2xWLb>--z=_#Koi0s48EB9HW7t||bAd*wi+!r?N#t}a@L6q7CRAnvx@)b1YyV3=tDvfZqsXzoS$|S> zyo@4J>$(ed;H4~NyzH}bUrMORmxknwFl@s!0*(1eA*k2(~j?990=Q8V@JP1I#y8!QQ71; z18-tdN>B*C0U_0o5g>$VH9(mKgje(PIl%j{yNeYYUS$>CSgK;fk>Qzd;-!z@$(y&6 zE#r|bX>WF1W}??djwrl=|Crnn#yRF8r*@86Vo3iSJOq_~zA@2>d>NW2LZ}{q%e&Ue z*z8Z39gHzMu#SurQSW4XZ`$c6SVOD;cJ0RuZ&!Agx6v84S#dq>)GR)1$(elEPF%tV z!n+ntstF%5>5$#itqcs>jP{2uK^&nOW=M|hZ{Drz9%EiSY(Jng%zd~WdQtIIvL){U zWM}@#mI61krA|iNw4;x(`*cs*t_qID@q&S!R`?I(w|vB;NXUMALni*`oqo`qZK(cj z*sQLv@O{{8K8oAA30peWg#Ck0na(p`RHqL@+WOvfee@vjbI;$=P^JdWDMtekd+Qu( z*RaIMDNI&iD*FL()Ab*V>6htSh2JVUUT;+%#yhea??~}Ml$E-e)p``y6!go2@ggKw z9W*BCmN(c%_Ip57pM%ak$37g#(YogcUaVdx9$6JS+1sr7FFu2PkR-t>>w+IpaRDn1 zq>%3Z03D6Eln?E)-x_#wwolhE;ErsEo6r##+`9Y}3EjaF?p&7x}k+bn9%4+Ns!D@f6r&4ab|ZKCRa-YhDXDn6>c zk!7*VY!=IBc}!A@t9a-5mskNAX0c*6oh36P+sKA06-#)x*x}?ehfN`KF`LOsl;nEe zIWf856PTsq3aB zrt`$4!ATdRSj(SeW*e9yyuuO%pRh;p)FlnMB`}e(87w{QbMqGdgvg{?g2Vse$9olC zX;Jai^;)}w&(Dc?wqEows&fh@FX_p<^yCYuIEmfW1--NaVz^}Zpaps>l-Y5-TM8-< z8zpLAKAT3pLRZiaC#~=9%H=kj<#1QpRq~X`t|*=fy#If02~MOXy~w7t(h|iyn#Y+; za^qg>eu+6$`-=(kOHpCMyAP^NvYzT{n`cWflZT%lg!e%|x0QtG&{%+oMAWpPEg2RYPN ziL~={)jT%u-WWE$Z0NDx|6gC4w(%G47?P`p`LMBfmfKT5{=45_c*Wo8C(*!QfG|2} zM?|}oUuFvNU9-rXNAIzD`gR7nh3ARhYh?qD{2rh6#=Wy5Zs!^QTRSv)l3)=v%d7ax zGrTOsiQ37LLI+U`42LCT;U-aQc!ZNreFsjKKn&<_OH@PSO`=+vZ5GSSqCs;%0bidT zdfuUkc0UWf`AWbbbq3 zzXBZxLHjY{CTD|}c)nN1Ip!Z|Y?E_sOf|j>H z!<%5UoAT32WOQLt3b&JIAAXuEB}So0>)S=x$~8j|-SIIn^r(JtNhr-5r8kg+u3Ol3 z-T z?8$%Pn$1cFqYjxxd$vMy?J>QBs9N$V(lFU1mif*`srebPl-DPE7Vm(DC7^d2Xw61^ z?Qawy9U?T;5K2EI$m{9%mXyt-)$^;2v`XgDRnbNoK|jXDxf;>U3qiLNw2am*oxtD; zj7#lCcsf?W5}FUX@<2lt7)S&CsoW-Ny9e@1TnlV~#l8{@&IO$l!R8U9Mx{inyM8r_ zs`&tASF2IQuC0{2^ghyFNl)^xgSTx3r{UUP!ZDcRVF?XGjlQ#Hac4dGRt6G8b?Rm) zt%cGG3iZARN9%GhFcY-rg28k=n(mb9{h2hHYAL{1g@f2+5_i&uTDhFU-S5KLQVRNK zfVLd4{y99k^fdW3?jfw%L811KptKrFrIga2WNQ9{J~>Yk9LEXv27>K7g6l_ou;r6B9*samThK6;~>%^|3y#+D+tQYlq2* zrd5JST?r&$=DcS7!gjaE+GWI$(-G6UaTzXoXeaFTi*%L?xuTY|R5-}BU05Tp7xhe-f~uY z4>IC@B$Bd}o2MoH7iYFezot^sx9$S9B}mi_(c-@uAd$WY+b%B`3BR(qRjTR@nt|E( zYe}h!_i|iV!G8HWHJqlmpDTwqYME)uScDZ+?mU5-pp7f*hgq2|VQyt11DSJaxrH_k zGMRR1<2pvtXVG=X(fW^!cRxexSF@#MGVTao;&`3Qnoo06V+$DXI)e`U%lhgMH1!l6 zxS4bF%b3kBrFI{6^4x6o3XW5=;7G0`q56+%t^bcI6Bt#VV2kcUY+)W?skMZfi>a|6 z`ql}+Or+$f-jz`H5wso2q*th(4Z;&6>6d#|=PP12zQqdydG~qFbW`jboM4wc{JH;NM^lj+sH-81u zFCaVuj1Pf52CPqkxfkd)Q1}ky$3gZh;O+ypLm)T+y#2tL1kEalc7bpwHek--U1u+% z_65{BpBm>-eKu{LNu$%D?=1rELf~8v3fF-AReUj9 Date: Sat, 6 Aug 2016 15:39:26 -0700 Subject: [PATCH 27/67] Fix saveDataBackup detection Thanks IamAVeryNicePereson! --- Saves/SaveUtil.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Saves/SaveUtil.cs b/Saves/SaveUtil.cs index 5b7976b7b..0a2b8aad4 100644 --- a/Saves/SaveUtil.cs +++ b/Saves/SaveUtil.cs @@ -190,8 +190,7 @@ public static string detectSaveFile() // save_manager if (path3DS != null && Directory.Exists(path = Path.Combine(path3DS, "saveDataBackup"))) - if (File.Exists(path = Path.Combine(path))) - possiblePaths.Add(path); + possiblePaths.AddRange(getSavesFromFolder(path, false)); // SaveDataFiler if (path3DS != null && Directory.Exists(path = Path.Combine(path3DS, "filer", "UserSaveData"))) From 73f3fef4ca65f778f1590108482660cc7ba183f4 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 7 Aug 2016 22:46:07 -0700 Subject: [PATCH 28/67] Add C-Gear skin i/o (WIP) Currently only works on saves that already have c-gear skin data, more research to follow at a later date to set the necessary info for enabling c-gear skins. Allows for importing images, although a memory spike exists (due to rotated images not being collected until after import) --- MainWindow/Main.Designer.cs | 295 ++++++++------- MainWindow/Main.cs | 5 + MainWindow/Main.resx | 3 + PKHeX.csproj | 10 + Saves/SAV5.cs | 9 +- Subforms/Save Editors/Gen5/CGearBackground.cs | 356 ++++++++++++++++++ .../Gen5/SAV_CGearSkin.Designer.cs | 156 ++++++++ Subforms/Save Editors/Gen5/SAV_CGearSkin.cs | 134 +++++++ Subforms/Save Editors/Gen5/SAV_CGearSkin.resx | 216 +++++++++++ 9 files changed, 1041 insertions(+), 143 deletions(-) create mode 100644 Subforms/Save Editors/Gen5/CGearBackground.cs create mode 100644 Subforms/Save Editors/Gen5/SAV_CGearSkin.Designer.cs create mode 100644 Subforms/Save Editors/Gen5/SAV_CGearSkin.cs create mode 100644 Subforms/Save Editors/Gen5/SAV_CGearSkin.resx diff --git a/MainWindow/Main.Designer.cs b/MainWindow/Main.Designer.cs index 91bf1f5d5..4c8015464 100644 --- a/MainWindow/Main.Designer.cs +++ b/MainWindow/Main.Designer.cs @@ -356,6 +356,7 @@ public void InitializeComponent() this.B_OpenSecretBase = new System.Windows.Forms.Button(); this.B_Pokeblocks = new System.Windows.Forms.Button(); this.B_LinkInfo = new System.Windows.Forms.Button(); + this.B_CGearSkin = new System.Windows.Forms.Button(); this.dragout = new System.Windows.Forms.PictureBox(); this.mnuL = new System.Windows.Forms.ContextMenuStrip(this.components); this.mnuLLegality = new System.Windows.Forms.ToolStripMenuItem(); @@ -3072,11 +3073,11 @@ public void InitializeComponent() this.bpkx30.TabStop = false; this.bpkx30.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx30.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx30.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx30.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx30.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx30.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx30.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx30.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx30.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx30.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // mnuVSD // @@ -3120,11 +3121,11 @@ public void InitializeComponent() this.bpkx29.TabStop = false; this.bpkx29.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx29.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx29.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx29.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx29.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx29.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx29.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx29.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx29.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx29.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx28 // @@ -3138,11 +3139,11 @@ public void InitializeComponent() this.bpkx28.TabStop = false; this.bpkx28.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx28.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx28.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx28.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx28.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx28.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx28.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx28.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx28.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx28.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx27 // @@ -3156,11 +3157,11 @@ public void InitializeComponent() this.bpkx27.TabStop = false; this.bpkx27.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx27.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx27.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx27.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx27.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx27.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx27.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx27.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx27.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx27.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx26 // @@ -3174,11 +3175,11 @@ public void InitializeComponent() this.bpkx26.TabStop = false; this.bpkx26.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx26.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx26.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx26.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx26.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx26.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx26.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx26.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx26.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx26.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx25 // @@ -3192,11 +3193,11 @@ public void InitializeComponent() this.bpkx25.TabStop = false; this.bpkx25.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx25.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx25.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx25.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx25.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx25.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx25.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx25.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx25.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx25.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx24 // @@ -3210,11 +3211,11 @@ public void InitializeComponent() this.bpkx24.TabStop = false; this.bpkx24.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx24.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx24.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx24.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx24.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx24.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx24.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx24.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx24.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx24.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx23 // @@ -3228,11 +3229,11 @@ public void InitializeComponent() this.bpkx23.TabStop = false; this.bpkx23.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx23.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx23.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx23.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx23.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx23.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx23.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx23.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx23.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx23.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx22 // @@ -3246,11 +3247,11 @@ public void InitializeComponent() this.bpkx22.TabStop = false; this.bpkx22.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx22.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx22.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx22.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx22.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx22.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx22.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx22.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx22.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx22.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx21 // @@ -3264,11 +3265,11 @@ public void InitializeComponent() this.bpkx21.TabStop = false; this.bpkx21.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx21.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx21.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx21.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx21.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx21.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx21.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx21.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx21.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx21.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx20 // @@ -3282,11 +3283,11 @@ public void InitializeComponent() this.bpkx20.TabStop = false; this.bpkx20.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx20.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx20.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx20.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx20.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx20.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx20.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx20.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx20.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx20.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx19 // @@ -3300,11 +3301,11 @@ public void InitializeComponent() this.bpkx19.TabStop = false; this.bpkx19.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx19.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx19.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx19.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx19.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx19.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx19.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx19.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx19.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx19.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx18 // @@ -3318,11 +3319,11 @@ public void InitializeComponent() this.bpkx18.TabStop = false; this.bpkx18.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx18.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx18.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx18.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx18.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx18.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx18.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx18.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx18.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx18.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx17 // @@ -3336,11 +3337,11 @@ public void InitializeComponent() this.bpkx17.TabStop = false; this.bpkx17.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx17.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx17.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx17.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx17.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx17.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx17.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx17.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx17.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx17.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx16 // @@ -3354,11 +3355,11 @@ public void InitializeComponent() this.bpkx16.TabStop = false; this.bpkx16.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx16.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx16.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx16.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx16.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx16.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx16.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx16.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx16.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx16.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx15 // @@ -3372,11 +3373,11 @@ public void InitializeComponent() this.bpkx15.TabStop = false; this.bpkx15.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx15.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx15.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx15.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx15.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx15.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx15.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx15.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx15.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx15.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx14 // @@ -3390,11 +3391,11 @@ public void InitializeComponent() this.bpkx14.TabStop = false; this.bpkx14.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx14.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx14.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx14.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx14.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx14.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx14.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx14.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx14.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx14.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx13 // @@ -3408,11 +3409,11 @@ public void InitializeComponent() this.bpkx13.TabStop = false; this.bpkx13.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx13.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx13.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx13.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx13.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx13.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx13.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx13.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx13.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx13.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx12 // @@ -3426,11 +3427,11 @@ public void InitializeComponent() this.bpkx12.TabStop = false; this.bpkx12.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx12.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx12.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx12.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx12.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx12.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx12.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx12.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx12.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx12.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx11 // @@ -3444,11 +3445,11 @@ public void InitializeComponent() this.bpkx11.TabStop = false; this.bpkx11.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx11.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx11.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx11.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx11.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx11.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx11.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx11.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx11.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx11.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx10 // @@ -3462,11 +3463,11 @@ public void InitializeComponent() this.bpkx10.TabStop = false; this.bpkx10.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx10.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx10.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx10.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx10.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx10.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx10.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx10.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx10.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx10.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx9 // @@ -3480,11 +3481,11 @@ public void InitializeComponent() this.bpkx9.TabStop = false; this.bpkx9.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx9.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx9.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx9.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx9.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx9.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx9.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx9.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx9.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx9.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx8 // @@ -3498,11 +3499,11 @@ public void InitializeComponent() this.bpkx8.TabStop = false; this.bpkx8.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx8.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx8.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx8.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx8.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx8.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx8.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx8.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx8.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx8.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx7 // @@ -3516,11 +3517,11 @@ public void InitializeComponent() this.bpkx7.TabStop = false; this.bpkx7.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx7.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx7.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx7.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx7.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx7.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx7.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx7.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx7.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx6 // @@ -3534,11 +3535,11 @@ public void InitializeComponent() this.bpkx6.TabStop = false; this.bpkx6.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx6.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx6.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx6.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx6.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx6.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx6.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx6.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx6.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx6.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx5 // @@ -3552,11 +3553,11 @@ public void InitializeComponent() this.bpkx5.TabStop = false; this.bpkx5.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx5.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx5.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx5.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx5.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx5.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx5.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx5.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx5.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx4 // @@ -3570,11 +3571,11 @@ public void InitializeComponent() this.bpkx4.TabStop = false; this.bpkx4.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx4.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx4.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx4.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx4.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx4.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx4.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx4.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx3 // @@ -3588,11 +3589,11 @@ public void InitializeComponent() this.bpkx3.TabStop = false; this.bpkx3.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx3.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx3.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx3.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx3.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx3.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx3.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx3.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx2 // @@ -3606,11 +3607,11 @@ public void InitializeComponent() this.bpkx2.TabStop = false; this.bpkx2.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx2.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx2.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx2.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx2.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx2.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bpkx1 // @@ -3624,11 +3625,11 @@ public void InitializeComponent() this.bpkx1.TabStop = false; this.bpkx1.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragDrop); this.bpkx1.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbBoxSlot_DragEnter); - this.bpkx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bpkx1.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bpkx1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bpkx1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bpkx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bpkx1.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bpkx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // B_BoxRight // @@ -3744,11 +3745,11 @@ public void InitializeComponent() this.bbpkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.bbpkx1.TabIndex = 8; this.bbpkx1.TabStop = false; - this.bbpkx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bbpkx1.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bbpkx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bbpkx1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bbpkx1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bbpkx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bbpkx1.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bbpkx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // mnuV // @@ -3773,11 +3774,11 @@ public void InitializeComponent() this.bbpkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.bbpkx2.TabIndex = 9; this.bbpkx2.TabStop = false; - this.bbpkx2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bbpkx2.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bbpkx2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bbpkx2.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bbpkx2.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bbpkx2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bbpkx2.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bbpkx2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bbpkx3 // @@ -3788,11 +3789,11 @@ public void InitializeComponent() this.bbpkx3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.bbpkx3.TabIndex = 10; this.bbpkx3.TabStop = false; - this.bbpkx3.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bbpkx3.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bbpkx3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bbpkx3.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bbpkx3.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bbpkx3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bbpkx3.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bbpkx3.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bbpkx4 // @@ -3803,11 +3804,11 @@ public void InitializeComponent() this.bbpkx4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.bbpkx4.TabIndex = 11; this.bbpkx4.TabStop = false; - this.bbpkx4.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bbpkx4.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bbpkx4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bbpkx4.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bbpkx4.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bbpkx4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bbpkx4.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bbpkx4.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bbpkx5 // @@ -3818,11 +3819,11 @@ public void InitializeComponent() this.bbpkx5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.bbpkx5.TabIndex = 12; this.bbpkx5.TabStop = false; - this.bbpkx5.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bbpkx5.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bbpkx5.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bbpkx5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bbpkx5.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bbpkx5.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bbpkx5.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bbpkx5.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // bbpkx6 // @@ -3833,11 +3834,11 @@ public void InitializeComponent() this.bbpkx6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.bbpkx6.TabIndex = 13; this.bbpkx6.TabStop = false; - this.bbpkx6.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.bbpkx6.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bbpkx6.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.bbpkx6.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.bbpkx6.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.bbpkx6.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.bbpkx6.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.bbpkx6.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // L_ReadOnlyPBB // @@ -3893,11 +3894,11 @@ public void InitializeComponent() this.ppkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.ppkx1.TabIndex = 2; this.ppkx1.TabStop = false; - this.ppkx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.ppkx1.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.ppkx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.ppkx1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.ppkx1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.ppkx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.ppkx1.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.ppkx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // ppkx2 // @@ -3908,11 +3909,11 @@ public void InitializeComponent() this.ppkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.ppkx2.TabIndex = 3; this.ppkx2.TabStop = false; - this.ppkx2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.ppkx2.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.ppkx2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.ppkx2.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.ppkx2.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.ppkx2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.ppkx2.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.ppkx2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // ppkx3 // @@ -3923,11 +3924,11 @@ public void InitializeComponent() this.ppkx3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.ppkx3.TabIndex = 4; this.ppkx3.TabStop = false; - this.ppkx3.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.ppkx3.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.ppkx3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.ppkx3.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.ppkx3.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.ppkx3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.ppkx3.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.ppkx3.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // ppkx4 // @@ -3938,11 +3939,11 @@ public void InitializeComponent() this.ppkx4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.ppkx4.TabIndex = 5; this.ppkx4.TabStop = false; - this.ppkx4.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.ppkx4.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.ppkx4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.ppkx4.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.ppkx4.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.ppkx4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.ppkx4.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.ppkx4.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // ppkx5 // @@ -3953,11 +3954,11 @@ public void InitializeComponent() this.ppkx5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.ppkx5.TabIndex = 6; this.ppkx5.TabStop = false; - this.ppkx5.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.ppkx5.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.ppkx5.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.ppkx5.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.ppkx5.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.ppkx5.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.ppkx5.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.ppkx5.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // ppkx6 // @@ -3968,11 +3969,11 @@ public void InitializeComponent() this.ppkx6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.ppkx6.TabIndex = 7; this.ppkx6.TabStop = false; - this.ppkx6.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.ppkx6.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.ppkx6.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.ppkx6.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.ppkx6.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.ppkx6.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.ppkx6.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.ppkx6.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // Tab_Other // @@ -4090,11 +4091,11 @@ public void InitializeComponent() this.dcpkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.dcpkx2.TabIndex = 11; this.dcpkx2.TabStop = false; - this.dcpkx2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.dcpkx2.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.dcpkx2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.dcpkx2.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.dcpkx2.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.dcpkx2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.dcpkx2.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.dcpkx2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // dcpkx1 // @@ -4106,11 +4107,11 @@ public void InitializeComponent() this.dcpkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.dcpkx1.TabIndex = 10; this.dcpkx1.TabStop = false; - this.dcpkx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.dcpkx1.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.dcpkx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.dcpkx1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.dcpkx1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.dcpkx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.dcpkx1.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.dcpkx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // DayCare_HasEgg // @@ -4143,11 +4144,11 @@ public void InitializeComponent() this.gtspkx.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.gtspkx.TabIndex = 23; this.gtspkx.TabStop = false; - this.gtspkx.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.gtspkx.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.gtspkx.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.gtspkx.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.gtspkx.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.gtspkx.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.gtspkx.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.gtspkx.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // GB_Fused // @@ -4169,11 +4170,11 @@ public void InitializeComponent() this.fusedpkx.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.fusedpkx.TabIndex = 24; this.fusedpkx.TabStop = false; - this.fusedpkx.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.fusedpkx.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.fusedpkx.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.fusedpkx.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.fusedpkx.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.fusedpkx.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.fusedpkx.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.fusedpkx.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // L_ReadOnlyOther // @@ -4207,11 +4208,11 @@ public void InitializeComponent() this.subepkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.subepkx1.TabIndex = 18; this.subepkx1.TabStop = false; - this.subepkx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); + this.subepkx1.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.subepkx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); this.subepkx1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); this.subepkx1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseMove); - this.subepkx1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseClick); - this.subepkx1.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.pbBoxSlot_QueryContinueDrag); + this.subepkx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseUp); // // subepkx2 // @@ -4377,6 +4378,7 @@ public void InitializeComponent() this.FLP_SAVtools.Controls.Add(this.B_OpenSecretBase); this.FLP_SAVtools.Controls.Add(this.B_Pokeblocks); this.FLP_SAVtools.Controls.Add(this.B_LinkInfo); + this.FLP_SAVtools.Controls.Add(this.B_CGearSkin); this.FLP_SAVtools.Location = new System.Drawing.Point(6, 10); this.FLP_SAVtools.Name = "FLP_SAVtools"; this.FLP_SAVtools.Size = new System.Drawing.Size(297, 87); @@ -4535,6 +4537,16 @@ public void InitializeComponent() this.B_LinkInfo.UseVisualStyleBackColor = true; this.B_LinkInfo.Click += new System.EventHandler(this.B_LinkInfo_Click); // + // B_CGearSkin + // + this.B_CGearSkin.Location = new System.Drawing.Point(3, 148); + this.B_CGearSkin.Name = "B_CGearSkin"; + this.B_CGearSkin.Size = new System.Drawing.Size(87, 23); + this.B_CGearSkin.TabIndex = 24; + this.B_CGearSkin.Text = "C-Gear Skin"; + this.B_CGearSkin.UseVisualStyleBackColor = true; + this.B_CGearSkin.Click += new System.EventHandler(this.B_CGearSkin_Click); + // // dragout // this.dragout.BackColor = System.Drawing.Color.Transparent; @@ -5071,6 +5083,7 @@ public void InitializeComponent() private System.Windows.Forms.Button BTN_Medals; private System.Windows.Forms.FlowLayoutPanel FLP_PKMEditors; private System.Windows.Forms.Button B_LinkInfo; + private System.Windows.Forms.Button B_CGearSkin; } } diff --git a/MainWindow/Main.cs b/MainWindow/Main.cs index d9f6a1c08..ad0aaac30 100644 --- a/MainWindow/Main.cs +++ b/MainWindow/Main.cs @@ -786,6 +786,7 @@ private void openSAV(byte[] input, string path) 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]; @@ -3235,6 +3236,10 @@ private void B_LinkInfo_Click(object sender, EventArgs e) { new SAV_Link6().ShowDialog(); } + private void B_CGearSkin_Click(object sender, EventArgs e) + { + new SAV_CGearSkin().ShowDialog(); + } private void B_JPEG_Click(object sender, EventArgs e) { byte[] jpeg = SAV.JPEGData; diff --git a/MainWindow/Main.resx b/MainWindow/Main.resx index 4332f0e62..4916aa9d4 100644 --- a/MainWindow/Main.resx +++ b/MainWindow/Main.resx @@ -1306,6 +1306,9 @@ True + + True + True diff --git a/PKHeX.csproj b/PKHeX.csproj index 9e8f5b4d6..7fec0743d 100644 --- a/PKHeX.csproj +++ b/PKHeX.csproj @@ -173,6 +173,13 @@ + + + Form + + + SAV_CGearSkin.cs + Form @@ -324,6 +331,9 @@ MemoryAmie.cs + + SAV_CGearSkin.cs + SAV_Link6.cs diff --git a/Saves/SAV5.cs b/Saves/SAV5.cs index d4dc3b12b..9d2b68d0d 100644 --- a/Saves/SAV5.cs +++ b/Saves/SAV5.cs @@ -42,6 +42,8 @@ public SAV5(byte[] data = null, GameVersion versionOverride = GameVersion.Any) Daycare = 0x20E00; PokeDex = 0x21600; PokeDexLanguageFlags = PokeDex + 0x320; + CGearInfoOffset = 0x1C000; + CGearDataOffset = 0x52000; // Inventory offsets are the same for each game. OFS_PouchHeldItem = 0x18400; // 0x188D7 @@ -65,6 +67,8 @@ public SAV5(byte[] data = null, GameVersion versionOverride = GameVersion.Any) Daycare = 0x20D00; PokeDex = 0x21400; PokeDexLanguageFlags = PokeDex + 0x328; // forme flags size is + 8 from bw with new formes (therians) + CGearInfoOffset = 0x1C000; + CGearDataOffset = 0x52800; // Inventory offsets are the same for each game. OFS_PouchHeldItem = 0x18400; // 0x188D7 @@ -152,7 +156,7 @@ private void getBlockInfo() new BlockInfo(0x19600, 0x1338, 0x1A93A, 0x23F3A), // ??? new BlockInfo(0x1AA00, 0x07C4, 0x1B1C6, 0x23F3C), // ??? new BlockInfo(0x1B200, 0x0D54, 0x1BF56, 0x23F3E), // ??? - new BlockInfo(0x1C000, 0x002C, 0x1C02E, 0x23F40), // ??? + new BlockInfo(0x1C000, 0x002C, 0x1C02E, 0x23F40), // Skin Info new BlockInfo(0x1C100, 0x0658, 0x1C75A, 0x23F42), // ??? Gym badge data new BlockInfo(0x1C800, 0x0A94, 0x1D296, 0x23F44), // ??? new BlockInfo(0x1D300, 0x01AC, 0x1D4AE, 0x23F46), // ??? @@ -229,7 +233,7 @@ private void getBlockInfo() new BlockInfo(0x19600, 0x1338, 0x1A93A, 0x25F3A), // Unity Tower and survey stuff new BlockInfo(0x1AA00, 0x07c4, 0x1B1C6, 0x25F3C), // Pal Pad Player Data (30d) new BlockInfo(0x1B200, 0x0d54, 0x1BF56, 0x25F3E), // Pal Pad Friend Data - new BlockInfo(0x1C000, 0x0094, 0x1C096, 0x25F40), // C-Gear + new BlockInfo(0x1C000, 0x0094, 0x1C096, 0x25F40), // Skin Info new BlockInfo(0x1C100, 0x0658, 0x1C75A, 0x25F42), // Card Signature Block & ???? new BlockInfo(0x1C800, 0x0a94, 0x1D296, 0x25F44), // Mystery Gift new BlockInfo(0x1D300, 0x01ac, 0x1D4AE, 0x25F46), // Dream World Stuff (Catalog) @@ -353,6 +357,7 @@ public override string ChecksumInfo private const int wcSeed = 0x1D290; + public readonly int CGearInfoOffset, CGearDataOffset; private readonly int Trainer2, AdventureInfo, PokeDexLanguageFlags; public override bool HasBoxWallpapers => false; public override bool HasPokeDex => false; diff --git a/Subforms/Save Editors/Gen5/CGearBackground.cs b/Subforms/Save Editors/Gen5/CGearBackground.cs new file mode 100644 index 000000000..cdcbdf7ba --- /dev/null +++ b/Subforms/Save Editors/Gen5/CGearBackground.cs @@ -0,0 +1,356 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Drawing.Imaging; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices; + +namespace PKHeX +{ + public class CGearBackground + { + public const string Extension = "cgb"; + public const string Filter = "C-Gear Background|*.cgb"; + public const int Width = 256; // px + public const int Height = 192; // px + public const int SIZE_CGB = 0x2600; + + /* CGearBackground Documentation + * CGearBackgrounds (.cgb) are tiled images. + * Tiles are 8x8, and serve as a tileset for building the image. + * The first 0x2000 bytes are the tile building region. + * A tile to have two pixels defined in one byte of space. + * A tile takes up 64 pixels, 32 bytes, 0x20 chunks. + * The last tile is actually the colors used in the image (16bit). + * Only 16 colors can be used for the entire image. + * 255 tiles may be chosen from, as (0x2000-(0x20))/0x20 = 0xFF + * The last 0x600 bytes are the tiles used. + * 256/8 = 32, 192/8 = 24 + * 32 * 24 = 0x300 + * The tiles are chosen based on the 16bit index of the tile. + * 0x300 * 2 = 0x600! + * + * CGearBackgrounds tilemap (when stored) employs odd obfuscation. + * BW obfuscates by adding 0xA0A0, B2W2 adds 0xA000 + * The obfuscated number is then tweaked by adding 15*(i/17) + * To reverse, use a similar reverse calculation + * PSK files are basically raw game rips (obfuscated) + * CGB files are un-obfuscated. + * Due to BW and B2W2 using different obfuscation adds, PSK files are incompatible between the versions. + */ + + public CGearBackground(byte[] data) + { + if (data.Length != SIZE_CGB) + return; + + byte[] Region1 = data.Take(0x1FE0).ToArray(); + byte[] ColorData = data.Skip(0x1FE0).Take(0x20).ToArray(); + byte[] Region2 = data.Skip(0x2000).Take(0x600).ToArray(); + + ColorPalette = new Color[0x10]; + for (int i = 0; i < 0x10; i++) + ColorPalette[i] = getRGB555(BitConverter.ToUInt16(ColorData, i * 2)); + + Tiles = new Tile[0xFF]; + for (int i = 0; i < 0xFF; i++) + { + Tiles[i] = new Tile(Region1.Skip(i * Tile.SIZE_TILE).Take(Tile.SIZE_TILE).ToArray()); + Tiles[i].setTile(ColorPalette); + } + + Map = new TileMap(Region2); + } + + public byte[] Write() + { + byte[] data = new byte[SIZE_CGB]; + for (int i = 0; i < Tiles.Length; i++) + Array.Copy(Tiles[i].Write(), 0, data, i*Tile.SIZE_TILE, Tile.SIZE_TILE); + + for (int i = 0; i < ColorPalette.Length; i++) + BitConverter.GetBytes(getRGB555(ColorPalette[i])).CopyTo(data, 0x1FE0 + i*2); + + Array.Copy(Map.Write(), 0, data, 0x2000, 0x600); + + return data; + } + + public static bool getIsCGB(byte[] data) + { + return data[0x2001] == 0; + } + public static byte[] CGBtoPSK(byte[] cgb, bool B2W2) + { + byte[] psk = (byte[])cgb.Clone(); + int shiftVal = B2W2 ? 0xA000 : 0xA0A0; + for (int i = 0x2000; i < 0x2600; i += 2) + { + int index = BitConverter.ToUInt16(cgb, i); + int val = IndexToVal(index, shiftVal); + BitConverter.GetBytes((ushort)val).CopyTo(psk, i); + } + return psk; + } + public static byte[] PSKtoCGB(byte[] psk, bool B2W2) + { + byte[] cgb = (byte[])psk.Clone(); + int shiftVal = B2W2 ? 0xA000 : 0xA0A0; + for (int i = 0x2000; i < 0x2600; i += 2) + { + int val = BitConverter.ToUInt16(psk, i); + int index = ValToIndex(val, shiftVal); + BitConverter.GetBytes((ushort)index).CopyTo(cgb, i); + } + return cgb; + } + + private Color[] ColorPalette; + private Tile[] Tiles; + private TileMap Map; + + public Bitmap GetImage() + { + Bitmap img = new Bitmap(Width, Height, PixelFormat.Format32bppArgb); + + // Fill Data + using (Graphics g = Graphics.FromImage(img)) + for (int i = 0; i < Map.TileChoices.Length; i++) + { + int x = (i*8)%Width; + int y = 8*((i*8)/Width); + + Bitmap b = Tiles[Map.TileChoices[i] % Tiles.Length].Rotate(Map.Rotations[i]); + g.DrawImage(b, new Point(x, y)); + } + return img; + } + public void SetImage(Bitmap img) + { + if (img.Width != Width) + throw new ArgumentException($"Invalid image width. Expected {Width} pixels wide."); + if (img.Height != Height) + throw new ArgumentException($"Invalid image height. Expected {Height} pixels high."); + + // get raw bytes of image + BitmapData bData = img.LockBits(new Rectangle(0, 0, Width, Height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb); + byte[] data = new byte[bData.Stride * bData.Height]; + Marshal.Copy(bData.Scan0, data, 0, data.Length); + + int bpp = bData.Stride/Width; + // get colors + Color[] colors = new Color[Width*Height]; + for (int i = 0; i < data.Length; i += bpp) + { + uint val = BitConverter.ToUInt32(data, i); + colors[i/bpp] = getRGB555(val); + } + + Color[] Palette = colors.Distinct().ToArray(); + if (Palette.Length > 0x10) + throw new ArgumentException($"Too many unique colors. Expected <= 16, got {Palette.Length}"); + + // Build Tiles + Tile[] tiles = new Tile[0x300]; + for (int i = 0; i < tiles.Length; i++) + { + int x = (i*8)%Width; + int y = 8*((i*8)/Width); + + Tile t = new Tile(); + for (uint ix = 0; ix < 8; ix++) + for (uint iy = 0; iy < 8; iy++) + { + int index = (int)(y + iy)*Width + (int)(x + ix); + Color c = colors[index]; + + t.ColorChoices[ix%8 + iy*8] = Array.IndexOf(Palette, c); + } + t.setTile(Palette); + tiles[i] = t; + } + + List tilelist = new List {tiles[0]}; + TileMap tm = new TileMap(new byte[2*Width*Height/64]); + for (int i = 1; i < tm.TileChoices.Length; i++) + { + for (int j = 0; j < tilelist.Count; j++) + { + int rotVal = tiles[i].getRotationValue(tilelist[j].PixelData); + if (rotVal <= -1) continue; + tm.TileChoices[i] = j; + tm.Rotations[i] = rotVal; + goto next; + } + if (tilelist.Count == 0xFF) + throw new ArgumentException($"Too many unique tiles. Expected < 256, ran out of tiles at {i + 1} of {tm.TileChoices.Length}"); + tilelist.Add(tiles[i]); + + next:; + } + + // Finished! + Map = tm; + ColorPalette = Palette; + Tiles = tilelist.ToArray(); + } + + private class Tile + { + public const int SIZE_TILE = 0x20; + private const int TileWidth = 8; + private const int TileHeight = 8; + public readonly int[] ColorChoices; + private Bitmap img; + public byte[] PixelData; + + public Tile(byte[] data = null) + { + if (data == null) + data = new byte[SIZE_TILE]; + if (data.Length != SIZE_TILE) + return; + + ColorChoices = new int[TileWidth*TileHeight]; + for (int i = 0; i < data.Length; i++) + { + ColorChoices[i*2+0] = data[i] & 0xF; + ColorChoices[i*2+1] = data[i] >> 4; + } + } + public void setTile(Color[] Palette) + { + img = new Bitmap(8, 8); + for (int x = 0; x < 8; x++) + for (int y = 0; y < 8; y++) + { + var index = ColorChoices[x%8 + y*8]; + var choice = Palette[index]; + img.SetPixel(x, y, choice); + } + + PixelData = getTileRAW(img); + } + public byte[] Write() + { + byte[] data = new byte[SIZE_TILE]; + for (int i = 0; i < data.Length; i++) + { + data[i] |= (byte)(ColorChoices[i*2+0] & 0xF); + data[i] |= (byte)((ColorChoices[i*2+1] & 0xF) << 4); + } + return data; + } + + public Bitmap Rotate(int rotFlip) + { + if (rotFlip == 0) + return img; + Bitmap tile = (Bitmap)img.Clone(); + if ((rotFlip & 4) > 0) + tile.RotateFlip(RotateFlipType.RotateNoneFlipX); + if ((rotFlip & 8) > 0) + tile.RotateFlip(RotateFlipType.RotateNoneFlipY); + return tile; + } + private static byte[] getTileRAW(Bitmap tile) + { + BitmapData bData = tile.LockBits(new Rectangle(0, 0, tile.Width, tile.Height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb); + byte[] data = new byte[bData.Stride * bData.Height]; + Marshal.Copy(bData.Scan0, data, 0, data.Length); + tile.UnlockBits(bData); + return data; + } + + public int getRotationValue(byte[] data) + { + // Check all rotation types + if (PixelData.SequenceEqual(data)) + return 0; + + if (getTileRAW(Rotate(4)).SequenceEqual(data)) + return 4; + if (getTileRAW(Rotate(8)).SequenceEqual(data)) + return 8; + if (getTileRAW(Rotate(12)).SequenceEqual(data)) + return 12; + return -1; + } + } + private class TileMap + { + public readonly int[] TileChoices; + public readonly int[] Rotations; + + public TileMap(byte[] data) + { + TileChoices = new int[data.Length/2]; + Rotations = new int[data.Length/2]; + for (int i = 0; i < data.Length; i += 2) + { + TileChoices[i/2] = data[i]; + Rotations[i/2] = data[i+1]; + } + } + public byte[] Write() + { + using (MemoryStream ms = new MemoryStream()) + using (BinaryWriter bw = new BinaryWriter(ms)) + { + for (int i = 0; i < TileChoices.Length; i++) + { + bw.Write((byte)TileChoices[i]); + bw.Write((byte)Rotations[i]); + } + return ms.ToArray(); + } + } + } + + private static int IndexToVal(int index, int shiftVal) + { + int val = index + shiftVal; + return val + 15*(index/17); + } + private static int ValToIndex(int val, int shiftVal) + { + int index = val - shiftVal; + return index - 15*(index/32); + } + + private static byte convert8to5(int colorval) + { + byte i = 0; + while (colorval > Convert5To8[i]) i++; + return i; + } + private static Color getRGB555(uint val) + { + int R = (int)(val >> 0 >> 3) & 0x1F; + int G = (int)(val >> 8 >> 3) & 0x1F; + int B = (int)(val >> 16 >> 3) & 0x1F; + return Color.FromArgb(0xFF, Convert5To8[R], Convert5To8[G], Convert5To8[B]); + } + private static Color getRGB555(ushort val) + { + int R = (val >> 0) & 0x1F; + int G = (val >> 5) & 0x1F; + int B = (val >> 10) & 0x1F; + return Color.FromArgb(0xFF, Convert5To8[R], Convert5To8[G], Convert5To8[B]); + } + private static ushort getRGB555(Color c) + { + int val = 0; + // val += c.A >> 8; // unused + val |= convert8to5(c.R) << 0; + val |= convert8to5(c.G) << 5; + val |= convert8to5(c.B) << 10; + return (ushort)val; + } + private static readonly int[] Convert5To8 = { 0x00,0x08,0x10,0x18,0x20,0x29,0x31,0x39, + 0x41,0x4A,0x52,0x5A,0x62,0x6A,0x73,0x7B, + 0x83,0x8B,0x94,0x9C,0xA4,0xAC,0xB4,0xBD, + 0xC5,0xCD,0xD5,0xDE,0xE6,0xEE,0xF6,0xFF }; + } +} diff --git a/Subforms/Save Editors/Gen5/SAV_CGearSkin.Designer.cs b/Subforms/Save Editors/Gen5/SAV_CGearSkin.Designer.cs new file mode 100644 index 000000000..9707291cf --- /dev/null +++ b/Subforms/Save Editors/Gen5/SAV_CGearSkin.Designer.cs @@ -0,0 +1,156 @@ +namespace PKHeX +{ + partial class SAV_CGearSkin + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SAV_CGearSkin)); + this.PB_Background = new System.Windows.Forms.PictureBox(); + this.B_Cancel = new System.Windows.Forms.Button(); + this.B_Save = new System.Windows.Forms.Button(); + this.B_ImportPNG = new System.Windows.Forms.Button(); + this.B_ExportPNG = new System.Windows.Forms.Button(); + this.B_ExportCGB = new System.Windows.Forms.Button(); + this.B_ImportCGB = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.PB_Background)).BeginInit(); + this.SuspendLayout(); + // + // PB_Background + // + this.PB_Background.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PB_Background.Location = new System.Drawing.Point(12, 12); + this.PB_Background.Name = "PB_Background"; + this.PB_Background.Size = new System.Drawing.Size(258, 194); + this.PB_Background.TabIndex = 0; + this.PB_Background.TabStop = false; + // + // B_Cancel + // + this.B_Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.B_Cancel.Location = new System.Drawing.Point(276, 183); + this.B_Cancel.Name = "B_Cancel"; + this.B_Cancel.Size = new System.Drawing.Size(103, 23); + this.B_Cancel.TabIndex = 1; + this.B_Cancel.Text = "Cancel"; + this.B_Cancel.UseVisualStyleBackColor = true; + this.B_Cancel.Click += new System.EventHandler(this.B_Cancel_Click); + // + // B_Save + // + this.B_Save.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.B_Save.Location = new System.Drawing.Point(276, 154); + this.B_Save.Name = "B_Save"; + this.B_Save.Size = new System.Drawing.Size(103, 23); + this.B_Save.TabIndex = 2; + this.B_Save.Text = "Save"; + this.B_Save.UseVisualStyleBackColor = true; + this.B_Save.Click += new System.EventHandler(this.B_Save_Click); + // + // B_ImportPNG + // + this.B_ImportPNG.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.B_ImportPNG.Location = new System.Drawing.Point(276, 12); + this.B_ImportPNG.Name = "B_ImportPNG"; + this.B_ImportPNG.Size = new System.Drawing.Size(103, 23); + this.B_ImportPNG.TabIndex = 3; + this.B_ImportPNG.Text = "Import .png"; + this.B_ImportPNG.UseVisualStyleBackColor = true; + this.B_ImportPNG.Click += new System.EventHandler(this.B_ImportPNG_Click); + // + // B_ExportPNG + // + this.B_ExportPNG.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.B_ExportPNG.Location = new System.Drawing.Point(276, 41); + this.B_ExportPNG.Name = "B_ExportPNG"; + this.B_ExportPNG.Size = new System.Drawing.Size(103, 23); + this.B_ExportPNG.TabIndex = 4; + this.B_ExportPNG.Text = "Export .png"; + this.B_ExportPNG.UseVisualStyleBackColor = true; + this.B_ExportPNG.Click += new System.EventHandler(this.B_ExportPNG_Click); + // + // B_ExportCGB + // + this.B_ExportCGB.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.B_ExportCGB.Location = new System.Drawing.Point(276, 112); + this.B_ExportCGB.Name = "B_ExportCGB"; + this.B_ExportCGB.Size = new System.Drawing.Size(103, 23); + this.B_ExportCGB.TabIndex = 6; + this.B_ExportCGB.Text = "Export .cgb"; + this.B_ExportCGB.UseVisualStyleBackColor = true; + this.B_ExportCGB.Click += new System.EventHandler(this.B_ExportCGB_Click); + // + // B_ImportCGB + // + this.B_ImportCGB.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.B_ImportCGB.Location = new System.Drawing.Point(276, 83); + this.B_ImportCGB.Name = "B_ImportCGB"; + this.B_ImportCGB.Size = new System.Drawing.Size(103, 23); + this.B_ImportCGB.TabIndex = 5; + this.B_ImportCGB.Text = "Import .cgb/.psk"; + this.B_ImportCGB.UseVisualStyleBackColor = true; + this.B_ImportCGB.Click += new System.EventHandler(this.B_ImportCGB_Click); + // + // SAV_CGearSkin + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(391, 216); + this.Controls.Add(this.B_ExportCGB); + this.Controls.Add(this.B_ImportCGB); + this.Controls.Add(this.B_ExportPNG); + this.Controls.Add(this.B_ImportPNG); + this.Controls.Add(this.B_Save); + this.Controls.Add(this.B_Cancel); + this.Controls.Add(this.PB_Background); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximizeBox = false; + this.Name = "SAV_CGearSkin"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "C-Gear Skin"; + ((System.ComponentModel.ISupportInitialize)(this.PB_Background)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PictureBox PB_Background; + private System.Windows.Forms.Button B_Cancel; + private System.Windows.Forms.Button B_Save; + private System.Windows.Forms.Button B_ImportPNG; + private System.Windows.Forms.Button B_ExportPNG; + private System.Windows.Forms.Button B_ExportCGB; + private System.Windows.Forms.Button B_ImportCGB; + } +} \ No newline at end of file diff --git a/Subforms/Save Editors/Gen5/SAV_CGearSkin.cs b/Subforms/Save Editors/Gen5/SAV_CGearSkin.cs new file mode 100644 index 000000000..3d0b6ea42 --- /dev/null +++ b/Subforms/Save Editors/Gen5/SAV_CGearSkin.cs @@ -0,0 +1,134 @@ +using System; +using System.Drawing; +using System.Drawing.Imaging; +using System.IO; +using System.Linq; +using System.Windows.Forms; + +namespace PKHeX +{ + public partial class SAV_CGearSkin : Form + { + public SAV_CGearSkin() + { + InitializeComponent(); + + SAV = (SAV5)Main.SAV.Clone(); + + bool cgearPresent = SAV.Data[SAV.CGearInfoOffset + 0x26] == 1; + bg = new CGearBackground(cgearPresent ? + CGearBackground.PSKtoCGB(SAV.Data.Skip(SAV.CGearDataOffset).Take(CGearBackground.SIZE_CGB).ToArray(), SAV.B2W2) + : new byte[CGearBackground.SIZE_CGB]); + + PB_Background.Image = bg.GetImage(); + } + + private readonly SAV5 SAV; + private CGearBackground bg; + + private void B_ImportPNG_Click(object sender, EventArgs e) + { + OpenFileDialog ofd = new OpenFileDialog + { + Filter = "PNG File|*.png", + FileName = "Background.png", + }; + + if (ofd.ShowDialog() != DialogResult.OK) + return; + + Bitmap img = (Bitmap)Image.FromFile(ofd.FileName); + + try + { + bg.SetImage(img); + PB_Background.Image = bg.GetImage(); + } + catch (Exception ex) + { + Util.Error(ex.Message); + } + } + private void B_ExportPNG_Click(object sender, EventArgs e) + { + Image png = PB_Background.Image; + SaveFileDialog sfd = new SaveFileDialog + { + Filter = "PNG File|*.png", + FileName = "Background.png", + }; + + if (sfd.ShowDialog() != DialogResult.OK) + return; + + png.Save(sfd.FileName, ImageFormat.Png); + } + private void B_ImportCGB_Click(object sender, EventArgs e) + { + OpenFileDialog ofd = new OpenFileDialog + { + Filter = CGearBackground.Filter + "|PokeStock C-Gear Skin|*.psk" + }; + + if (ofd.ShowDialog() != DialogResult.OK) + return; + + var len = new FileInfo(ofd.FileName).Length; + if (len != CGearBackground.SIZE_CGB) + { + Util.Error($"Incorrect size, got {len} bytes, expected {CGearBackground.SIZE_CGB} bytes."); + return; + } + + byte[] data = File.ReadAllBytes(ofd.FileName); + if (!CGearBackground.getIsCGB(data)) + { + bool B2W2 = data[0x2000] != 0x00; + data = CGearBackground.PSKtoCGB(data, B2W2); + } + + bg = new CGearBackground(data); + PB_Background.Image = bg.GetImage(); + } + private void B_ExportCGB_Click(object sender, EventArgs e) + { + SaveFileDialog sfd = new SaveFileDialog + { + Filter = CGearBackground.Filter, + }; + + if (sfd.ShowDialog() != DialogResult.OK) + return; + + byte[] data = bg.Write(); + File.WriteAllBytes(sfd.FileName, data); + } + private void B_Save_Click(object sender, EventArgs e) + { + byte[] bgdata = bg.Write(); + if (bgdata.SequenceEqual(new byte[CGearBackground.SIZE_CGB])) + return; + + bgdata = CGearBackground.CGBtoPSK(bgdata, SAV.B2W2); + + Array.Copy(bgdata, 0, Main.SAV.Data, SAV.CGearDataOffset, bgdata.Length); + ushort chk = SaveUtil.ccitt16(bgdata); + BitConverter.GetBytes(chk).CopyTo(Main.SAV.Data, SAV.CGearDataOffset + bgdata.Length + 2); + BitConverter.GetBytes(chk).CopyTo(Main.SAV.Data, SAV.CGearDataOffset + bgdata.Length + 0x100); + + byte[] skinchkdata = Main.SAV.Data.Skip(SAV.CGearDataOffset + bgdata.Length + 0x100).Take(4).ToArray(); + ushort skinchkval = SaveUtil.ccitt16(skinchkdata); + BitConverter.GetBytes(skinchkval).CopyTo(Main.SAV.Data, SAV.CGearDataOffset + bgdata.Length + 0x112); + + Main.SAV.Data[SAV.CGearInfoOffset + 0x26] = 1; // data present + BitConverter.GetBytes(chk).CopyTo(Main.SAV.Data, SAV.CGearInfoOffset + 0x24); + + Main.SAV.Edited = true; + Close(); + } + private void B_Cancel_Click(object sender, EventArgs e) + { + Close(); + } + } +} diff --git a/Subforms/Save Editors/Gen5/SAV_CGearSkin.resx b/Subforms/Save Editors/Gen5/SAV_CGearSkin.resx new file mode 100644 index 000000000..603f660be --- /dev/null +++ b/Subforms/Save Editors/Gen5/SAV_CGearSkin.resx @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAE + AAAAAAAAAAAAAAAAAAAAAAAAIyMjAQAAAAALCwsPJiYmJysrKycqKionKSkpJykpKScpKSknKioqJyoq + KicrKysnJycnJw0ODQ8AAAAAJiYmAQAAAABpaWlHq6ur17+/v+6+vr7svr6+7b6+vu2+vr7tvr6+7b6+ + vu2+vr7tvr6+7L+/v+6rq6vXampqSAAAAAAoKSgXvr++3eLi4v/g4OD94eHh/+Hh4f/i4uL/4uLi/+Li + 4v/i4uL/4eHh/+Dh4P/g4OD94uLi/7+/v90sLCwXfn5+PNna2frg4OD/39/f/uHh4f7h4eH+39/f/uDg + 4P7g4OD+39/f/uHh4f7h4OH+39/f/t/g3//a2tr6g4ODPoOCgz7X19f64+Pj/+Li4v7k5OT/4+Tj//Ly + 8v/19fX/9PT0//T09P/k5OT/5OTk/+Pj4/7j4+P/19jX+4qLikCDhIM+2tra++Xl5f/k5eT+5OTk//Lz + 8v+urq7/RUVF/z4+Pv+Zmpn/8fHx/+Xm5f/k5eT+5eXl/9ra2vyLi4tAhYWFPuXm5vvx8vP/7+/w/v// + //+sra3/AgIC/15eXv9tbG3/BQUF/4yMjP//////7+/w/vHy8//l5ub8jY2NQC4uLD5LS0f7UFBL/09P + Sv5YWVP/FBUS/29wcP///////////5SUlP8PDw//U1NO/1BQS/5PT0r/S0tH/DIyMEAAAAs+AAAM+wAA + Dv8AAA/+AwMS/wAAAP+UlJX///////////+3t7n/AAAA/wAAD/8BAQ/+AAAO/wAADPwCAg5ABARSPgoK + k/sNDab/DQ2o/hAQvP8CAmj/IiIW/7Kzrv/Cw8D/NDQm/wAATf8QELz/DQ2q/gwMp/8LC5T8Dg5bQAUF + Xj4KCpz7DQ2u/w0NsP4NDbX/Dw+//wUFYf8CAhL/AwMP/wMDTf8ODrj/Dg64/w0NsP4MDK7/Cwud/A8P + aEEGBmU9DAyl+w4Otf8ODrf+Dw+6/xAQvv8TE8v/EhK+/xAQvP8TE8v/EBDA/w8Puf8PD7f+Dg61/w0N + pvsREW9ACAhtQA8PsfsTE77/ExO//xQUwP8UFML/FBTD/xUVyP8WFsn/FRXE/xQUw/8UFMH/ExO//xMT + vv8QELL7ERF3QxkZdCgXF771ExPH/xUVyPwVFcn9FhbL/RcXzP0XF8z9FxfM/RcXy/0XF8v9FhbJ/RUV + yPwTE8f/Fxe+9RkZdykAAAAAIyOtghsbx/8ZGcj+GRnJ/xoayf8aGsn/GhrK/xoayv8aGsn/GhrJ/xkZ + yf8ZGcj+GxvH/yMjrYQAAAAAAADHAQAAAAAzM51FLCyscCoqrGwqKqxtKSmsbSoqrG0qKqxtKSmsbSoq + rG0qKqxsLCyscDMznUUAAAAAAAAAAP//AADAAwAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIAB + AACAAQAAgAEAAIABAACAAQAAgAEAAP//AAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKysrCR0dHSMWFhY3GBgYORgYGDkYGBg5GBgYORgY + GDkYGBg5GBgYORgYGDkYGBg5GBgYORgYGDkYGBg5GBgYORgYGDkYGBg5GBgYORgYGDkYGBg5FxcXNx4e + HiQuLi4JAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASEhIARYWFis7OzuVkJCQ2ampqeqqqqrsqqqq7Kqq + quyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqq + quypqanqkZGR2j09PZcXFxcsUFBQAQAAAAAAAAAAAAAAAAAAAAASEhIuhISEytvb2/7W1tb/19fX/9jY + 2P/Y2Nj/2NjY/9jY2P/Y2Nj/2NjY/9nZ2f/Z2dn/2dnZ/9nZ2f/Z2dn/2dnZ/9nZ2f/Y2Nj/2NjY/9jY + 2P/Y2Nj/2NjY/9fX1//W1tb/29vb/oeHh8sTExMvAAAAAAAAAAAAAAAAPDw8DGtra6zZ2dn/2dnZ/9ra + 2v/b29v/29vb/9vb2//c3Nz/3Nzc/9zc3P/c3Nz/3d3d/93d3f/d3d3/3d3d/93d3f/d3d3/3Nzc/9zc + 3P/c3Nz/3Nzc/9vb2//b29v/29vb/9ra2v/Z2dn/2dnZ/21tba5DQ0MNAAAAAAAAAAAiIiIx1NXU9tna + 2f/c3Nz/3d3d/93e3f/e3t7/3t7e/9/f3//f39//39/f/9/g3//g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg + 4P/g4OD/39/f/9/f3//f39//3t/e/97e3v/d3t3/3d3d/9zc3P/Z2tn/1dXV9icnJzMAAAAAAAAAAFhZ + WFzf4N//3Nzc/97e3v/f39//39/f/9/g3//g4OD/4ODg/+Hh4f/h4eH/4eHh/+Li4v/i4uL/4uLi/+Li + 4v/i4uL/4uLi/+Hi4f/h4eH/4eHh/+Dg4P/g4OD/3+Df/9/f3//f39//3t7e/9zc3P/f39//XV1dXQAA + AAAAAAAAZmZmZdvc2//e3t7/3+Df/+Dg4P/g4eD/4eHh/+Hi4f/i4uL/4uPi/+Pj4//j4+P/5OTk/+Tk + 5P/k5OT/5OTk/+Tk5P/k5OT/4+Pj/+Pj4//j4+P/4uLi/+Li4v/h4eH/4eHh/+Dg4P/f4N//3t7e/9vb + 2/9wcHBoAAAAAAAAAABoaGhl3d3d/9/f3//h4eH/4eLh/+Li4v/j4+P/4+Pj/+Tk5P/k5OT/5eXl/+Xl + 5f/l5uX/5ubm/+bm5v/m5ub/5ubm/+bm5v/l5eX/5eXl/+Tk5P/k5OT/4+Pj/+Pj4//i4uL/4uLi/+Hh + 4f/f39//3N3c/3Nzc2kAAAAAAAAAAGhoaGXe3t7/4ODg/+Li4v/j4+P/4+Pj/+Tk5P/l5eX/5eXl/+bm + 5v/m5+b/5+fn/+fn5//n6Of/6Ojo/+jo6P/o6Oj/5+fn/+fn5//n5+f/5ubm/+Xl5f/l5eX/5OTk/+Pk + 4//j4+P/4uLi/+Dg4P/e3t7/c3NzaQAAAAAAAAAAaGhoZd/g3//i4uL/5OTk/+Tl5P/l5eX/5ebl/+bn + 5v/n5+f/5+jn/+jp6P/p6en/7Ozs/8LCwv+Tk5P/ioqK/66urv/o6ej/6enp/+jp6P/o6Oj/5+jn/+bn + 5v/m5ub/5ebl/+Tl5P/k5OT/4uLi/9/g3/9zdHNpAAAAAAAAAABoaWhl4eLh/+Pk4//m5ub/5ubm/+fn + 5//n6Of/6Ojo/+np6f/p6un/6urq/8bGxv8yMjL/AAAA/wAAAP8AAAD/AAAA/xMTE/+ZmZn/7Ozs/+rq + 6v/p6en/6Ojo/+jo6P/n5+f/5ubm/+bm5v/k5OT/4eHh/3R0dGkAAAAAAAAAAGhpaGXj4+P/5eXl/+fn + 5//n6Of/6Ojo/+np6f/q6ur/6urq/+vr6//Dw8P/DAwM/wAAAP8AAAD/Gxsb/ygoKP8BAQH/AAAA/wAA + AP+FhYX/7O3s/+rr6v/q6ur/6enp/+jo6P/o6Oj/5+fn/+Xl5f/i4+L/dHR0aQAAAAAAAAAAYWFhZeTl + 5P/m5+b/6Ono/+np6f/p6un/6uvq/+vr6//s7Oz/7e7t/ycnJ/8AAAD/Ghoa/7S0tP/m5ub/5OTk/9HR + 0f9GRkb/AAAA/wICAv/IyMj/7Ozs/+vs6//q6+r/6urq/+nq6f/o6ej/5+fn/+Tk5P9sbGxpAAAAAAAA + AAA9Pj1lj4+P/5OTk/+VlZX/lpaW/5eXl/+YmJj/mZmZ/5qamv92dnb/AAAA/wEBAf+/wL//3Nzc/+Tk + 5P/l5eX/3d3d/+Li4v8mJib/AAAA/0ZGRv+ampr/mZmZ/5iYmP+Xl5f/lpaW/5WVlf+Tk5P/j4+P/0ZG + RmoAAAAAAAAAAAwMDGUAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/Nzc3/+fn + 5//q6ur/7O3s/+zt7P/v7+//39/f/4WFhf8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/EBAQagAAAAAAAAAAAwMHZQAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP9NTU3/5ufm//Lz8v/z9PP/8/Tz//X19f/l5eX/nZ2d/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8GBgpqAAAAAAAAAAAAABZlAQEk/wEBJ/8CAin/AgIq/wICKv8CAiv/AgIs/wIC + LP8BAR3/AAAA/xwcHP/w8PD/6+zr//r6+v/6+vr/9PT0/+vr6/9lZWX/AAAA/wAAD/8CAi3/AgIs/wIC + K/8CAir/AgIq/wICKf8BASf/AQEl/wUFG2oAAAAAAAAAAAICQGUGBpL/Bwec/wgIo/8JCaf/CQmq/wkJ + rf8JCa//Cgqz/wkJqP8AAAL/AAAA/4CAgP/y8/L/6+zr/+3t7f/u7u7/xMTE/wcHB/8AAAD/BgZz/woK + s/8JCbD/CQmt/wkJqv8JCaj/CAik/wcHnf8HB5P/Dg5MagAAAAAAAAAAAwNHZQgIk/8JCZ3/Cgqj/wsL + p/8LC6n/Cwus/wsLr/8MDLL/DAy2/wYGW/8AAAD/AAAA/1JSUv+sraz/tra2/3h4eP8KCgr/AAAA/wIC + Iv8MDLb/DAyy/wsLsP8LC63/Cwuq/wsLp/8KCqT/CQmd/wgIk/8PD1VrAAAAAAAAAAAEBE1lCQmY/woK + ov8LC6j/DAyr/wwMrf8MDLD/DAyy/w0Ntf8NDbf/Dg67/wUFSv8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8CAiH/DQ2q/w0NuP8NDbX/DQ2z/wwMsP8MDK7/DAyr/wsLqP8KCqL/CQmZ/xAQWmsAAAAAAAAAAAQE + UGUKCp7/Cwum/wwMrP8NDa//DQ2w/w0Ns/8ODrX/Dg63/w4Ouf8ODrv/Dw/A/wwMiv8FBTj/AAAG/wAA + AP8DAyb/CQls/w8Pu/8PD7z/Dg66/w4OuP8ODrX/DQ2z/w0Nsf8NDa//DAys/wsLp/8KCp7/ERFeawAA + AAAAAAAABQVTZQsLpP8MDKv/DQ2w/w4Os/8ODrT/Dg62/w8PuP8PD7r/Dw+8/w8Pvf8QEL//EBDA/xER + w/8SEsn/ERHJ/xERxf8QEMD/EBC//w8Pvv8PD7z/Dw+6/w8PuP8ODrf/Dg61/w4Os/8NDbH/DAyr/wsL + pP8SEmFrAAAAAAAAAAAGBlZlDAyq/w4OsP8PD7X/Dw+3/w8PuP8QELr/EBC7/xAQvf8REb7/ERHA/xER + wf8REcL/EhLC/xISw/8SEsP/EhLC/xERwv8REcH/ERHA/xERvv8QEL3/EBC7/xAQuv8QELj/Dw+3/w8P + tf8ODrD/DAyq/xMTZWsAAAAAAAAAAAcHWmUODrD/EBC2/xERuv8REbz/ERG9/xISvv8SEr//EhLA/xMT + wf8TE8P/ExPD/xMTxP8TE8X/FBTF/xQUxf8UFMX/ExPE/xMTxP8TE8P/ExPC/xISwf8SEr//EhK+/xER + vf8REbz/ERG6/xAQtv8ODrD/FBRpawAAAAAAAAAACAhcYxAQtf8SErv/ExO+/xQUwP8UFMD/FBTB/xUV + wv8VFcP/FRXE/xUVxf8WFsb/FhbG/xYWx/8WFsf/FhbH/xYWx/8WFsf/FhbG/xYWxf8VFcT/FRXD/xUV + wv8UFMH/FBTB/xQUwP8TE77/EhK7/xAQtf8TE2hoAAAAAAAAAAAQEFNUFRXC/xMTv/8UFMP/FRXE/xUV + xP8VFcX/FRXG/xYWx/8WFsf/FhbI/xYWyf8XF8n/FxfK/xcXyv8XF8r/FxfK/xcXyf8XF8n/FhbI/xYW + yP8WFsf/FhbG/xUVxf8VFcT/FRXE/xQUw/8TE7//FRXB/xAQV1UAAAAAAAAAAA0NPxkjI8byFBTD/xUV + x/8WFsj/FxfJ/xcXyf8XF8r/FxfK/xcXy/8YGMz/GBjM/xgYzP8YGM3/GBjN/xgYzf8YGM3/GBjM/xgY + zP8YGMz/GBjL/xcXy/8XF8r/FxfJ/xcXyf8WFsj/FRXH/xQUw/8jI8f0Dg5GGwAAAAAAAAAAFhZxAiUl + eIUZGcr/FBTI/xUVyv8WFsv/FhbM/xYWzP8WFsz/FhbN/xcXzf8XF83/FxfN/xcXzv8XF87/FxfO/xcX + zv8XF87/FxfN/xcXzf8WFs3/FhbM/xYWzP8WFsz/FhbL/xUVyv8UFMj/GBjJ/yYmeogWFnYCAAAAAAAA + AAAAAAAAGBh1BzMzk50kJNP+FxfK/xgYzP8YGMz/GBjN/xgYzf8YGM3/GBjN/xgYzf8ZGc7/GRnO/xkZ + zv8ZGc7/GRnO/xkZzv8YGM3/GBjN/xgYzf8YGM3/GBjN/xgYzP8YGMz/FxfK/yMj0v4zM5WfFBRkBwAA + AAAAAAAAAAAAAAAAAAAAAAAAHBx7Ay0tdkg3N5emMTGpxSwsp8gsLKfILCynyCwsp8gsLKfILCynyCws + p8gsLKfILCynyCwsp8gsLKfILCynyCwsp8gsLKfILCynyCwsp8gsLKfILCynyDExqcU2NpenLi54Shsb + ewMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////8AAAD+AAAAfAAAADwAAAA8AAAAPAAAADwAAAA8AA + AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA + AAPAAAADwAAAA8AAAAPAAAAD4AAAB/gAAB////// + + + \ No newline at end of file From 801300adf2725d8f45c0621d56a4be12223f645b Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 8 Aug 2016 00:40:54 -0700 Subject: [PATCH 29/67] Fix image import Fix not setting tile choice for new tile, fix tile speed by comparing colors instead (manual rotation no fun) --- Subforms/Save Editors/Gen5/CGearBackground.cs | 52 +++++++++---------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/Subforms/Save Editors/Gen5/CGearBackground.cs b/Subforms/Save Editors/Gen5/CGearBackground.cs index cdcbdf7ba..fffd17cd7 100644 --- a/Subforms/Save Editors/Gen5/CGearBackground.cs +++ b/Subforms/Save Editors/Gen5/CGearBackground.cs @@ -139,6 +139,7 @@ public void SetImage(Bitmap img) Marshal.Copy(bData.Scan0, data, 0, data.Length); int bpp = bData.Stride/Width; + img.UnlockBits(bData); // get colors Color[] colors = new Color[Width*Height]; for (int i = 0; i < data.Length; i += bpp) @@ -177,7 +178,7 @@ public void SetImage(Bitmap img) { for (int j = 0; j < tilelist.Count; j++) { - int rotVal = tiles[i].getRotationValue(tilelist[j].PixelData); + int rotVal = tiles[i].getRotationValue(tilelist[j].ColorChoices); if (rotVal <= -1) continue; tm.TileChoices[i] = j; tm.Rotations[i] = rotVal; @@ -186,6 +187,7 @@ public void SetImage(Bitmap img) if (tilelist.Count == 0xFF) throw new ArgumentException($"Too many unique tiles. Expected < 256, ran out of tiles at {i + 1} of {tm.TileChoices.Length}"); tilelist.Add(tiles[i]); + tm.TileChoices[i] = tilelist.Count - 1; next:; } @@ -203,7 +205,6 @@ private class Tile private const int TileHeight = 8; public readonly int[] ColorChoices; private Bitmap img; - public byte[] PixelData; public Tile(byte[] data = null) { @@ -229,8 +230,6 @@ public void setTile(Color[] Palette) var choice = Palette[index]; img.SetPixel(x, y, choice); } - - PixelData = getTileRAW(img); } public byte[] Write() { @@ -254,28 +253,32 @@ public Bitmap Rotate(int rotFlip) tile.RotateFlip(RotateFlipType.RotateNoneFlipY); return tile; } - private static byte[] getTileRAW(Bitmap tile) - { - BitmapData bData = tile.LockBits(new Rectangle(0, 0, tile.Width, tile.Height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb); - byte[] data = new byte[bData.Stride * bData.Height]; - Marshal.Copy(bData.Scan0, data, 0, data.Length); - tile.UnlockBits(bData); - return data; - } - public int getRotationValue(byte[] data) + public int getRotationValue(int[] tileColors) { // Check all rotation types - if (PixelData.SequenceEqual(data)) + if (ColorChoices.SequenceEqual(tileColors)) return 0; - if (getTileRAW(Rotate(4)).SequenceEqual(data)) - return 4; - if (getTileRAW(Rotate(8)).SequenceEqual(data)) - return 8; - if (getTileRAW(Rotate(12)).SequenceEqual(data)) - return 12; - return -1; + // flip x + for (int i = 0; i < 64; i++) + if (ColorChoices[(7 - (i & 7)) + 8 * (i / 8)] != tileColors[i]) + goto check8; + return 4; + + // flip y + check8: + for (int i = 0; i < 64; i++) + if (ColorChoices[64 - 8 * (1 + (i / 8)) + (i & 7)] != tileColors[i]) + goto check12; + return 8; + + // flip xy + check12: + for (int i = 0; i < 64; i++) + if (ColorChoices[63 - i] != tileColors[i]) + return -1; + return 12; } } private class TileMap @@ -332,13 +335,6 @@ private static Color getRGB555(uint val) int B = (int)(val >> 16 >> 3) & 0x1F; return Color.FromArgb(0xFF, Convert5To8[R], Convert5To8[G], Convert5To8[B]); } - private static Color getRGB555(ushort val) - { - int R = (val >> 0) & 0x1F; - int G = (val >> 5) & 0x1F; - int B = (val >> 10) & 0x1F; - return Color.FromArgb(0xFF, Convert5To8[R], Convert5To8[G], Convert5To8[B]); - } private static ushort getRGB555(Color c) { int val = 0; From 2ce5e442b1651e42b0dfe2af6e71208447e451bd Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 8 Aug 2016 00:45:30 -0700 Subject: [PATCH 30/67] Fix colors disappearing Thanks SciresM! --- Subforms/Save Editors/Gen5/CGearBackground.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Subforms/Save Editors/Gen5/CGearBackground.cs b/Subforms/Save Editors/Gen5/CGearBackground.cs index fffd17cd7..33f5a816d 100644 --- a/Subforms/Save Editors/Gen5/CGearBackground.cs +++ b/Subforms/Save Editors/Gen5/CGearBackground.cs @@ -51,7 +51,7 @@ public CGearBackground(byte[] data) ColorPalette = new Color[0x10]; for (int i = 0; i < 0x10; i++) - ColorPalette[i] = getRGB555(BitConverter.ToUInt16(ColorData, i * 2)); + ColorPalette[i] = getRGB555_16(BitConverter.ToUInt16(ColorData, i * 2)); Tiles = new Tile[0xFF]; for (int i = 0; i < 0xFF; i++) @@ -145,7 +145,7 @@ public void SetImage(Bitmap img) for (int i = 0; i < data.Length; i += bpp) { uint val = BitConverter.ToUInt32(data, i); - colors[i/bpp] = getRGB555(val); + colors[i/bpp] = getRGB555_32(val); } Color[] Palette = colors.Distinct().ToArray(); @@ -328,13 +328,20 @@ private static byte convert8to5(int colorval) while (colorval > Convert5To8[i]) i++; return i; } - private static Color getRGB555(uint val) + private static Color getRGB555_32(uint val) { int R = (int)(val >> 0 >> 3) & 0x1F; int G = (int)(val >> 8 >> 3) & 0x1F; int B = (int)(val >> 16 >> 3) & 0x1F; return Color.FromArgb(0xFF, Convert5To8[R], Convert5To8[G], Convert5To8[B]); } + private static Color getRGB555_16(ushort val) + { + int R = (val >> 0) & 0x1F; + int G = (val >> 5) & 0x1F; + int B = (val >> 10) & 0x1F; + return Color.FromArgb(0xFF, Convert5To8[R], Convert5To8[G], Convert5To8[B]); + } private static ushort getRGB555(Color c) { int val = 0; From c105d69ccef38a75e6f38d11d2face1037c6e96a Mon Sep 17 00:00:00 2001 From: evandixon Date: Mon, 8 Aug 2016 14:05:15 -0500 Subject: [PATCH 31/67] Changed resource type of certain text files to None for consistency --- PKHeX.csproj | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/PKHeX.csproj b/PKHeX.csproj index b01803dcf..5582f62c3 100644 --- a/PKHeX.csproj +++ b/PKHeX.csproj @@ -708,33 +708,33 @@ - + - + - + - + - + - + - + - + @@ -977,7 +977,7 @@ - + From 50efec724e527eb69fd30887f7de124477b86190 Mon Sep 17 00:00:00 2001 From: evandixon Date: Mon, 8 Aug 2016 15:11:02 -0500 Subject: [PATCH 32/67] Added helper functions to simplify getting string lists --- Legality/Checks.cs | 2 +- MainWindow/Main.cs | 6 ++-- PKM/PKX.cs | 18 ++++++------ PKM/ShowdownSet.cs | 6 ++-- Subforms/Save Editors/Gen6/SAV_HallOfFame.cs | 2 +- Util/DataUtil.cs | 31 ++++++++++++++++++++ 6 files changed, 48 insertions(+), 17 deletions(-) diff --git a/Legality/Checks.cs b/Legality/Checks.cs index 69d08b97a..5d9878e22 100644 --- a/Legality/Checks.cs +++ b/Legality/Checks.cs @@ -1054,7 +1054,7 @@ private LegalityCheck[] verifyRelearn() return res; } - internal static string[] movelist = Util.getStringList("moves", "en"); + internal static string[] movelist = Util.getMovesList("en"); private static readonly string[] EventRibName = { "Country", "National", "Earth", "World", "Classic", diff --git a/MainWindow/Main.cs b/MainWindow/Main.cs index ad0aaac30..a644a45a6 100644 --- a/MainWindow/Main.cs +++ b/MainWindow/Main.cs @@ -921,11 +921,11 @@ private void InitializeStrings() string l = curlanguage; natures = Util.getStringList("natures", l); types = Util.getStringList("types", l); - abilitylist = Util.getStringList("abilities", l); - movelist = Util.getStringList("moves", l); + abilitylist = Util.getAbilitiesList(l); + movelist = Util.getMovesList(l); itemlist = Util.getStringList("items", l); characteristics = Util.getStringList("character", l); - specieslist = Util.getStringList("species", l); + specieslist = Util.getSpeciesList(l); wallpapernames = Util.getStringList("wallpaper", l); encountertypelist = Util.getStringList("encountertype", l); gamelist = Util.getStringList("games", l); diff --git a/PKM/PKX.cs b/PKM/PKX.cs index 7ba8fffa6..5a45fdbc0 100644 --- a/PKM/PKX.cs +++ b/PKM/PKX.cs @@ -159,15 +159,15 @@ internal static uint LCRNG(ref uint seed) internal static readonly string[][] SpeciesLang = { - Util.getStringList("species", "ja"), // none - Util.getStringList("species", "ja"), // 1 - Util.getStringList("species", "en"), // 2 - Util.getStringList("species", "fr"), // 3 - Util.getStringList("species", "it"), // 4 - Util.getStringList("species", "de"), // 5 - Util.getStringList("species", "es"), // none - Util.getStringList("species", "es"), // 7 - Util.getStringList("species", "ko"), // 8 + Util.getSpeciesList("ja"), // none + Util.getSpeciesList("ja"), // 1 + Util.getSpeciesList("en"), // 2 + Util.getSpeciesList("fr"), // 3 + Util.getSpeciesList("it"), // 4 + Util.getSpeciesList("de"), // 5 + Util.getSpeciesList("es"), // none + Util.getSpeciesList("es"), // 7 + Util.getSpeciesList("ko"), // 8 }; internal static string getSpeciesName(int species, int lang) diff --git a/PKM/ShowdownSet.cs b/PKM/ShowdownSet.cs index 21f69fa25..4cc9df962 100644 --- a/PKM/ShowdownSet.cs +++ b/PKM/ShowdownSet.cs @@ -9,11 +9,11 @@ public class ShowdownSet internal static readonly string[] StatNames = { "HP", "Atk", "Def", "SpA", "SpD", "Spe" }; public static readonly string[] types = Util.getStringList("types", "en"); public static readonly string[] forms = Util.getStringList("forms", "en"); - private static readonly string[] species = Util.getStringList("species", "en"); + private static readonly string[] species = Util.getSpeciesList("en"); private static readonly string[] items = Util.getStringList("items", "en"); private static readonly string[] natures = Util.getStringList("natures", "en"); - private static readonly string[] moves = Util.getStringList("moves", "en"); - private static readonly string[] abilities = Util.getStringList("abilities", "en"); + private static readonly string[] moves = Util.getMovesList("en"); + private static readonly string[] abilities = Util.getAbilitiesList("en"); private static readonly string[] hptypes = types.Skip(1).ToArray(); // Default Set Data diff --git a/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs b/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs index a8fc4534a..6dcf088a8 100644 --- a/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs +++ b/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs @@ -344,7 +344,7 @@ private void updateNickname(object sender, EventArgs e) { // get language string l = Main.curlanguage; - TB_Nickname.Text = Util.getStringList("species", l)[species]; + TB_Nickname.Text = Util.getSpeciesList(l)[species]; } } TB_Nickname.ReadOnly = !CHK_Nicknamed.Checked; diff --git a/Util/DataUtil.cs b/Util/DataUtil.cs index d0788f954..86ffbf8cb 100644 --- a/Util/DataUtil.cs +++ b/Util/DataUtil.cs @@ -6,6 +6,37 @@ namespace PKHeX { public partial class Util { + + /// + /// Gets a list of all Pokémon species names. + /// + /// Language of the Pokémon species names to select (e.g. "en", "fr", "jp", etc.) + /// An array of strings whose indexes correspond to the IDs of each Pokémon species name. + public static string[] getSpeciesList(string language) + { + return getStringList("species", language); + } + + /// + /// Gets a list of all move names. + /// + /// Language of the move names to select (e.g. "en", "fr", "jp", etc.) + /// An array of strings whose indexes correspond to the IDs of each move name. + public static string[] getMovesList(string language) + { + return getStringList("moves", language); + } + + /// + /// Gets a list of all Pokémon ability names. + /// + /// Language of the Pokémon ability names to select (e.g. "en", "fr", "jp", etc.) + /// An array of strings whose indexes correspond to the IDs of each Pokémon ability name. + public static string[] getAbilitiesList(string language) + { + return getStringList("abilities", language); + } + public static string[] getStringList(string f) { object txt = Properties.Resources.ResourceManager.GetObject(f); // Fetch File, \n to list. From df313c05897e97b4f39d4e0c2c5f2b4ca6b58f3a Mon Sep 17 00:00:00 2001 From: evandixon Date: Mon, 8 Aug 2016 15:47:56 -0500 Subject: [PATCH 33/67] Made more things public --- PKM/PKMConverter.cs | 9 +++- PKM/PKX.cs | 108 ++++++++++++++++++++++---------------------- 2 files changed, 61 insertions(+), 56 deletions(-) diff --git a/PKM/PKMConverter.cs b/PKM/PKMConverter.cs index 5c1bdebaf..03e506a58 100644 --- a/PKM/PKMConverter.cs +++ b/PKM/PKMConverter.cs @@ -2,7 +2,7 @@ namespace PKHeX { - internal static class PKMConverter + public static class PKMConverter { internal static int Country = 49; internal static int Region = 7; @@ -19,7 +19,12 @@ internal static void updateConfig(int SUBREGION, int COUNTRY, int _3DSREGION, st OT_Gender = TRAINERGENDER; } - private static int getPKMDataFormat(byte[] data) + /// + /// Gets the generation of the Pokemon data. + /// + /// Raw data representing a Pokemon. + /// An integer indicating the generation of the PKM file, or -1 if the data is invalid. + public static int getPKMDataFormat(byte[] data) { if (!PKX.getIsPKM(data.Length)) return -1; diff --git a/PKM/PKX.cs b/PKM/PKX.cs index 5a45fdbc0..3a683088e 100644 --- a/PKM/PKX.cs +++ b/PKM/PKX.cs @@ -7,7 +7,7 @@ namespace PKHeX { - internal static class PKX + public static class PKX { internal const int SIZE_3PARTY = 100; internal const int SIZE_3STORED = 80; @@ -25,7 +25,7 @@ internal static class PKX internal const int SIZE_6STORED = 0xE8; internal const int SIZE_6BLOCK = 56; - internal static bool getIsPKM(long len) + public static bool getIsPKM(long len) { return new[] {SIZE_3STORED, SIZE_3PARTY, SIZE_4STORED, SIZE_4PARTY, SIZE_5PARTY, SIZE_6STORED, SIZE_6PARTY}.Contains((int)len); } @@ -36,14 +36,14 @@ internal static bool getIsPKM(long len) // Relies on Util for some common operations. // Data - internal static uint LCRNG(uint seed) + public static uint LCRNG(uint seed) { const uint a = 0x41C64E6D; const uint c = 0x00006073; return seed * a + c; } - internal static uint LCRNG(ref uint seed) + public static uint LCRNG(ref uint seed) { const uint a = 0x41C64E6D; const uint c = 0x00006073; @@ -156,8 +156,8 @@ internal static uint LCRNG(ref uint seed) {1000000, 600000, 1640000, 1059860, 800000, 1250000}, }; #endregion - - internal static readonly string[][] SpeciesLang = + + public static readonly string[][] SpeciesLang = { Util.getSpeciesList("ja"), // none Util.getSpeciesList("ja"), // 1 @@ -170,20 +170,20 @@ internal static uint LCRNG(ref uint seed) Util.getSpeciesList("ko"), // 8 }; - internal static string getSpeciesName(int species, int lang) + public static string getSpeciesName(int species, int lang) { try { return SpeciesLang[lang][species]; } catch { return ""; } } - internal static bool getIsNicknamed(int species, string nick) + public static bool getIsNicknamed(int species, string nick) { try { return SpeciesLang.All(list => list[species].ToUpper() != nick); } catch { return false; } } - internal static readonly PersonalTable Personal = PersonalTable.AO; + public static readonly PersonalTable Personal = PersonalTable.AO; // Stat Fetching - internal static byte[] getRandomEVs() + public static byte[] getRandomEVs() { byte[] evs = new byte[6]; do { @@ -197,7 +197,7 @@ internal static byte[] getRandomEVs() Util.Shuffle(evs); return evs; } - internal static int getLevel(int species, uint exp) + public static int getLevel(int species, uint exp) { int growth = Personal[species].EXPGrowth; int tl = 1; // Initial Level. Iterate upwards to find the level @@ -205,13 +205,13 @@ internal static int getLevel(int species, uint exp) if (tl == 100) return 100; return --tl; } - internal static uint getEXP(int level, int species) + public static uint getEXP(int level, int species) { if (level <= 1) return 0; if (level > 100) level = 100; return ExpTable[level, Personal[species].EXPGrowth]; } - internal static int getGender(string s) + public static int getGender(string s) { if (s == null) return -1; @@ -222,7 +222,7 @@ internal static int getGender(string s) return 2; } - internal static string[] getCountryRegionText(int country, int region, string lang) + public static string[] getCountryRegionText(int country, int region, string lang) { // Get Language we're fetching for int index = Array.IndexOf(new[] { "ja", "en", "fr", "de", "it", "es", "zh", "ko"}, lang); @@ -275,7 +275,7 @@ internal static string[] getCountryRegionText(int country, int region, string la return data; } - internal static string getLocation(PKM pk, bool eggmet) + public static string getLocation(PKM pk, bool eggmet) { int locval = eggmet ? pk.Egg_Location : pk.Met_Location; if (pk.Format == 3) @@ -302,7 +302,7 @@ internal static string getLocation(PKM pk, bool eggmet) } return null; // Shouldn't happen. } - internal static string[] getQRText(PKM pkm) + public static string[] getQRText(PKM pkm) { string[] response = new string[3]; // Summarize @@ -332,7 +332,7 @@ internal static string[] getQRText(PKM pkm) } // PKX Manipulation - internal static readonly byte[][] blockPosition = + public static readonly byte[][] blockPosition = { new byte[] {0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 2, 3, 1, 1, 2, 3, 2, 3, 1, 1, 2, 3, 2, 3}, new byte[] {1, 1, 2, 3, 2, 3, 0, 0, 0, 0, 0, 0, 2, 3, 1, 1, 3, 2, 2, 3, 1, 1, 3, 2}, @@ -340,11 +340,11 @@ internal static string[] getQRText(PKM pkm) new byte[] {3, 2, 3, 2, 1, 1, 3, 2, 3, 2, 1, 1, 3, 2, 3, 2, 1, 1, 0, 0, 0, 0, 0, 0}, }; - internal static readonly byte[] blockPositionInvert = + public static readonly byte[] blockPositionInvert = { 0, 1, 2, 4, 3, 5, 6, 7, 12, 18, 13, 19, 8, 10, 14, 20, 16, 22, 9, 11, 15, 21, 17, 23 }; - internal static byte[] shuffleArray(byte[] data, uint sv) + public static byte[] shuffleArray(byte[] data, uint sv) { byte[] sdata = new byte[data.Length]; Array.Copy(data, sdata, 8); // Copy unshuffled bytes @@ -359,7 +359,7 @@ internal static byte[] shuffleArray(byte[] data, uint sv) return sdata; } - internal static byte[] decryptArray(byte[] ekx) + public static byte[] decryptArray(byte[] ekx) { byte[] pkx = (byte[])ekx.Clone(); @@ -383,7 +383,7 @@ internal static byte[] decryptArray(byte[] ekx) return pkx; } - internal static byte[] encryptArray(byte[] pkx) + public static byte[] encryptArray(byte[] pkx) { // Shuffle uint pv = BitConverter.ToUInt32(pkx, 0); @@ -410,7 +410,7 @@ internal static byte[] encryptArray(byte[] pkx) // Done return ekx; } - internal static ushort getCHK(byte[] data) + public static ushort getCHK(byte[] data) { ushort chk = 0; for (int i = 8; i < 232; i += 2) // Loop through the entire PKX @@ -419,7 +419,7 @@ internal static ushort getCHK(byte[] data) return chk; } - internal static uint getRandomPID(int species, int cg, int origin, int nature, int form, uint OLDPID) + public static uint getRandomPID(int species, int cg, int origin, int nature, int form, uint OLDPID) { uint bits = OLDPID & 0x00010001; int gt = Personal[species].Gender; @@ -455,9 +455,9 @@ internal static uint getRandomPID(int species, int cg, int origin, int nature, i return pid; // PID Passes } } - + // Data Requests - internal static Image getSprite(int species, int form, int gender, int item, bool isegg, bool shiny, int generation = -1) + public static Image getSprite(int species, int form, int gender, int item, bool isegg, bool shiny, int generation = -1) { if (species == 0) return (Image)Resources.ResourceManager.GetObject("_0"); @@ -507,7 +507,7 @@ internal static Image getSprite(int species, int form, int gender, int item, boo } return baseImage; } - internal static Image getSprite(PKM pkm) + public static Image getSprite(PKM pkm) { return getSprite(pkm.Species, pkm.AltForm, pkm.Gender, pkm.HeldItem, pkm.IsEgg, pkm.IsShiny, pkm.Format); } @@ -524,7 +524,7 @@ private static FontFamily[] FontFamilies return s_FontCollection.Families; } } - internal static Font getPKXFont(float size) + public static Font getPKXFont(float size) { return new Font(FontFamilies[0], size); } @@ -541,9 +541,9 @@ private static void setPKXFont() } catch { Util.Error("Unable to add ingame font."); } } - + // Personal.dat - internal static string[] getFormList(int species, string[] t, string[] f, string[] g) + public static string[] getFormList(int species, string[] t, string[] f, string[] g) { // Mega List if (Array.IndexOf(new[] @@ -866,13 +866,13 @@ internal static string[] getFormList(int species, string[] t, string[] f, string /// Hidden Power Type /// Order: HP,ATK,DEF,SPEED,SPA,SPD /// Hidden Power Type - internal static int[] setHPIVs(int type, int[] ivs) + public static int[] setHPIVs(int type, int[] ivs) { for (int i = 0; i < 6; i++) ivs[i] = (ivs[i] & 0x1E) + hpivs[type, i]; return ivs; } - internal static readonly int[,] hpivs = { + public static readonly int[,] hpivs = { { 1, 1, 0, 0, 0, 0 }, // Fighting { 0, 0, 0, 0, 0, 1 }, // Flying { 1, 1, 0, 0, 0, 1 }, // Poison @@ -891,7 +891,7 @@ internal static int[] setHPIVs(int type, int[] ivs) { 1, 1, 1, 1, 1, 1 }, // Dark }; - internal static string TrimFromFFFF(string input) + public static string TrimFromFFFF(string input) { int index = input.IndexOf((char)0xFFFF); return index < 0 ? input : input.Substring(0, index); @@ -899,7 +899,7 @@ internal static string TrimFromFFFF(string input) // Past Gen Manipulation - internal static byte[] shuffleArray45(byte[] data, uint sv) + public static byte[] shuffleArray45(byte[] data, uint sv) { byte[] sdata = new byte[data.Length]; Array.Copy(data, sdata, 8); // Copy unshuffled bytes @@ -915,7 +915,7 @@ internal static byte[] shuffleArray45(byte[] data, uint sv) return sdata; } - internal static byte[] decryptArray45(byte[] ekm) + public static byte[] decryptArray45(byte[] ekm) { byte[] pkm = (byte[])ekm.Clone(); @@ -941,7 +941,7 @@ internal static byte[] decryptArray45(byte[] ekm) return pkm; } - internal static byte[] encryptArray45(byte[] pkm) + public static byte[] encryptArray45(byte[] pkm) { uint pv = BitConverter.ToUInt32(pkm, 0); uint sv = ((pv & 0x3E000) >> 0xD) % 24; @@ -968,26 +968,26 @@ internal static byte[] encryptArray45(byte[] pkm) // Done return ekm; } - - internal static int getUnownForm(uint PID) + + public static int getUnownForm(uint PID) { byte[] data = BitConverter.GetBytes(PID); return (((data[3] & 3) << 6) + ((data[2] & 3) << 4) + ((data[1] & 3) << 2) + ((data[0] & 3) << 0)) % 28; } - internal static ushort val2charG4(ushort val) + public static ushort val2charG4(ushort val) { int index = Array.IndexOf(G4Values, val); return index > -1 ? G4Chars[index] : (ushort)0xFFFF; } - internal static ushort char2valG4(ushort chr) + public static ushort char2valG4(ushort chr) { int index = Array.IndexOf(G4Chars, chr); return index > -1 ? G4Values[index] : (ushort)0xFFFF; } - internal static string array2strG4(byte[] strdata) + public static string array2strG4(byte[] strdata) { string s = ""; for (int i = 0; i < strdata.Length; i += 2) @@ -1001,7 +1001,7 @@ internal static string array2strG4(byte[] strdata) return s; } - internal static byte[] str2arrayG4(string str) + public static byte[] str2arrayG4(string str) { byte[] strdata = new byte[str.Length * 2 + 2]; // +2 for 0xFFFF for (int i = 0; i < str.Length; i++) @@ -1017,16 +1017,16 @@ internal static byte[] str2arrayG4(string str) } // Gen3 && 3->4 Conversion has two character tables, and translates to the same character map. - internal static ushort getG4Val(byte val, bool jp) { return jp ? G34_4J[val] : G34_4E[val]; } - internal static ushort getG3Char(byte val, bool jp) { return val2charG4(getG4Val(val, jp)); } + public static ushort getG4Val(byte val, bool jp) { return jp ? G34_4J[val] : G34_4E[val]; } + public static ushort getG3Char(byte val, bool jp) { return val2charG4(getG4Val(val, jp)); } - internal static byte setG3Char(ushort chr, bool jp) + public static byte setG3Char(ushort chr, bool jp) { int index = Array.IndexOf(jp ? G34_4J : G34_4E, char2valG4(chr)); return (byte)(index > -1 ? index : 0xFF); } - internal static string getG3Str(byte[] strdata, bool jp) + public static string getG3Str(byte[] strdata, bool jp) { return strdata .TakeWhile(val => val < 247) // Take valid values @@ -1035,7 +1035,7 @@ internal static string getG3Str(byte[] strdata, bool jp) .Aggregate("", (current, chr) => current + (char)chr); } - internal static byte[] setG3Str(string str, bool jp) + public static byte[] setG3Str(string str, bool jp) { byte[] strdata = new byte[str.Length + 1]; // +1 for 0xFF for (int i = 0; i < str.Length; i++) @@ -1051,19 +1051,19 @@ internal static byte[] setG3Str(string str, bool jp) return strdata; } - internal static int getG4Species(int g3index) + public static int getG4Species(int g3index) { int index = Array.IndexOf(oldindex, g3index); return newindex[index > -1 ? index : 0]; } - internal static int getG3Species(int g4index) + public static int getG3Species(int g4index) { int index = Array.IndexOf(newindex, g4index); return oldindex[index > -1 ? index : 0]; } - internal static int getGender(int species, uint PID) + public static int getGender(int species, uint PID) { int genderratio = Personal[species].Gender; switch (genderratio) @@ -1512,7 +1512,7 @@ internal static int getGender(int species, uint PID) }; #endregion - internal static readonly byte[][] G4TransferTrashBytes = { + public static readonly byte[][] G4TransferTrashBytes = { new byte[] { }, // Unused new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, new byte[] { 0x18, 0x20, 0x0D, 0x02, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0xA1, 0x0C, 0x02, 0xE0, 0xFF }, @@ -1523,7 +1523,7 @@ internal static int getGender(int species, uint PID) new byte[] { 0x74, 0x20, 0x0D, 0x02, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xA1, 0x0C, 0x02, 0xE0, 0xFF }, }; - internal static byte[] decryptArray3(byte[] ekm) + public static byte[] decryptArray3(byte[] ekm) { if (ekm.Length != SIZE_3PARTY && ekm.Length != SIZE_3STORED) return null; @@ -1537,7 +1537,7 @@ internal static byte[] decryptArray3(byte[] ekm) ekm[i] ^= xorkey[i % 4]; return shuffleArray3(ekm, PID%24); } - internal static byte[] shuffleArray3(byte[] data, uint sv) + public static byte[] shuffleArray3(byte[] data, uint sv) { byte[] sdata = new byte[data.Length]; Array.Copy(data, sdata, 32); // Copy unshuffled bytes @@ -1552,7 +1552,7 @@ internal static byte[] shuffleArray3(byte[] data, uint sv) return sdata; } - internal static byte[] encryptArray3(byte[] pkm) + public static byte[] encryptArray3(byte[] pkm) { if (pkm.Length != SIZE_3PARTY && pkm.Length != SIZE_3STORED) return null; @@ -1568,7 +1568,7 @@ internal static byte[] encryptArray3(byte[] pkm) return ekm; } - internal static ushort getG4Item(ushort g3val) + public static ushort getG4Item(ushort g3val) { ushort[] arr = { From fc7f7d788c947bb529562ea2bc29d784c4087a6d Mon Sep 17 00:00:00 2001 From: evandixon Date: Mon, 8 Aug 2016 16:44:05 -0500 Subject: [PATCH 34/67] Added XML comments where appropriate --- PKM/PKMConverter.cs | 9 ++++++++- PKM/PKX.cs | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/PKM/PKMConverter.cs b/PKM/PKMConverter.cs index 03e506a58..be573542a 100644 --- a/PKM/PKMConverter.cs +++ b/PKM/PKMConverter.cs @@ -58,7 +58,14 @@ public static int getPKMDataFormat(byte[] data) } return -1; } - internal static PKM getPKMfromBytes(byte[] data, string ident = null) + + /// + /// Creates an instance of from the given data. + /// + /// Raw data of the Pokemon file. + /// Optional identifier for the Pokemon. Usually the full path of the source file. + /// An instance of created from the given , or null if is invalid. + public static PKM getPKMfromBytes(byte[] data, string ident = null) { checkEncrypted(ref data); switch (getPKMDataFormat(data)) diff --git a/PKM/PKX.cs b/PKM/PKX.cs index 3a683088e..8aebbcbae 100644 --- a/PKM/PKX.cs +++ b/PKM/PKX.cs @@ -25,6 +25,11 @@ public static class PKX internal const int SIZE_6STORED = 0xE8; internal const int SIZE_6BLOCK = 56; + /// + /// Determines if the given length is valid for a Pokemon file. + /// + /// Length of the data to check. + /// A boolean indicating whether or not the length is valid for a Pokemon file. public static bool getIsPKM(long len) { return new[] {SIZE_3STORED, SIZE_3PARTY, SIZE_4STORED, SIZE_4PARTY, SIZE_5PARTY, SIZE_6STORED, SIZE_6PARTY}.Contains((int)len); From c757f59377a9b308caeb5b69d020fbeab5de9cb3 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 8 Aug 2016 18:32:13 -0700 Subject: [PATCH 35/67] Fix inverted setShinyPID copying EC Thanks JSS! --- MainWindow/Main.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MainWindow/Main.cs b/MainWindow/Main.cs index ad0aaac30..dc295f7e9 100644 --- a/MainWindow/Main.cs +++ b/MainWindow/Main.cs @@ -2105,7 +2105,7 @@ private void updateShinyPID(object sender, EventArgs e) pkm.setShinyPID(); TB_PID.Text = pkm.PID.ToString("X8"); - if (pkm.Format >= 6) + if (pkm.Format < 6) TB_EC.Text = TB_PID.Text; getQuickFiller(dragout); From 724da7ff0fac381f1724125e6492a9cfba107fea Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 8 Aug 2016 18:42:42 -0700 Subject: [PATCH 36/67] Improve PID/EC rerolling automation --- MainWindow/Main.cs | 11 ++++++----- PKM/PKM.cs | 11 +++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/MainWindow/Main.cs b/MainWindow/Main.cs index 0a5a91864..cdd1fdf45 100644 --- a/MainWindow/Main.cs +++ b/MainWindow/Main.cs @@ -1628,13 +1628,13 @@ private void updateRandomPID(object sender, EventArgs e) pkm.setPIDGender(pkm.Gender); TB_PID.Text = pkm.PID.ToString("X8"); getQuickFiller(dragout); - if (pkm.Format >= 6) - TB_EC.Text = pkm.EncryptionConstant.ToString("X8"); + if (pkm.GenNumber < 6 && TB_EC.Visible) + TB_EC.Text = TB_PID.Text; } private void updateRandomEC(object sender, EventArgs e) { - int origin = Util.getIndex(CB_GameOrigin); - if (origin < 24) + pkm.Version = Util.getIndex(CB_GameOrigin); + if (pkm.GenNumber < 6) { TB_EC.Text = TB_PID.Text; Util.Alert("EC should match PID."); @@ -2101,11 +2101,12 @@ private void updateShinyPID(object sender, EventArgs e) pkm.Nature = Util.getIndex(CB_Nature); pkm.Gender = PKX.getGender(Label_Gender.Text); pkm.AltForm = CB_Form.SelectedIndex; + pkm.Version = Util.getIndex(CB_GameOrigin); pkm.setShinyPID(); TB_PID.Text = pkm.PID.ToString("X8"); - if (pkm.Format < 6) + if (pkm.GenNumber < 6 && TB_EC.Visible) TB_EC.Text = TB_PID.Text; getQuickFiller(dragout); diff --git a/PKM/PKM.cs b/PKM/PKM.cs index 2b5f121bf..1d3134d82 100644 --- a/PKM/PKM.cs +++ b/PKM/PKM.cs @@ -153,6 +153,17 @@ public byte[] Write() public bool Gen4 => Version >= 10 && Version < 12 || Version >= 7 && Version <= 8; public bool Gen3 => Version >= 1 && Version <= 5 || Version == 15; public bool GenU => !(Gen6 || Gen5 || Gen4 || Gen3); + public int GenNumber + { + get + { + if (Gen6) return 6; + if (Gen5) return 5; + if (Gen4) return 4; + if (Gen3) return 3; + return -1; + } + } public bool PKRS_Infected => PKRS_Strain > 0; public bool PKRS_Cured => PKRS_Days == 0 && PKRS_Strain > 0; public bool ChecksumValid => Checksum == CalculateChecksum(); From 5fc03ef0a7659387f25a8358f6c31e849b56c7e8 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 9 Aug 2016 02:27:14 -0700 Subject: [PATCH 37/67] Fix c-gear .psk decoding --- Subforms/Save Editors/Gen5/CGearBackground.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Subforms/Save Editors/Gen5/CGearBackground.cs b/Subforms/Save Editors/Gen5/CGearBackground.cs index 33f5a816d..6605e50d9 100644 --- a/Subforms/Save Editors/Gen5/CGearBackground.cs +++ b/Subforms/Save Editors/Gen5/CGearBackground.cs @@ -96,11 +96,10 @@ public static byte[] CGBtoPSK(byte[] cgb, bool B2W2) public static byte[] PSKtoCGB(byte[] psk, bool B2W2) { byte[] cgb = (byte[])psk.Clone(); - int shiftVal = B2W2 ? 0xA000 : 0xA0A0; for (int i = 0x2000; i < 0x2600; i += 2) { int val = BitConverter.ToUInt16(psk, i); - int index = ValToIndex(val, shiftVal); + int index = ValToIndex(val); BitConverter.GetBytes((ushort)index).CopyTo(cgb, i); } return cgb; @@ -316,10 +315,11 @@ private static int IndexToVal(int index, int shiftVal) int val = index + shiftVal; return val + 15*(index/17); } - private static int ValToIndex(int val, int shiftVal) + private static int ValToIndex(int val) { - int index = val - shiftVal; - return index - 15*(index/32); + if ((val & 0x3FF) < 0xA0 || (val & 0x3FF) > 0x280) + return ((val & 0x5C00) | 0xFF); + return ((val % 0x20) + 0x11 * (((val & 0x3FF) - 0xA0) / 0x20)) | (val & 0x5C00); } private static byte convert8to5(int colorval) From ef904c889f3f672573e3e09da18011fd923ff549 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Tue, 9 Aug 2016 22:52:59 -0700 Subject: [PATCH 38/67] Fix gen5 dex set Use the size constant for each region. The 0x60's should have been changed to 0x54 when the (gen6 method) was copied and modified. Thanks /u/Porta_14! --- Saves/SAV5.cs | 2 +- Saves/SAV6.cs | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Saves/SAV5.cs b/Saves/SAV5.cs index 9d2b68d0d..068006099 100644 --- a/Saves/SAV5.cs +++ b/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/Saves/SAV6.cs index df076efb0..bc9ec6b64 100644 --- a/Saves/SAV6.cs +++ b/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; From 9cae30b2b40524680c1749e8351fb7e5e8423eb0 Mon Sep 17 00:00:00 2001 From: easyworld Date: Wed, 10 Aug 2016 19:59:29 +0800 Subject: [PATCH 39/67] update zh translation --- Resources/text/zh/lang_zh.txt | 637 ++++++++++++++++++++++++++++------ 1 file changed, 537 insertions(+), 100 deletions(-) diff --git a/Resources/text/zh/lang_zh.txt b/Resources/text/zh/lang_zh.txt index 3e1085fad..e177179ff 100644 --- a/Resources/text/zh/lang_zh.txt +++ b/Resources/text/zh/lang_zh.txt @@ -220,76 +220,76 @@ L_RibbonChampionNational = 国家冠军 L_RibbonChampionWorld = 世界冠军 L_RibbonCountMemoryContest = 以前的华丽大赛缎带 L_RibbonCountMemoryBattle = 以前的战斗塔缎带 -L_RibbonChampionG6Hoenn = Hoenn Champion (ORAS) -L_RibbonContestStar = Contest Star -L_RibbonMasterCoolness = Coolness Master -L_RibbonMasterBeauty = Beauty Master -L_RibbonMasterCuteness = Cuteness Master -L_RibbonMasterCleverness = Cleverness Master -L_RibbonMasterToughness = Toughness Master +L_RibbonChampionG6Hoenn = 丰缘冠军 (ORAS) +L_RibbonContestStar = 华丽大赛之星 +L_RibbonMasterCoolness = 帅气大师 +L_RibbonMasterBeauty = 美丽大师 +L_RibbonMasterCuteness = 可爱大师 +L_RibbonMasterCleverness = 聪明大师 +L_RibbonMasterToughness = 强壮大师 ----------------Contest/Battle (PAST)------------------ -L_RibbonG3Cool = Cool (G3) -L_RibbonG3CoolSuper = Cool Super -L_RibbonG3CoolHyper = Cool Hyper -L_RibbonG3CoolMaster = Cool Master -L_RibbonG3Beauty = Beauty (G3) -L_RibbonG3BeautySuper = Beauty Super -L_RibbonG3BeautyHyper = Beauty Hyper -L_RibbonG3BeautyMaster = Beauty Master -L_RibbonG3Cute = Cute (G3) -L_RibbonG3CuteSuper = Cute Super -L_RibbonG3CuteHyper = Cute Hyper -L_RibbonG3CuteMaster = Cute Master -L_RibbonG3Smart = Smart (G3) -L_RibbonG3SmartSuper = Smart Super -L_RibbonG3SmartHyper = Smart Hyper -L_RibbonG3SmartMaster = Smart Master -L_RibbonG3Tough = Tough (G3) -L_RibbonG3ToughSuper = Tough Super -L_RibbonG3ToughHyper = Tough Hyper -L_RibbonG3ToughMaster = Tough Master -L_RibbonG4Cool = Cool (G4) -L_RibbonG4CoolGreat = Cool Great -L_RibbonG4CoolUltra = Cool Ultra -L_RibbonG4CoolMaster = Cool Master -L_RibbonG4Beauty = Beauty (G4) -L_RibbonG4BeautyGreat = Beauty Great -L_RibbonG4BeautyUltra = Beauty Ultra -L_RibbonG4BeautyMaster = Beauty Master -L_RibbonG4Cute = Cute (G4) -L_RibbonG4CuteGreat = Cute Great -L_RibbonG4CuteUltra = Cute Ultra -L_RibbonG4CuteMaster = Cute Master -L_RibbonG4Smart = Smart (G4) -L_RibbonG4SmartGreat = Smart Great -L_RibbonG4SmartUltra = Smart Ultra -L_RibbonG4SmartMaster = Smart Master -L_RibbonG4Tough = Tough (G4) -L_RibbonG4ToughGreat = Tough Great -L_RibbonG4ToughUltra = Tough Ultra -L_RibbonG4ToughMaster = Tough Master -L_RibbonWinning = Winning -L_RibbonVictory = Victory -L_RibbonAbility = Ability -L_RibbonAbilityGreat = Great Ability -L_RibbonAbilityDouble = Double Ability -L_RibbonAbilityMulti = Multi Ability -L_RibbonAbilityPair = Pair Ability -L_RibbonAbilityWorld = World Ability -L_RibbonCountG3Cool = Cool -L_RibbonCountG3Beauty = Beauty -L_RibbonCountG3Cute = Cute -L_RibbonCountG3Smart = Smart -L_RibbonCountG3Tough = Tough +L_RibbonG3Cool = 帅气 (G3) +L_RibbonG3CoolSuper = 帅气超级 +L_RibbonG3CoolHyper = 帅气特级 +L_RibbonG3CoolMaster = 帅气大师 +L_RibbonG3Beauty = 美丽 (G3) +L_RibbonG3BeautySuper = 美丽超级 +L_RibbonG3BeautyHyper = 美丽特级 +L_RibbonG3BeautyMaster = 美丽大师 +L_RibbonG3Cute = 可爱 (G3) +L_RibbonG3CuteSuper = 可爱超级 +L_RibbonG3CuteHyper = 可爱特级 +L_RibbonG3CuteMaster = 可爱大师 +L_RibbonG3Smart = 聪明 (G3) +L_RibbonG3SmartSuper = 聪明超级 +L_RibbonG3SmartHyper = 聪明特级 +L_RibbonG3SmartMaster = 聪明大师 +L_RibbonG3Tough = 强壮 (G3) +L_RibbonG3ToughSuper = 强壮超级 +L_RibbonG3ToughHyper = 强壮特级 +L_RibbonG3ToughMaster = 强壮大师 +L_RibbonG4Cool = 帅气 (G4) +L_RibbonG4CoolGreat = 帅气超级 +L_RibbonG4CoolUltra = 帅气特级 +L_RibbonG4CoolMaster = 帅气大师 +L_RibbonG4Beauty = 美丽 (G4) +L_RibbonG4BeautyGreat = 美丽超级 +L_RibbonG4BeautyUltra = 美丽特级 +L_RibbonG4BeautyMaster = 美丽大师 +L_RibbonG4Cute = 可爱 (G4) +L_RibbonG4CuteGreat = 可爱超级 +L_RibbonG4CuteUltra = 可爱特级 +L_RibbonG4CuteMaster = 可爱大师 +L_RibbonG4Smart = 聪明 (G4) +L_RibbonG4SmartGreat = 聪明超级 +L_RibbonG4SmartUltra = 聪明特级 +L_RibbonG4SmartMaster = 聪明大师 +L_RibbonG4Tough = 强壮 (G4) +L_RibbonG4ToughGreat = 强壮超级 +L_RibbonG4ToughUltra = 强壮特级 +L_RibbonG4ToughMaster = 强壮大师 +L_RibbonWinning = 成功 +L_RibbonVictory = 胜利 +L_RibbonAbility = 才能 +L_RibbonAbilityGreat = 超级才能 +L_RibbonAbilityDouble = 双人才能 +L_RibbonAbilityMulti = 配合才能 +L_RibbonAbilityPair = 组队双打才能 +L_RibbonAbilityWorld = 世界才能 +L_RibbonCountG3Cool = 帅气 +L_RibbonCountG3Beauty = 美丽 +L_RibbonCountG3Cute = 可爱 +L_RibbonCountG3Smart = 聪明 +L_RibbonCountG3Tough = 强壮 ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. ! SuperTrainingEditor = Medal Editor - Change stuff below this line, not above. ----------------------Buttons-------------------------- -B_All = Give All -B_None = Remove All -B_Cancel = Cancel -B_Save = Save +B_All = 给与所有 +B_None = 移除所有 +B_Cancel = 取消 +B_Save = 保存 ------------------Super Training----------------------- L_SuperTrain1_HP = 等级1: HP L_SuperTrain1_ATK = 等级1: 攻击 @@ -310,18 +310,18 @@ L_SuperTrain3_SPA = 等级3: 特攻 L_SuperTrain3_SPD = 等级3: 特防 L_SuperTrain3_SPE = 等级3: 速度 CHK_Secret = 秘密训练开启 -L_SuperTrain4_1 = 等级4: Troubles -L_SuperTrain5_1 = 等级5: 草 -L_SuperTrain5_2 = 等级5: 火 -L_SuperTrain5_3 = 等级5: 水 +L_SuperTrain4_1 = 等级4: 困境 +L_SuperTrain5_1 = 等级5: 草之石 +L_SuperTrain5_2 = 等级5: 火之石 +L_SuperTrain5_3 = 等级5: 水之石 L_SuperTrain5_4 = 等级5: 逃跑 -L_SuperTrain6_1 = 等级6: Second -L_SuperTrain6_2 = 等级6: Quick -L_SuperTrain6_3 = 等级6: Long -L_SuperTrain7_1 = 等级7: Scatter -L_SuperTrain7_2 = 等级7: Barrage -L_SuperTrain7_3 = 等级7: Hydreigon -L_SuperTrain8_1 = 等级8: X/Y +L_SuperTrain6_1 = 等级6: 反击战 +L_SuperTrain6_2 = 等级6: 速攻战 +L_SuperTrain6_3 = 等级6: 远距离 +L_SuperTrain7_1 = 等级7: 逆袭粉蛹 +L_SuperTrain7_2 = 等级7: 小气球 +L_SuperTrain7_3 = 等级7: 三头龙 +L_SuperTrain8_1 = 等级8: 最强之战 --- L_Bag = 上一次使用物品: L_Hits = 剩余点数: @@ -333,31 +333,468 @@ L_Hits = 剩余点数: ---------------------Bottom UI------------------------- BTN_Cancel = 取消 BTN_Save = 保存 -L_Handler = 現在のハンドラ -L_Fullness = 豊かさ -L_Enjoyment = 楽しみ +L_Handler = 现在的主人： - -Tab_OTMemory = との思い出 OT -L_OT_Friendship = なつき度 -L_OT_Affection = あい -L_OT_TextLine = メモリタイプ -L_OT_Quality = 強度 -L_OT_Feeling = 気持ち -Tab_CTMemory = との思い出 notOT -L_CT_Friendship = なつき度 -L_cT_Affection = あい -L_CT_TextLine = メモリタイプ -L_CT_Quality = 強度 -L_CT_Feeling = 気持ち -Tab_Residence = 住まい -GB_Residence = ポケモンに住んでいます -L_Geo0 = 以前的地理位置0 -L_Geo1 = 以前的地理位置1 -L_Geo2 = 以前的地理位置2 -L_Geo3 = 以前的地理位置3 -L_Geo4 = 以前的地理位置4 -L_Region = 地域 -L_Country = 国 +Tab_OTMemory = 与原主人的记忆： +L_OT_Friendship = 友好度： +L_OT_Affection = 喜爱度: +Tab_CTMemory = 与现主人的记忆： +L_CT_Friendship = 友好度： +L_cT_Affection = 喜爱度： +Tab_Residence = 居住地 -- -L_Arguments = 禁止使用 ; 左はありませんでした ; OT ; 前回のゲーム ; との思い出 ; 宝可梦 ; 地区 ; 道具 ; わざ ; 地点 ; +L_Country = 国家 +L_Region = 地区 +L_Geo0 = 现居地: +L_Geo1 = 故居1: +L_Geo2 = 故居2: +L_Geo3 = 故居3: +L_Geo4 = 故居4: +-- +L_Arguments = 关闭 ; 从未离开 ; 原主人 ; 前作 ; 回忆 ; 宝可梦 ; 地区 ; 道具 ; 移动 ; 位置 ; +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! f2_Text = Special Characters +- Change stuff below this line, not above. +------------------------------------------------------- +-- No Elements to rename here. +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_BerryField = Berry Field Viewer +- Change stuff below this line, not above. +------------------------------------------------------- +L_Berry = 树果: +L_Field = 田: +L_Unfinished = 未完成: 需要更多研究 +L_u1 = 1 +L_u2 = 2 +L_u3 = 3 +L_u4 = 4 +L_u5 = 5 +L_u6 = 6 +L_u7 = 7 +B_Cancel = 取消 +B_Save = 保存 +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. Memories / Amie UI Below +! SAV_BoxLayout = Box Layout Editor +- Change stuff below this line, not above. +------------------------------------------------------- +L_Unlocked = 已解锁: +B_Cancel = 取消 +B_Save = 保存 +L_Flags = 解锁的背景标识: +L_BG = 背景: +L_BoxName = 箱子名: +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_EventFlagsORAS = Event Flag Editor (ORAS) +- Change stuff below this line, not above. +------------------------------------------------------ +L_Ash = 火山灰: +GB_Misc = 杂项 +flag_0288 = 配合雕像 +flag_0287 = 轮盘雕像 +flag_0286 = 三重雕像 +flag_0293 = 超级配合 已解锁 +flag_0292 = 超级轮盘 已解锁 +flag_0291 = 超级三重 已解锁 +flag_0290 = 超级双人 已解锁 +flag_0289 = 超级单人 已解锁 +flag_0285 = 双人雕像 +flag_0284 = 单人雕像 +GB_Rebattle = 重新战斗 +flag_2835 = (AS) 拉帝欧斯 已捕获 +flag_0420 = (AS) 拉帝欧斯 已打败 +L_SkyTower = *天空塔 +flag_2834 = (OR) 拉帝亚斯 已捕获 +flag_0419 = (OR) 拉帝亚斯 已打败 +flag_2828 = (OR) 龙卷云 已捕获 +flag_2830 = (OR) 雷希拉姆 已捕获 +flag_0182 = (OR) 雷希拉姆 已打败 +flag_2820 = (OR) 帕路奇犽 已捕获 +flag_2839 = (OR) 固拉多 已捕获 +flag_0648 = (OR) 固拉多 已打败 +flag_2815 = (OR) 凤王 已捕获 +flag_0208 = (OR) 凤王 已打败 +flag_2824 = 克雷色利亚 已捕获 +flag_0172 = 克雷色利亚 已打败 +flag_2821 = 席多蓝恩 已捕获 +flag_0260 = 席多蓝恩 已打败 +flag_2842 = 代欧奇希斯 已捕获 +flag_0945 = 代欧奇希斯 已打败 +flag_2838 = 雷吉斯奇鲁 已捕获 +flag_0958 = 雷吉斯奇鲁 已打败 +flag_2836 = 雷吉洛克 已捕获 +flag_0956 = 雷吉洛克 已打败 +flag_2837 = 雷吉艾斯 已捕获 +flag_0957 = 雷吉艾斯 已打败 +flag_2813 = 水君 已捕获 +flag_0175 = 水君 已打败 +flag_2811 = 雷公 已捕获 +flag_0173 = 雷公 已打败 +flag_2812 = 炎帝 已捕获 +flag_0174 = 炎帝 已打败 +flag_2832 = 土地云 已捕获 +flag_2829 = (AS) 雷电云 已捕获 +flag_2822 = 雷吉奇卡斯 已捕获 +flag_0252 = 雷吉奇卡斯 已打败 +flag_2827 = 毕力吉翁 已捕获 +flag_0178 = 毕力吉翁 已打败 +flag_2826 = 代拉基翁 已捕获 +flag_0177 = 代拉基翁 已打败 +flag_2823 = 骑拉帝纳 已捕获 +flag_2819 = (AS) 帝牙卢卡 已捕获 +flag_2833 = 酋雷姆 已捕获 +flag_0184 = 酋雷姆 已打败 +flag_2816 = 由克希 已捕获 +flag_0179 = 由克希 已打败 +flag_2817 = 艾姆利多 已捕获 +flag_0180 = 艾姆利多 已打败 +flag_2825 = 勾帕路翁 已捕获 +flag_0176 = 勾帕路翁 已打败 +flag_2814 = (AS) 洛奇亚 已捕获 +flag_0209 = (AS) 洛奇亚 已打败 +flag_2818 = 亚克诺姆 已捕获 +flag_0181 = 亚克诺姆 已打败 +flag_2831 = (AS) 捷克罗姆 已捕获 +flag_0183 = (AS) 捷克罗姆 已打败 +flag_2840 = (AS) 盖欧卡 已捕获 +flag_0647 = (AS) 盖欧卡 已打败 +GB_Researcher = 标识区别研究器 +L_UnSet = 未设置 +L_IsSet = 已设置 +B_LoadNew = 读新数据 +B_LoadOld = 读老数据 +GB_FlagStatus = 检查标识状态 +L_Flag = 标识: +CHK_CustomFlag = 状态: +B_Save = 保存 +B_Cancel = 取消 +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_EventFlagsXY = Event Flag Editor (XY) +- Change stuff below this line, not above. +------------------------------------------------------- +flag_2546 = Pokédex Obtained +GB_Misc = Misc +flag_0289 = Multi Statuette +flag_0288 = Rotation Statuette +flag_0287 = Triples Statuette +flag_0294 = Super Multi Unlocked +flag_0293 = Super Rotation Unlocked +flag_0292 = Super Triples Unlocked +flag_0291 = Super Doubles Unlocked +flag_0290 = Super Singles Unlocked +flag_0675 = 50: Beat Chatelaine +flag_0286 = Doubles Statuette +flag_0285 = Singles Statuette +GB_Rebattle = Rebattle +flag_0114 = Zygarde Captured +flag_0790 = Zygarde Defeated +flag_0115 = Mewtwo Captured +flag_0963 = Mewtwo Defeated +GB_Researcher = FlagDiff Researcher +L_UnSet = UnSet +L_IsSet = IsSet +B_LoadNew = Load New +B_LoadOld = Load Old +flag_2239 = 2239 +flag_2238 = 2238 +flag_2237 = 2237 +B_Save = Save +flag_0005 = Flag5 +flag_0004 = Flag4 +flag_0003 = Flag3 +flag_0002 = Flag2 +flag_0001 = Flag1 +GB_FlagStatus = Check Flag Status +L_Flag = Flag: +CHK_CustomFlag = Status: +B_Cancel = Cancel +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_PokedexORAS = Pokédex Editor (ORAS) +- Change stuff below this line, not above. +------------------------------------------------------ +L_goto = goto: +GB_Owned = Owned +CHK_P1 = Obtained +CHK_P2 = Male +CHK_P3 = Female +CHK_P4 = Shiny Male +CHK_P5 = Shiny Female +GB_Encountered = Encountered +CHK_P6 = Male +CHK_P7 = Female +CHK_P8 = Shiny Male +CHK_P9 = Shiny Female +L_DexNav = DexNav Lv: +GB_Language = Languages +CHK_L1 = Japanese +CHK_L2 = English +CHK_L3 = French +CHK_L4 = Italian +CHK_L5 = German +CHK_L6 = Spanish +CHK_L7 = Korean +B_Modify = Modify... +B_GiveAll = Check All +L_Spinda = Spinda: +B_Save = Save +B_Cancel = Cancel +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_PokedexXY = Pokédex Editor (XY) +- Change stuff below this line, not above. +------------------------------------------------------- +L_goto = goto: +GB_Owned = Owned +CHK_F1 = Foreign (Pre) +CHK_P1 = Native (Kalos) +GB_Encountered = Encountered +CHK_P2 = Male +CHK_P3 = Female +CHK_P4 = Shiny Male +CHK_P5 = Shiny Female +GB_Displayed = Displayed +CHK_P6 = Male +CHK_P7 = Female +CHK_P8 = Shiny Male +CHK_P9 = Shiny Female +GB_Language = Languages +CHK_L1 = Japanese +CHK_L2 = English +CHK_L3 = French +CHK_L4 = Italian +CHK_L5 = German +CHK_L6 = Spanish +CHK_L7 = Korean +B_Modify = Modify... +B_GiveAll = Check All +L_Spinda = Spinda: +B_Save = Save +B_Cancel = Cancel +! End +------------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_HallOfFame = Hall of Fame Editor +- Change stuff below this line, not above. +------------------------------------------------------- +B_CopyText = Copy txt +L_Level = Level: +L_Shiny = Shiny: +Label_Form = Form: +B_Cancel = Cancel +Label_MetDate = Date: +L_Victory = Victory Number: +GB_OT = Trainer Information +Label_OT = OT: +Label_SID = SID: +Label_TID = TID: +Label_HeldItem = Held Item: +GB_CurrentMoves = Current Moves +Label_EncryptionConstant = Encryption Constant: +CHK_Nicknamed = Nickname: +Label_Species = Species: +L_PartyNum = Party Index: +B_Close = Save +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_Inventory = Inventory Editor +- Change stuff below this line, not above. +------------------------------------------------------- +GB_Pouch = Pouches +B_DisplayBerries = Berry +B_DisplayMedicine = Medicine +B_DisplayTMHM = TM/HM +B_DisplayKeyItems = Key Items +B_DisplayItems = Items +B_Save = Save +B_Cancel = Cancel +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_OPower = O-Power Editor +- Change stuff below this line, not above. +------------------------------------------------------- +GB_Regular = Regular +B_MaxP = Give All +L_1 = Hatching: +L_2 = Bargain: +L_3 = ?Prize: +L_4 = EXP: +L_5 = Capture: +L_6 = ?Encounter +L_7 = ?Stealth: +L_8 = HP Restore: +L_9 = ?PP: +L_10 = ?Befriend: +L_11 = ?Attack: +L_12 = ?Defense: +L_13 = ?Sp. Atk: +L_14 = ?Sp. Def: +L_15 = ?Speed: +L_16 = ?Critical Hit: +L_17 = ?Accuracy: +GB_Event = Event +CHK_1 = ?Bargain MAX +CHK_2 = ?EXP MAX +CHK_3 = ?Prize MAX +CHK_4 = ?Hatch MAX +CHK_5 = ?Capture MAX +CHK_6 = ?Restore MAX +CHK_7 = ?Befriend MAX +CHK_8 = ?Unused +B_AllMax = Give All +B_Save = Save +B_Cancel = Cancel +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_Pokepuff = ‎Poké Puffs Editor +- Change stuff below this line, not above. +------------------------------------------------------- +L_Count = CNT: +B_None = None +B_Sort = Sort +B_All = All +B_Cancel = Cancel +B_Save = Save +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_SecretBase = Secret Base Editor +- Change stuff below this line, not above. +------------------------------------------------------- +L_FlagsCaptured = Flags Captured: +B_FSave = < +B_GiveDecor = Give All Decorations +B_Cancel = Cancel +B_Save = Save +B_FDisplay = > +L_Favorite = Favorites: +-- +f_MAIN = Main +L_TrName = Trainer Name: +L_BaseLocation = Secret Base Location: +L_Happy = Happy: +L_Encourage = Encourage: +L_Blackboard = Blackboard: +L_Confetti = Confetti: +L_TeamName = Team Name: +L_TeamSlogan = Team Slogan: +-- +GB_Object = Object Layout +L_Index = Index: +L_Decoration = Decoration: +L_Rotation = Rotation Val: +L_X = X Coordinate: +L_Y = Y Coordinate: +-- +f_PKM = Trainer Pokémon +GB_PKM = PKM +L_Participant = Participant: +L_EncryptionConstant = ENC: +L_IVs = IVs +L_EVs = EVs +L_HP = HP +L_ATK = ATK +L_DEF = DEF +L_SpA = SpA +L_SpD = SpD +L_SPE = SPE +L_PKFriendship = Friendship: +L_PPUps = PPUps +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_Trainer = Trainer Data Editor +- Change stuff below this line, not above. +------------------------------------------------------- +Tab_Multiplayer = Multiplayer +L_MultiplayerSprite = Multiplayer Sprite: +L_Style = Style: +Tab_BadgeMap = Badges/Map +GB_Map = Map Position +L_CurrentMap = Current Map: +L_X = X Coordinate: +L_Z = Z Coordinate: +L_Y = Y Coordinate: +L_Offset = (offset) +Tab_Appearance = Current Appearance (X/Y) +L_Outfit = Outfit Vals +B_GiveAccessories = Give All Accessories +L_Dress = Dress: +L_Accessory = Accessory: +L_Bag = Bag: +L_Socks = Socks: +L_Pants = Pants: +L_Shirt = Shirt: +L_Hat = Hat: +L_FacialHair = Facial Hair: +L_Hairstyle = Hairstyle: +L_HairColor = Hair Color: +L_SkinColor = Skin Color: +GB_MaisonCurrent = Maison Streaks (Current) +L_SuperC = Super +L_NormalC = Normal +L_MultiC = Multi: +L_RotationC = Rotation: +L_TriplesC = Triples: +L_DoublesC = Doubles: +L_SinglesC = Singles: +GB_MaisonBest = Maison Streaks (Best) +L_SuperB = Super +L_NormalB = Normal +L_MultiB = Multi: +L_RotationB = Rotation: +L_TriplesB = Triples: +L_DoublesB = Doubles: +L_SinglesB = Singles: +B_Save = Save +L_Stats = Stats +B_Cancel = Cancel +Tab_Overview = Overview +L_Seconds = Sec: +L_Minutes = Min: +L_Hours = Hrs: +L_Language = Language: +L_PM = PokéMiles: +L_Region = Region: +L_BP = BP: +L_Country = Country: +B_MaxCash = + +L_3DSReg = 3DS Region: +L_Money = $: +L_SID = SID: +L_TID = TID: +L_TrainerName = Trainer Name: +L_Value = Value +GB_Sayings = Saved Sayings +L_Saying1 = 1: +L_Saying2 = 2: +L_Saying3 = 3: +L_Saying4 = 4: +L_Saying5 = 5: +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_Wondercard = Wonder Card I/O +- Change stuff below this line, not above. +------------------------------------------------------- +L_Details = Details: +L_Received = Received List: +B_Import = Import +B_Output = Export +B_Cancel = Cancel +B_Save = Save ! End \ No newline at end of file From 4d1ef52b34bca673dccd92bc6f2120600803b090 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Wed, 10 Aug 2016 08:10:31 -0500 Subject: [PATCH 40/67] Moved project to its own directory Will make it easier to add projects in the future, like unit tests --- PKHeX.sln | 8 +++++--- {Legality => PKHeX/Legality}/Analysis.cs | 0 {Legality => PKHeX/Legality}/Checks.cs | 0 {Legality => PKHeX/Legality}/Core.cs | 0 {Legality => PKHeX/Legality}/Data.cs | 0 {Legality => PKHeX/Legality}/Tables.cs | 0 {Legality => PKHeX/Legality}/Tables3.cs | 0 {Legality => PKHeX/Legality}/Tables4.cs | 0 {Legality => PKHeX/Legality}/Tables5.cs | 0 {MainWindow => PKHeX/MainWindow}/Main.Designer.cs | 0 {MainWindow => PKHeX/MainWindow}/Main.cs | 0 {MainWindow => PKHeX/MainWindow}/Main.resx | 0 {MainWindow => PKHeX/MainWindow}/MainPK3.cs | 0 {MainWindow => PKHeX/MainWindow}/MainPK4.cs | 0 {MainWindow => PKHeX/MainWindow}/MainPK5.cs | 0 {MainWindow => PKHeX/MainWindow}/MainPK6.cs | 0 {Misc => PKHeX/Misc}/About.Designer.cs | 0 {Misc => PKHeX/Misc}/About.cs | 0 {Misc => PKHeX/Misc}/About.resx | 0 {Misc => PKHeX/Misc}/ComboItem.cs | 0 {Misc => PKHeX/Misc}/QR.Designer.cs | 0 {Misc => PKHeX/Misc}/QR.cs | 0 {Misc => PKHeX/Misc}/QR.resx | 0 {Misc => PKHeX/Misc}/SplashScreen.Designer.cs | 0 {Misc => PKHeX/Misc}/SplashScreen.cs | 0 {Misc => PKHeX/Misc}/SplashScreen.resx | 0 {MysteryGifts => PKHeX/MysteryGifts}/MysteryGift.cs | 0 {MysteryGifts => PKHeX/MysteryGifts}/PGF.cs | 0 {MysteryGifts => PKHeX/MysteryGifts}/PGT.cs | 0 {MysteryGifts => PKHeX/MysteryGifts}/PL6.cs | 0 {MysteryGifts => PKHeX/MysteryGifts}/WC6.cs | 0 PKHeX.csproj => PKHeX/PKHeX.csproj | 0 PKHeX.userprefs => PKHeX/PKHeX.userprefs | 0 {PKM => PKHeX/PKM}/PK3.cs | 0 {PKM => PKHeX/PKM}/PK4.cs | 0 {PKM => PKHeX/PKM}/PK5.cs | 0 {PKM => PKHeX/PKM}/PK6.cs | 0 {PKM => PKHeX/PKM}/PKM.cs | 0 {PKM => PKHeX/PKM}/PKMConverter.cs | 0 {PKM => PKHeX/PKM}/PKX.cs | 0 {PKM => PKHeX/PKM}/ShowdownSet.cs | 0 .../PersonalInfo}/PersonalInfo.cs | 0 .../PersonalInfo}/PersonalInfoB2W2.cs | 0 .../PersonalInfo}/PersonalInfoBW.cs | 0 .../PersonalInfo}/PersonalInfoG3.cs | 0 .../PersonalInfo}/PersonalInfoG4.cs | 0 .../PersonalInfo}/PersonalInfoORAS.cs | 0 .../PersonalInfo}/PersonalInfoXY.cs | 0 .../PersonalInfo}/PersonalTable.cs | 0 Program.cs => PKHeX/Program.cs | 0 {Properties => PKHeX/Properties}/AssemblyInfo.cs | 0 .../Properties}/Resources.Designer.cs | 0 {Properties => PKHeX/Properties}/Resources.resx | 0 .../Properties}/Settings.Designer.cs | 0 {Properties => PKHeX/Properties}/Settings.settings | 0 .../Resources}/byte/PGLDings-NormalRegular.ttf | Bin {Resources => PKHeX/Resources}/byte/eggmove_ao.pkl | Bin {Resources => PKHeX/Resources}/byte/eggmove_xy.pkl | Bin {Resources => PKHeX/Resources}/byte/encounter_a.pkl | Bin {Resources => PKHeX/Resources}/byte/encounter_o.pkl | Bin {Resources => PKHeX/Resources}/byte/encounter_x.pkl | Bin {Resources => PKHeX/Resources}/byte/encounter_y.pkl | Bin {Resources => PKHeX/Resources}/byte/evos_ao.pkl | Bin {Resources => PKHeX/Resources}/byte/lvlmove_ao.pkl | Bin {Resources => PKHeX/Resources}/byte/lvlmove_xy.pkl | Bin {Resources => PKHeX/Resources}/byte/personal_ao | Bin {Resources => PKHeX/Resources}/byte/personal_b2w2 | Bin {Resources => PKHeX/Resources}/byte/personal_bw | Bin {Resources => PKHeX/Resources}/byte/personal_dp | Bin {Resources => PKHeX/Resources}/byte/personal_e | Bin {Resources => PKHeX/Resources}/byte/personal_fr | Bin {Resources => PKHeX/Resources}/byte/personal_hgss | Bin {Resources => PKHeX/Resources}/byte/personal_lg | Bin {Resources => PKHeX/Resources}/byte/personal_pt | Bin {Resources => PKHeX/Resources}/byte/personal_rs | Bin {Resources => PKHeX/Resources}/byte/personal_xy | Bin {Resources => PKHeX/Resources}/byte/wc6.pkl | Bin {Resources => PKHeX/Resources}/byte/wc6full.pkl | Bin {Resources => PKHeX/Resources}/icon.ico | Bin .../Resources}/img/Bag/Bag_Balls.png | Bin .../Resources}/img/Bag/Bag_Battle.png | Bin .../Resources}/img/Bag/Bag_Berries.png | Bin .../Resources}/img/Bag/Bag_Items.png | Bin {Resources => PKHeX/Resources}/img/Bag/Bag_Key.png | Bin {Resources => PKHeX/Resources}/img/Bag/Bag_Mail.png | Bin .../Resources}/img/Bag/Bag_Medicine.png | Bin {Resources => PKHeX/Resources}/img/Bag/Bag_TMHM.png | Bin .../Resources}/img/Pokemon Sprites/0.png | Bin .../Resources}/img/Pokemon Sprites/1.png | Bin .../Resources}/img/Pokemon Sprites/10.png | Bin .../Resources}/img/Pokemon Sprites/100.png | Bin .../Resources}/img/Pokemon Sprites/101.png | Bin .../Resources}/img/Pokemon Sprites/102.png | Bin .../Resources}/img/Pokemon Sprites/103.png | Bin .../Resources}/img/Pokemon Sprites/104.png | Bin .../Resources}/img/Pokemon Sprites/105.png | Bin .../Resources}/img/Pokemon Sprites/106.png | Bin .../Resources}/img/Pokemon Sprites/107.png | Bin .../Resources}/img/Pokemon Sprites/108.png | Bin .../Resources}/img/Pokemon Sprites/109.png | Bin .../Resources}/img/Pokemon Sprites/11.png | Bin .../Resources}/img/Pokemon Sprites/110.png | Bin .../Resources}/img/Pokemon Sprites/111.png | Bin .../Resources}/img/Pokemon Sprites/112.png | Bin .../Resources}/img/Pokemon Sprites/113.png | Bin .../Resources}/img/Pokemon Sprites/114.png | Bin .../Resources}/img/Pokemon Sprites/115-1.png | Bin .../Resources}/img/Pokemon Sprites/115.png | Bin .../Resources}/img/Pokemon Sprites/116.png | Bin .../Resources}/img/Pokemon Sprites/117.png | Bin .../Resources}/img/Pokemon Sprites/118.png | Bin .../Resources}/img/Pokemon Sprites/119.png | Bin .../Resources}/img/Pokemon Sprites/12.png | Bin .../Resources}/img/Pokemon Sprites/120.png | Bin .../Resources}/img/Pokemon Sprites/121.png | Bin .../Resources}/img/Pokemon Sprites/122.png | Bin .../Resources}/img/Pokemon Sprites/123.png | Bin .../Resources}/img/Pokemon Sprites/124.png | Bin .../Resources}/img/Pokemon Sprites/125.png | Bin .../Resources}/img/Pokemon Sprites/126.png | Bin .../Resources}/img/Pokemon Sprites/127-1.png | Bin .../Resources}/img/Pokemon Sprites/127.png | Bin .../Resources}/img/Pokemon Sprites/128.png | Bin .../Resources}/img/Pokemon Sprites/129.png | Bin .../Resources}/img/Pokemon Sprites/13.png | Bin .../Resources}/img/Pokemon Sprites/130-1.png | Bin .../Resources}/img/Pokemon Sprites/130.png | Bin .../Resources}/img/Pokemon Sprites/131.png | Bin .../Resources}/img/Pokemon Sprites/132.png | Bin .../Resources}/img/Pokemon Sprites/133.png | Bin .../Resources}/img/Pokemon Sprites/134.png | Bin .../Resources}/img/Pokemon Sprites/135.png | Bin .../Resources}/img/Pokemon Sprites/136.png | Bin .../Resources}/img/Pokemon Sprites/137.png | Bin .../Resources}/img/Pokemon Sprites/138.png | Bin .../Resources}/img/Pokemon Sprites/139.png | Bin .../Resources}/img/Pokemon Sprites/14.png | Bin .../Resources}/img/Pokemon Sprites/140.png | Bin .../Resources}/img/Pokemon Sprites/141.png | Bin .../Resources}/img/Pokemon Sprites/142-1.png | Bin .../Resources}/img/Pokemon Sprites/142.png | Bin .../Resources}/img/Pokemon Sprites/143.png | Bin .../Resources}/img/Pokemon Sprites/144.png | Bin .../Resources}/img/Pokemon Sprites/145.png | Bin .../Resources}/img/Pokemon Sprites/146.png | Bin .../Resources}/img/Pokemon Sprites/147.png | Bin .../Resources}/img/Pokemon Sprites/148.png | Bin .../Resources}/img/Pokemon Sprites/149.png | Bin .../Resources}/img/Pokemon Sprites/15-1.png | Bin .../Resources}/img/Pokemon Sprites/15.png | Bin .../Resources}/img/Pokemon Sprites/150-1.png | Bin .../Resources}/img/Pokemon Sprites/150-2.png | Bin .../Resources}/img/Pokemon Sprites/150.png | Bin .../Resources}/img/Pokemon Sprites/151.png | Bin .../Resources}/img/Pokemon Sprites/152.png | Bin .../Resources}/img/Pokemon Sprites/153.png | Bin .../Resources}/img/Pokemon Sprites/154.png | Bin .../Resources}/img/Pokemon Sprites/155.png | Bin .../Resources}/img/Pokemon Sprites/156.png | Bin .../Resources}/img/Pokemon Sprites/157.png | Bin .../Resources}/img/Pokemon Sprites/158.png | Bin .../Resources}/img/Pokemon Sprites/159.png | Bin .../Resources}/img/Pokemon Sprites/16.png | Bin .../Resources}/img/Pokemon Sprites/160.png | Bin .../Resources}/img/Pokemon Sprites/161.png | Bin .../Resources}/img/Pokemon Sprites/162.png | Bin .../Resources}/img/Pokemon Sprites/163.png | Bin .../Resources}/img/Pokemon Sprites/164.png | Bin .../Resources}/img/Pokemon Sprites/165.png | Bin .../Resources}/img/Pokemon Sprites/166.png | Bin .../Resources}/img/Pokemon Sprites/167.png | Bin .../Resources}/img/Pokemon Sprites/168.png | Bin .../Resources}/img/Pokemon Sprites/169.png | Bin .../Resources}/img/Pokemon Sprites/17.png | Bin .../Resources}/img/Pokemon Sprites/170.png | Bin .../Resources}/img/Pokemon Sprites/171.png | Bin .../Resources}/img/Pokemon Sprites/172.png | Bin .../Resources}/img/Pokemon Sprites/173.png | Bin .../Resources}/img/Pokemon Sprites/174.png | Bin .../Resources}/img/Pokemon Sprites/175.png | Bin .../Resources}/img/Pokemon Sprites/176.png | Bin .../Resources}/img/Pokemon Sprites/177.png | Bin .../Resources}/img/Pokemon Sprites/178.png | Bin .../Resources}/img/Pokemon Sprites/179.png | Bin .../Resources}/img/Pokemon Sprites/18-1.png | Bin .../Resources}/img/Pokemon Sprites/18.png | Bin .../Resources}/img/Pokemon Sprites/180.png | Bin .../Resources}/img/Pokemon Sprites/181-1.png | Bin .../Resources}/img/Pokemon Sprites/181.png | Bin .../Resources}/img/Pokemon Sprites/182.png | Bin .../Resources}/img/Pokemon Sprites/183.png | Bin .../Resources}/img/Pokemon Sprites/184.png | Bin .../Resources}/img/Pokemon Sprites/185.png | Bin .../Resources}/img/Pokemon Sprites/186.png | Bin .../Resources}/img/Pokemon Sprites/187.png | Bin .../Resources}/img/Pokemon Sprites/188.png | Bin .../Resources}/img/Pokemon Sprites/189.png | Bin .../Resources}/img/Pokemon Sprites/19.png | Bin .../Resources}/img/Pokemon Sprites/190.png | Bin .../Resources}/img/Pokemon Sprites/191.png | Bin .../Resources}/img/Pokemon Sprites/192.png | Bin .../Resources}/img/Pokemon Sprites/193.png | Bin .../Resources}/img/Pokemon Sprites/194.png | Bin .../Resources}/img/Pokemon Sprites/195.png | Bin .../Resources}/img/Pokemon Sprites/196.png | Bin .../Resources}/img/Pokemon Sprites/197.png | Bin .../Resources}/img/Pokemon Sprites/198.png | Bin .../Resources}/img/Pokemon Sprites/199.png | Bin .../Resources}/img/Pokemon Sprites/2.png | Bin .../Resources}/img/Pokemon Sprites/20.png | Bin .../Resources}/img/Pokemon Sprites/200.png | Bin .../Resources}/img/Pokemon Sprites/201-1.png | Bin .../Resources}/img/Pokemon Sprites/201-10.png | Bin .../Resources}/img/Pokemon Sprites/201-11.png | Bin .../Resources}/img/Pokemon Sprites/201-12.png | Bin .../Resources}/img/Pokemon Sprites/201-13.png | Bin .../Resources}/img/Pokemon Sprites/201-14.png | Bin .../Resources}/img/Pokemon Sprites/201-15.png | Bin .../Resources}/img/Pokemon Sprites/201-16.png | Bin .../Resources}/img/Pokemon Sprites/201-17.png | Bin .../Resources}/img/Pokemon Sprites/201-18.png | Bin .../Resources}/img/Pokemon Sprites/201-19.png | Bin .../Resources}/img/Pokemon Sprites/201-2.png | Bin .../Resources}/img/Pokemon Sprites/201-20.png | Bin .../Resources}/img/Pokemon Sprites/201-21.png | Bin .../Resources}/img/Pokemon Sprites/201-22.png | Bin .../Resources}/img/Pokemon Sprites/201-23.png | Bin .../Resources}/img/Pokemon Sprites/201-24.png | Bin .../Resources}/img/Pokemon Sprites/201-25.png | Bin .../Resources}/img/Pokemon Sprites/201-26.png | Bin .../Resources}/img/Pokemon Sprites/201-27.png | Bin .../Resources}/img/Pokemon Sprites/201-3.png | Bin .../Resources}/img/Pokemon Sprites/201-4.png | Bin .../Resources}/img/Pokemon Sprites/201-5.png | Bin .../Resources}/img/Pokemon Sprites/201-6.png | Bin .../Resources}/img/Pokemon Sprites/201-7.png | Bin .../Resources}/img/Pokemon Sprites/201-8.png | Bin .../Resources}/img/Pokemon Sprites/201-9.png | Bin .../Resources}/img/Pokemon Sprites/201.png | Bin .../Resources}/img/Pokemon Sprites/202.png | Bin .../Resources}/img/Pokemon Sprites/203.png | Bin .../Resources}/img/Pokemon Sprites/204.png | Bin .../Resources}/img/Pokemon Sprites/205.png | Bin .../Resources}/img/Pokemon Sprites/206.png | Bin .../Resources}/img/Pokemon Sprites/207.png | Bin .../Resources}/img/Pokemon Sprites/208-1.png | Bin .../Resources}/img/Pokemon Sprites/208.png | Bin .../Resources}/img/Pokemon Sprites/209.png | Bin .../Resources}/img/Pokemon Sprites/21.png | Bin .../Resources}/img/Pokemon Sprites/210.png | Bin .../Resources}/img/Pokemon Sprites/211.png | Bin .../Resources}/img/Pokemon Sprites/212-1.png | Bin .../Resources}/img/Pokemon Sprites/212.png | Bin .../Resources}/img/Pokemon Sprites/213.png | Bin .../Resources}/img/Pokemon Sprites/214-1.png | Bin .../Resources}/img/Pokemon Sprites/214.png | Bin .../Resources}/img/Pokemon Sprites/215.png | Bin .../Resources}/img/Pokemon Sprites/216.png | Bin .../Resources}/img/Pokemon Sprites/217.png | Bin .../Resources}/img/Pokemon Sprites/218.png | Bin .../Resources}/img/Pokemon Sprites/219.png | Bin .../Resources}/img/Pokemon Sprites/22.png | Bin .../Resources}/img/Pokemon Sprites/220.png | Bin .../Resources}/img/Pokemon Sprites/221.png | Bin .../Resources}/img/Pokemon Sprites/222.png | Bin .../Resources}/img/Pokemon Sprites/223.png | Bin .../Resources}/img/Pokemon Sprites/224.png | Bin .../Resources}/img/Pokemon Sprites/225.png | Bin .../Resources}/img/Pokemon Sprites/226.png | Bin .../Resources}/img/Pokemon Sprites/227.png | Bin .../Resources}/img/Pokemon Sprites/228.png | Bin .../Resources}/img/Pokemon Sprites/229-1.png | Bin .../Resources}/img/Pokemon Sprites/229.png | Bin .../Resources}/img/Pokemon Sprites/23.png | Bin .../Resources}/img/Pokemon Sprites/230.png | Bin .../Resources}/img/Pokemon Sprites/231.png | Bin .../Resources}/img/Pokemon Sprites/232.png | Bin .../Resources}/img/Pokemon Sprites/233.png | Bin .../Resources}/img/Pokemon Sprites/234.png | Bin .../Resources}/img/Pokemon Sprites/235.png | Bin .../Resources}/img/Pokemon Sprites/236.png | Bin .../Resources}/img/Pokemon Sprites/237.png | Bin .../Resources}/img/Pokemon Sprites/238.png | Bin .../Resources}/img/Pokemon Sprites/239.png | Bin .../Resources}/img/Pokemon Sprites/24.png | Bin .../Resources}/img/Pokemon Sprites/240.png | Bin .../Resources}/img/Pokemon Sprites/241.png | Bin .../Resources}/img/Pokemon Sprites/242.png | Bin .../Resources}/img/Pokemon Sprites/243.png | Bin .../Resources}/img/Pokemon Sprites/244.png | Bin .../Resources}/img/Pokemon Sprites/245.png | Bin .../Resources}/img/Pokemon Sprites/246.png | Bin .../Resources}/img/Pokemon Sprites/247.png | Bin .../Resources}/img/Pokemon Sprites/248-1.png | Bin .../Resources}/img/Pokemon Sprites/248.png | Bin .../Resources}/img/Pokemon Sprites/249.png | Bin .../Resources}/img/Pokemon Sprites/25-1.png | Bin .../Resources}/img/Pokemon Sprites/25-2.png | Bin .../Resources}/img/Pokemon Sprites/25-3.png | Bin .../Resources}/img/Pokemon Sprites/25-4.png | Bin .../Resources}/img/Pokemon Sprites/25-5.png | Bin .../Resources}/img/Pokemon Sprites/25-6.png | Bin .../Resources}/img/Pokemon Sprites/25.png | Bin .../Resources}/img/Pokemon Sprites/250.png | Bin .../Resources}/img/Pokemon Sprites/251.png | Bin .../Resources}/img/Pokemon Sprites/252.png | Bin .../Resources}/img/Pokemon Sprites/253.png | Bin .../Resources}/img/Pokemon Sprites/254-1.png | Bin .../Resources}/img/Pokemon Sprites/254.png | Bin .../Resources}/img/Pokemon Sprites/255.png | Bin .../Resources}/img/Pokemon Sprites/256.png | Bin .../Resources}/img/Pokemon Sprites/257-1.png | Bin .../Resources}/img/Pokemon Sprites/257.png | Bin .../Resources}/img/Pokemon Sprites/258.png | Bin .../Resources}/img/Pokemon Sprites/259.png | Bin .../Resources}/img/Pokemon Sprites/26.png | Bin .../Resources}/img/Pokemon Sprites/260-1.png | Bin .../Resources}/img/Pokemon Sprites/260.png | Bin .../Resources}/img/Pokemon Sprites/261.png | Bin .../Resources}/img/Pokemon Sprites/262.png | Bin .../Resources}/img/Pokemon Sprites/263.png | Bin .../Resources}/img/Pokemon Sprites/264.png | Bin .../Resources}/img/Pokemon Sprites/265.png | Bin .../Resources}/img/Pokemon Sprites/266.png | Bin .../Resources}/img/Pokemon Sprites/267.png | Bin .../Resources}/img/Pokemon Sprites/268.png | Bin .../Resources}/img/Pokemon Sprites/269.png | Bin .../Resources}/img/Pokemon Sprites/27.png | Bin .../Resources}/img/Pokemon Sprites/270.png | Bin .../Resources}/img/Pokemon Sprites/271.png | Bin .../Resources}/img/Pokemon Sprites/272.png | Bin .../Resources}/img/Pokemon Sprites/273.png | Bin .../Resources}/img/Pokemon Sprites/274.png | Bin .../Resources}/img/Pokemon Sprites/275.png | Bin .../Resources}/img/Pokemon Sprites/276.png | Bin .../Resources}/img/Pokemon Sprites/277.png | Bin .../Resources}/img/Pokemon Sprites/278.png | Bin .../Resources}/img/Pokemon Sprites/279.png | Bin .../Resources}/img/Pokemon Sprites/28.png | Bin .../Resources}/img/Pokemon Sprites/280.png | Bin .../Resources}/img/Pokemon Sprites/281.png | Bin .../Resources}/img/Pokemon Sprites/282-1.png | Bin .../Resources}/img/Pokemon Sprites/282.png | Bin .../Resources}/img/Pokemon Sprites/283.png | Bin .../Resources}/img/Pokemon Sprites/284.png | Bin .../Resources}/img/Pokemon Sprites/285.png | Bin .../Resources}/img/Pokemon Sprites/286.png | Bin .../Resources}/img/Pokemon Sprites/287.png | Bin .../Resources}/img/Pokemon Sprites/288.png | Bin .../Resources}/img/Pokemon Sprites/289.png | Bin .../Resources}/img/Pokemon Sprites/29.png | Bin .../Resources}/img/Pokemon Sprites/290.png | Bin .../Resources}/img/Pokemon Sprites/291.png | Bin .../Resources}/img/Pokemon Sprites/292.png | Bin .../Resources}/img/Pokemon Sprites/293.png | Bin .../Resources}/img/Pokemon Sprites/294.png | Bin .../Resources}/img/Pokemon Sprites/295.png | Bin .../Resources}/img/Pokemon Sprites/296.png | Bin .../Resources}/img/Pokemon Sprites/297.png | Bin .../Resources}/img/Pokemon Sprites/298.png | Bin .../Resources}/img/Pokemon Sprites/299.png | Bin .../Resources}/img/Pokemon Sprites/3-1.png | Bin .../Resources}/img/Pokemon Sprites/3.png | Bin .../Resources}/img/Pokemon Sprites/30.png | Bin .../Resources}/img/Pokemon Sprites/300.png | Bin .../Resources}/img/Pokemon Sprites/301.png | Bin .../Resources}/img/Pokemon Sprites/302-1.png | Bin .../Resources}/img/Pokemon Sprites/302.png | Bin .../Resources}/img/Pokemon Sprites/303-1.png | Bin .../Resources}/img/Pokemon Sprites/303.png | Bin .../Resources}/img/Pokemon Sprites/304.png | Bin .../Resources}/img/Pokemon Sprites/305.png | Bin .../Resources}/img/Pokemon Sprites/306-1.png | Bin .../Resources}/img/Pokemon Sprites/306.png | Bin .../Resources}/img/Pokemon Sprites/307.png | Bin .../Resources}/img/Pokemon Sprites/308-1.png | Bin .../Resources}/img/Pokemon Sprites/308.png | Bin .../Resources}/img/Pokemon Sprites/309.png | Bin .../Resources}/img/Pokemon Sprites/31.png | Bin .../Resources}/img/Pokemon Sprites/310-1.png | Bin .../Resources}/img/Pokemon Sprites/310.png | Bin .../Resources}/img/Pokemon Sprites/311.png | Bin .../Resources}/img/Pokemon Sprites/312.png | Bin .../Resources}/img/Pokemon Sprites/313.png | Bin .../Resources}/img/Pokemon Sprites/314.png | Bin .../Resources}/img/Pokemon Sprites/315.png | Bin .../Resources}/img/Pokemon Sprites/316.png | Bin .../Resources}/img/Pokemon Sprites/317.png | Bin .../Resources}/img/Pokemon Sprites/318.png | Bin .../Resources}/img/Pokemon Sprites/319-1.png | Bin .../Resources}/img/Pokemon Sprites/319.png | Bin .../Resources}/img/Pokemon Sprites/32.png | Bin .../Resources}/img/Pokemon Sprites/320.png | Bin .../Resources}/img/Pokemon Sprites/321.png | Bin .../Resources}/img/Pokemon Sprites/322.png | Bin .../Resources}/img/Pokemon Sprites/323-1.png | Bin .../Resources}/img/Pokemon Sprites/323.png | Bin .../Resources}/img/Pokemon Sprites/324.png | Bin .../Resources}/img/Pokemon Sprites/325.png | Bin .../Resources}/img/Pokemon Sprites/326.png | Bin .../Resources}/img/Pokemon Sprites/327.png | Bin .../Resources}/img/Pokemon Sprites/328.png | Bin .../Resources}/img/Pokemon Sprites/329.png | Bin .../Resources}/img/Pokemon Sprites/33.png | Bin .../Resources}/img/Pokemon Sprites/330.png | Bin .../Resources}/img/Pokemon Sprites/331.png | Bin .../Resources}/img/Pokemon Sprites/332.png | Bin .../Resources}/img/Pokemon Sprites/333.png | Bin .../Resources}/img/Pokemon Sprites/334-1.png | Bin .../Resources}/img/Pokemon Sprites/334.png | Bin .../Resources}/img/Pokemon Sprites/335.png | Bin .../Resources}/img/Pokemon Sprites/336.png | Bin .../Resources}/img/Pokemon Sprites/337.png | Bin .../Resources}/img/Pokemon Sprites/338.png | Bin .../Resources}/img/Pokemon Sprites/339.png | Bin .../Resources}/img/Pokemon Sprites/34.png | Bin .../Resources}/img/Pokemon Sprites/340.png | Bin .../Resources}/img/Pokemon Sprites/341.png | Bin .../Resources}/img/Pokemon Sprites/342.png | Bin .../Resources}/img/Pokemon Sprites/343.png | Bin .../Resources}/img/Pokemon Sprites/344.png | Bin .../Resources}/img/Pokemon Sprites/345.png | Bin .../Resources}/img/Pokemon Sprites/346.png | Bin .../Resources}/img/Pokemon Sprites/347.png | Bin .../Resources}/img/Pokemon Sprites/348.png | Bin .../Resources}/img/Pokemon Sprites/349.png | Bin .../Resources}/img/Pokemon Sprites/35.png | Bin .../Resources}/img/Pokemon Sprites/350.png | Bin .../Resources}/img/Pokemon Sprites/351-1.png | Bin .../Resources}/img/Pokemon Sprites/351-2.png | Bin .../Resources}/img/Pokemon Sprites/351-3.png | Bin .../Resources}/img/Pokemon Sprites/351.png | Bin .../Resources}/img/Pokemon Sprites/352.png | Bin .../Resources}/img/Pokemon Sprites/353.png | Bin .../Resources}/img/Pokemon Sprites/354-1.png | Bin .../Resources}/img/Pokemon Sprites/354.png | Bin .../Resources}/img/Pokemon Sprites/355.png | Bin .../Resources}/img/Pokemon Sprites/356.png | Bin .../Resources}/img/Pokemon Sprites/357.png | Bin .../Resources}/img/Pokemon Sprites/358.png | Bin .../Resources}/img/Pokemon Sprites/359-1.png | Bin .../Resources}/img/Pokemon Sprites/359.png | Bin .../Resources}/img/Pokemon Sprites/36.png | Bin .../Resources}/img/Pokemon Sprites/360.png | Bin .../Resources}/img/Pokemon Sprites/361.png | Bin .../Resources}/img/Pokemon Sprites/362-1.png | Bin .../Resources}/img/Pokemon Sprites/362.png | Bin .../Resources}/img/Pokemon Sprites/363.png | Bin .../Resources}/img/Pokemon Sprites/364.png | Bin .../Resources}/img/Pokemon Sprites/365.png | Bin .../Resources}/img/Pokemon Sprites/366.png | Bin .../Resources}/img/Pokemon Sprites/367.png | Bin .../Resources}/img/Pokemon Sprites/368.png | Bin .../Resources}/img/Pokemon Sprites/369.png | Bin .../Resources}/img/Pokemon Sprites/37.png | Bin .../Resources}/img/Pokemon Sprites/370.png | Bin .../Resources}/img/Pokemon Sprites/371.png | Bin .../Resources}/img/Pokemon Sprites/372.png | Bin .../Resources}/img/Pokemon Sprites/373-1.png | Bin .../Resources}/img/Pokemon Sprites/373.png | Bin .../Resources}/img/Pokemon Sprites/374.png | Bin .../Resources}/img/Pokemon Sprites/375.png | Bin .../Resources}/img/Pokemon Sprites/376-1.png | Bin .../Resources}/img/Pokemon Sprites/376.png | Bin .../Resources}/img/Pokemon Sprites/377.png | Bin .../Resources}/img/Pokemon Sprites/378.png | Bin .../Resources}/img/Pokemon Sprites/379.png | Bin .../Resources}/img/Pokemon Sprites/38.png | Bin .../Resources}/img/Pokemon Sprites/380-1.png | Bin .../Resources}/img/Pokemon Sprites/380.png | Bin .../Resources}/img/Pokemon Sprites/381-1.png | Bin .../Resources}/img/Pokemon Sprites/381.png | Bin .../Resources}/img/Pokemon Sprites/382-1.png | Bin .../Resources}/img/Pokemon Sprites/382.png | Bin .../Resources}/img/Pokemon Sprites/383-1.png | Bin .../Resources}/img/Pokemon Sprites/383.png | Bin .../Resources}/img/Pokemon Sprites/384-1.png | Bin .../Resources}/img/Pokemon Sprites/384.png | Bin .../Resources}/img/Pokemon Sprites/385.png | Bin .../Resources}/img/Pokemon Sprites/386-1.png | Bin .../Resources}/img/Pokemon Sprites/386-2.png | Bin .../Resources}/img/Pokemon Sprites/386-3.png | Bin .../Resources}/img/Pokemon Sprites/386.png | Bin .../Resources}/img/Pokemon Sprites/387.png | Bin .../Resources}/img/Pokemon Sprites/388.png | Bin .../Resources}/img/Pokemon Sprites/389.png | Bin .../Resources}/img/Pokemon Sprites/39.png | Bin .../Resources}/img/Pokemon Sprites/390.png | Bin .../Resources}/img/Pokemon Sprites/391.png | Bin .../Resources}/img/Pokemon Sprites/392.png | Bin .../Resources}/img/Pokemon Sprites/393.png | Bin .../Resources}/img/Pokemon Sprites/394.png | Bin .../Resources}/img/Pokemon Sprites/395.png | Bin .../Resources}/img/Pokemon Sprites/396.png | Bin .../Resources}/img/Pokemon Sprites/397.png | Bin .../Resources}/img/Pokemon Sprites/398.png | Bin .../Resources}/img/Pokemon Sprites/399.png | Bin .../Resources}/img/Pokemon Sprites/4.png | Bin .../Resources}/img/Pokemon Sprites/40.png | Bin .../Resources}/img/Pokemon Sprites/400.png | Bin .../Resources}/img/Pokemon Sprites/401.png | Bin .../Resources}/img/Pokemon Sprites/402.png | Bin .../Resources}/img/Pokemon Sprites/403.png | Bin .../Resources}/img/Pokemon Sprites/404.png | Bin .../Resources}/img/Pokemon Sprites/405.png | Bin .../Resources}/img/Pokemon Sprites/406.png | Bin .../Resources}/img/Pokemon Sprites/407.png | Bin .../Resources}/img/Pokemon Sprites/408.png | Bin .../Resources}/img/Pokemon Sprites/409.png | Bin .../Resources}/img/Pokemon Sprites/41.png | Bin .../Resources}/img/Pokemon Sprites/410.png | Bin .../Resources}/img/Pokemon Sprites/411.png | Bin .../Resources}/img/Pokemon Sprites/412-1.png | Bin .../Resources}/img/Pokemon Sprites/412-2.png | Bin .../Resources}/img/Pokemon Sprites/412.png | Bin .../Resources}/img/Pokemon Sprites/413-1.png | Bin .../Resources}/img/Pokemon Sprites/413-2.png | Bin .../Resources}/img/Pokemon Sprites/413.png | Bin .../Resources}/img/Pokemon Sprites/414.png | Bin .../Resources}/img/Pokemon Sprites/415.png | Bin .../Resources}/img/Pokemon Sprites/416.png | Bin .../Resources}/img/Pokemon Sprites/417.png | Bin .../Resources}/img/Pokemon Sprites/418.png | Bin .../Resources}/img/Pokemon Sprites/419.png | Bin .../Resources}/img/Pokemon Sprites/42.png | Bin .../Resources}/img/Pokemon Sprites/420.png | Bin .../Resources}/img/Pokemon Sprites/421-1.png | Bin .../Resources}/img/Pokemon Sprites/421.png | Bin .../Resources}/img/Pokemon Sprites/422-1.png | Bin .../Resources}/img/Pokemon Sprites/422.png | Bin .../Resources}/img/Pokemon Sprites/423-1.png | Bin .../Resources}/img/Pokemon Sprites/423.png | Bin .../Resources}/img/Pokemon Sprites/424.png | Bin .../Resources}/img/Pokemon Sprites/425.png | Bin .../Resources}/img/Pokemon Sprites/426.png | Bin .../Resources}/img/Pokemon Sprites/427.png | Bin .../Resources}/img/Pokemon Sprites/428-1.png | Bin .../Resources}/img/Pokemon Sprites/428.png | Bin .../Resources}/img/Pokemon Sprites/429.png | Bin .../Resources}/img/Pokemon Sprites/43.png | Bin .../Resources}/img/Pokemon Sprites/430.png | Bin .../Resources}/img/Pokemon Sprites/431.png | Bin .../Resources}/img/Pokemon Sprites/432.png | Bin .../Resources}/img/Pokemon Sprites/433.png | Bin .../Resources}/img/Pokemon Sprites/434.png | Bin .../Resources}/img/Pokemon Sprites/435.png | Bin .../Resources}/img/Pokemon Sprites/436.png | Bin .../Resources}/img/Pokemon Sprites/437.png | Bin .../Resources}/img/Pokemon Sprites/438.png | Bin .../Resources}/img/Pokemon Sprites/439.png | Bin .../Resources}/img/Pokemon Sprites/44.png | Bin .../Resources}/img/Pokemon Sprites/440.png | Bin .../Resources}/img/Pokemon Sprites/441.png | Bin .../Resources}/img/Pokemon Sprites/442.png | Bin .../Resources}/img/Pokemon Sprites/443.png | Bin .../Resources}/img/Pokemon Sprites/444.png | Bin .../Resources}/img/Pokemon Sprites/445-1.png | Bin .../Resources}/img/Pokemon Sprites/445.png | Bin .../Resources}/img/Pokemon Sprites/446.png | Bin .../Resources}/img/Pokemon Sprites/447.png | Bin .../Resources}/img/Pokemon Sprites/448-1.png | Bin .../Resources}/img/Pokemon Sprites/448.png | Bin .../Resources}/img/Pokemon Sprites/449.png | Bin .../Resources}/img/Pokemon Sprites/45.png | Bin .../Resources}/img/Pokemon Sprites/450.png | Bin .../Resources}/img/Pokemon Sprites/451.png | Bin .../Resources}/img/Pokemon Sprites/452.png | Bin .../Resources}/img/Pokemon Sprites/453.png | Bin .../Resources}/img/Pokemon Sprites/454.png | Bin .../Resources}/img/Pokemon Sprites/455.png | Bin .../Resources}/img/Pokemon Sprites/456.png | Bin .../Resources}/img/Pokemon Sprites/457.png | Bin .../Resources}/img/Pokemon Sprites/458.png | Bin .../Resources}/img/Pokemon Sprites/459.png | Bin .../Resources}/img/Pokemon Sprites/46.png | Bin .../Resources}/img/Pokemon Sprites/460-1.png | Bin .../Resources}/img/Pokemon Sprites/460.png | Bin .../Resources}/img/Pokemon Sprites/461.png | Bin .../Resources}/img/Pokemon Sprites/462.png | Bin .../Resources}/img/Pokemon Sprites/463.png | Bin .../Resources}/img/Pokemon Sprites/464.png | Bin .../Resources}/img/Pokemon Sprites/465.png | Bin .../Resources}/img/Pokemon Sprites/466.png | Bin .../Resources}/img/Pokemon Sprites/467.png | Bin .../Resources}/img/Pokemon Sprites/468.png | Bin .../Resources}/img/Pokemon Sprites/469.png | Bin .../Resources}/img/Pokemon Sprites/47.png | Bin .../Resources}/img/Pokemon Sprites/470.png | Bin .../Resources}/img/Pokemon Sprites/471.png | Bin .../Resources}/img/Pokemon Sprites/472.png | Bin .../Resources}/img/Pokemon Sprites/473.png | Bin .../Resources}/img/Pokemon Sprites/474.png | Bin .../Resources}/img/Pokemon Sprites/475-1.png | Bin .../Resources}/img/Pokemon Sprites/475.png | Bin .../Resources}/img/Pokemon Sprites/476.png | Bin .../Resources}/img/Pokemon Sprites/477.png | Bin .../Resources}/img/Pokemon Sprites/478.png | Bin .../Resources}/img/Pokemon Sprites/479-1.png | Bin .../Resources}/img/Pokemon Sprites/479-2.png | Bin .../Resources}/img/Pokemon Sprites/479-3.png | Bin .../Resources}/img/Pokemon Sprites/479-4.png | Bin .../Resources}/img/Pokemon Sprites/479-5.png | Bin .../Resources}/img/Pokemon Sprites/479.png | Bin .../Resources}/img/Pokemon Sprites/48.png | Bin .../Resources}/img/Pokemon Sprites/480.png | Bin .../Resources}/img/Pokemon Sprites/481.png | Bin .../Resources}/img/Pokemon Sprites/482.png | Bin .../Resources}/img/Pokemon Sprites/483.png | Bin .../Resources}/img/Pokemon Sprites/484.png | Bin .../Resources}/img/Pokemon Sprites/485.png | Bin .../Resources}/img/Pokemon Sprites/486.png | Bin .../Resources}/img/Pokemon Sprites/487-1.png | Bin .../Resources}/img/Pokemon Sprites/487.png | Bin .../Resources}/img/Pokemon Sprites/488.png | Bin .../Resources}/img/Pokemon Sprites/489.png | Bin .../Resources}/img/Pokemon Sprites/49.png | Bin .../Resources}/img/Pokemon Sprites/490.png | Bin .../Resources}/img/Pokemon Sprites/491.png | Bin .../Resources}/img/Pokemon Sprites/492-1.png | Bin .../Resources}/img/Pokemon Sprites/492.png | Bin .../Resources}/img/Pokemon Sprites/493.png | Bin .../Resources}/img/Pokemon Sprites/494.png | Bin .../Resources}/img/Pokemon Sprites/495.png | Bin .../Resources}/img/Pokemon Sprites/496.png | Bin .../Resources}/img/Pokemon Sprites/497.png | Bin .../Resources}/img/Pokemon Sprites/498.png | Bin .../Resources}/img/Pokemon Sprites/499.png | Bin .../Resources}/img/Pokemon Sprites/5.png | Bin .../Resources}/img/Pokemon Sprites/50.png | Bin .../Resources}/img/Pokemon Sprites/500.png | Bin .../Resources}/img/Pokemon Sprites/501.png | Bin .../Resources}/img/Pokemon Sprites/502.png | Bin .../Resources}/img/Pokemon Sprites/503.png | Bin .../Resources}/img/Pokemon Sprites/504.png | Bin .../Resources}/img/Pokemon Sprites/505.png | Bin .../Resources}/img/Pokemon Sprites/506.png | Bin .../Resources}/img/Pokemon Sprites/507.png | Bin .../Resources}/img/Pokemon Sprites/508.png | Bin .../Resources}/img/Pokemon Sprites/509.png | Bin .../Resources}/img/Pokemon Sprites/51.png | Bin .../Resources}/img/Pokemon Sprites/510.png | Bin .../Resources}/img/Pokemon Sprites/511.png | Bin .../Resources}/img/Pokemon Sprites/512.png | Bin .../Resources}/img/Pokemon Sprites/513.png | Bin .../Resources}/img/Pokemon Sprites/514.png | Bin .../Resources}/img/Pokemon Sprites/515.png | Bin .../Resources}/img/Pokemon Sprites/516.png | Bin .../Resources}/img/Pokemon Sprites/517.png | Bin .../Resources}/img/Pokemon Sprites/518.png | Bin .../Resources}/img/Pokemon Sprites/519.png | Bin .../Resources}/img/Pokemon Sprites/52.png | Bin .../Resources}/img/Pokemon Sprites/520.png | Bin .../Resources}/img/Pokemon Sprites/521.png | Bin .../Resources}/img/Pokemon Sprites/521_1.png | Bin .../Resources}/img/Pokemon Sprites/522.png | Bin .../Resources}/img/Pokemon Sprites/523.png | Bin .../Resources}/img/Pokemon Sprites/524.png | Bin .../Resources}/img/Pokemon Sprites/525.png | Bin .../Resources}/img/Pokemon Sprites/526.png | Bin .../Resources}/img/Pokemon Sprites/527.png | Bin .../Resources}/img/Pokemon Sprites/528.png | Bin .../Resources}/img/Pokemon Sprites/529.png | Bin .../Resources}/img/Pokemon Sprites/53.png | Bin .../Resources}/img/Pokemon Sprites/530.png | Bin .../Resources}/img/Pokemon Sprites/531-1.png | Bin .../Resources}/img/Pokemon Sprites/531.png | Bin .../Resources}/img/Pokemon Sprites/532.png | Bin .../Resources}/img/Pokemon Sprites/533.png | Bin .../Resources}/img/Pokemon Sprites/534.png | Bin .../Resources}/img/Pokemon Sprites/535.png | Bin .../Resources}/img/Pokemon Sprites/536.png | Bin .../Resources}/img/Pokemon Sprites/537.png | Bin .../Resources}/img/Pokemon Sprites/538.png | Bin .../Resources}/img/Pokemon Sprites/539.png | Bin .../Resources}/img/Pokemon Sprites/54.png | Bin .../Resources}/img/Pokemon Sprites/540.png | Bin .../Resources}/img/Pokemon Sprites/541.png | Bin .../Resources}/img/Pokemon Sprites/542.png | Bin .../Resources}/img/Pokemon Sprites/543.png | Bin .../Resources}/img/Pokemon Sprites/544.png | Bin .../Resources}/img/Pokemon Sprites/545.png | Bin .../Resources}/img/Pokemon Sprites/546.png | Bin .../Resources}/img/Pokemon Sprites/547.png | Bin .../Resources}/img/Pokemon Sprites/548.png | Bin .../Resources}/img/Pokemon Sprites/549.png | Bin .../Resources}/img/Pokemon Sprites/55.png | Bin .../Resources}/img/Pokemon Sprites/550-1.png | Bin .../Resources}/img/Pokemon Sprites/550.png | Bin .../Resources}/img/Pokemon Sprites/551.png | Bin .../Resources}/img/Pokemon Sprites/552.png | Bin .../Resources}/img/Pokemon Sprites/553.png | Bin .../Resources}/img/Pokemon Sprites/554.png | Bin .../Resources}/img/Pokemon Sprites/555-1.png | Bin .../Resources}/img/Pokemon Sprites/555.png | Bin .../Resources}/img/Pokemon Sprites/556.png | Bin .../Resources}/img/Pokemon Sprites/557.png | Bin .../Resources}/img/Pokemon Sprites/558.png | Bin .../Resources}/img/Pokemon Sprites/559.png | Bin .../Resources}/img/Pokemon Sprites/56.png | Bin .../Resources}/img/Pokemon Sprites/560.png | Bin .../Resources}/img/Pokemon Sprites/561.png | Bin .../Resources}/img/Pokemon Sprites/562.png | Bin .../Resources}/img/Pokemon Sprites/563.png | Bin .../Resources}/img/Pokemon Sprites/564.png | Bin .../Resources}/img/Pokemon Sprites/565.png | Bin .../Resources}/img/Pokemon Sprites/566.png | Bin .../Resources}/img/Pokemon Sprites/567.png | Bin .../Resources}/img/Pokemon Sprites/568.png | Bin .../Resources}/img/Pokemon Sprites/569.png | Bin .../Resources}/img/Pokemon Sprites/57.png | Bin .../Resources}/img/Pokemon Sprites/570.png | Bin .../Resources}/img/Pokemon Sprites/571.png | Bin .../Resources}/img/Pokemon Sprites/572.png | Bin .../Resources}/img/Pokemon Sprites/573.png | Bin .../Resources}/img/Pokemon Sprites/574.png | Bin .../Resources}/img/Pokemon Sprites/575.png | Bin .../Resources}/img/Pokemon Sprites/576.png | Bin .../Resources}/img/Pokemon Sprites/577.png | Bin .../Resources}/img/Pokemon Sprites/578.png | Bin .../Resources}/img/Pokemon Sprites/579.png | Bin .../Resources}/img/Pokemon Sprites/58.png | Bin .../Resources}/img/Pokemon Sprites/580.png | Bin .../Resources}/img/Pokemon Sprites/581.png | Bin .../Resources}/img/Pokemon Sprites/582.png | Bin .../Resources}/img/Pokemon Sprites/583.png | Bin .../Resources}/img/Pokemon Sprites/584.png | Bin .../Resources}/img/Pokemon Sprites/585-1.png | Bin .../Resources}/img/Pokemon Sprites/585-2.png | Bin .../Resources}/img/Pokemon Sprites/585-3.png | Bin .../Resources}/img/Pokemon Sprites/585.png | Bin .../Resources}/img/Pokemon Sprites/586-1.png | Bin .../Resources}/img/Pokemon Sprites/586-2.png | Bin .../Resources}/img/Pokemon Sprites/586-3.png | Bin .../Resources}/img/Pokemon Sprites/586.png | Bin .../Resources}/img/Pokemon Sprites/587.png | Bin .../Resources}/img/Pokemon Sprites/588.png | Bin .../Resources}/img/Pokemon Sprites/589.png | Bin .../Resources}/img/Pokemon Sprites/59.png | Bin .../Resources}/img/Pokemon Sprites/590.png | Bin .../Resources}/img/Pokemon Sprites/591.png | Bin .../Resources}/img/Pokemon Sprites/592-1.png | Bin .../Resources}/img/Pokemon Sprites/592.png | Bin .../Resources}/img/Pokemon Sprites/593-1.png | Bin .../Resources}/img/Pokemon Sprites/593.png | Bin .../Resources}/img/Pokemon Sprites/594.png | Bin .../Resources}/img/Pokemon Sprites/595.png | Bin .../Resources}/img/Pokemon Sprites/596.png | Bin .../Resources}/img/Pokemon Sprites/597.png | Bin .../Resources}/img/Pokemon Sprites/598.png | Bin .../Resources}/img/Pokemon Sprites/599.png | Bin .../Resources}/img/Pokemon Sprites/6-1.png | Bin .../Resources}/img/Pokemon Sprites/6-2.png | Bin .../Resources}/img/Pokemon Sprites/6.png | Bin .../Resources}/img/Pokemon Sprites/60.png | Bin .../Resources}/img/Pokemon Sprites/600.png | Bin .../Resources}/img/Pokemon Sprites/601.png | Bin .../Resources}/img/Pokemon Sprites/602.png | Bin .../Resources}/img/Pokemon Sprites/603.png | Bin .../Resources}/img/Pokemon Sprites/604.png | Bin .../Resources}/img/Pokemon Sprites/605.png | Bin .../Resources}/img/Pokemon Sprites/606.png | Bin .../Resources}/img/Pokemon Sprites/607.png | Bin .../Resources}/img/Pokemon Sprites/608.png | Bin .../Resources}/img/Pokemon Sprites/609.png | Bin .../Resources}/img/Pokemon Sprites/61.png | Bin .../Resources}/img/Pokemon Sprites/610.png | Bin .../Resources}/img/Pokemon Sprites/611.png | Bin .../Resources}/img/Pokemon Sprites/612.png | Bin .../Resources}/img/Pokemon Sprites/613.png | Bin .../Resources}/img/Pokemon Sprites/614.png | Bin .../Resources}/img/Pokemon Sprites/615.png | Bin .../Resources}/img/Pokemon Sprites/616.png | Bin .../Resources}/img/Pokemon Sprites/617.png | Bin .../Resources}/img/Pokemon Sprites/618.png | Bin .../Resources}/img/Pokemon Sprites/619.png | Bin .../Resources}/img/Pokemon Sprites/62.png | Bin .../Resources}/img/Pokemon Sprites/620.png | Bin .../Resources}/img/Pokemon Sprites/621.png | Bin .../Resources}/img/Pokemon Sprites/622.png | Bin .../Resources}/img/Pokemon Sprites/623.png | Bin .../Resources}/img/Pokemon Sprites/624.png | Bin .../Resources}/img/Pokemon Sprites/625.png | Bin .../Resources}/img/Pokemon Sprites/626.png | Bin .../Resources}/img/Pokemon Sprites/627.png | Bin .../Resources}/img/Pokemon Sprites/628.png | Bin .../Resources}/img/Pokemon Sprites/629.png | Bin .../Resources}/img/Pokemon Sprites/63.png | Bin .../Resources}/img/Pokemon Sprites/630.png | Bin .../Resources}/img/Pokemon Sprites/631.png | Bin .../Resources}/img/Pokemon Sprites/632.png | Bin .../Resources}/img/Pokemon Sprites/633.png | Bin .../Resources}/img/Pokemon Sprites/634.png | Bin .../Resources}/img/Pokemon Sprites/635.png | Bin .../Resources}/img/Pokemon Sprites/636.png | Bin .../Resources}/img/Pokemon Sprites/637.png | Bin .../Resources}/img/Pokemon Sprites/638.png | Bin .../Resources}/img/Pokemon Sprites/639.png | Bin .../Resources}/img/Pokemon Sprites/64.png | Bin .../Resources}/img/Pokemon Sprites/640.png | Bin .../Resources}/img/Pokemon Sprites/641-1.png | Bin .../Resources}/img/Pokemon Sprites/641.png | Bin .../Resources}/img/Pokemon Sprites/642-1.png | Bin .../Resources}/img/Pokemon Sprites/642.png | Bin .../Resources}/img/Pokemon Sprites/643.png | Bin .../Resources}/img/Pokemon Sprites/644.png | Bin .../Resources}/img/Pokemon Sprites/645-1.png | Bin .../Resources}/img/Pokemon Sprites/645.png | Bin .../Resources}/img/Pokemon Sprites/646-1.png | Bin .../Resources}/img/Pokemon Sprites/646-2.png | Bin .../Resources}/img/Pokemon Sprites/646.png | Bin .../Resources}/img/Pokemon Sprites/647-1.png | Bin .../Resources}/img/Pokemon Sprites/647.png | Bin .../Resources}/img/Pokemon Sprites/648-1.png | Bin .../Resources}/img/Pokemon Sprites/648.png | Bin .../Resources}/img/Pokemon Sprites/649-1.png | Bin .../Resources}/img/Pokemon Sprites/649-2.png | Bin .../Resources}/img/Pokemon Sprites/649-3.png | Bin .../Resources}/img/Pokemon Sprites/649-4.png | Bin .../Resources}/img/Pokemon Sprites/649.png | Bin .../Resources}/img/Pokemon Sprites/65-1.png | Bin .../Resources}/img/Pokemon Sprites/65.png | Bin .../Resources}/img/Pokemon Sprites/650.png | Bin .../Resources}/img/Pokemon Sprites/651.png | Bin .../Resources}/img/Pokemon Sprites/652.png | Bin .../Resources}/img/Pokemon Sprites/653.png | Bin .../Resources}/img/Pokemon Sprites/654.png | Bin .../Resources}/img/Pokemon Sprites/655.png | Bin .../Resources}/img/Pokemon Sprites/656.png | Bin .../Resources}/img/Pokemon Sprites/657.png | Bin .../Resources}/img/Pokemon Sprites/658.png | Bin .../Resources}/img/Pokemon Sprites/659.png | Bin .../Resources}/img/Pokemon Sprites/66.png | Bin .../Resources}/img/Pokemon Sprites/660.png | Bin .../Resources}/img/Pokemon Sprites/661.png | Bin .../Resources}/img/Pokemon Sprites/662.png | Bin .../Resources}/img/Pokemon Sprites/663.png | Bin .../Resources}/img/Pokemon Sprites/664.png | Bin .../Resources}/img/Pokemon Sprites/665.png | Bin .../Resources}/img/Pokemon Sprites/666-1.png | Bin .../Resources}/img/Pokemon Sprites/666-10.png | Bin .../Resources}/img/Pokemon Sprites/666-11.png | Bin .../Resources}/img/Pokemon Sprites/666-12.png | Bin .../Resources}/img/Pokemon Sprites/666-13.png | Bin .../Resources}/img/Pokemon Sprites/666-14.png | Bin .../Resources}/img/Pokemon Sprites/666-15.png | Bin .../Resources}/img/Pokemon Sprites/666-16.png | Bin .../Resources}/img/Pokemon Sprites/666-17.png | Bin .../Resources}/img/Pokemon Sprites/666-18.png | Bin .../Resources}/img/Pokemon Sprites/666-19.png | Bin .../Resources}/img/Pokemon Sprites/666-2.png | Bin .../Resources}/img/Pokemon Sprites/666-3.png | Bin .../Resources}/img/Pokemon Sprites/666-4.png | Bin .../Resources}/img/Pokemon Sprites/666-5.png | Bin .../Resources}/img/Pokemon Sprites/666-6.png | Bin .../Resources}/img/Pokemon Sprites/666-7.png | Bin .../Resources}/img/Pokemon Sprites/666-8.png | Bin .../Resources}/img/Pokemon Sprites/666-9.png | Bin .../Resources}/img/Pokemon Sprites/666.png | Bin .../Resources}/img/Pokemon Sprites/667.png | Bin .../Resources}/img/Pokemon Sprites/668.png | Bin .../Resources}/img/Pokemon Sprites/668_1.png | Bin .../Resources}/img/Pokemon Sprites/669-1.png | Bin .../Resources}/img/Pokemon Sprites/669-2.png | Bin .../Resources}/img/Pokemon Sprites/669-3.png | Bin .../Resources}/img/Pokemon Sprites/669-4.png | Bin .../Resources}/img/Pokemon Sprites/669.png | Bin .../Resources}/img/Pokemon Sprites/67.png | Bin .../Resources}/img/Pokemon Sprites/670-1.png | Bin .../Resources}/img/Pokemon Sprites/670-2.png | Bin .../Resources}/img/Pokemon Sprites/670-3.png | Bin .../Resources}/img/Pokemon Sprites/670-4.png | Bin .../Resources}/img/Pokemon Sprites/670-5.png | Bin .../Resources}/img/Pokemon Sprites/670.png | Bin .../Resources}/img/Pokemon Sprites/671-1.png | Bin .../Resources}/img/Pokemon Sprites/671-2.png | Bin .../Resources}/img/Pokemon Sprites/671-3.png | Bin .../Resources}/img/Pokemon Sprites/671-4.png | Bin .../Resources}/img/Pokemon Sprites/671.png | Bin .../Resources}/img/Pokemon Sprites/672.png | Bin .../Resources}/img/Pokemon Sprites/673.png | Bin .../Resources}/img/Pokemon Sprites/674.png | Bin .../Resources}/img/Pokemon Sprites/675.png | Bin .../Resources}/img/Pokemon Sprites/676-1.png | Bin .../Resources}/img/Pokemon Sprites/676-2.png | Bin .../Resources}/img/Pokemon Sprites/676-3.png | Bin .../Resources}/img/Pokemon Sprites/676-4.png | Bin .../Resources}/img/Pokemon Sprites/676-5.png | Bin .../Resources}/img/Pokemon Sprites/676-6.png | Bin .../Resources}/img/Pokemon Sprites/676-7.png | Bin .../Resources}/img/Pokemon Sprites/676-8.png | Bin .../Resources}/img/Pokemon Sprites/676-9.png | Bin .../Resources}/img/Pokemon Sprites/676.png | Bin .../Resources}/img/Pokemon Sprites/677.png | Bin .../Resources}/img/Pokemon Sprites/678-1.png | Bin .../Resources}/img/Pokemon Sprites/678.png | Bin .../Resources}/img/Pokemon Sprites/679.png | Bin .../Resources}/img/Pokemon Sprites/68.png | Bin .../Resources}/img/Pokemon Sprites/680.png | Bin .../Resources}/img/Pokemon Sprites/681-1.png | Bin .../Resources}/img/Pokemon Sprites/681.png | Bin .../Resources}/img/Pokemon Sprites/682.png | Bin .../Resources}/img/Pokemon Sprites/683.png | Bin .../Resources}/img/Pokemon Sprites/684.png | Bin .../Resources}/img/Pokemon Sprites/685.png | Bin .../Resources}/img/Pokemon Sprites/686.png | Bin .../Resources}/img/Pokemon Sprites/687.png | Bin .../Resources}/img/Pokemon Sprites/688.png | Bin .../Resources}/img/Pokemon Sprites/689.png | Bin .../Resources}/img/Pokemon Sprites/69.png | Bin .../Resources}/img/Pokemon Sprites/690.png | Bin .../Resources}/img/Pokemon Sprites/691.png | Bin .../Resources}/img/Pokemon Sprites/692.png | Bin .../Resources}/img/Pokemon Sprites/693.png | Bin .../Resources}/img/Pokemon Sprites/694.png | Bin .../Resources}/img/Pokemon Sprites/695.png | Bin .../Resources}/img/Pokemon Sprites/696.png | Bin .../Resources}/img/Pokemon Sprites/697.png | Bin .../Resources}/img/Pokemon Sprites/698.png | Bin .../Resources}/img/Pokemon Sprites/699.png | Bin .../Resources}/img/Pokemon Sprites/7.png | Bin .../Resources}/img/Pokemon Sprites/70.png | Bin .../Resources}/img/Pokemon Sprites/700.png | Bin .../Resources}/img/Pokemon Sprites/701.png | Bin .../Resources}/img/Pokemon Sprites/702.png | Bin .../Resources}/img/Pokemon Sprites/703.png | Bin .../Resources}/img/Pokemon Sprites/704.png | Bin .../Resources}/img/Pokemon Sprites/705.png | Bin .../Resources}/img/Pokemon Sprites/706.png | Bin .../Resources}/img/Pokemon Sprites/707.png | Bin .../Resources}/img/Pokemon Sprites/708.png | Bin .../Resources}/img/Pokemon Sprites/709.png | Bin .../Resources}/img/Pokemon Sprites/71.png | Bin .../Resources}/img/Pokemon Sprites/710-1.png | Bin .../Resources}/img/Pokemon Sprites/710-2.png | Bin .../Resources}/img/Pokemon Sprites/710-3.png | Bin .../Resources}/img/Pokemon Sprites/710.png | Bin .../Resources}/img/Pokemon Sprites/711-1.png | Bin .../Resources}/img/Pokemon Sprites/711-2.png | Bin .../Resources}/img/Pokemon Sprites/711-3.png | Bin .../Resources}/img/Pokemon Sprites/711.png | Bin .../Resources}/img/Pokemon Sprites/712.png | Bin .../Resources}/img/Pokemon Sprites/713.png | Bin .../Resources}/img/Pokemon Sprites/714.png | Bin .../Resources}/img/Pokemon Sprites/715.png | Bin .../Resources}/img/Pokemon Sprites/716-1.png | Bin .../Resources}/img/Pokemon Sprites/716.png | Bin .../Resources}/img/Pokemon Sprites/717.png | Bin .../Resources}/img/Pokemon Sprites/718.png | Bin .../Resources}/img/Pokemon Sprites/719-1.png | Bin .../Resources}/img/Pokemon Sprites/719.png | Bin .../Resources}/img/Pokemon Sprites/72.png | Bin .../Resources}/img/Pokemon Sprites/720-1.png | Bin .../Resources}/img/Pokemon Sprites/720.png | Bin .../Resources}/img/Pokemon Sprites/721.png | Bin .../Resources}/img/Pokemon Sprites/722.png | Bin .../Resources}/img/Pokemon Sprites/73.png | Bin .../Resources}/img/Pokemon Sprites/74.png | Bin .../Resources}/img/Pokemon Sprites/75.png | Bin .../Resources}/img/Pokemon Sprites/76.png | Bin .../Resources}/img/Pokemon Sprites/77.png | Bin .../Resources}/img/Pokemon Sprites/78.png | Bin .../Resources}/img/Pokemon Sprites/79.png | Bin .../Resources}/img/Pokemon Sprites/8.png | Bin .../Resources}/img/Pokemon Sprites/80-1.png | Bin .../Resources}/img/Pokemon Sprites/80.png | Bin .../Resources}/img/Pokemon Sprites/81.png | Bin .../Resources}/img/Pokemon Sprites/82.png | Bin .../Resources}/img/Pokemon Sprites/83.png | Bin .../Resources}/img/Pokemon Sprites/84.png | Bin .../Resources}/img/Pokemon Sprites/85.png | Bin .../Resources}/img/Pokemon Sprites/86.png | Bin .../Resources}/img/Pokemon Sprites/87.png | Bin .../Resources}/img/Pokemon Sprites/88.png | Bin .../Resources}/img/Pokemon Sprites/89.png | Bin .../Resources}/img/Pokemon Sprites/9-1.png | Bin .../Resources}/img/Pokemon Sprites/9.png | Bin .../Resources}/img/Pokemon Sprites/90.png | Bin .../Resources}/img/Pokemon Sprites/91.png | Bin .../Resources}/img/Pokemon Sprites/92.png | Bin .../Resources}/img/Pokemon Sprites/93.png | Bin .../Resources}/img/Pokemon Sprites/94-1.png | Bin .../Resources}/img/Pokemon Sprites/94.png | Bin .../Resources}/img/Pokemon Sprites/95.png | Bin .../Resources}/img/Pokemon Sprites/96.png | Bin .../Resources}/img/Pokemon Sprites/97.png | Bin .../Resources}/img/Pokemon Sprites/98.png | Bin .../Resources}/img/Pokemon Sprites/99.png | Bin .../Resources}/img/Pokemon Sprites/egg.png | Bin .../Resources}/img/Pokemon Sprites/unknown.png | Bin .../Resources}/img/Program/about.png | Bin {Resources => PKHeX/Resources}/img/Program/bak.png | Bin {Resources => PKHeX/Resources}/img/Program/data.png | Bin .../Resources}/img/Program/database.png | Bin {Resources => PKHeX/Resources}/img/Program/dump.png | Bin {Resources => PKHeX/Resources}/img/Program/exit.png | Bin .../Resources}/img/Program/export.png | Bin .../Resources}/img/Program/folder.png | Bin .../Resources}/img/Program/import.png | Bin .../Resources}/img/Program/language.png | Bin {Resources => PKHeX/Resources}/img/Program/load.png | Bin {Resources => PKHeX/Resources}/img/Program/main.png | Bin .../Resources}/img/Program/nocheck.png | Bin {Resources => PKHeX/Resources}/img/Program/open.png | Bin .../Resources}/img/Program/other.png | Bin .../Resources}/img/Program/report.png | Bin .../Resources}/img/Program/savePKM.png | Bin .../Resources}/img/Program/saveSAV.png | Bin .../Resources}/img/Program/settings.png | Bin .../Resources}/img/Program/showdown.png | Bin .../Resources}/img/Trainer Sprites/tr_00.png | Bin .../Resources}/img/Trainer Sprites/tr_01.png | Bin .../Resources}/img/Trainer Sprites/tr_02.png | Bin .../Resources}/img/Trainer Sprites/tr_03.png | Bin .../Resources}/img/Trainer Sprites/tr_04.png | Bin .../Resources}/img/Trainer Sprites/tr_05.png | Bin .../Resources}/img/Trainer Sprites/tr_06.png | Bin .../Resources}/img/Trainer Sprites/tr_07.png | Bin .../Resources}/img/Trainer Sprites/tr_08.png | Bin .../Resources}/img/Trainer Sprites/tr_09.png | Bin .../Resources}/img/Trainer Sprites/tr_10.png | Bin .../Resources}/img/Trainer Sprites/tr_11.png | Bin .../Resources}/img/Trainer Sprites/tr_12.png | Bin .../Resources}/img/Trainer Sprites/tr_128.png | Bin .../Resources}/img/Trainer Sprites/tr_129.png | Bin .../Resources}/img/Trainer Sprites/tr_13.png | Bin .../Resources}/img/Trainer Sprites/tr_14.png | Bin .../Resources}/img/Trainer Sprites/tr_15.png | Bin .../Resources}/img/Trainer Sprites/tr_16.png | Bin .../Resources}/img/Trainer Sprites/tr_17.png | Bin .../Resources}/img/Trainer Sprites/tr_18.png | Bin .../Resources}/img/Trainer Sprites/tr_19.png | Bin .../Resources}/img/Trainer Sprites/tr_20.png | Bin .../Resources}/img/Trainer Sprites/tr_21.png | Bin .../Resources}/img/Trainer Sprites/tr_22.png | Bin .../Resources}/img/Trainer Sprites/tr_23.png | Bin .../Resources}/img/Trainer Sprites/tr_24.png | Bin .../Resources}/img/Trainer Sprites/tr_25.png | Bin .../Resources}/img/Trainer Sprites/tr_26.png | Bin .../Resources}/img/Trainer Sprites/tr_27.png | Bin .../Resources}/img/Trainer Sprites/tr_28.png | Bin .../Resources}/img/Trainer Sprites/tr_29.png | Bin .../Resources}/img/Trainer Sprites/tr_30.png | Bin .../Resources}/img/Trainer Sprites/tr_31.png | Bin .../Resources}/img/Trainer Sprites/tr_32.png | Bin .../Resources}/img/Trainer Sprites/tr_33.png | Bin .../Resources}/img/Trainer Sprites/tr_34.png | Bin .../Resources}/img/Trainer Sprites/tr_35.png | Bin .../Resources}/img/Trainer Sprites/tr_36.png | Bin .../Resources}/img/Trainer Sprites/tr_37.png | Bin .../Resources}/img/Trainer Sprites/tr_38.png | Bin .../Resources}/img/Trainer Sprites/tr_39.png | Bin .../Resources}/img/Trainer Sprites/tr_40.png | Bin .../Resources}/img/Trainer Sprites/tr_41.png | Bin .../Resources}/img/Trainer Sprites/tr_42.png | Bin .../Resources}/img/Trainer Sprites/tr_43.png | Bin .../Resources}/img/Trainer Sprites/tr_44.png | Bin .../Resources}/img/Trainer Sprites/tr_45.png | Bin .../Resources}/img/Trainer Sprites/tr_46.png | Bin .../Resources}/img/Trainer Sprites/tr_47.png | Bin .../Resources}/img/Trainer Sprites/tr_48.png | Bin .../Resources}/img/Trainer Sprites/tr_49.png | Bin .../Resources}/img/Trainer Sprites/tr_50.png | Bin .../Resources}/img/Trainer Sprites/tr_51.png | Bin .../Resources}/img/Trainer Sprites/tr_52.png | Bin .../Resources}/img/Trainer Sprites/tr_53.png | Bin .../Resources}/img/Trainer Sprites/tr_54.png | Bin .../Resources}/img/Trainer Sprites/tr_55.png | Bin .../Resources}/img/Trainer Sprites/tr_56.png | Bin .../Resources}/img/Trainer Sprites/tr_57.png | Bin .../Resources}/img/Trainer Sprites/tr_58.png | Bin .../Resources}/img/Trainer Sprites/tr_59.png | Bin .../Resources}/img/Trainer Sprites/tr_60.png | Bin .../Resources}/img/Trainer Sprites/tr_61.png | Bin .../Resources}/img/Trainer Sprites/tr_62.png | Bin .../Resources}/img/Trainer Sprites/tr_63.png | Bin .../Resources}/img/Trainer Sprites/tr_64.png | Bin .../Resources}/img/Trainer Sprites/tr_65.png | Bin .../Resources}/img/Trainer Sprites/tr_66.png | Bin .../Resources}/img/Trainer Sprites/tr_67.png | Bin .../Resources}/img/Trainer Sprites/tr_68.png | Bin .../Resources}/img/Trainer Sprites/tr_69.png | Bin .../Resources}/img/Trainer Sprites/tr_70.png | Bin .../Resources}/img/Trainer Sprites/tr_71.png | Bin .../Resources}/img/Trainer Sprites/tr_72.png | Bin .../Resources}/img/Trainer Sprites/tr_73.png | Bin .../Resources}/img/badges/badge_01.png | Bin .../Resources}/img/badges/badge_02.png | Bin .../Resources}/img/badges/badge_03.png | Bin .../Resources}/img/badges/badge_04.png | Bin .../Resources}/img/badges/badge_05.png | Bin .../Resources}/img/badges/badge_06.png | Bin .../Resources}/img/badges/badge_07.png | Bin .../Resources}/img/badges/badge_08.png | Bin .../Resources}/img/badges/badge_1.png | Bin .../Resources}/img/badges/badge_2.png | Bin .../Resources}/img/badges/badge_3.png | Bin .../Resources}/img/badges/badge_4.png | Bin .../Resources}/img/badges/badge_5.png | Bin .../Resources}/img/badges/badge_6.png | Bin .../Resources}/img/badges/badge_7.png | Bin .../Resources}/img/badges/badge_8.png | Bin .../Resources}/img/box/ao/box_wp17ao.png | Bin .../Resources}/img/box/ao/box_wp18ao.png | Bin .../Resources}/img/box/ao/box_wp19ao.png | Bin .../Resources}/img/box/ao/box_wp20ao.png | Bin .../Resources}/img/box/ao/box_wp21ao.png | Bin .../Resources}/img/box/ao/box_wp22ao.png | Bin .../Resources}/img/box/ao/box_wp23ao.png | Bin .../Resources}/img/box/ao/box_wp24ao.png | Bin .../Resources}/img/box/b2w2/box_wp17b2w2.png | Bin .../Resources}/img/box/b2w2/box_wp18b2w2.png | Bin .../Resources}/img/box/b2w2/box_wp19b2w2.png | Bin .../Resources}/img/box/b2w2/box_wp20b2w2.png | Bin .../Resources}/img/box/b2w2/box_wp21b2w2.png | Bin .../Resources}/img/box/b2w2/box_wp22b2w2.png | Bin .../Resources}/img/box/b2w2/box_wp23b2w2.png | Bin .../Resources}/img/box/b2w2/box_wp24b2w2.png | Bin .../Resources}/img/box/bw/box_wp01bw.png | Bin .../Resources}/img/box/bw/box_wp02bw.png | Bin .../Resources}/img/box/bw/box_wp03bw.png | Bin .../Resources}/img/box/bw/box_wp04bw.png | Bin .../Resources}/img/box/bw/box_wp05bw.png | Bin .../Resources}/img/box/bw/box_wp06bw.png | Bin .../Resources}/img/box/bw/box_wp07bw.png | Bin .../Resources}/img/box/bw/box_wp08bw.png | Bin .../Resources}/img/box/bw/box_wp09bw.png | Bin .../Resources}/img/box/bw/box_wp10bw.png | Bin .../Resources}/img/box/bw/box_wp11bw.png | Bin .../Resources}/img/box/bw/box_wp12bw.png | Bin .../Resources}/img/box/bw/box_wp13bw.png | Bin .../Resources}/img/box/bw/box_wp14bw.png | Bin .../Resources}/img/box/bw/box_wp15bw.png | Bin .../Resources}/img/box/bw/box_wp16bw.png | Bin .../Resources}/img/box/bw/box_wp17bw.png | Bin .../Resources}/img/box/bw/box_wp18bw.png | Bin .../Resources}/img/box/bw/box_wp19bw.png | Bin .../Resources}/img/box/bw/box_wp20bw.png | Bin .../Resources}/img/box/bw/box_wp21bw.png | Bin .../Resources}/img/box/bw/box_wp22bw.png | Bin .../Resources}/img/box/bw/box_wp23bw.png | Bin .../Resources}/img/box/bw/box_wp24bw.png | Bin .../Resources}/img/box/dp/box_wp01dp.png | Bin .../Resources}/img/box/dp/box_wp02dp.png | Bin .../Resources}/img/box/dp/box_wp03dp.png | Bin .../Resources}/img/box/dp/box_wp04dp.png | Bin .../Resources}/img/box/dp/box_wp05dp.png | Bin .../Resources}/img/box/dp/box_wp06dp.png | Bin .../Resources}/img/box/dp/box_wp07dp.png | Bin .../Resources}/img/box/dp/box_wp08dp.png | Bin .../Resources}/img/box/dp/box_wp09dp.png | Bin .../Resources}/img/box/dp/box_wp10dp.png | Bin .../Resources}/img/box/dp/box_wp11dp.png | Bin .../Resources}/img/box/dp/box_wp12dp.png | Bin .../Resources}/img/box/dp/box_wp13dp.png | Bin .../Resources}/img/box/dp/box_wp14dp.png | Bin .../Resources}/img/box/dp/box_wp15dp.png | Bin .../Resources}/img/box/dp/box_wp16dp.png | Bin .../Resources}/img/box/dp/box_wp17dp.png | Bin .../Resources}/img/box/dp/box_wp18dp.png | Bin .../Resources}/img/box/dp/box_wp19dp.png | Bin .../Resources}/img/box/dp/box_wp20dp.png | Bin .../Resources}/img/box/dp/box_wp21dp.png | Bin .../Resources}/img/box/dp/box_wp22dp.png | Bin .../Resources}/img/box/dp/box_wp23dp.png | Bin .../Resources}/img/box/dp/box_wp24dp.png | Bin .../Resources}/img/box/e/box_wp01e.png | Bin .../Resources}/img/box/e/box_wp02e.png | Bin .../Resources}/img/box/e/box_wp03e.png | Bin .../Resources}/img/box/e/box_wp04e.png | Bin .../Resources}/img/box/e/box_wp05e.png | Bin .../Resources}/img/box/e/box_wp06e.png | Bin .../Resources}/img/box/e/box_wp07e.png | Bin .../Resources}/img/box/e/box_wp08e.png | Bin .../Resources}/img/box/e/box_wp09e.png | Bin .../Resources}/img/box/e/box_wp10e.png | Bin .../Resources}/img/box/e/box_wp11e.png | Bin .../Resources}/img/box/e/box_wp12e.png | Bin .../Resources}/img/box/e/box_wp13e.png | Bin .../Resources}/img/box/e/box_wp14e.png | Bin .../Resources}/img/box/e/box_wp15e.png | Bin .../Resources}/img/box/e/box_wp16e.png | Bin .../Resources}/img/box/frlg/box_wp13frlg.png | Bin .../Resources}/img/box/frlg/box_wp14frlg.png | Bin .../Resources}/img/box/frlg/box_wp15frlg.png | Bin .../Resources}/img/box/frlg/box_wp16frlg.png | Bin .../Resources}/img/box/hgss/box_wp17hgss.png | Bin .../Resources}/img/box/hgss/box_wp18hgss.png | Bin .../Resources}/img/box/hgss/box_wp19hgss.png | Bin .../Resources}/img/box/hgss/box_wp20hgss.png | Bin .../Resources}/img/box/hgss/box_wp21hgss.png | Bin .../Resources}/img/box/hgss/box_wp22hgss.png | Bin .../Resources}/img/box/hgss/box_wp23hgss.png | Bin .../Resources}/img/box/hgss/box_wp24hgss.png | Bin .../Resources}/img/box/pt/box_wp17pt.png | Bin .../Resources}/img/box/pt/box_wp18pt.png | Bin .../Resources}/img/box/pt/box_wp19pt.png | Bin .../Resources}/img/box/pt/box_wp20pt.png | Bin .../Resources}/img/box/pt/box_wp21pt.png | Bin .../Resources}/img/box/pt/box_wp22pt.png | Bin .../Resources}/img/box/pt/box_wp23pt.png | Bin .../Resources}/img/box/pt/box_wp24pt.png | Bin .../Resources}/img/box/rs/box_wp01rs.png | Bin .../Resources}/img/box/rs/box_wp02rs.png | Bin .../Resources}/img/box/rs/box_wp03rs.png | Bin .../Resources}/img/box/rs/box_wp04rs.png | Bin .../Resources}/img/box/rs/box_wp05rs.png | Bin .../Resources}/img/box/rs/box_wp06rs.png | Bin .../Resources}/img/box/rs/box_wp07rs.png | Bin .../Resources}/img/box/rs/box_wp08rs.png | Bin .../Resources}/img/box/rs/box_wp09rs.png | Bin .../Resources}/img/box/rs/box_wp10rs.png | Bin .../Resources}/img/box/rs/box_wp11rs.png | Bin .../Resources}/img/box/rs/box_wp12rs.png | Bin .../Resources}/img/box/rs/box_wp13rs.png | Bin .../Resources}/img/box/rs/box_wp14rs.png | Bin .../Resources}/img/box/rs/box_wp15rs.png | Bin .../Resources}/img/box/rs/box_wp16rs.png | Bin {Resources => PKHeX/Resources}/img/box/slotDel.png | Bin {Resources => PKHeX/Resources}/img/box/slotSet.png | Bin .../Resources}/img/box/slotTrans.png | Bin {Resources => PKHeX/Resources}/img/box/slotView.png | Bin .../Resources}/img/box/xy/box_wp01xy.png | Bin .../Resources}/img/box/xy/box_wp02xy.png | Bin .../Resources}/img/box/xy/box_wp03xy.png | Bin .../Resources}/img/box/xy/box_wp04xy.png | Bin .../Resources}/img/box/xy/box_wp05xy.png | Bin .../Resources}/img/box/xy/box_wp06xy.png | Bin .../Resources}/img/box/xy/box_wp07xy.png | Bin .../Resources}/img/box/xy/box_wp08xy.png | Bin .../Resources}/img/box/xy/box_wp09xy.png | Bin .../Resources}/img/box/xy/box_wp10xy.png | Bin .../Resources}/img/box/xy/box_wp11xy.png | Bin .../Resources}/img/box/xy/box_wp12xy.png | Bin .../Resources}/img/box/xy/box_wp13xy.png | Bin .../Resources}/img/box/xy/box_wp14xy.png | Bin .../Resources}/img/box/xy/box_wp15xy.png | Bin .../Resources}/img/box/xy/box_wp16xy.png | Bin .../Resources}/img/box/xy/box_wp17xy.png | Bin .../Resources}/img/box/xy/box_wp18xy.png | Bin .../Resources}/img/box/xy/box_wp19xy.png | Bin .../Resources}/img/box/xy/box_wp20xy.png | Bin .../Resources}/img/box/xy/box_wp21xy.png | Bin .../Resources}/img/box/xy/box_wp22xy.png | Bin .../Resources}/img/box/xy/box_wp23xy.png | Bin .../Resources}/img/box/xy/box_wp24xy.png | Bin {Resources => PKHeX/Resources}/img/icon.png | Bin {Resources => PKHeX/Resources}/img/item/item_1.png | Bin {Resources => PKHeX/Resources}/img/item/item_10.png | Bin .../Resources}/img/item/item_100.png | Bin .../Resources}/img/item/item_101.png | Bin .../Resources}/img/item/item_102.png | Bin .../Resources}/img/item/item_103.png | Bin .../Resources}/img/item/item_104.png | Bin .../Resources}/img/item/item_105.png | Bin .../Resources}/img/item/item_106.png | Bin .../Resources}/img/item/item_107.png | Bin .../Resources}/img/item/item_108.png | Bin .../Resources}/img/item/item_109.png | Bin {Resources => PKHeX/Resources}/img/item/item_11.png | Bin .../Resources}/img/item/item_110.png | Bin .../Resources}/img/item/item_112.png | Bin .../Resources}/img/item/item_116.png | Bin .../Resources}/img/item/item_117.png | Bin .../Resources}/img/item/item_118.png | Bin .../Resources}/img/item/item_119.png | Bin {Resources => PKHeX/Resources}/img/item/item_12.png | Bin {Resources => PKHeX/Resources}/img/item/item_13.png | Bin .../Resources}/img/item/item_134.png | Bin .../Resources}/img/item/item_135.png | Bin .../Resources}/img/item/item_136.png | Bin {Resources => PKHeX/Resources}/img/item/item_14.png | Bin .../Resources}/img/item/item_149.png | Bin {Resources => PKHeX/Resources}/img/item/item_15.png | Bin .../Resources}/img/item/item_150.png | Bin .../Resources}/img/item/item_151.png | Bin .../Resources}/img/item/item_152.png | Bin .../Resources}/img/item/item_153.png | Bin .../Resources}/img/item/item_154.png | Bin .../Resources}/img/item/item_155.png | Bin .../Resources}/img/item/item_156.png | Bin .../Resources}/img/item/item_157.png | Bin .../Resources}/img/item/item_158.png | Bin .../Resources}/img/item/item_159.png | Bin {Resources => PKHeX/Resources}/img/item/item_16.png | Bin .../Resources}/img/item/item_160.png | Bin .../Resources}/img/item/item_161.png | Bin .../Resources}/img/item/item_162.png | Bin .../Resources}/img/item/item_163.png | Bin .../Resources}/img/item/item_164.png | Bin .../Resources}/img/item/item_165.png | Bin .../Resources}/img/item/item_166.png | Bin .../Resources}/img/item/item_167.png | Bin .../Resources}/img/item/item_168.png | Bin .../Resources}/img/item/item_169.png | Bin {Resources => PKHeX/Resources}/img/item/item_17.png | Bin .../Resources}/img/item/item_170.png | Bin .../Resources}/img/item/item_171.png | Bin .../Resources}/img/item/item_172.png | Bin .../Resources}/img/item/item_173.png | Bin .../Resources}/img/item/item_174.png | Bin .../Resources}/img/item/item_175.png | Bin .../Resources}/img/item/item_176.png | Bin .../Resources}/img/item/item_177.png | Bin .../Resources}/img/item/item_178.png | Bin .../Resources}/img/item/item_179.png | Bin {Resources => PKHeX/Resources}/img/item/item_18.png | Bin .../Resources}/img/item/item_180.png | Bin .../Resources}/img/item/item_181.png | Bin .../Resources}/img/item/item_182.png | Bin .../Resources}/img/item/item_183.png | Bin .../Resources}/img/item/item_184.png | Bin .../Resources}/img/item/item_185.png | Bin .../Resources}/img/item/item_186.png | Bin .../Resources}/img/item/item_187.png | Bin .../Resources}/img/item/item_188.png | Bin .../Resources}/img/item/item_189.png | Bin {Resources => PKHeX/Resources}/img/item/item_19.png | Bin .../Resources}/img/item/item_190.png | Bin .../Resources}/img/item/item_191.png | Bin .../Resources}/img/item/item_192.png | Bin .../Resources}/img/item/item_193.png | Bin .../Resources}/img/item/item_194.png | Bin .../Resources}/img/item/item_195.png | Bin .../Resources}/img/item/item_196.png | Bin .../Resources}/img/item/item_197.png | Bin .../Resources}/img/item/item_198.png | Bin .../Resources}/img/item/item_199.png | Bin {Resources => PKHeX/Resources}/img/item/item_2.png | Bin {Resources => PKHeX/Resources}/img/item/item_20.png | Bin .../Resources}/img/item/item_200.png | Bin .../Resources}/img/item/item_201.png | Bin .../Resources}/img/item/item_202.png | Bin .../Resources}/img/item/item_203.png | Bin .../Resources}/img/item/item_204.png | Bin .../Resources}/img/item/item_205.png | Bin .../Resources}/img/item/item_206.png | Bin .../Resources}/img/item/item_207.png | Bin .../Resources}/img/item/item_208.png | Bin .../Resources}/img/item/item_209.png | Bin {Resources => PKHeX/Resources}/img/item/item_21.png | Bin .../Resources}/img/item/item_210.png | Bin .../Resources}/img/item/item_211.png | Bin .../Resources}/img/item/item_212.png | Bin .../Resources}/img/item/item_213.png | Bin .../Resources}/img/item/item_214.png | Bin .../Resources}/img/item/item_215.png | Bin .../Resources}/img/item/item_217.png | Bin .../Resources}/img/item/item_218.png | Bin .../Resources}/img/item/item_219.png | Bin {Resources => PKHeX/Resources}/img/item/item_22.png | Bin .../Resources}/img/item/item_220.png | Bin .../Resources}/img/item/item_221.png | Bin .../Resources}/img/item/item_222.png | Bin .../Resources}/img/item/item_223.png | Bin .../Resources}/img/item/item_224.png | Bin .../Resources}/img/item/item_225.png | Bin .../Resources}/img/item/item_226.png | Bin .../Resources}/img/item/item_227.png | Bin .../Resources}/img/item/item_228.png | Bin .../Resources}/img/item/item_229.png | Bin {Resources => PKHeX/Resources}/img/item/item_23.png | Bin .../Resources}/img/item/item_230.png | Bin .../Resources}/img/item/item_231.png | Bin .../Resources}/img/item/item_232.png | Bin .../Resources}/img/item/item_233.png | Bin .../Resources}/img/item/item_234.png | Bin .../Resources}/img/item/item_235.png | Bin .../Resources}/img/item/item_236.png | Bin .../Resources}/img/item/item_237.png | Bin .../Resources}/img/item/item_238.png | Bin .../Resources}/img/item/item_239.png | Bin {Resources => PKHeX/Resources}/img/item/item_24.png | Bin .../Resources}/img/item/item_240.png | Bin .../Resources}/img/item/item_241.png | Bin .../Resources}/img/item/item_242.png | Bin .../Resources}/img/item/item_243.png | Bin .../Resources}/img/item/item_244.png | Bin .../Resources}/img/item/item_245.png | Bin .../Resources}/img/item/item_246.png | Bin .../Resources}/img/item/item_247.png | Bin .../Resources}/img/item/item_248.png | Bin .../Resources}/img/item/item_249.png | Bin {Resources => PKHeX/Resources}/img/item/item_25.png | Bin .../Resources}/img/item/item_250.png | Bin .../Resources}/img/item/item_251.png | Bin .../Resources}/img/item/item_252.png | Bin .../Resources}/img/item/item_253.png | Bin .../Resources}/img/item/item_254.png | Bin .../Resources}/img/item/item_255.png | Bin .../Resources}/img/item/item_256.png | Bin .../Resources}/img/item/item_257.png | Bin .../Resources}/img/item/item_258.png | Bin .../Resources}/img/item/item_259.png | Bin {Resources => PKHeX/Resources}/img/item/item_26.png | Bin .../Resources}/img/item/item_260.png | Bin .../Resources}/img/item/item_261.png | Bin .../Resources}/img/item/item_262.png | Bin .../Resources}/img/item/item_263.png | Bin .../Resources}/img/item/item_264.png | Bin .../Resources}/img/item/item_265.png | Bin .../Resources}/img/item/item_266.png | Bin .../Resources}/img/item/item_267.png | Bin .../Resources}/img/item/item_268.png | Bin .../Resources}/img/item/item_269.png | Bin {Resources => PKHeX/Resources}/img/item/item_27.png | Bin .../Resources}/img/item/item_270.png | Bin .../Resources}/img/item/item_271.png | Bin .../Resources}/img/item/item_272.png | Bin .../Resources}/img/item/item_273.png | Bin .../Resources}/img/item/item_274.png | Bin .../Resources}/img/item/item_275.png | Bin .../Resources}/img/item/item_276.png | Bin .../Resources}/img/item/item_277.png | Bin .../Resources}/img/item/item_278.png | Bin .../Resources}/img/item/item_279.png | Bin {Resources => PKHeX/Resources}/img/item/item_28.png | Bin .../Resources}/img/item/item_280.png | Bin .../Resources}/img/item/item_281.png | Bin .../Resources}/img/item/item_282.png | Bin .../Resources}/img/item/item_283.png | Bin .../Resources}/img/item/item_284.png | Bin .../Resources}/img/item/item_285.png | Bin .../Resources}/img/item/item_286.png | Bin .../Resources}/img/item/item_287.png | Bin .../Resources}/img/item/item_288.png | Bin .../Resources}/img/item/item_289.png | Bin {Resources => PKHeX/Resources}/img/item/item_29.png | Bin .../Resources}/img/item/item_290.png | Bin .../Resources}/img/item/item_291.png | Bin .../Resources}/img/item/item_292.png | Bin .../Resources}/img/item/item_293.png | Bin .../Resources}/img/item/item_294.png | Bin .../Resources}/img/item/item_295.png | Bin .../Resources}/img/item/item_296.png | Bin .../Resources}/img/item/item_297.png | Bin .../Resources}/img/item/item_298.png | Bin .../Resources}/img/item/item_299.png | Bin {Resources => PKHeX/Resources}/img/item/item_3.png | Bin {Resources => PKHeX/Resources}/img/item/item_30.png | Bin .../Resources}/img/item/item_300.png | Bin .../Resources}/img/item/item_301.png | Bin .../Resources}/img/item/item_302.png | Bin .../Resources}/img/item/item_303.png | Bin .../Resources}/img/item/item_304.png | Bin .../Resources}/img/item/item_305.png | Bin .../Resources}/img/item/item_306.png | Bin .../Resources}/img/item/item_307.png | Bin .../Resources}/img/item/item_308.png | Bin .../Resources}/img/item/item_309.png | Bin {Resources => PKHeX/Resources}/img/item/item_31.png | Bin .../Resources}/img/item/item_310.png | Bin .../Resources}/img/item/item_311.png | Bin .../Resources}/img/item/item_312.png | Bin .../Resources}/img/item/item_313.png | Bin .../Resources}/img/item/item_314.png | Bin .../Resources}/img/item/item_315.png | Bin .../Resources}/img/item/item_316.png | Bin .../Resources}/img/item/item_317.png | Bin .../Resources}/img/item/item_318.png | Bin .../Resources}/img/item/item_319.png | Bin {Resources => PKHeX/Resources}/img/item/item_32.png | Bin .../Resources}/img/item/item_320.png | Bin .../Resources}/img/item/item_321.png | Bin .../Resources}/img/item/item_322.png | Bin .../Resources}/img/item/item_323.png | Bin .../Resources}/img/item/item_324.png | Bin .../Resources}/img/item/item_325.png | Bin .../Resources}/img/item/item_326.png | Bin .../Resources}/img/item/item_327.png | Bin {Resources => PKHeX/Resources}/img/item/item_33.png | Bin {Resources => PKHeX/Resources}/img/item/item_34.png | Bin {Resources => PKHeX/Resources}/img/item/item_35.png | Bin {Resources => PKHeX/Resources}/img/item/item_36.png | Bin {Resources => PKHeX/Resources}/img/item/item_37.png | Bin {Resources => PKHeX/Resources}/img/item/item_38.png | Bin {Resources => PKHeX/Resources}/img/item/item_39.png | Bin {Resources => PKHeX/Resources}/img/item/item_4.png | Bin {Resources => PKHeX/Resources}/img/item/item_40.png | Bin {Resources => PKHeX/Resources}/img/item/item_41.png | Bin {Resources => PKHeX/Resources}/img/item/item_42.png | Bin {Resources => PKHeX/Resources}/img/item/item_43.png | Bin {Resources => PKHeX/Resources}/img/item/item_44.png | Bin {Resources => PKHeX/Resources}/img/item/item_45.png | Bin {Resources => PKHeX/Resources}/img/item/item_46.png | Bin {Resources => PKHeX/Resources}/img/item/item_47.png | Bin {Resources => PKHeX/Resources}/img/item/item_48.png | Bin {Resources => PKHeX/Resources}/img/item/item_49.png | Bin {Resources => PKHeX/Resources}/img/item/item_5.png | Bin {Resources => PKHeX/Resources}/img/item/item_50.png | Bin .../Resources}/img/item/item_504.png | Bin {Resources => PKHeX/Resources}/img/item/item_51.png | Bin {Resources => PKHeX/Resources}/img/item/item_52.png | Bin {Resources => PKHeX/Resources}/img/item/item_53.png | Bin .../Resources}/img/item/item_534.png | Bin .../Resources}/img/item/item_535.png | Bin .../Resources}/img/item/item_537.png | Bin .../Resources}/img/item/item_538.png | Bin .../Resources}/img/item/item_539.png | Bin {Resources => PKHeX/Resources}/img/item/item_54.png | Bin .../Resources}/img/item/item_540.png | Bin .../Resources}/img/item/item_541.png | Bin .../Resources}/img/item/item_542.png | Bin .../Resources}/img/item/item_543.png | Bin .../Resources}/img/item/item_544.png | Bin .../Resources}/img/item/item_545.png | Bin .../Resources}/img/item/item_546.png | Bin .../Resources}/img/item/item_547.png | Bin .../Resources}/img/item/item_548.png | Bin .../Resources}/img/item/item_549.png | Bin {Resources => PKHeX/Resources}/img/item/item_55.png | Bin .../Resources}/img/item/item_550.png | Bin .../Resources}/img/item/item_551.png | Bin .../Resources}/img/item/item_552.png | Bin .../Resources}/img/item/item_553.png | Bin .../Resources}/img/item/item_554.png | Bin .../Resources}/img/item/item_555.png | Bin .../Resources}/img/item/item_556.png | Bin .../Resources}/img/item/item_557.png | Bin .../Resources}/img/item/item_558.png | Bin .../Resources}/img/item/item_559.png | Bin {Resources => PKHeX/Resources}/img/item/item_56.png | Bin .../Resources}/img/item/item_560.png | Bin .../Resources}/img/item/item_561.png | Bin .../Resources}/img/item/item_562.png | Bin .../Resources}/img/item/item_563.png | Bin .../Resources}/img/item/item_564.png | Bin .../Resources}/img/item/item_565.png | Bin .../Resources}/img/item/item_566.png | Bin .../Resources}/img/item/item_567.png | Bin .../Resources}/img/item/item_568.png | Bin .../Resources}/img/item/item_569.png | Bin {Resources => PKHeX/Resources}/img/item/item_57.png | Bin .../Resources}/img/item/item_570.png | Bin .../Resources}/img/item/item_571.png | Bin .../Resources}/img/item/item_572.png | Bin .../Resources}/img/item/item_573.png | Bin .../Resources}/img/item/item_577.png | Bin {Resources => PKHeX/Resources}/img/item/item_58.png | Bin .../Resources}/img/item/item_580.png | Bin .../Resources}/img/item/item_581.png | Bin .../Resources}/img/item/item_582.png | Bin .../Resources}/img/item/item_583.png | Bin .../Resources}/img/item/item_584.png | Bin .../Resources}/img/item/item_585.png | Bin .../Resources}/img/item/item_586.png | Bin .../Resources}/img/item/item_587.png | Bin .../Resources}/img/item/item_588.png | Bin .../Resources}/img/item/item_589.png | Bin {Resources => PKHeX/Resources}/img/item/item_59.png | Bin .../Resources}/img/item/item_590.png | Bin .../Resources}/img/item/item_591.png | Bin {Resources => PKHeX/Resources}/img/item/item_6.png | Bin {Resources => PKHeX/Resources}/img/item/item_60.png | Bin {Resources => PKHeX/Resources}/img/item/item_61.png | Bin {Resources => PKHeX/Resources}/img/item/item_62.png | Bin {Resources => PKHeX/Resources}/img/item/item_63.png | Bin .../Resources}/img/item/item_639.png | Bin {Resources => PKHeX/Resources}/img/item/item_64.png | Bin .../Resources}/img/item/item_640.png | Bin .../Resources}/img/item/item_644.png | Bin .../Resources}/img/item/item_645.png | Bin .../Resources}/img/item/item_646.png | Bin .../Resources}/img/item/item_647.png | Bin .../Resources}/img/item/item_648.png | Bin .../Resources}/img/item/item_649.png | Bin {Resources => PKHeX/Resources}/img/item/item_65.png | Bin .../Resources}/img/item/item_650.png | Bin .../Resources}/img/item/item_652.png | Bin .../Resources}/img/item/item_653.png | Bin .../Resources}/img/item/item_654.png | Bin .../Resources}/img/item/item_655.png | Bin .../Resources}/img/item/item_656.png | Bin .../Resources}/img/item/item_657.png | Bin .../Resources}/img/item/item_658.png | Bin .../Resources}/img/item/item_659.png | Bin {Resources => PKHeX/Resources}/img/item/item_66.png | Bin .../Resources}/img/item/item_660.png | Bin .../Resources}/img/item/item_661.png | Bin .../Resources}/img/item/item_662.png | Bin .../Resources}/img/item/item_663.png | Bin .../Resources}/img/item/item_664.png | Bin .../Resources}/img/item/item_665.png | Bin .../Resources}/img/item/item_666.png | Bin .../Resources}/img/item/item_667.png | Bin .../Resources}/img/item/item_668.png | Bin .../Resources}/img/item/item_669.png | Bin {Resources => PKHeX/Resources}/img/item/item_67.png | Bin .../Resources}/img/item/item_670.png | Bin .../Resources}/img/item/item_671.png | Bin .../Resources}/img/item/item_672.png | Bin .../Resources}/img/item/item_673.png | Bin .../Resources}/img/item/item_674.png | Bin .../Resources}/img/item/item_675.png | Bin .../Resources}/img/item/item_676.png | Bin .../Resources}/img/item/item_677.png | Bin .../Resources}/img/item/item_678.png | Bin .../Resources}/img/item/item_679.png | Bin {Resources => PKHeX/Resources}/img/item/item_68.png | Bin .../Resources}/img/item/item_680.png | Bin .../Resources}/img/item/item_681.png | Bin .../Resources}/img/item/item_682.png | Bin .../Resources}/img/item/item_683.png | Bin .../Resources}/img/item/item_684.png | Bin .../Resources}/img/item/item_685.png | Bin .../Resources}/img/item/item_686.png | Bin .../Resources}/img/item/item_687.png | Bin .../Resources}/img/item/item_688.png | Bin {Resources => PKHeX/Resources}/img/item/item_69.png | Bin .../Resources}/img/item/item_699.png | Bin {Resources => PKHeX/Resources}/img/item/item_7.png | Bin {Resources => PKHeX/Resources}/img/item/item_70.png | Bin .../Resources}/img/item/item_704.png | Bin .../Resources}/img/item/item_708.png | Bin .../Resources}/img/item/item_709.png | Bin {Resources => PKHeX/Resources}/img/item/item_71.png | Bin .../Resources}/img/item/item_710.png | Bin .../Resources}/img/item/item_711.png | Bin .../Resources}/img/item/item_715.png | Bin {Resources => PKHeX/Resources}/img/item/item_72.png | Bin {Resources => PKHeX/Resources}/img/item/item_73.png | Bin {Resources => PKHeX/Resources}/img/item/item_74.png | Bin {Resources => PKHeX/Resources}/img/item/item_75.png | Bin .../Resources}/img/item/item_752.png | Bin .../Resources}/img/item/item_753.png | Bin .../Resources}/img/item/item_754.png | Bin .../Resources}/img/item/item_755.png | Bin .../Resources}/img/item/item_756.png | Bin .../Resources}/img/item/item_757.png | Bin .../Resources}/img/item/item_758.png | Bin .../Resources}/img/item/item_759.png | Bin {Resources => PKHeX/Resources}/img/item/item_76.png | Bin .../Resources}/img/item/item_760.png | Bin .../Resources}/img/item/item_761.png | Bin .../Resources}/img/item/item_762.png | Bin .../Resources}/img/item/item_763.png | Bin .../Resources}/img/item/item_764.png | Bin .../Resources}/img/item/item_767.png | Bin .../Resources}/img/item/item_768.png | Bin .../Resources}/img/item/item_769.png | Bin {Resources => PKHeX/Resources}/img/item/item_77.png | Bin .../Resources}/img/item/item_770.png | Bin {Resources => PKHeX/Resources}/img/item/item_78.png | Bin {Resources => PKHeX/Resources}/img/item/item_79.png | Bin {Resources => PKHeX/Resources}/img/item/item_8.png | Bin {Resources => PKHeX/Resources}/img/item/item_80.png | Bin {Resources => PKHeX/Resources}/img/item/item_81.png | Bin {Resources => PKHeX/Resources}/img/item/item_82.png | Bin {Resources => PKHeX/Resources}/img/item/item_83.png | Bin {Resources => PKHeX/Resources}/img/item/item_84.png | Bin {Resources => PKHeX/Resources}/img/item/item_85.png | Bin {Resources => PKHeX/Resources}/img/item/item_86.png | Bin {Resources => PKHeX/Resources}/img/item/item_87.png | Bin {Resources => PKHeX/Resources}/img/item/item_88.png | Bin {Resources => PKHeX/Resources}/img/item/item_89.png | Bin {Resources => PKHeX/Resources}/img/item/item_9.png | Bin {Resources => PKHeX/Resources}/img/item/item_90.png | Bin {Resources => PKHeX/Resources}/img/item/item_91.png | Bin {Resources => PKHeX/Resources}/img/item/item_92.png | Bin {Resources => PKHeX/Resources}/img/item/item_93.png | Bin {Resources => PKHeX/Resources}/img/item/item_94.png | Bin {Resources => PKHeX/Resources}/img/item/item_95.png | Bin {Resources => PKHeX/Resources}/img/item/item_96.png | Bin {Resources => PKHeX/Resources}/img/item/item_97.png | Bin {Resources => PKHeX/Resources}/img/item/item_98.png | Bin {Resources => PKHeX/Resources}/img/item/item_99.png | Bin {Resources => PKHeX/Resources}/img/item/item_tm.png | Bin .../Resources}/img/misc/anti_pokerus_icon.png | Bin .../Resources}/img/misc/box_mark_01.png | Bin .../Resources}/img/misc/box_mark_02.png | Bin .../Resources}/img/misc/box_mark_03.png | Bin .../Resources}/img/misc/box_mark_04.png | Bin .../Resources}/img/misc/box_mark_05.png | Bin .../Resources}/img/misc/box_mark_06.png | Bin .../Resources}/img/misc/else_icon.png | Bin .../Resources}/img/misc/helditem.png | Bin {Resources => PKHeX/Resources}/img/misc/locked.png | Bin {Resources => PKHeX/Resources}/img/misc/party.png | Bin .../Resources}/img/misc/rare_icon.png | Bin .../Resources}/img/misc/trainingmedal.png | Bin .../Resources}/img/ribbons/ribbonability.png | Bin .../Resources}/img/ribbons/ribbonabilitydouble.png | Bin .../Resources}/img/ribbons/ribbonabilitygreat.png | Bin .../Resources}/img/ribbons/ribbonabilitymulti.png | Bin .../Resources}/img/ribbons/ribbonabilitypair.png | Bin .../Resources}/img/ribbons/ribbonabilityworld.png | Bin .../Resources}/img/ribbons/ribbonalert.png | Bin .../Resources}/img/ribbons/ribbonartist.png | Bin .../Resources}/img/ribbons/ribbonbattlerexpert.png | Bin .../img/ribbons/ribbonbattlerskillful.png | Bin .../Resources}/img/ribbons/ribbonbestfriends.png | Bin .../Resources}/img/ribbons/ribbonbirthday.png | Bin .../Resources}/img/ribbons/ribboncareless.png | Bin .../Resources}/img/ribbons/ribbonchampionbattle.png | Bin .../img/ribbons/ribbonchampiong3hoenn.png | Bin .../img/ribbons/ribbonchampiong6hoenn.png | Bin .../Resources}/img/ribbons/ribbonchampionkalos.png | Bin .../img/ribbons/ribbonchampionnational.png | Bin .../img/ribbons/ribbonchampionregional.png | Bin .../Resources}/img/ribbons/ribbonchampionsinnoh.png | Bin .../Resources}/img/ribbons/ribbonchampionworld.png | Bin .../Resources}/img/ribbons/ribbonclassic.png | Bin .../Resources}/img/ribbons/ribbonconteststar.png | Bin .../img/ribbons/ribboncountmemorybattle.png | Bin .../img/ribbons/ribboncountmemorybattle2.png | Bin .../img/ribbons/ribboncountmemorycontest.png | Bin .../img/ribbons/ribboncountmemorycontest2.png | Bin .../Resources}/img/ribbons/ribboncountry.png | Bin .../Resources}/img/ribbons/ribbondowncast.png | Bin .../Resources}/img/ribbons/ribbonearth.png | Bin .../Resources}/img/ribbons/ribboneffort.png | Bin .../Resources}/img/ribbons/ribbonevent.png | Bin .../Resources}/img/ribbons/ribbonfootprint.png | Bin .../Resources}/img/ribbons/ribbong3beauty.png | Bin .../Resources}/img/ribbons/ribbong3beautyhyper.png | Bin .../Resources}/img/ribbons/ribbong3beautymaster.png | Bin .../Resources}/img/ribbons/ribbong3beautysuper.png | Bin .../Resources}/img/ribbons/ribbong3cool.png | Bin .../Resources}/img/ribbons/ribbong3coolhyper.png | Bin .../Resources}/img/ribbons/ribbong3coolmaster.png | Bin .../Resources}/img/ribbons/ribbong3coolsuper.png | Bin .../Resources}/img/ribbons/ribbong3cute.png | Bin .../Resources}/img/ribbons/ribbong3cutehyper.png | Bin .../Resources}/img/ribbons/ribbong3cutemaster.png | Bin .../Resources}/img/ribbons/ribbong3cutesuper.png | Bin .../Resources}/img/ribbons/ribbong3smart.png | Bin .../Resources}/img/ribbons/ribbong3smarthyper.png | Bin .../Resources}/img/ribbons/ribbong3smartmaster.png | Bin .../Resources}/img/ribbons/ribbong3smartsuper.png | Bin .../Resources}/img/ribbons/ribbong3tough.png | Bin .../Resources}/img/ribbons/ribbong3toughhyper.png | Bin .../Resources}/img/ribbons/ribbong3toughmaster.png | Bin .../Resources}/img/ribbons/ribbong3toughsuper.png | Bin .../Resources}/img/ribbons/ribbong4beauty.png | Bin .../Resources}/img/ribbons/ribbong4beautygreat.png | Bin .../Resources}/img/ribbons/ribbong4beautymaster.png | Bin .../Resources}/img/ribbons/ribbong4beautyultra.png | Bin .../Resources}/img/ribbons/ribbong4cool.png | Bin .../Resources}/img/ribbons/ribbong4coolgreat.png | Bin .../Resources}/img/ribbons/ribbong4coolmaster.png | Bin .../Resources}/img/ribbons/ribbong4coolultra.png | Bin .../Resources}/img/ribbons/ribbong4cute.png | Bin .../Resources}/img/ribbons/ribbong4cutegreat.png | Bin .../Resources}/img/ribbons/ribbong4cutemaster.png | Bin .../Resources}/img/ribbons/ribbong4cuteultra.png | Bin .../Resources}/img/ribbons/ribbong4smart.png | Bin .../Resources}/img/ribbons/ribbong4smartgreat.png | Bin .../Resources}/img/ribbons/ribbong4smartmaster.png | Bin .../Resources}/img/ribbons/ribbong4smartultra.png | Bin .../Resources}/img/ribbons/ribbong4tough.png | Bin .../Resources}/img/ribbons/ribbong4toughgreat.png | Bin .../Resources}/img/ribbons/ribbong4toughmaster.png | Bin .../Resources}/img/ribbons/ribbong4toughultra.png | Bin .../Resources}/img/ribbons/ribbongorgeous.png | Bin .../Resources}/img/ribbons/ribbongorgeousroyal.png | Bin .../Resources}/img/ribbons/ribbonlegend.png | Bin .../Resources}/img/ribbons/ribbonmasterbeauty.png | Bin .../img/ribbons/ribbonmastercleverness.png | Bin .../Resources}/img/ribbons/ribbonmastercoolness.png | Bin .../Resources}/img/ribbons/ribbonmastercuteness.png | Bin .../img/ribbons/ribbonmastertoughness.png | Bin .../Resources}/img/ribbons/ribbonnational.png | Bin .../Resources}/img/ribbons/ribbonpremier.png | Bin .../Resources}/img/ribbons/ribbonrecord.png | Bin .../Resources}/img/ribbons/ribbonrelax.png | Bin .../Resources}/img/ribbons/ribbonroyal.png | Bin .../Resources}/img/ribbons/ribbonshock.png | Bin .../Resources}/img/ribbons/ribbonsmile.png | Bin .../Resources}/img/ribbons/ribbonsnooze.png | Bin .../Resources}/img/ribbons/ribbonsouvenir.png | Bin .../Resources}/img/ribbons/ribbonspecial.png | Bin .../Resources}/img/ribbons/ribbontraining.png | Bin .../Resources}/img/ribbons/ribbonvictory.png | Bin .../Resources}/img/ribbons/ribbonwinning.png | Bin .../Resources}/img/ribbons/ribbonwishing.png | Bin .../Resources}/img/ribbons/ribbonworld.png | Bin {Resources => PKHeX/Resources}/img/valid.png | Bin {Resources => PKHeX/Resources}/img/warn.png | Bin {Resources => PKHeX/Resources}/text/changelog.txt | 0 {Resources => PKHeX/Resources}/text/de/lang_de.txt | 0 .../Resources}/text/de/text_Abilities_de.txt | 0 .../Resources}/text/de/text_Character_de.txt | 0 .../Resources}/text/de/text_EncounterType_de.txt | 0 .../Resources}/text/de/text_Forms_de.txt | 0 .../Resources}/text/de/text_Games_de.txt | 0 .../Resources}/text/de/text_GenLoc_de.txt | 0 .../Resources}/text/de/text_Items_de.txt | 0 .../Resources}/text/de/text_Memories_de.txt | 0 .../Resources}/text/de/text_Moves_de.txt | 0 .../Resources}/text/de/text_Natures_de.txt | 0 .../Resources}/text/de/text_Pokeblock_de.txt | 0 .../Resources}/text/de/text_Puff_de.txt | 0 .../Resources}/text/de/text_Species_de.txt | 0 .../Resources}/text/de/text_SuperTraining_de.txt | 0 .../Resources}/text/de/text_TrainingBag_de.txt | 0 .../Resources}/text/de/text_Types_de.txt | 0 .../Resources}/text/de/text_Wallpaper_de.txt | 0 .../Resources}/text/de/text_bw2_00000_de.txt | 0 .../Resources}/text/de/text_bw2_30000_de.txt | 0 .../Resources}/text/de/text_bw2_40000_de.txt | 0 .../Resources}/text/de/text_bw2_60000_de.txt | 0 .../Resources}/text/de/text_hgss_00000_de.txt | 0 .../Resources}/text/de/text_hgss_02000_de.txt | 0 .../Resources}/text/de/text_hgss_03000_de.txt | 0 .../Resources}/text/de/text_tradeao_de.txt | 0 .../Resources}/text/de/text_tradexy_de.txt | 0 .../Resources}/text/de/text_xy_00000_de.txt | 0 .../Resources}/text/de/text_xy_30000_de.txt | 0 .../Resources}/text/de/text_xy_40000_de.txt | 0 .../Resources}/text/de/text_xy_60000_de.txt | 0 {Resources => PKHeX/Resources}/text/en/lang_en.txt | 0 .../Resources}/text/en/text_Abilities_en.txt | 0 .../Resources}/text/en/text_Character_en.txt | 0 .../Resources}/text/en/text_EncounterType_en.txt | 0 .../Resources}/text/en/text_Forms_en.txt | 0 .../Resources}/text/en/text_Games_en.txt | 0 .../Resources}/text/en/text_GenLoc_en.txt | 0 .../Resources}/text/en/text_Items_en.txt | 0 .../Resources}/text/en/text_Memories_en.txt | 0 .../Resources}/text/en/text_Moves_en.txt | 0 .../Resources}/text/en/text_Natures_en.txt | 0 .../Resources}/text/en/text_Pokeblock_en.txt | 0 .../Resources}/text/en/text_Puff_en.txt | 0 .../Resources}/text/en/text_Species_en.txt | 0 .../Resources}/text/en/text_SuperTraining_en.txt | 0 .../Resources}/text/en/text_TrainingBag_en.txt | 0 .../Resources}/text/en/text_Types_en.txt | 0 .../Resources}/text/en/text_Wallpaper_en.txt | 0 .../Resources}/text/en/text_bw2_00000_en.txt | 0 .../Resources}/text/en/text_bw2_30000_en.txt | 0 .../Resources}/text/en/text_bw2_40000_en.txt | 0 .../Resources}/text/en/text_bw2_60000_en.txt | 0 .../Resources}/text/en/text_hgss_00000_en.txt | 0 .../Resources}/text/en/text_hgss_02000_en.txt | 0 .../Resources}/text/en/text_hgss_03000_en.txt | 0 .../Resources}/text/en/text_tradeao_en.txt | 0 .../Resources}/text/en/text_tradexy_en.txt | 0 .../Resources}/text/en/text_xy_00000_en.txt | 0 .../Resources}/text/en/text_xy_30000_en.txt | 0 .../Resources}/text/en/text_xy_40000_en.txt | 0 .../Resources}/text/en/text_xy_60000_en.txt | 0 {Resources => PKHeX/Resources}/text/es/lang_es.txt | 0 .../Resources}/text/es/text_Abilities_es.txt | 0 .../Resources}/text/es/text_Character_es.txt | 0 .../Resources}/text/es/text_EncounterType_es.txt | 0 .../Resources}/text/es/text_Forms_es.txt | 0 .../Resources}/text/es/text_Games_es.txt | 0 .../Resources}/text/es/text_GenLoc_es.txt | 0 .../Resources}/text/es/text_Items_es.txt | 0 .../Resources}/text/es/text_Memories_es.txt | 0 .../Resources}/text/es/text_Moves_es.txt | 0 .../Resources}/text/es/text_Natures_es.txt | 0 .../Resources}/text/es/text_Pokeblock_es.txt | 0 .../Resources}/text/es/text_Puff_es.txt | 0 .../Resources}/text/es/text_Species_es.txt | 0 .../Resources}/text/es/text_SuperTraining_es.txt | 0 .../Resources}/text/es/text_TrainingBag_es.txt | 0 .../Resources}/text/es/text_Types_es.txt | 0 .../Resources}/text/es/text_Wallpaper_es.txt | 0 .../Resources}/text/es/text_bw2_00000_es.txt | 0 .../Resources}/text/es/text_bw2_30000_es.txt | 0 .../Resources}/text/es/text_bw2_40000_es.txt | 0 .../Resources}/text/es/text_bw2_60000_es.txt | 0 .../Resources}/text/es/text_hgss_00000_es.txt | 0 .../Resources}/text/es/text_hgss_02000_es.txt | 0 .../Resources}/text/es/text_hgss_03000_es.txt | 0 .../Resources}/text/es/text_tradeao_es.txt | 0 .../Resources}/text/es/text_tradexy_es.txt | 0 .../Resources}/text/es/text_xy_00000_es.txt | 0 .../Resources}/text/es/text_xy_30000_es.txt | 0 .../Resources}/text/es/text_xy_40000_es.txt | 0 .../Resources}/text/es/text_xy_60000_es.txt | 0 {Resources => PKHeX/Resources}/text/fr/lang_fr.txt | 0 .../Resources}/text/fr/text_Abilities_fr.txt | 0 .../Resources}/text/fr/text_Character_fr.txt | 0 .../Resources}/text/fr/text_EncounterType_fr.txt | 0 .../Resources}/text/fr/text_Forms_fr.txt | 0 .../Resources}/text/fr/text_Games_fr.txt | 0 .../Resources}/text/fr/text_GenLoc_fr.txt | 0 .../Resources}/text/fr/text_Items_fr.txt | 0 .../Resources}/text/fr/text_Memories_fr.txt | 0 .../Resources}/text/fr/text_Moves_fr.txt | 0 .../Resources}/text/fr/text_Natures_fr.txt | 0 .../Resources}/text/fr/text_Pokeblock_fr.txt | 0 .../Resources}/text/fr/text_Puff_fr.txt | 0 .../Resources}/text/fr/text_Species_fr.txt | 0 .../Resources}/text/fr/text_SuperTraining_fr.txt | 0 .../Resources}/text/fr/text_TrainingBag_fr.txt | 0 .../Resources}/text/fr/text_Types_fr.txt | 0 .../Resources}/text/fr/text_Wallpaper_fr.txt | 0 .../Resources}/text/fr/text_bw2_00000_fr.txt | 0 .../Resources}/text/fr/text_bw2_30000_fr.txt | 0 .../Resources}/text/fr/text_bw2_40000_fr.txt | 0 .../Resources}/text/fr/text_bw2_60000_fr.txt | 0 .../Resources}/text/fr/text_hgss_00000_fr.txt | 0 .../Resources}/text/fr/text_hgss_02000_fr.txt | 0 .../Resources}/text/fr/text_hgss_03000_fr.txt | 0 .../Resources}/text/fr/text_tradeao_fr.txt | 0 .../Resources}/text/fr/text_tradexy_fr.txt | 0 .../Resources}/text/fr/text_xy_00000_fr.txt | 0 .../Resources}/text/fr/text_xy_30000_fr.txt | 0 .../Resources}/text/fr/text_xy_40000_fr.txt | 0 .../Resources}/text/fr/text_xy_60000_fr.txt | 0 .../Resources}/text/gen3/text_ItemsG3_en.txt | Bin .../Resources}/text/gen3/text_rsefrlg_00000_en.txt | Bin {Resources => PKHeX/Resources}/text/it/lang_it.txt | 0 .../Resources}/text/it/text_Abilities_it.txt | 0 .../Resources}/text/it/text_Character_it.txt | 0 .../Resources}/text/it/text_EncounterType_it.txt | 0 .../Resources}/text/it/text_Forms_it.txt | 0 .../Resources}/text/it/text_Games_it.txt | 0 .../Resources}/text/it/text_GenLoc_it.txt | 0 .../Resources}/text/it/text_Items_it.txt | 0 .../Resources}/text/it/text_Memories_it.txt | 0 .../Resources}/text/it/text_Moves_it.txt | 0 .../Resources}/text/it/text_Natures_it.txt | 0 .../Resources}/text/it/text_Pokeblock_it.txt | 0 .../Resources}/text/it/text_Puff_it.txt | 0 .../Resources}/text/it/text_Species_it.txt | 0 .../Resources}/text/it/text_SuperTraining_it.txt | 0 .../Resources}/text/it/text_TrainingBag_it.txt | 0 .../Resources}/text/it/text_Types_it.txt | 0 .../Resources}/text/it/text_Wallpaper_it.txt | 0 .../Resources}/text/it/text_bw2_00000_it.txt | 0 .../Resources}/text/it/text_bw2_30000_it.txt | 0 .../Resources}/text/it/text_bw2_40000_it.txt | 0 .../Resources}/text/it/text_bw2_60000_it.txt | 0 .../Resources}/text/it/text_hgss_00000_it.txt | 0 .../Resources}/text/it/text_hgss_02000_it.txt | 0 .../Resources}/text/it/text_hgss_03000_it.txt | 0 .../Resources}/text/it/text_tradeao_it.txt | 0 .../Resources}/text/it/text_tradexy_it.txt | 0 .../Resources}/text/it/text_xy_00000_it.txt | 0 .../Resources}/text/it/text_xy_30000_it.txt | 0 .../Resources}/text/it/text_xy_40000_it.txt | 0 .../Resources}/text/it/text_xy_60000_it.txt | 0 {Resources => PKHeX/Resources}/text/ja/lang_ja.txt | 0 .../Resources}/text/ja/text_Abilities_ja.txt | 0 .../Resources}/text/ja/text_Character_ja.txt | 0 .../Resources}/text/ja/text_EncounterType_ja.txt | 0 .../Resources}/text/ja/text_Forms_ja.txt | 0 .../Resources}/text/ja/text_Games_ja.txt | 0 .../Resources}/text/ja/text_GenLoc_ja.txt | 0 .../Resources}/text/ja/text_Items_ja.txt | 0 .../Resources}/text/ja/text_Memories_ja.txt | 0 .../Resources}/text/ja/text_Moves_ja.txt | 0 .../Resources}/text/ja/text_Natures_ja.txt | 0 .../Resources}/text/ja/text_Pokeblock_ja.txt | 0 .../Resources}/text/ja/text_Puff_ja.txt | 0 .../Resources}/text/ja/text_Species_ja.txt | 0 .../Resources}/text/ja/text_SuperTraining_ja.txt | 0 .../Resources}/text/ja/text_TrainingBag_ja.txt | 0 .../Resources}/text/ja/text_Types_ja.txt | 0 .../Resources}/text/ja/text_Wallpaper_ja.txt | 0 .../Resources}/text/ja/text_bw2_00000_ja.txt | 0 .../Resources}/text/ja/text_bw2_30000_ja.txt | 0 .../Resources}/text/ja/text_bw2_40000_ja.txt | 0 .../Resources}/text/ja/text_bw2_60000_ja.txt | 0 .../Resources}/text/ja/text_hgss_00000_ja.txt | 0 .../Resources}/text/ja/text_hgss_02000_ja.txt | 0 .../Resources}/text/ja/text_hgss_03000_ja.txt | 0 .../Resources}/text/ja/text_tradeao_ja.txt | 0 .../Resources}/text/ja/text_tradexy_ja.txt | 0 .../Resources}/text/ja/text_xy_00000_ja.txt | 0 .../Resources}/text/ja/text_xy_30000_ja.txt | 0 .../Resources}/text/ja/text_xy_40000_ja.txt | 0 .../Resources}/text/ja/text_xy_60000_ja.txt | 0 {Resources => PKHeX/Resources}/text/ko/lang_ko.txt | 0 .../Resources}/text/ko/text_Abilities_ko.txt | 0 .../Resources}/text/ko/text_Character_ko.txt | 0 .../Resources}/text/ko/text_EncounterType_ko.txt | 0 .../Resources}/text/ko/text_Forms_ko.txt | 0 .../Resources}/text/ko/text_Games_ko.txt | 0 .../Resources}/text/ko/text_GenLoc_ko.txt | 0 .../Resources}/text/ko/text_Items_ko.txt | 0 .../Resources}/text/ko/text_Memories_ko.txt | 0 .../Resources}/text/ko/text_Moves_ko.txt | 0 .../Resources}/text/ko/text_Natures_ko.txt | 0 .../Resources}/text/ko/text_Pokeblock_ko.txt | 0 .../Resources}/text/ko/text_Puff_ko.txt | 0 .../Resources}/text/ko/text_Species_ko.txt | 0 .../Resources}/text/ko/text_SuperTraining_ko.txt | 0 .../Resources}/text/ko/text_TrainingBag_ko.txt | 0 .../Resources}/text/ko/text_Types_ko.txt | 0 .../Resources}/text/ko/text_Wallpaper_ko.txt | 0 .../Resources}/text/ko/text_bw2_00000_ko.txt | 0 .../Resources}/text/ko/text_bw2_30000_ko.txt | 0 .../Resources}/text/ko/text_bw2_40000_ko.txt | 0 .../Resources}/text/ko/text_bw2_60000_ko.txt | 0 .../Resources}/text/ko/text_hgss_00000_ko.txt | 0 .../Resources}/text/ko/text_hgss_02000_ko.txt | 0 .../Resources}/text/ko/text_hgss_03000_ko.txt | 0 .../Resources}/text/ko/text_tradeao_ko.txt | 0 .../Resources}/text/ko/text_tradexy_ko.txt | 0 .../Resources}/text/ko/text_xy_00000_ko.txt | 0 .../Resources}/text/ko/text_xy_30000_ko.txt | 0 .../Resources}/text/ko/text_xy_40000_ko.txt | 0 .../Resources}/text/ko/text_xy_60000_ko.txt | 0 .../Resources}/text/locale/countries.txt | Bin .../Resources}/text/locale/countryMap.txt | 0 .../Resources}/text/locale/languages.txt | Bin .../Resources}/text/locale/regions3ds.txt | Bin .../Resources}/text/locale/sr_ID/sr_001.txt | 0 .../Resources}/text/locale/sr_ID/sr_008.txt | 0 .../Resources}/text/locale/sr_ID/sr_009.txt | 0 .../Resources}/text/locale/sr_ID/sr_010.txt | 0 .../Resources}/text/locale/sr_ID/sr_011.txt | 0 .../Resources}/text/locale/sr_ID/sr_012.txt | 0 .../Resources}/text/locale/sr_ID/sr_013.txt | 0 .../Resources}/text/locale/sr_ID/sr_014.txt | 0 .../Resources}/text/locale/sr_ID/sr_015.txt | 0 .../Resources}/text/locale/sr_ID/sr_016.txt | 0 .../Resources}/text/locale/sr_ID/sr_017.txt | 0 .../Resources}/text/locale/sr_ID/sr_018.txt | 0 .../Resources}/text/locale/sr_ID/sr_019.txt | 0 .../Resources}/text/locale/sr_ID/sr_020.txt | 0 .../Resources}/text/locale/sr_ID/sr_021.txt | 0 .../Resources}/text/locale/sr_ID/sr_022.txt | 0 .../Resources}/text/locale/sr_ID/sr_023.txt | 0 .../Resources}/text/locale/sr_ID/sr_024.txt | 0 .../Resources}/text/locale/sr_ID/sr_025.txt | 0 .../Resources}/text/locale/sr_ID/sr_026.txt | 0 .../Resources}/text/locale/sr_ID/sr_027.txt | 0 .../Resources}/text/locale/sr_ID/sr_028.txt | 0 .../Resources}/text/locale/sr_ID/sr_029.txt | 0 .../Resources}/text/locale/sr_ID/sr_030.txt | 0 .../Resources}/text/locale/sr_ID/sr_031.txt | 0 .../Resources}/text/locale/sr_ID/sr_032.txt | 0 .../Resources}/text/locale/sr_ID/sr_033.txt | 0 .../Resources}/text/locale/sr_ID/sr_034.txt | 0 .../Resources}/text/locale/sr_ID/sr_035.txt | 0 .../Resources}/text/locale/sr_ID/sr_036.txt | 0 .../Resources}/text/locale/sr_ID/sr_037.txt | 0 .../Resources}/text/locale/sr_ID/sr_038.txt | 0 .../Resources}/text/locale/sr_ID/sr_039.txt | 0 .../Resources}/text/locale/sr_ID/sr_040.txt | 0 .../Resources}/text/locale/sr_ID/sr_041.txt | 0 .../Resources}/text/locale/sr_ID/sr_042.txt | 0 .../Resources}/text/locale/sr_ID/sr_043.txt | 0 .../Resources}/text/locale/sr_ID/sr_044.txt | 0 .../Resources}/text/locale/sr_ID/sr_045.txt | 0 .../Resources}/text/locale/sr_ID/sr_046.txt | 0 .../Resources}/text/locale/sr_ID/sr_047.txt | 0 .../Resources}/text/locale/sr_ID/sr_048.txt | 0 .../Resources}/text/locale/sr_ID/sr_049.txt | 0 .../Resources}/text/locale/sr_ID/sr_050.txt | 0 .../Resources}/text/locale/sr_ID/sr_051.txt | 0 .../Resources}/text/locale/sr_ID/sr_052.txt | 0 .../Resources}/text/locale/sr_ID/sr_064.txt | 0 .../Resources}/text/locale/sr_ID/sr_065.txt | 0 .../Resources}/text/locale/sr_ID/sr_066.txt | 0 .../Resources}/text/locale/sr_ID/sr_067.txt | 0 .../Resources}/text/locale/sr_ID/sr_068.txt | 0 .../Resources}/text/locale/sr_ID/sr_069.txt | 0 .../Resources}/text/locale/sr_ID/sr_070.txt | 0 .../Resources}/text/locale/sr_ID/sr_071.txt | 0 .../Resources}/text/locale/sr_ID/sr_072.txt | 0 .../Resources}/text/locale/sr_ID/sr_073.txt | 0 .../Resources}/text/locale/sr_ID/sr_074.txt | 0 .../Resources}/text/locale/sr_ID/sr_075.txt | 0 .../Resources}/text/locale/sr_ID/sr_076.txt | 0 .../Resources}/text/locale/sr_ID/sr_077.txt | 0 .../Resources}/text/locale/sr_ID/sr_078.txt | 0 .../Resources}/text/locale/sr_ID/sr_079.txt | 0 .../Resources}/text/locale/sr_ID/sr_080.txt | 0 .../Resources}/text/locale/sr_ID/sr_081.txt | 0 .../Resources}/text/locale/sr_ID/sr_082.txt | 0 .../Resources}/text/locale/sr_ID/sr_083.txt | 0 .../Resources}/text/locale/sr_ID/sr_084.txt | 0 .../Resources}/text/locale/sr_ID/sr_085.txt | 0 .../Resources}/text/locale/sr_ID/sr_086.txt | 0 .../Resources}/text/locale/sr_ID/sr_087.txt | 0 .../Resources}/text/locale/sr_ID/sr_088.txt | 0 .../Resources}/text/locale/sr_ID/sr_089.txt | 0 .../Resources}/text/locale/sr_ID/sr_090.txt | 0 .../Resources}/text/locale/sr_ID/sr_091.txt | 0 .../Resources}/text/locale/sr_ID/sr_092.txt | 0 .../Resources}/text/locale/sr_ID/sr_093.txt | 0 .../Resources}/text/locale/sr_ID/sr_094.txt | 0 .../Resources}/text/locale/sr_ID/sr_095.txt | 0 .../Resources}/text/locale/sr_ID/sr_096.txt | 0 .../Resources}/text/locale/sr_ID/sr_097.txt | 0 .../Resources}/text/locale/sr_ID/sr_098.txt | 0 .../Resources}/text/locale/sr_ID/sr_099.txt | 0 .../Resources}/text/locale/sr_ID/sr_100.txt | 0 .../Resources}/text/locale/sr_ID/sr_101.txt | 0 .../Resources}/text/locale/sr_ID/sr_102.txt | 0 .../Resources}/text/locale/sr_ID/sr_103.txt | 0 .../Resources}/text/locale/sr_ID/sr_104.txt | 0 .../Resources}/text/locale/sr_ID/sr_105.txt | 0 .../Resources}/text/locale/sr_ID/sr_106.txt | 0 .../Resources}/text/locale/sr_ID/sr_107.txt | 0 .../Resources}/text/locale/sr_ID/sr_108.txt | 0 .../Resources}/text/locale/sr_ID/sr_109.txt | 0 .../Resources}/text/locale/sr_ID/sr_110.txt | 0 .../Resources}/text/locale/sr_ID/sr_111.txt | 0 .../Resources}/text/locale/sr_ID/sr_112.txt | 0 .../Resources}/text/locale/sr_ID/sr_113.txt | 0 .../Resources}/text/locale/sr_ID/sr_114.txt | 0 .../Resources}/text/locale/sr_ID/sr_115.txt | 0 .../Resources}/text/locale/sr_ID/sr_116.txt | 0 .../Resources}/text/locale/sr_ID/sr_117.txt | 0 .../Resources}/text/locale/sr_ID/sr_118.txt | 0 .../Resources}/text/locale/sr_ID/sr_119.txt | 0 .../Resources}/text/locale/sr_ID/sr_120.txt | 0 .../Resources}/text/locale/sr_ID/sr_121.txt | 0 .../Resources}/text/locale/sr_ID/sr_122.txt | 0 .../Resources}/text/locale/sr_ID/sr_123.txt | 0 .../Resources}/text/locale/sr_ID/sr_124.txt | 0 .../Resources}/text/locale/sr_ID/sr_125.txt | 0 .../Resources}/text/locale/sr_ID/sr_126.txt | 0 .../Resources}/text/locale/sr_ID/sr_127.txt | 0 .../Resources}/text/locale/sr_ID/sr_128.txt | 0 .../Resources}/text/locale/sr_ID/sr_136.txt | 0 .../Resources}/text/locale/sr_ID/sr_144.txt | 0 .../Resources}/text/locale/sr_ID/sr_153.txt | 0 .../Resources}/text/locale/sr_ID/sr_156.txt | 0 .../Resources}/text/locale/sr_ID/sr_160.txt | 0 .../Resources}/text/locale/sr_ID/sr_168.txt | 0 .../Resources}/text/locale/sr_ID/sr_169.txt | 0 .../Resources}/text/locale/sr_ID/sr_174.txt | 0 .../Resources}/text/locale/sr_ID/sr_184.txt | 0 .../Resources}/text/locale/sr_ID/sr_185.txt | 0 .../Resources}/text/locale/sr_ID/sr_186.txt | 0 .../Resources}/text/other/const_oras.txt | 0 .../Resources}/text/other/flags_oras.txt | 0 .../Resources}/text/other/flags_xy.txt | 0 .../Resources}/text/other/lang_pt.txt | 0 {Resources => PKHeX/Resources}/text/shortcuts.txt | 0 {Resources => PKHeX/Resources}/text/zh/lang_zh.txt | 0 .../Resources}/text/zh/text_Abilities_zh.txt | 0 .../Resources}/text/zh/text_Character_zh.txt | 0 .../Resources}/text/zh/text_EncounterType_zh.txt | 0 .../Resources}/text/zh/text_Forms_zh.txt | 0 .../Resources}/text/zh/text_Games_zh.txt | 0 .../Resources}/text/zh/text_GenLoc_zh.txt | 0 .../Resources}/text/zh/text_Items_zh.txt | 0 .../Resources}/text/zh/text_Memories_zh.txt | 0 .../Resources}/text/zh/text_Moves_zh.txt | 0 .../Resources}/text/zh/text_Natures_zh.txt | 0 .../Resources}/text/zh/text_Pokeblock_zh.txt | 0 .../Resources}/text/zh/text_Puff_zh.txt | 0 .../Resources}/text/zh/text_Species_zh.txt | 0 .../Resources}/text/zh/text_SuperTraining_zh.txt | 0 .../Resources}/text/zh/text_TrainingBag_zh.txt | 0 .../Resources}/text/zh/text_Types_zh.txt | 0 .../Resources}/text/zh/text_Wallpaper_zh.txt | 0 .../Resources}/text/zh/text_bw2_00000_zh.txt | 0 .../Resources}/text/zh/text_bw2_30000_zh.txt | 0 .../Resources}/text/zh/text_bw2_40000_zh.txt | 0 .../Resources}/text/zh/text_bw2_60000_zh.txt | 0 .../Resources}/text/zh/text_hgss_00000_zh.txt | 0 .../Resources}/text/zh/text_hgss_02000_zh.txt | 0 .../Resources}/text/zh/text_hgss_03000_zh.txt | 0 .../Resources}/text/zh/text_tradeao_zh.txt | 0 .../Resources}/text/zh/text_tradexy_zh.txt | 0 .../Resources}/text/zh/text_xy_00000_zh.txt | 0 .../Resources}/text/zh/text_xy_30000_zh.txt | 0 .../Resources}/text/zh/text_xy_40000_zh.txt | 0 .../Resources}/text/zh/text_xy_60000_zh.txt | 0 {Saves => PKHeX/Saves}/BlockInfo.cs | 0 {Saves => PKHeX/Saves}/BoxWallpaper.cs | 0 {Saves => PKHeX/Saves}/Inventory.cs | 0 {Saves => PKHeX/Saves}/SAV3.cs | 0 {Saves => PKHeX/Saves}/SAV4.cs | 0 {Saves => PKHeX/Saves}/SAV5.cs | 0 {Saves => PKHeX/Saves}/SAV6.cs | 0 {Saves => PKHeX/Saves}/SaveFile.cs | 0 {Saves => PKHeX/Saves}/SaveObjects.cs | 0 {Saves => PKHeX/Saves}/SaveUtil.cs | 0 .../Subforms}/PKM Editors/BatchEditor.Designer.cs | 0 .../Subforms}/PKM Editors/BatchEditor.cs | 0 .../Subforms}/PKM Editors/BatchEditor.resx | 0 .../Subforms}/PKM Editors/MemoryAmie.Designer.cs | 0 .../Subforms}/PKM Editors/MemoryAmie.cs | 0 .../Subforms}/PKM Editors/MemoryAmie.resx | 0 .../Subforms}/PKM Editors/RibbonEditor.Designer.cs | 0 .../Subforms}/PKM Editors/RibbonEditor.cs | 0 .../Subforms}/PKM Editors/RibbonEditor.resx | 0 .../PKM Editors/SuperTrainingEditor.Designer.cs | 0 .../Subforms}/PKM Editors/SuperTrainingEditor.cs | 0 .../Subforms}/PKM Editors/SuperTrainingEditor.resx | 0 .../Subforms}/PKM Editors/Text.Designer.cs | 0 {Subforms => PKHeX/Subforms}/PKM Editors/Text.cs | 0 {Subforms => PKHeX/Subforms}/PKM Editors/Text.resx | 0 .../Subforms}/SAV_Database.Designer.cs | 0 {Subforms => PKHeX/Subforms}/SAV_Database.cs | 0 {Subforms => PKHeX/Subforms}/SAV_Database.resx | 0 .../Subforms}/Save Editors/Gen5/CGearBackground.cs | 0 .../Save Editors/Gen5/SAV_CGearSkin.Designer.cs | 0 .../Subforms}/Save Editors/Gen5/SAV_CGearSkin.cs | 0 .../Subforms}/Save Editors/Gen5/SAV_CGearSkin.resx | 0 .../Save Editors/Gen6/SAV_BerryFieldXY.Designer.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_BerryFieldXY.cs | 0 .../Save Editors/Gen6/SAV_BerryFieldXY.resx | 0 .../Save Editors/Gen6/SAV_BoxLayout.Designer.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_BoxLayout.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_BoxLayout.resx | 0 .../Save Editors/Gen6/SAV_HallOfFame.Designer.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_HallOfFame.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_HallOfFame.resx | 0 .../Save Editors/Gen6/SAV_Link6.Designer.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_Link6.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_Link6.resx | 0 .../Save Editors/Gen6/SAV_OPower.Designer.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_OPower.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_OPower.resx | 0 .../Save Editors/Gen6/SAV_PokeBlockORAS.Designer.cs | 0 .../Save Editors/Gen6/SAV_PokeBlockORAS.cs | 0 .../Save Editors/Gen6/SAV_PokeBlockORAS.resx | 0 .../Save Editors/Gen6/SAV_PokedexORAS.Designer.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_PokedexORAS.cs | 0 .../Save Editors/Gen6/SAV_PokedexORAS.resx | 0 .../Save Editors/Gen6/SAV_PokedexXY.Designer.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_PokedexXY.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_PokedexXY.resx | 0 .../Save Editors/Gen6/SAV_Pokepuff.Designer.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_Pokepuff.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_Pokepuff.resx | 0 .../Save Editors/Gen6/SAV_SecretBase.Designer.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_SecretBase.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_SecretBase.resx | 0 .../Save Editors/Gen6/SAV_SuperTrain.Designer.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_SuperTrain.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_SuperTrain.resx | 0 .../Save Editors/Gen6/SAV_Trainer.Designer.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_Trainer.cs | 0 .../Subforms}/Save Editors/Gen6/SAV_Trainer.resx | 0 .../Save Editors/SAV_EventFlags.Designer.cs | 0 .../Subforms}/Save Editors/SAV_EventFlags.cs | 0 .../Subforms}/Save Editors/SAV_EventFlags.resx | 0 .../Save Editors/SAV_Inventory.Designer.cs | 0 .../Subforms}/Save Editors/SAV_Inventory.cs | 0 .../Subforms}/Save Editors/SAV_Inventory.resx | 0 .../Save Editors/SAV_SimpleTrainer.Designer.cs | 0 .../Subforms}/Save Editors/SAV_SimpleTrainer.cs | 0 .../Subforms}/Save Editors/SAV_SimpleTrainer.resx | 0 .../Save Editors/SAV_Wondercard.Designer.cs | 0 .../Subforms}/Save Editors/SAV_Wondercard.cs | 0 .../Subforms}/Save Editors/SAV_Wondercard.resx | 0 {Subforms => PKHeX/Subforms}/frmReport.Designer.cs | 0 {Subforms => PKHeX/Subforms}/frmReport.cs | 0 {Subforms => PKHeX/Subforms}/frmReport.resx | 0 {Util => PKHeX/Util}/DataUtil.cs | 0 {Util => PKHeX/Util}/FormUtil.cs | 0 {Util => PKHeX/Util}/ImageUtil.cs | 0 {Util => PKHeX/Util}/PathUtil.cs | 0 {Util => PKHeX/Util}/RandUtil.cs | 0 {Util => PKHeX/Util}/ReflectUtil.cs | 0 {Util => PKHeX/Util}/StringUtil.cs | 0 app.config => PKHeX/app.config | 0 2250 files changed, 5 insertions(+), 3 deletions(-) rename {Legality => PKHeX/Legality}/Analysis.cs (100%) rename {Legality => PKHeX/Legality}/Checks.cs (100%) rename {Legality => PKHeX/Legality}/Core.cs (100%) rename {Legality => PKHeX/Legality}/Data.cs (100%) rename {Legality => PKHeX/Legality}/Tables.cs (100%) rename {Legality => PKHeX/Legality}/Tables3.cs (100%) rename {Legality => PKHeX/Legality}/Tables4.cs (100%) rename {Legality => PKHeX/Legality}/Tables5.cs (100%) rename {MainWindow => PKHeX/MainWindow}/Main.Designer.cs (100%) rename {MainWindow => PKHeX/MainWindow}/Main.cs (100%) rename {MainWindow => PKHeX/MainWindow}/Main.resx (100%) rename {MainWindow => PKHeX/MainWindow}/MainPK3.cs (100%) rename {MainWindow => PKHeX/MainWindow}/MainPK4.cs (100%) rename {MainWindow => PKHeX/MainWindow}/MainPK5.cs (100%) rename {MainWindow => PKHeX/MainWindow}/MainPK6.cs (100%) rename {Misc => PKHeX/Misc}/About.Designer.cs (100%) rename {Misc => PKHeX/Misc}/About.cs (100%) rename {Misc => PKHeX/Misc}/About.resx (100%) rename {Misc => PKHeX/Misc}/ComboItem.cs (100%) rename {Misc => PKHeX/Misc}/QR.Designer.cs (100%) rename {Misc => PKHeX/Misc}/QR.cs (100%) rename {Misc => PKHeX/Misc}/QR.resx (100%) rename {Misc => PKHeX/Misc}/SplashScreen.Designer.cs (100%) rename {Misc => PKHeX/Misc}/SplashScreen.cs (100%) rename {Misc => PKHeX/Misc}/SplashScreen.resx (100%) rename {MysteryGifts => PKHeX/MysteryGifts}/MysteryGift.cs (100%) rename {MysteryGifts => PKHeX/MysteryGifts}/PGF.cs (100%) rename {MysteryGifts => PKHeX/MysteryGifts}/PGT.cs (100%) rename {MysteryGifts => PKHeX/MysteryGifts}/PL6.cs (100%) rename {MysteryGifts => PKHeX/MysteryGifts}/WC6.cs (100%) rename PKHeX.csproj => PKHeX/PKHeX.csproj (100%) rename PKHeX.userprefs => PKHeX/PKHeX.userprefs (100%) rename {PKM => PKHeX/PKM}/PK3.cs (100%) rename {PKM => PKHeX/PKM}/PK4.cs (100%) rename {PKM => PKHeX/PKM}/PK5.cs (100%) rename {PKM => PKHeX/PKM}/PK6.cs (100%) rename {PKM => PKHeX/PKM}/PKM.cs (100%) rename {PKM => PKHeX/PKM}/PKMConverter.cs (100%) rename {PKM => PKHeX/PKM}/PKX.cs (100%) rename {PKM => PKHeX/PKM}/ShowdownSet.cs (100%) rename {PersonalInfo => PKHeX/PersonalInfo}/PersonalInfo.cs (100%) rename {PersonalInfo => PKHeX/PersonalInfo}/PersonalInfoB2W2.cs (100%) rename {PersonalInfo => PKHeX/PersonalInfo}/PersonalInfoBW.cs (100%) rename {PersonalInfo => PKHeX/PersonalInfo}/PersonalInfoG3.cs (100%) rename {PersonalInfo => PKHeX/PersonalInfo}/PersonalInfoG4.cs (100%) rename {PersonalInfo => PKHeX/PersonalInfo}/PersonalInfoORAS.cs (100%) rename {PersonalInfo => PKHeX/PersonalInfo}/PersonalInfoXY.cs (100%) rename {PersonalInfo => PKHeX/PersonalInfo}/PersonalTable.cs (100%) rename Program.cs => PKHeX/Program.cs (100%) rename {Properties => PKHeX/Properties}/AssemblyInfo.cs (100%) rename {Properties => PKHeX/Properties}/Resources.Designer.cs (100%) rename {Properties => PKHeX/Properties}/Resources.resx (100%) rename {Properties => PKHeX/Properties}/Settings.Designer.cs (100%) rename {Properties => PKHeX/Properties}/Settings.settings (100%) rename {Resources => PKHeX/Resources}/byte/PGLDings-NormalRegular.ttf (100%) rename {Resources => PKHeX/Resources}/byte/eggmove_ao.pkl (100%) rename {Resources => PKHeX/Resources}/byte/eggmove_xy.pkl (100%) rename {Resources => PKHeX/Resources}/byte/encounter_a.pkl (100%) rename {Resources => PKHeX/Resources}/byte/encounter_o.pkl (100%) rename {Resources => PKHeX/Resources}/byte/encounter_x.pkl (100%) rename {Resources => PKHeX/Resources}/byte/encounter_y.pkl (100%) rename {Resources => PKHeX/Resources}/byte/evos_ao.pkl (100%) rename {Resources => PKHeX/Resources}/byte/lvlmove_ao.pkl (100%) rename {Resources => PKHeX/Resources}/byte/lvlmove_xy.pkl (100%) rename {Resources => PKHeX/Resources}/byte/personal_ao (100%) rename {Resources => PKHeX/Resources}/byte/personal_b2w2 (100%) rename {Resources => PKHeX/Resources}/byte/personal_bw (100%) rename {Resources => PKHeX/Resources}/byte/personal_dp (100%) rename {Resources => PKHeX/Resources}/byte/personal_e (100%) rename {Resources => PKHeX/Resources}/byte/personal_fr (100%) rename {Resources => PKHeX/Resources}/byte/personal_hgss (100%) rename {Resources => PKHeX/Resources}/byte/personal_lg (100%) rename {Resources => PKHeX/Resources}/byte/personal_pt (100%) rename {Resources => PKHeX/Resources}/byte/personal_rs (100%) rename {Resources => PKHeX/Resources}/byte/personal_xy (100%) rename {Resources => PKHeX/Resources}/byte/wc6.pkl (100%) rename {Resources => PKHeX/Resources}/byte/wc6full.pkl (100%) rename {Resources => PKHeX/Resources}/icon.ico (100%) rename {Resources => PKHeX/Resources}/img/Bag/Bag_Balls.png (100%) rename {Resources => PKHeX/Resources}/img/Bag/Bag_Battle.png (100%) rename {Resources => PKHeX/Resources}/img/Bag/Bag_Berries.png (100%) rename {Resources => PKHeX/Resources}/img/Bag/Bag_Items.png (100%) rename {Resources => PKHeX/Resources}/img/Bag/Bag_Key.png (100%) rename {Resources => PKHeX/Resources}/img/Bag/Bag_Mail.png (100%) rename {Resources => PKHeX/Resources}/img/Bag/Bag_Medicine.png (100%) rename {Resources => PKHeX/Resources}/img/Bag/Bag_TMHM.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/0.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/10.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/100.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/101.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/102.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/103.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/104.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/105.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/106.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/107.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/108.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/109.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/11.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/110.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/111.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/112.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/113.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/114.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/115-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/115.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/116.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/117.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/118.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/119.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/12.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/120.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/121.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/122.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/123.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/124.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/125.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/126.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/127-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/127.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/128.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/129.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/13.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/130-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/130.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/131.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/132.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/133.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/134.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/135.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/136.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/137.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/138.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/139.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/14.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/140.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/141.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/142-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/142.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/143.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/144.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/145.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/146.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/147.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/148.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/149.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/15-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/15.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/150-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/150-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/150.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/151.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/152.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/153.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/154.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/155.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/156.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/157.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/158.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/159.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/16.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/160.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/161.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/162.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/163.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/164.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/165.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/166.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/167.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/168.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/169.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/17.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/170.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/171.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/172.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/173.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/174.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/175.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/176.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/177.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/178.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/179.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/18-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/18.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/180.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/181-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/181.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/182.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/183.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/184.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/185.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/186.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/187.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/188.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/189.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/19.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/190.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/191.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/192.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/193.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/194.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/195.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/196.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/197.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/198.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/199.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/20.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/200.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-10.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-11.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-12.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-13.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-14.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-15.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-16.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-17.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-18.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-19.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-20.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-21.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-22.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-23.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-24.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-25.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-26.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-27.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-4.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-5.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-6.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-7.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-8.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201-9.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/201.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/202.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/203.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/204.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/205.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/206.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/207.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/208-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/208.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/209.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/21.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/210.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/211.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/212-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/212.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/213.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/214-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/214.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/215.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/216.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/217.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/218.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/219.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/22.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/220.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/221.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/222.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/223.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/224.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/225.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/226.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/227.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/228.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/229-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/229.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/23.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/230.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/231.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/232.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/233.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/234.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/235.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/236.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/237.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/238.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/239.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/24.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/240.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/241.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/242.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/243.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/244.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/245.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/246.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/247.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/248-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/248.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/249.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/25-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/25-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/25-3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/25-4.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/25-5.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/25-6.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/25.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/250.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/251.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/252.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/253.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/254-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/254.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/255.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/256.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/257-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/257.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/258.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/259.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/26.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/260-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/260.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/261.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/262.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/263.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/264.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/265.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/266.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/267.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/268.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/269.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/27.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/270.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/271.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/272.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/273.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/274.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/275.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/276.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/277.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/278.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/279.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/28.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/280.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/281.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/282-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/282.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/283.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/284.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/285.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/286.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/287.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/288.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/289.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/29.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/290.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/291.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/292.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/293.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/294.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/295.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/296.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/297.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/298.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/299.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/3-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/30.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/300.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/301.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/302-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/302.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/303-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/303.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/304.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/305.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/306-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/306.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/307.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/308-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/308.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/309.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/31.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/310-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/310.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/311.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/312.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/313.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/314.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/315.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/316.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/317.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/318.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/319-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/319.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/32.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/320.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/321.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/322.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/323-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/323.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/324.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/325.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/326.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/327.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/328.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/329.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/33.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/330.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/331.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/332.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/333.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/334-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/334.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/335.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/336.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/337.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/338.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/339.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/34.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/340.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/341.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/342.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/343.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/344.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/345.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/346.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/347.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/348.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/349.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/35.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/350.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/351-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/351-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/351-3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/351.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/352.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/353.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/354-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/354.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/355.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/356.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/357.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/358.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/359-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/359.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/36.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/360.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/361.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/362-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/362.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/363.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/364.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/365.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/366.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/367.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/368.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/369.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/37.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/370.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/371.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/372.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/373-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/373.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/374.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/375.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/376-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/376.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/377.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/378.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/379.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/38.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/380-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/380.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/381-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/381.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/382-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/382.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/383-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/383.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/384-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/384.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/385.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/386-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/386-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/386-3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/386.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/387.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/388.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/389.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/39.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/390.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/391.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/392.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/393.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/394.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/395.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/396.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/397.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/398.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/399.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/4.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/40.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/400.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/401.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/402.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/403.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/404.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/405.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/406.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/407.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/408.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/409.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/41.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/410.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/411.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/412-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/412-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/412.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/413-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/413-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/413.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/414.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/415.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/416.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/417.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/418.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/419.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/42.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/420.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/421-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/421.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/422-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/422.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/423-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/423.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/424.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/425.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/426.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/427.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/428-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/428.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/429.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/43.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/430.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/431.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/432.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/433.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/434.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/435.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/436.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/437.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/438.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/439.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/44.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/440.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/441.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/442.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/443.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/444.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/445-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/445.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/446.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/447.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/448-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/448.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/449.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/45.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/450.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/451.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/452.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/453.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/454.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/455.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/456.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/457.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/458.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/459.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/46.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/460-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/460.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/461.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/462.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/463.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/464.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/465.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/466.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/467.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/468.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/469.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/47.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/470.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/471.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/472.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/473.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/474.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/475-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/475.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/476.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/477.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/478.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/479-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/479-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/479-3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/479-4.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/479-5.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/479.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/48.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/480.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/481.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/482.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/483.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/484.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/485.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/486.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/487-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/487.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/488.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/489.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/49.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/490.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/491.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/492-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/492.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/493.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/494.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/495.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/496.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/497.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/498.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/499.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/5.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/50.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/500.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/501.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/502.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/503.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/504.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/505.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/506.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/507.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/508.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/509.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/51.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/510.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/511.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/512.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/513.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/514.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/515.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/516.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/517.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/518.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/519.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/52.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/520.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/521.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/521_1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/522.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/523.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/524.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/525.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/526.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/527.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/528.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/529.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/53.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/530.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/531-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/531.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/532.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/533.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/534.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/535.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/536.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/537.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/538.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/539.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/54.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/540.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/541.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/542.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/543.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/544.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/545.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/546.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/547.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/548.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/549.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/55.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/550-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/550.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/551.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/552.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/553.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/554.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/555-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/555.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/556.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/557.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/558.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/559.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/56.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/560.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/561.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/562.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/563.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/564.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/565.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/566.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/567.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/568.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/569.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/57.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/570.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/571.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/572.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/573.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/574.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/575.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/576.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/577.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/578.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/579.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/58.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/580.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/581.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/582.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/583.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/584.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/585-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/585-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/585-3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/585.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/586-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/586-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/586-3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/586.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/587.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/588.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/589.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/59.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/590.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/591.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/592-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/592.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/593-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/593.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/594.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/595.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/596.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/597.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/598.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/599.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/6-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/6-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/6.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/60.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/600.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/601.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/602.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/603.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/604.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/605.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/606.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/607.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/608.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/609.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/61.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/610.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/611.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/612.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/613.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/614.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/615.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/616.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/617.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/618.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/619.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/62.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/620.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/621.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/622.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/623.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/624.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/625.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/626.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/627.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/628.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/629.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/63.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/630.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/631.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/632.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/633.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/634.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/635.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/636.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/637.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/638.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/639.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/64.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/640.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/641-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/641.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/642-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/642.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/643.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/644.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/645-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/645.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/646-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/646-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/646.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/647-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/647.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/648-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/648.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/649-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/649-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/649-3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/649-4.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/649.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/65-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/65.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/650.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/651.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/652.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/653.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/654.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/655.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/656.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/657.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/658.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/659.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/66.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/660.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/661.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/662.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/663.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/664.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/665.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-10.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-11.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-12.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-13.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-14.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-15.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-16.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-17.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-18.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-19.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-4.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-5.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-6.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-7.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-8.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666-9.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/666.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/667.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/668.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/668_1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/669-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/669-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/669-3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/669-4.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/669.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/67.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/670-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/670-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/670-3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/670-4.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/670-5.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/670.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/671-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/671-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/671-3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/671-4.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/671.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/672.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/673.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/674.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/675.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/676-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/676-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/676-3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/676-4.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/676-5.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/676-6.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/676-7.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/676-8.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/676-9.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/676.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/677.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/678-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/678.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/679.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/68.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/680.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/681-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/681.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/682.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/683.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/684.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/685.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/686.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/687.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/688.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/689.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/69.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/690.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/691.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/692.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/693.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/694.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/695.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/696.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/697.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/698.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/699.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/7.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/70.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/700.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/701.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/702.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/703.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/704.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/705.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/706.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/707.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/708.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/709.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/71.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/710-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/710-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/710-3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/710.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/711-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/711-2.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/711-3.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/711.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/712.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/713.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/714.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/715.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/716-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/716.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/717.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/718.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/719-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/719.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/72.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/720-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/720.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/721.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/722.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/73.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/74.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/75.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/76.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/77.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/78.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/79.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/8.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/80-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/80.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/81.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/82.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/83.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/84.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/85.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/86.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/87.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/88.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/89.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/9-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/9.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/90.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/91.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/92.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/93.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/94-1.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/94.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/95.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/96.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/97.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/98.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/99.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/egg.png (100%) rename {Resources => PKHeX/Resources}/img/Pokemon Sprites/unknown.png (100%) rename {Resources => PKHeX/Resources}/img/Program/about.png (100%) rename {Resources => PKHeX/Resources}/img/Program/bak.png (100%) rename {Resources => PKHeX/Resources}/img/Program/data.png (100%) rename {Resources => PKHeX/Resources}/img/Program/database.png (100%) rename {Resources => PKHeX/Resources}/img/Program/dump.png (100%) rename {Resources => PKHeX/Resources}/img/Program/exit.png (100%) rename {Resources => PKHeX/Resources}/img/Program/export.png (100%) rename {Resources => PKHeX/Resources}/img/Program/folder.png (100%) rename {Resources => PKHeX/Resources}/img/Program/import.png (100%) rename {Resources => PKHeX/Resources}/img/Program/language.png (100%) rename {Resources => PKHeX/Resources}/img/Program/load.png (100%) rename {Resources => PKHeX/Resources}/img/Program/main.png (100%) rename {Resources => PKHeX/Resources}/img/Program/nocheck.png (100%) rename {Resources => PKHeX/Resources}/img/Program/open.png (100%) rename {Resources => PKHeX/Resources}/img/Program/other.png (100%) rename {Resources => PKHeX/Resources}/img/Program/report.png (100%) rename {Resources => PKHeX/Resources}/img/Program/savePKM.png (100%) rename {Resources => PKHeX/Resources}/img/Program/saveSAV.png (100%) rename {Resources => PKHeX/Resources}/img/Program/settings.png (100%) rename {Resources => PKHeX/Resources}/img/Program/showdown.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_00.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_01.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_02.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_03.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_04.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_05.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_06.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_07.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_08.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_09.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_10.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_11.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_12.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_128.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_129.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_13.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_14.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_15.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_16.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_17.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_18.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_19.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_20.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_21.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_22.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_23.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_24.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_25.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_26.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_27.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_28.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_29.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_30.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_31.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_32.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_33.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_34.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_35.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_36.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_37.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_38.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_39.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_40.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_41.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_42.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_43.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_44.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_45.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_46.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_47.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_48.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_49.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_50.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_51.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_52.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_53.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_54.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_55.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_56.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_57.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_58.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_59.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_60.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_61.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_62.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_63.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_64.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_65.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_66.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_67.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_68.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_69.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_70.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_71.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_72.png (100%) rename {Resources => PKHeX/Resources}/img/Trainer Sprites/tr_73.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_01.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_02.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_03.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_04.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_05.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_06.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_07.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_08.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_1.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_2.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_3.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_4.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_5.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_6.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_7.png (100%) rename {Resources => PKHeX/Resources}/img/badges/badge_8.png (100%) rename {Resources => PKHeX/Resources}/img/box/ao/box_wp17ao.png (100%) rename {Resources => PKHeX/Resources}/img/box/ao/box_wp18ao.png (100%) rename {Resources => PKHeX/Resources}/img/box/ao/box_wp19ao.png (100%) rename {Resources => PKHeX/Resources}/img/box/ao/box_wp20ao.png (100%) rename {Resources => PKHeX/Resources}/img/box/ao/box_wp21ao.png (100%) rename {Resources => PKHeX/Resources}/img/box/ao/box_wp22ao.png (100%) rename {Resources => PKHeX/Resources}/img/box/ao/box_wp23ao.png (100%) rename {Resources => PKHeX/Resources}/img/box/ao/box_wp24ao.png (100%) rename {Resources => PKHeX/Resources}/img/box/b2w2/box_wp17b2w2.png (100%) rename {Resources => PKHeX/Resources}/img/box/b2w2/box_wp18b2w2.png (100%) rename {Resources => PKHeX/Resources}/img/box/b2w2/box_wp19b2w2.png (100%) rename {Resources => PKHeX/Resources}/img/box/b2w2/box_wp20b2w2.png (100%) rename {Resources => PKHeX/Resources}/img/box/b2w2/box_wp21b2w2.png (100%) rename {Resources => PKHeX/Resources}/img/box/b2w2/box_wp22b2w2.png (100%) rename {Resources => PKHeX/Resources}/img/box/b2w2/box_wp23b2w2.png (100%) rename {Resources => PKHeX/Resources}/img/box/b2w2/box_wp24b2w2.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp01bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp02bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp03bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp04bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp05bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp06bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp07bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp08bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp09bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp10bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp11bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp12bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp13bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp14bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp15bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp16bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp17bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp18bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp19bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp20bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp21bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp22bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp23bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/bw/box_wp24bw.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp01dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp02dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp03dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp04dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp05dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp06dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp07dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp08dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp09dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp10dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp11dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp12dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp13dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp14dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp15dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp16dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp17dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp18dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp19dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp20dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp21dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp22dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp23dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/dp/box_wp24dp.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp01e.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp02e.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp03e.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp04e.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp05e.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp06e.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp07e.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp08e.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp09e.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp10e.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp11e.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp12e.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp13e.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp14e.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp15e.png (100%) rename {Resources => PKHeX/Resources}/img/box/e/box_wp16e.png (100%) rename {Resources => PKHeX/Resources}/img/box/frlg/box_wp13frlg.png (100%) rename {Resources => PKHeX/Resources}/img/box/frlg/box_wp14frlg.png (100%) rename {Resources => PKHeX/Resources}/img/box/frlg/box_wp15frlg.png (100%) rename {Resources => PKHeX/Resources}/img/box/frlg/box_wp16frlg.png (100%) rename {Resources => PKHeX/Resources}/img/box/hgss/box_wp17hgss.png (100%) rename {Resources => PKHeX/Resources}/img/box/hgss/box_wp18hgss.png (100%) rename {Resources => PKHeX/Resources}/img/box/hgss/box_wp19hgss.png (100%) rename {Resources => PKHeX/Resources}/img/box/hgss/box_wp20hgss.png (100%) rename {Resources => PKHeX/Resources}/img/box/hgss/box_wp21hgss.png (100%) rename {Resources => PKHeX/Resources}/img/box/hgss/box_wp22hgss.png (100%) rename {Resources => PKHeX/Resources}/img/box/hgss/box_wp23hgss.png (100%) rename {Resources => PKHeX/Resources}/img/box/hgss/box_wp24hgss.png (100%) rename {Resources => PKHeX/Resources}/img/box/pt/box_wp17pt.png (100%) rename {Resources => PKHeX/Resources}/img/box/pt/box_wp18pt.png (100%) rename {Resources => PKHeX/Resources}/img/box/pt/box_wp19pt.png (100%) rename {Resources => PKHeX/Resources}/img/box/pt/box_wp20pt.png (100%) rename {Resources => PKHeX/Resources}/img/box/pt/box_wp21pt.png (100%) rename {Resources => PKHeX/Resources}/img/box/pt/box_wp22pt.png (100%) rename {Resources => PKHeX/Resources}/img/box/pt/box_wp23pt.png (100%) rename {Resources => PKHeX/Resources}/img/box/pt/box_wp24pt.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp01rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp02rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp03rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp04rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp05rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp06rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp07rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp08rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp09rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp10rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp11rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp12rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp13rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp14rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp15rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/rs/box_wp16rs.png (100%) rename {Resources => PKHeX/Resources}/img/box/slotDel.png (100%) rename {Resources => PKHeX/Resources}/img/box/slotSet.png (100%) rename {Resources => PKHeX/Resources}/img/box/slotTrans.png (100%) rename {Resources => PKHeX/Resources}/img/box/slotView.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp01xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp02xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp03xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp04xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp05xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp06xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp07xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp08xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp09xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp10xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp11xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp12xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp13xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp14xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp15xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp16xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp17xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp18xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp19xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp20xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp21xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp22xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp23xy.png (100%) rename {Resources => PKHeX/Resources}/img/box/xy/box_wp24xy.png (100%) rename {Resources => PKHeX/Resources}/img/icon.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_1.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_10.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_100.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_101.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_102.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_103.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_104.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_105.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_106.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_107.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_108.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_109.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_11.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_110.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_112.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_116.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_117.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_118.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_119.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_12.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_13.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_134.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_135.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_136.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_14.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_149.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_15.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_150.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_151.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_152.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_153.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_154.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_155.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_156.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_157.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_158.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_159.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_16.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_160.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_161.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_162.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_163.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_164.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_165.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_166.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_167.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_168.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_169.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_17.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_170.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_171.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_172.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_173.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_174.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_175.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_176.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_177.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_178.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_179.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_18.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_180.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_181.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_182.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_183.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_184.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_185.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_186.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_187.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_188.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_189.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_19.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_190.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_191.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_192.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_193.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_194.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_195.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_196.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_197.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_198.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_199.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_2.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_20.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_200.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_201.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_202.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_203.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_204.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_205.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_206.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_207.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_208.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_209.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_21.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_210.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_211.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_212.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_213.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_214.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_215.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_217.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_218.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_219.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_22.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_220.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_221.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_222.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_223.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_224.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_225.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_226.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_227.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_228.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_229.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_23.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_230.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_231.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_232.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_233.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_234.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_235.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_236.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_237.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_238.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_239.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_24.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_240.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_241.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_242.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_243.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_244.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_245.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_246.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_247.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_248.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_249.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_25.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_250.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_251.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_252.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_253.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_254.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_255.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_256.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_257.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_258.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_259.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_26.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_260.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_261.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_262.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_263.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_264.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_265.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_266.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_267.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_268.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_269.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_27.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_270.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_271.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_272.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_273.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_274.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_275.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_276.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_277.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_278.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_279.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_28.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_280.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_281.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_282.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_283.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_284.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_285.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_286.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_287.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_288.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_289.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_29.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_290.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_291.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_292.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_293.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_294.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_295.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_296.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_297.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_298.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_299.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_3.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_30.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_300.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_301.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_302.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_303.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_304.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_305.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_306.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_307.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_308.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_309.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_31.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_310.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_311.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_312.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_313.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_314.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_315.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_316.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_317.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_318.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_319.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_32.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_320.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_321.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_322.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_323.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_324.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_325.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_326.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_327.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_33.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_34.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_35.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_36.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_37.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_38.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_39.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_4.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_40.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_41.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_42.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_43.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_44.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_45.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_46.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_47.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_48.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_49.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_5.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_50.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_504.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_51.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_52.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_53.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_534.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_535.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_537.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_538.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_539.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_54.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_540.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_541.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_542.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_543.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_544.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_545.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_546.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_547.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_548.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_549.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_55.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_550.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_551.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_552.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_553.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_554.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_555.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_556.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_557.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_558.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_559.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_56.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_560.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_561.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_562.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_563.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_564.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_565.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_566.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_567.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_568.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_569.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_57.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_570.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_571.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_572.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_573.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_577.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_58.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_580.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_581.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_582.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_583.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_584.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_585.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_586.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_587.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_588.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_589.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_59.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_590.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_591.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_6.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_60.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_61.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_62.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_63.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_639.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_64.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_640.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_644.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_645.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_646.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_647.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_648.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_649.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_65.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_650.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_652.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_653.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_654.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_655.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_656.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_657.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_658.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_659.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_66.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_660.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_661.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_662.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_663.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_664.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_665.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_666.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_667.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_668.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_669.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_67.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_670.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_671.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_672.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_673.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_674.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_675.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_676.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_677.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_678.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_679.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_68.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_680.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_681.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_682.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_683.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_684.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_685.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_686.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_687.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_688.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_69.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_699.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_7.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_70.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_704.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_708.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_709.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_71.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_710.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_711.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_715.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_72.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_73.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_74.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_75.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_752.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_753.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_754.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_755.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_756.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_757.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_758.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_759.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_76.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_760.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_761.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_762.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_763.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_764.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_767.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_768.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_769.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_77.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_770.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_78.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_79.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_8.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_80.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_81.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_82.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_83.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_84.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_85.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_86.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_87.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_88.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_89.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_9.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_90.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_91.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_92.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_93.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_94.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_95.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_96.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_97.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_98.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_99.png (100%) rename {Resources => PKHeX/Resources}/img/item/item_tm.png (100%) rename {Resources => PKHeX/Resources}/img/misc/anti_pokerus_icon.png (100%) rename {Resources => PKHeX/Resources}/img/misc/box_mark_01.png (100%) rename {Resources => PKHeX/Resources}/img/misc/box_mark_02.png (100%) rename {Resources => PKHeX/Resources}/img/misc/box_mark_03.png (100%) rename {Resources => PKHeX/Resources}/img/misc/box_mark_04.png (100%) rename {Resources => PKHeX/Resources}/img/misc/box_mark_05.png (100%) rename {Resources => PKHeX/Resources}/img/misc/box_mark_06.png (100%) rename {Resources => PKHeX/Resources}/img/misc/else_icon.png (100%) rename {Resources => PKHeX/Resources}/img/misc/helditem.png (100%) rename {Resources => PKHeX/Resources}/img/misc/locked.png (100%) rename {Resources => PKHeX/Resources}/img/misc/party.png (100%) rename {Resources => PKHeX/Resources}/img/misc/rare_icon.png (100%) rename {Resources => PKHeX/Resources}/img/misc/trainingmedal.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonability.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonabilitydouble.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonabilitygreat.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonabilitymulti.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonabilitypair.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonabilityworld.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonalert.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonartist.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonbattlerexpert.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonbattlerskillful.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonbestfriends.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonbirthday.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribboncareless.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonchampionbattle.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonchampiong3hoenn.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonchampiong6hoenn.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonchampionkalos.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonchampionnational.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonchampionregional.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonchampionsinnoh.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonchampionworld.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonclassic.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonconteststar.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribboncountmemorybattle.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribboncountmemorybattle2.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribboncountmemorycontest.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribboncountmemorycontest2.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribboncountry.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbondowncast.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonearth.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribboneffort.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonevent.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonfootprint.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3beauty.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3beautyhyper.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3beautymaster.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3beautysuper.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3cool.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3coolhyper.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3coolmaster.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3coolsuper.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3cute.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3cutehyper.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3cutemaster.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3cutesuper.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3smart.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3smarthyper.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3smartmaster.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3smartsuper.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3tough.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3toughhyper.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3toughmaster.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong3toughsuper.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4beauty.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4beautygreat.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4beautymaster.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4beautyultra.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4cool.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4coolgreat.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4coolmaster.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4coolultra.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4cute.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4cutegreat.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4cutemaster.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4cuteultra.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4smart.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4smartgreat.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4smartmaster.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4smartultra.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4tough.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4toughgreat.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4toughmaster.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbong4toughultra.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbongorgeous.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbongorgeousroyal.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonlegend.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonmasterbeauty.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonmastercleverness.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonmastercoolness.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonmastercuteness.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonmastertoughness.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonnational.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonpremier.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonrecord.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonrelax.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonroyal.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonshock.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonsmile.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonsnooze.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonsouvenir.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonspecial.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbontraining.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonvictory.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonwinning.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonwishing.png (100%) rename {Resources => PKHeX/Resources}/img/ribbons/ribbonworld.png (100%) rename {Resources => PKHeX/Resources}/img/valid.png (100%) rename {Resources => PKHeX/Resources}/img/warn.png (100%) rename {Resources => PKHeX/Resources}/text/changelog.txt (100%) rename {Resources => PKHeX/Resources}/text/de/lang_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_Abilities_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_Character_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_EncounterType_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_Forms_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_Games_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_GenLoc_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_Items_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_Memories_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_Moves_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_Natures_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_Pokeblock_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_Puff_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_Species_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_SuperTraining_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_TrainingBag_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_Types_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_Wallpaper_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_bw2_00000_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_bw2_30000_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_bw2_40000_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_bw2_60000_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_hgss_00000_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_hgss_02000_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_hgss_03000_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_tradeao_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_tradexy_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_xy_00000_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_xy_30000_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_xy_40000_de.txt (100%) rename {Resources => PKHeX/Resources}/text/de/text_xy_60000_de.txt (100%) rename {Resources => PKHeX/Resources}/text/en/lang_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_Abilities_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_Character_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_EncounterType_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_Forms_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_Games_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_GenLoc_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_Items_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_Memories_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_Moves_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_Natures_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_Pokeblock_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_Puff_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_Species_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_SuperTraining_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_TrainingBag_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_Types_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_Wallpaper_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_bw2_00000_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_bw2_30000_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_bw2_40000_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_bw2_60000_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_hgss_00000_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_hgss_02000_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_hgss_03000_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_tradeao_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_tradexy_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_xy_00000_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_xy_30000_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_xy_40000_en.txt (100%) rename {Resources => PKHeX/Resources}/text/en/text_xy_60000_en.txt (100%) rename {Resources => PKHeX/Resources}/text/es/lang_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_Abilities_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_Character_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_EncounterType_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_Forms_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_Games_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_GenLoc_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_Items_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_Memories_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_Moves_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_Natures_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_Pokeblock_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_Puff_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_Species_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_SuperTraining_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_TrainingBag_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_Types_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_Wallpaper_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_bw2_00000_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_bw2_30000_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_bw2_40000_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_bw2_60000_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_hgss_00000_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_hgss_02000_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_hgss_03000_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_tradeao_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_tradexy_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_xy_00000_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_xy_30000_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_xy_40000_es.txt (100%) rename {Resources => PKHeX/Resources}/text/es/text_xy_60000_es.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/lang_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_Abilities_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_Character_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_EncounterType_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_Forms_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_Games_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_GenLoc_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_Items_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_Memories_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_Moves_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_Natures_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_Pokeblock_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_Puff_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_Species_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_SuperTraining_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_TrainingBag_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_Types_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_Wallpaper_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_bw2_00000_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_bw2_30000_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_bw2_40000_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_bw2_60000_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_hgss_00000_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_hgss_02000_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_hgss_03000_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_tradeao_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_tradexy_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_xy_00000_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_xy_30000_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_xy_40000_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/fr/text_xy_60000_fr.txt (100%) rename {Resources => PKHeX/Resources}/text/gen3/text_ItemsG3_en.txt (100%) rename {Resources => PKHeX/Resources}/text/gen3/text_rsefrlg_00000_en.txt (100%) rename {Resources => PKHeX/Resources}/text/it/lang_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_Abilities_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_Character_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_EncounterType_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_Forms_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_Games_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_GenLoc_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_Items_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_Memories_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_Moves_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_Natures_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_Pokeblock_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_Puff_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_Species_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_SuperTraining_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_TrainingBag_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_Types_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_Wallpaper_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_bw2_00000_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_bw2_30000_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_bw2_40000_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_bw2_60000_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_hgss_00000_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_hgss_02000_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_hgss_03000_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_tradeao_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_tradexy_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_xy_00000_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_xy_30000_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_xy_40000_it.txt (100%) rename {Resources => PKHeX/Resources}/text/it/text_xy_60000_it.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/lang_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_Abilities_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_Character_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_EncounterType_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_Forms_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_Games_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_GenLoc_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_Items_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_Memories_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_Moves_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_Natures_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_Pokeblock_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_Puff_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_Species_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_SuperTraining_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_TrainingBag_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_Types_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_Wallpaper_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_bw2_00000_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_bw2_30000_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_bw2_40000_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_bw2_60000_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_hgss_00000_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_hgss_02000_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_hgss_03000_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_tradeao_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_tradexy_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_xy_00000_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_xy_30000_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_xy_40000_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ja/text_xy_60000_ja.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/lang_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_Abilities_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_Character_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_EncounterType_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_Forms_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_Games_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_GenLoc_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_Items_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_Memories_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_Moves_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_Natures_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_Pokeblock_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_Puff_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_Species_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_SuperTraining_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_TrainingBag_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_Types_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_Wallpaper_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_bw2_00000_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_bw2_30000_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_bw2_40000_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_bw2_60000_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_hgss_00000_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_hgss_02000_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_hgss_03000_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_tradeao_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_tradexy_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_xy_00000_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_xy_30000_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_xy_40000_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/ko/text_xy_60000_ko.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/countries.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/countryMap.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/languages.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/regions3ds.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_001.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_008.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_009.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_010.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_011.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_012.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_013.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_014.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_015.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_016.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_017.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_018.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_019.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_020.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_021.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_022.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_023.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_024.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_025.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_026.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_027.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_028.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_029.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_030.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_031.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_032.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_033.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_034.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_035.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_036.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_037.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_038.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_039.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_040.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_041.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_042.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_043.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_044.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_045.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_046.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_047.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_048.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_049.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_050.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_051.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_052.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_064.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_065.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_066.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_067.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_068.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_069.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_070.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_071.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_072.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_073.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_074.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_075.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_076.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_077.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_078.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_079.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_080.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_081.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_082.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_083.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_084.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_085.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_086.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_087.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_088.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_089.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_090.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_091.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_092.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_093.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_094.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_095.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_096.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_097.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_098.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_099.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_100.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_101.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_102.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_103.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_104.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_105.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_106.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_107.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_108.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_109.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_110.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_111.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_112.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_113.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_114.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_115.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_116.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_117.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_118.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_119.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_120.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_121.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_122.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_123.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_124.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_125.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_126.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_127.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_128.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_136.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_144.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_153.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_156.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_160.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_168.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_169.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_174.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_184.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_185.txt (100%) rename {Resources => PKHeX/Resources}/text/locale/sr_ID/sr_186.txt (100%) rename {Resources => PKHeX/Resources}/text/other/const_oras.txt (100%) rename {Resources => PKHeX/Resources}/text/other/flags_oras.txt (100%) rename {Resources => PKHeX/Resources}/text/other/flags_xy.txt (100%) rename {Resources => PKHeX/Resources}/text/other/lang_pt.txt (100%) rename {Resources => PKHeX/Resources}/text/shortcuts.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/lang_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_Abilities_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_Character_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_EncounterType_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_Forms_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_Games_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_GenLoc_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_Items_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_Memories_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_Moves_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_Natures_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_Pokeblock_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_Puff_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_Species_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_SuperTraining_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_TrainingBag_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_Types_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_Wallpaper_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_bw2_00000_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_bw2_30000_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_bw2_40000_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_bw2_60000_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_hgss_00000_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_hgss_02000_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_hgss_03000_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_tradeao_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_tradexy_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_xy_00000_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_xy_30000_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_xy_40000_zh.txt (100%) rename {Resources => PKHeX/Resources}/text/zh/text_xy_60000_zh.txt (100%) rename {Saves => PKHeX/Saves}/BlockInfo.cs (100%) rename {Saves => PKHeX/Saves}/BoxWallpaper.cs (100%) rename {Saves => PKHeX/Saves}/Inventory.cs (100%) rename {Saves => PKHeX/Saves}/SAV3.cs (100%) rename {Saves => PKHeX/Saves}/SAV4.cs (100%) rename {Saves => PKHeX/Saves}/SAV5.cs (100%) rename {Saves => PKHeX/Saves}/SAV6.cs (100%) rename {Saves => PKHeX/Saves}/SaveFile.cs (100%) rename {Saves => PKHeX/Saves}/SaveObjects.cs (100%) rename {Saves => PKHeX/Saves}/SaveUtil.cs (100%) rename {Subforms => PKHeX/Subforms}/PKM Editors/BatchEditor.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/PKM Editors/BatchEditor.cs (100%) rename {Subforms => PKHeX/Subforms}/PKM Editors/BatchEditor.resx (100%) rename {Subforms => PKHeX/Subforms}/PKM Editors/MemoryAmie.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/PKM Editors/MemoryAmie.cs (100%) rename {Subforms => PKHeX/Subforms}/PKM Editors/MemoryAmie.resx (100%) rename {Subforms => PKHeX/Subforms}/PKM Editors/RibbonEditor.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/PKM Editors/RibbonEditor.cs (100%) rename {Subforms => PKHeX/Subforms}/PKM Editors/RibbonEditor.resx (100%) rename {Subforms => PKHeX/Subforms}/PKM Editors/SuperTrainingEditor.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/PKM Editors/SuperTrainingEditor.cs (100%) rename {Subforms => PKHeX/Subforms}/PKM Editors/SuperTrainingEditor.resx (100%) rename {Subforms => PKHeX/Subforms}/PKM Editors/Text.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/PKM Editors/Text.cs (100%) rename {Subforms => PKHeX/Subforms}/PKM Editors/Text.resx (100%) rename {Subforms => PKHeX/Subforms}/SAV_Database.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/SAV_Database.cs (100%) rename {Subforms => PKHeX/Subforms}/SAV_Database.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen5/CGearBackground.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen5/SAV_CGearSkin.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen5/SAV_CGearSkin.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen5/SAV_CGearSkin.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_BerryFieldXY.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_BerryFieldXY.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_BerryFieldXY.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_BoxLayout.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_BoxLayout.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_BoxLayout.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_HallOfFame.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_HallOfFame.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_HallOfFame.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_Link6.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_Link6.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_Link6.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_OPower.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_OPower.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_OPower.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_PokeBlockORAS.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_PokeBlockORAS.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_PokeBlockORAS.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_PokedexORAS.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_PokedexORAS.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_PokedexORAS.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_PokedexXY.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_PokedexXY.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_PokedexXY.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_Pokepuff.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_Pokepuff.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_Pokepuff.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_SecretBase.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_SecretBase.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_SecretBase.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_SuperTrain.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_SuperTrain.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_SuperTrain.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_Trainer.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_Trainer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/Gen6/SAV_Trainer.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/SAV_EventFlags.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/SAV_EventFlags.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/SAV_EventFlags.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/SAV_Inventory.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/SAV_Inventory.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/SAV_Inventory.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/SAV_SimpleTrainer.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/SAV_SimpleTrainer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/SAV_SimpleTrainer.resx (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/SAV_Wondercard.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/SAV_Wondercard.cs (100%) rename {Subforms => PKHeX/Subforms}/Save Editors/SAV_Wondercard.resx (100%) rename {Subforms => PKHeX/Subforms}/frmReport.Designer.cs (100%) rename {Subforms => PKHeX/Subforms}/frmReport.cs (100%) rename {Subforms => PKHeX/Subforms}/frmReport.resx (100%) rename {Util => PKHeX/Util}/DataUtil.cs (100%) rename {Util => PKHeX/Util}/FormUtil.cs (100%) rename {Util => PKHeX/Util}/ImageUtil.cs (100%) rename {Util => PKHeX/Util}/PathUtil.cs (100%) rename {Util => PKHeX/Util}/RandUtil.cs (100%) rename {Util => PKHeX/Util}/ReflectUtil.cs (100%) rename {Util => PKHeX/Util}/StringUtil.cs (100%) rename app.config => PKHeX/app.config (100%) diff --git a/PKHeX.sln b/PKHeX.sln index ebf4a3433..7599a9cb6 100644 --- a/PKHeX.sln +++ b/PKHeX.sln @@ -1,7 +1,9 @@  -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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution 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 100% rename from Legality/Tables.cs rename to PKHeX/Legality/Tables.cs 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 100% rename from MainWindow/Main.cs rename to PKHeX/MainWindow/Main.cs 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 100% rename from MainWindow/MainPK4.cs rename to PKHeX/MainWindow/MainPK4.cs diff --git a/MainWindow/MainPK5.cs b/PKHeX/MainWindow/MainPK5.cs similarity index 100% rename from MainWindow/MainPK5.cs rename to PKHeX/MainWindow/MainPK5.cs diff --git a/MainWindow/MainPK6.cs b/PKHeX/MainWindow/MainPK6.cs similarity index 100% rename from MainWindow/MainPK6.cs rename to PKHeX/MainWindow/MainPK6.cs 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 100% rename from MysteryGifts/PGF.cs rename to PKHeX/MysteryGifts/PGF.cs diff --git a/MysteryGifts/PGT.cs b/PKHeX/MysteryGifts/PGT.cs similarity index 100% rename from MysteryGifts/PGT.cs rename to PKHeX/MysteryGifts/PGT.cs 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 100% rename from MysteryGifts/WC6.cs rename to PKHeX/MysteryGifts/WC6.cs diff --git a/PKHeX.csproj b/PKHeX/PKHeX.csproj similarity index 100% rename from PKHeX.csproj rename to PKHeX/PKHeX.csproj 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 100% rename from PKM/PK3.cs rename to PKHeX/PKM/PK3.cs diff --git a/PKM/PK4.cs b/PKHeX/PKM/PK4.cs similarity index 100% rename from PKM/PK4.cs rename to PKHeX/PKM/PK4.cs diff --git a/PKM/PK5.cs b/PKHeX/PKM/PK5.cs similarity index 100% rename from PKM/PK5.cs rename to PKHeX/PKM/PK5.cs diff --git a/PKM/PK6.cs b/PKHeX/PKM/PK6.cs similarity index 100% rename from PKM/PK6.cs rename to PKHeX/PKM/PK6.cs diff --git a/PKM/PKM.cs b/PKHeX/PKM/PKM.cs similarity index 100% rename from PKM/PKM.cs rename to PKHeX/PKM/PKM.cs 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 100% rename from PKM/ShowdownSet.cs rename to PKHeX/PKM/ShowdownSet.cs 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 100% rename from Saves/SAV5.cs rename to PKHeX/Saves/SAV5.cs diff --git a/Saves/SAV6.cs b/PKHeX/Saves/SAV6.cs similarity index 100% rename from Saves/SAV6.cs rename to PKHeX/Saves/SAV6.cs 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 100% rename from Saves/SaveUtil.cs rename to PKHeX/Saves/SaveUtil.cs 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 100% rename from Subforms/frmReport.cs rename to PKHeX/Subforms/frmReport.cs 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/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 100% rename from Util/ImageUtil.cs rename to PKHeX/Util/ImageUtil.cs 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 100% rename from Util/ReflectUtil.cs rename to PKHeX/Util/ReflectUtil.cs 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 From f0c72abafc37cc04e1d4d6f4d41bc50a9f443df4 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Wed, 10 Aug 2016 09:02:31 -0500 Subject: [PATCH 41/67] Added MetDate and EggMetDate properties to PKM and others Issue #171 --- PKHeX/MainWindow/MainPK4.cs | 40 ++++++++-------- PKHeX/MainWindow/MainPK5.cs | 42 ++++++++-------- PKHeX/MainWindow/MainPK6.cs | 40 ++++++++-------- PKHeX/MysteryGifts/PGF.cs | 53 ++++++++++++++++---- PKHeX/MysteryGifts/PGT.cs | 9 +--- PKHeX/MysteryGifts/WC6.cs | 75 +++++++++++++++++++++-------- PKHeX/PKHeX.csproj | 1 + PKHeX/PKM/PK3.cs | 4 +- PKHeX/PKM/PK4.cs | 16 +++---- PKHeX/PKM/PK5.cs | 20 ++++---- PKHeX/PKM/PK6.cs | 12 ++--- PKHeX/PKM/PKM.cs | 96 ++++++++++++++++++++++++++++++++++--- PKHeX/Subforms/frmReport.cs | 12 ++--- PKHeX/Util/DateUtil.cs | 34 +++++++++++++ PKHeX/Util/ImageUtil.cs | 2 +- PKHeX/Util/ReflectUtil.cs | 2 +- 16 files changed, 319 insertions(+), 139 deletions(-) create mode 100644 PKHeX/Util/DateUtil.cs diff --git a/PKHeX/MainWindow/MainPK4.cs b/PKHeX/MainWindow/MainPK4.cs index 697193b01..4e27d2d69 100644 --- a/PKHeX/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/PKHeX/MainWindow/MainPK5.cs b/PKHeX/MainWindow/MainPK5.cs index 15f674aab..469fed01d 100644 --- a/PKHeX/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/PKHeX/MainWindow/MainPK6.cs b/PKHeX/MainWindow/MainPK6.cs index ced541a41..534dbd8db 100644 --- a/PKHeX/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/PKHeX/MysteryGifts/PGF.cs b/PKHeX/MysteryGifts/PGF.cs index b4cf94520..24764e7c1 100644 --- a/PKHeX/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(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; + 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/PKHeX/MysteryGifts/PGT.cs b/PKHeX/MysteryGifts/PGT.cs index 9eeebbfea..911754cf9 100644 --- a/PKHeX/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/PKHeX/MysteryGifts/WC6.cs b/PKHeX/MysteryGifts/WC6.cs index 26f8a186c..254c8f841 100644 --- a/PKHeX/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(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; + 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/PKHeX.csproj b/PKHeX/PKHeX.csproj index 14445871e..86daecab2 100644 --- a/PKHeX/PKHeX.csproj +++ b/PKHeX/PKHeX.csproj @@ -298,6 +298,7 @@ + diff --git a/PKHeX/PKM/PK3.cs b/PKHeX/PKM/PK3.cs index a6f20bc4c..7dc83b479 100644 --- a/PKHeX/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/PKHeX/PKM/PK4.cs b/PKHeX/PKM/PK4.cs index f5a73b823..535382a52 100644 --- a/PKHeX/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/PKHeX/PKM/PK5.cs b/PKHeX/PKM/PK5.cs index d8a302b1a..65772c052 100644 --- a/PKHeX/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/PKHeX/PKM/PK6.cs b/PKHeX/PKM/PK6.cs index ca81c2eb2..b731d2b26 100644 --- a/PKHeX/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/PKHeX/PKM/PKM.cs b/PKHeX/PKM/PKM.cs index 1d3134d82..590c5fc1f 100644 --- a/PKHeX/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(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; + 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(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; + 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/PKHeX/Subforms/frmReport.cs b/PKHeX/Subforms/frmReport.cs index 7004595a4..2b0203bc1 100644 --- a/PKHeX/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/PKHeX/Util/DateUtil.cs b/PKHeX/Util/DateUtil.cs new file mode 100644 index 000000000..3811833a7 --- /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, day)); + } + + /// + /// 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 < 0 || year > DateTime.MaxValue.Year || month < 1 || month > 12 || day < 1 || day > DateTime.DaysInMonth((int)year, (int)day)); + } + } +} diff --git a/PKHeX/Util/ImageUtil.cs b/PKHeX/Util/ImageUtil.cs index cf6db53bf..84a0d29a9 100644 --- a/PKHeX/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/PKHeX/Util/ReflectUtil.cs b/PKHeX/Util/ReflectUtil.cs index f90a32dd2..4ff92d882 100644 --- a/PKHeX/Util/ReflectUtil.cs +++ b/PKHeX/Util/ReflectUtil.cs @@ -5,7 +5,7 @@ namespace PKHeX { - public static class ReflectUtil + public static partial class ReflectUtil { internal static bool GetValueEquals(object obj, string propertyName, object value) { From 4669551d774739eaaa72478e109074bcb4691343 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Wed, 10 Aug 2016 09:07:16 -0500 Subject: [PATCH 42/67] Fixed errors in implementation --- PKHeX/MysteryGifts/PGF.cs | 2 +- PKHeX/MysteryGifts/WC6.cs | 2 +- PKHeX/PKM/PKM.cs | 4 ++-- PKHeX/Util/DateUtil.cs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PKHeX/MysteryGifts/PGF.cs b/PKHeX/MysteryGifts/PGF.cs index 24764e7c1..06bab3020 100644 --- a/PKHeX/MysteryGifts/PGF.cs +++ b/PKHeX/MysteryGifts/PGF.cs @@ -116,7 +116,7 @@ public override string CardTitle if (value.HasValue) { // Only update the properties if a value is provided. - Year = (ushort)value.Value.Year; + Year = (ushort)(value.Value.Year - 2000); Month = (byte)value.Value.Month; Day = (byte)value.Value.Day; } diff --git a/PKHeX/MysteryGifts/WC6.cs b/PKHeX/MysteryGifts/WC6.cs index 254c8f841..7ce7850ce 100644 --- a/PKHeX/MysteryGifts/WC6.cs +++ b/PKHeX/MysteryGifts/WC6.cs @@ -66,7 +66,7 @@ public WC6(byte[] data = null) if (value.HasValue) { // Only update the properties if a value is provided. - Year = (ushort)value.Value.Year; + Year = (ushort)(value.Value.Year - 2000); Month = (byte)value.Value.Month; Day = (byte)value.Value.Day; } diff --git a/PKHeX/PKM/PKM.cs b/PKHeX/PKM/PKM.cs index 590c5fc1f..e94d84d39 100644 --- a/PKHeX/PKM/PKM.cs +++ b/PKHeX/PKM/PKM.cs @@ -155,7 +155,7 @@ public byte[] Write() if (value.HasValue) { // Only update the properties if a value is provided. - Met_Year = value.Value.Year; + Met_Year = value.Value.Year - 2000; Met_Month = value.Value.Month; Met_Day = value.Value.Day; } @@ -200,7 +200,7 @@ public byte[] Write() if (value.HasValue) { // Only update the properties if a value is provided. - Egg_Year = value.Value.Year; + Egg_Year = value.Value.Year - 2000; Egg_Month = value.Value.Month; Egg_Day = value.Value.Day; } diff --git a/PKHeX/Util/DateUtil.cs b/PKHeX/Util/DateUtil.cs index 3811833a7..702410538 100644 --- a/PKHeX/Util/DateUtil.cs +++ b/PKHeX/Util/DateUtil.cs @@ -16,7 +16,7 @@ public static partial class Util /// 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, day)); + return !(year < 0 || year > DateTime.MaxValue.Year || month < 1 || month > 12 || day < 1 || day > DateTime.DaysInMonth(year, month)); } /// @@ -28,7 +28,7 @@ public static bool IsDateValid(int year, int month, int day) /// A boolean indicating whether or not the date is valid. public static bool IsDateValid(uint year, uint month, uint day) { - return !(year < 0 || year > DateTime.MaxValue.Year || month < 1 || month > 12 || day < 1 || day > DateTime.DaysInMonth((int)year, (int)day)); + return !(year < 0 || year > DateTime.MaxValue.Year || month < 1 || month > 12 || day < 1 || day > DateTime.DaysInMonth((int)year, (int)month)); } } } From 9852c42ca14b9b8d85f401a058f3d993d90c1b6f Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Wed, 10 Aug 2016 09:24:40 -0500 Subject: [PATCH 43/67] Added tests for DateUtil --- PKHeX.sln | 19 ++++ PKHeX/Util/DateUtil.cs | 2 +- Tests/PKHeX.Tests/PKHeX.Tests.csproj | 89 +++++++++++++++ Tests/PKHeX.Tests/Properties/AssemblyInfo.cs | 36 ++++++ Tests/PKHeX.Tests/Util/DateUtilTests.cs | 112 +++++++++++++++++++ 5 files changed, 257 insertions(+), 1 deletion(-) create mode 100644 Tests/PKHeX.Tests/PKHeX.Tests.csproj create mode 100644 Tests/PKHeX.Tests/Properties/AssemblyInfo.cs create mode 100644 Tests/PKHeX.Tests/Util/DateUtilTests.cs diff --git a/PKHeX.sln b/PKHeX.sln index 7599a9cb6..b990fba3c 100644 --- a/PKHeX.sln +++ b/PKHeX.sln @@ -5,18 +5,37 @@ 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 + Debug|Any CPU = Debug|Any CPU Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Debug|Any CPU.ActiveCfg = Debug|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Debug|x86.ActiveCfg = Debug|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Debug|x86.Build.0 = Debug|x86 + {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Release|Any CPU.ActiveCfg = Release|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|Any CPU.ActiveCfg = Debug|Any CPU + {8E2499BC-C11A-4809-8737-66D35A625425}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E2499BC-C11A-4809-8737-66D35A625425}.Debug|x86.ActiveCfg = Debug|Any CPU + {8E2499BC-C11A-4809-8737-66D35A625425}.Debug|x86.Build.0 = Debug|Any CPU + {8E2499BC-C11A-4809-8737-66D35A625425}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E2499BC-C11A-4809-8737-66D35A625425}.Release|Any CPU.Build.0 = Release|Any CPU + {8E2499BC-C11A-4809-8737-66D35A625425}.Release|x86.ActiveCfg = Release|Any CPU + {8E2499BC-C11A-4809-8737-66D35A625425}.Release|x86.Build.0 = Release|Any CPU 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/PKHeX/Util/DateUtil.cs b/PKHeX/Util/DateUtil.cs index 702410538..c7edda0ae 100644 --- a/PKHeX/Util/DateUtil.cs +++ b/PKHeX/Util/DateUtil.cs @@ -28,7 +28,7 @@ public static bool IsDateValid(int year, int month, int day) /// A boolean indicating whether or not the date is valid. public static bool IsDateValid(uint year, uint month, uint day) { - return !(year < 0 || year > DateTime.MaxValue.Year || month < 1 || month > 12 || day < 1 || day > DateTime.DaysInMonth((int)year, (int)month)); + return year < int.MaxValue && month < int.MaxValue && day < int.MaxValue && IsDateValid((int)year, (int)month, (int)day); } } } diff --git a/Tests/PKHeX.Tests/PKHeX.Tests.csproj b/Tests/PKHeX.Tests/PKHeX.Tests.csproj new file mode 100644 index 000000000..88f9d09a7 --- /dev/null +++ b/Tests/PKHeX.Tests/PKHeX.Tests.csproj @@ -0,0 +1,89 @@ + + + + Debug + AnyCPU + {8E2499BC-C11A-4809-8737-66D35A625425} + Library + Properties + PKHeX.Tests + PKHeX.Tests + v4.6 + 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 + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + {b4eff030-c75a-49f9-a4bc-738d1b61c4af} + PKHeX + + + + + + + False + + + False + + + False + + + False + + + + + + + + \ No newline at end of file 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..4356003de --- /dev/null +++ b/Tests/PKHeX.Tests/Util/DateUtilTests.cs @@ -0,0 +1,112 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +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 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"); + } + } +} From 17078c8d282483e353733ac0daea8888291e35f9 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Wed, 10 Aug 2016 09:42:58 -0500 Subject: [PATCH 44/67] Added test for PKM.MetDate --- Tests/PKHeX.Tests/PKHeX.Tests.csproj | 2 + Tests/PKHeX.Tests/PKM/DateTestPKM.cs | 1063 ++++++++++++++++++++++++++ Tests/PKHeX.Tests/PKM/PKMTests.cs | 71 ++ 3 files changed, 1136 insertions(+) create mode 100644 Tests/PKHeX.Tests/PKM/DateTestPKM.cs create mode 100644 Tests/PKHeX.Tests/PKM/PKMTests.cs diff --git a/Tests/PKHeX.Tests/PKHeX.Tests.csproj b/Tests/PKHeX.Tests/PKHeX.Tests.csproj index 88f9d09a7..374291b32 100644 --- a/Tests/PKHeX.Tests/PKHeX.Tests.csproj +++ b/Tests/PKHeX.Tests/PKHeX.Tests.csproj @@ -50,6 +50,8 @@ + + diff --git a/Tests/PKHeX.Tests/PKM/DateTestPKM.cs b/Tests/PKHeX.Tests/PKM/DateTestPKM.cs new file mode 100644 index 000000000..1195e7e4e --- /dev/null +++ b/Tests/PKHeX.Tests/PKM/DateTestPKM.cs @@ -0,0 +1,1063 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +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..885780303 --- /dev/null +++ b/Tests/PKHeX.Tests/PKM/PKMTests.cs @@ -0,0 +1,71 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +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."); + } + + [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"); + } + } +} From e53fe6e180f0a638e9b32d973d5b2df07cc741a3 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Wed, 10 Aug 2016 09:46:38 -0500 Subject: [PATCH 45/67] Added tests for PKM.EggMetDate --- Tests/PKHeX.Tests/PKM/PKMTests.cs | 56 +++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/Tests/PKHeX.Tests/PKM/PKMTests.cs b/Tests/PKHeX.Tests/PKM/PKMTests.cs index 885780303..37f394d7a 100644 --- a/Tests/PKHeX.Tests/PKM/PKMTests.cs +++ b/Tests/PKHeX.Tests/PKM/PKMTests.cs @@ -67,5 +67,61 @@ public void MetDateSetterTest() 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"); + } } } From a7f2f2e20978fa578e5fe55a4c1bedb81a4ccd62 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Wed, 10 Aug 2016 09:47:53 -0500 Subject: [PATCH 46/67] Set test platform to x86 to fix a processor type mismatch warning --- Tests/PKHeX.Tests/PKHeX.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/Tests/PKHeX.Tests/PKHeX.Tests.csproj b/Tests/PKHeX.Tests/PKHeX.Tests.csproj index 374291b32..b27a7c662 100644 --- a/Tests/PKHeX.Tests/PKHeX.Tests.csproj +++ b/Tests/PKHeX.Tests/PKHeX.Tests.csproj @@ -25,6 +25,7 @@ DEBUG;TRACE prompt 4 + x86 pdbonly From 98c86ddb7acf9208d4917502ac7f02a5be403519 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Wed, 10 Aug 2016 10:04:41 -0500 Subject: [PATCH 47/67] Removed "Any CPU" project and solution configurations --- PKHeX.sln | 16 ++++----------- Tests/PKHeX.Tests/PKHeX.Tests.csproj | 29 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/PKHeX.sln b/PKHeX.sln index b990fba3c..e4bd67805 100644 --- a/PKHeX.sln +++ b/PKHeX.sln @@ -11,26 +11,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{7C0598C9 EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Debug|Any CPU.ActiveCfg = Debug|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Debug|x86.ActiveCfg = Debug|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Debug|x86.Build.0 = Debug|x86 - {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Release|Any CPU.ActiveCfg = Release|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|Any CPU.ActiveCfg = Debug|Any CPU - {8E2499BC-C11A-4809-8737-66D35A625425}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E2499BC-C11A-4809-8737-66D35A625425}.Debug|x86.ActiveCfg = Debug|Any CPU - {8E2499BC-C11A-4809-8737-66D35A625425}.Debug|x86.Build.0 = Debug|Any CPU - {8E2499BC-C11A-4809-8737-66D35A625425}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E2499BC-C11A-4809-8737-66D35A625425}.Release|Any CPU.Build.0 = Release|Any CPU - {8E2499BC-C11A-4809-8737-66D35A625425}.Release|x86.ActiveCfg = Release|Any CPU - {8E2499BC-C11A-4809-8737-66D35A625425}.Release|x86.Build.0 = Release|Any CPU + {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 diff --git a/Tests/PKHeX.Tests/PKHeX.Tests.csproj b/Tests/PKHeX.Tests/PKHeX.Tests.csproj index b27a7c662..4633f1236 100644 --- a/Tests/PKHeX.Tests/PKHeX.Tests.csproj +++ b/Tests/PKHeX.Tests/PKHeX.Tests.csproj @@ -8,7 +8,7 @@ Properties PKHeX.Tests PKHeX.Tests - v4.6 + v4.0 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 @@ -16,24 +16,25 @@ $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False UnitTest + - + true - full - false - bin\Debug\ + bin\x86\Debug\ DEBUG;TRACE - prompt - 4 + full x86 - - - pdbonly - true - bin\Release\ - TRACE prompt - 4 + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset From 32ec5c392c87d53cd63ce631ac2eac63c1c6ea46 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Wed, 10 Aug 2016 13:43:00 -0500 Subject: [PATCH 48/67] Fixed batch editor and database searches on properties of type `DateTime?` --- PKHeX/Util/ReflectUtil.cs | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/PKHeX/Util/ReflectUtil.cs b/PKHeX/Util/ReflectUtil.cs index 4ff92d882..74f89e5ea 100644 --- a/PKHeX/Util/ReflectUtil.cs +++ b/PKHeX/Util/ReflectUtil.cs @@ -11,13 +11,13 @@ internal static bool GetValueEquals(object obj, string propertyName, object valu { 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 +38,26 @@ internal static bool HasProperty(this Type type, string name) { return type.GetProperties(BindingFlags.Public | BindingFlags.Instance).Any(p => p.Name == name); } + + internal static object ConvertValue(object value, Type type) + { + if (type == typeof(DateTime?)) // Used for PKM.MetDate and other similar properties + { + DateTime dateValue; + if (DateTime.TryParse(value.ToString(), out dateValue)) + { + return new DateTime?(dateValue); + } + else + { + return null; + } + } + else + { + // Convert.ChangeType is suitable for most things + return Convert.ChangeType(value, type); + } + } } } From 35d4edf85df04284e1f874290b359c484a0c0fdc Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Wed, 10 Aug 2016 19:54:12 -0500 Subject: [PATCH 49/67] Fixed crash in DateUtil when Year is 0 --- PKHeX/MysteryGifts/PGF.cs | 2 +- PKHeX/MysteryGifts/WC6.cs | 2 +- PKHeX/PKM/PKM.cs | 4 ++-- PKHeX/Util/DateUtil.cs | 2 +- Tests/PKHeX.Tests/PKM/PKMTests.cs | 8 +++++++- Tests/PKHeX.Tests/Util/DateUtilTests.cs | 7 +++++++ 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/PKHeX/MysteryGifts/PGF.cs b/PKHeX/MysteryGifts/PGF.cs index 06bab3020..7645a89bc 100644 --- a/PKHeX/MysteryGifts/PGF.cs +++ b/PKHeX/MysteryGifts/PGF.cs @@ -102,7 +102,7 @@ public override string CardTitle get { // Check to see if date is valid - if (!Util.IsDateValid(Year, Month, Day)) + if (!Util.IsDateValid(2000 + Year, Month, Day)) { return null; } diff --git a/PKHeX/MysteryGifts/WC6.cs b/PKHeX/MysteryGifts/WC6.cs index 7ce7850ce..3774d5d78 100644 --- a/PKHeX/MysteryGifts/WC6.cs +++ b/PKHeX/MysteryGifts/WC6.cs @@ -52,7 +52,7 @@ public WC6(byte[] data = null) get { // Check to see if date is valid - if (!Util.IsDateValid(Year, Month, Day)) + if (!Util.IsDateValid(2000 + Year, Month, Day)) { return null; } diff --git a/PKHeX/PKM/PKM.cs b/PKHeX/PKM/PKM.cs index e94d84d39..3008f6e80 100644 --- a/PKHeX/PKM/PKM.cs +++ b/PKHeX/PKM/PKM.cs @@ -141,7 +141,7 @@ public byte[] Write() get { // Check to see if date is valid - if (!Util.IsDateValid(Met_Year, Met_Month, Met_Day)) + if (!Util.IsDateValid(2000 + Met_Year, Met_Month, Met_Day)) { return null; } @@ -186,7 +186,7 @@ public byte[] Write() get { // Check to see if date is valid - if (!Util.IsDateValid(Egg_Year, Egg_Month, Egg_Day)) + if (!Util.IsDateValid(2000 + Egg_Year, Egg_Month, Egg_Day)) { return null; } diff --git a/PKHeX/Util/DateUtil.cs b/PKHeX/Util/DateUtil.cs index c7edda0ae..0cff93c7f 100644 --- a/PKHeX/Util/DateUtil.cs +++ b/PKHeX/Util/DateUtil.cs @@ -16,7 +16,7 @@ public static partial class Util /// 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)); + return !(year <= 0 || year > DateTime.MaxValue.Year || month < 1 || month > 12 || day < 1 || day > DateTime.DaysInMonth(year, month)); } /// diff --git a/Tests/PKHeX.Tests/PKM/PKMTests.cs b/Tests/PKHeX.Tests/PKM/PKMTests.cs index 37f394d7a..172511e7b 100644 --- a/Tests/PKHeX.Tests/PKM/PKMTests.cs +++ b/Tests/PKHeX.Tests/PKM/PKMTests.cs @@ -22,13 +22,19 @@ public void MetDateGetterTest() pk.MetDay = 0; pk.MetMonth = 0; pk.MetYear = 0; - Assert.IsFalse(pk.MetDate.HasValue, "MetDate should be null when date components are all 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] diff --git a/Tests/PKHeX.Tests/Util/DateUtilTests.cs b/Tests/PKHeX.Tests/Util/DateUtilTests.cs index 4356003de..002bfb1dd 100644 --- a/Tests/PKHeX.Tests/Util/DateUtilTests.cs +++ b/Tests/PKHeX.Tests/Util/DateUtilTests.cs @@ -101,6 +101,13 @@ 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() From b6a20a43e3d4dea67bd17aa34b59db4b3136c183 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Wed, 10 Aug 2016 20:17:37 -0500 Subject: [PATCH 50/67] Reverted ClickOnce deployment code due to Mono and Wine not supporting it Should fix issue #161 --- PKHeX/MainWindow/Main.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index cdd1fdf45..ba35fd652 100644 --- a/PKHeX/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; @@ -177,7 +176,18 @@ 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 + { + get + { + // This is how we'd do it with ClickOnce deployment (after importing System.Deployment) + // return ApplicationDeployment.IsNetworkDeployed ? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "PKHeX") : Environment.CurrentDirectory; + + // However, Mono and Wine don't implement this, so we're going to leave it like this, until ClickOnce deployment is a public feature. + return 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"); From 822810b00c9de9e19f338de63e3be57f4e37e879 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Wed, 10 Aug 2016 20:20:36 -0500 Subject: [PATCH 51/67] Removed assembly reference --- PKHeX/PKHeX.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj index 86daecab2..304c061ea 100644 --- a/PKHeX/PKHeX.csproj +++ b/PKHeX/PKHeX.csproj @@ -62,7 +62,6 @@ - From 170e82cd06578b55d48dd07784237d5b5c5719dc Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 10 Aug 2016 19:29:21 -0700 Subject: [PATCH 52/67] Fix datetime parsing Force an exact format to tryparsing as the 'time' portion is not used. 20160810 --- PKHeX/Util/ReflectUtil.cs | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/PKHeX/Util/ReflectUtil.cs b/PKHeX/Util/ReflectUtil.cs index 74f89e5ea..4af27060e 100644 --- a/PKHeX/Util/ReflectUtil.cs +++ b/PKHeX/Util/ReflectUtil.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Reflection; @@ -39,25 +40,18 @@ internal static bool HasProperty(this Type type, string name) return type.GetProperties(BindingFlags.Public | BindingFlags.Instance).Any(p => p.Name == name); } - internal static object ConvertValue(object value, Type type) + private static object ConvertValue(object value, Type type) { if (type == typeof(DateTime?)) // Used for PKM.MetDate and other similar properties { DateTime dateValue; - if (DateTime.TryParse(value.ToString(), out dateValue)) - { - return new DateTime?(dateValue); - } - else - { - return null; - } - } - else - { - // Convert.ChangeType is suitable for most things - return Convert.ChangeType(value, type); + 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); } } } From edb4928117c52cbbf4b70e822a377d56737ac770 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 10 Aug 2016 19:32:57 -0700 Subject: [PATCH 53/67] Minor cleanup Unused usings/references --- PKHeX/PKHeX.csproj | 2 -- Tests/PKHeX.Tests/PKM/DateTestPKM.cs | 4 ---- Tests/PKHeX.Tests/PKM/PKMTests.cs | 4 ---- Tests/PKHeX.Tests/Util/DateUtilTests.cs | 5 ----- 4 files changed, 15 deletions(-) diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj index 304c061ea..a0a1c2b8b 100644 --- a/PKHeX/PKHeX.csproj +++ b/PKHeX/PKHeX.csproj @@ -61,11 +61,9 @@ - - diff --git a/Tests/PKHeX.Tests/PKM/DateTestPKM.cs b/Tests/PKHeX.Tests/PKM/DateTestPKM.cs index 1195e7e4e..8617f8ab0 100644 --- a/Tests/PKHeX.Tests/PKM/DateTestPKM.cs +++ b/Tests/PKHeX.Tests/PKM/DateTestPKM.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PKHeX.Tests.PKM { diff --git a/Tests/PKHeX.Tests/PKM/PKMTests.cs b/Tests/PKHeX.Tests/PKM/PKMTests.cs index 172511e7b..022b377be 100644 --- a/Tests/PKHeX.Tests/PKM/PKMTests.cs +++ b/Tests/PKHeX.Tests/PKM/PKMTests.cs @@ -1,9 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PKHeX.Tests.PKM { diff --git a/Tests/PKHeX.Tests/Util/DateUtilTests.cs b/Tests/PKHeX.Tests/Util/DateUtilTests.cs index 002bfb1dd..c6ac91477 100644 --- a/Tests/PKHeX.Tests/Util/DateUtilTests.cs +++ b/Tests/PKHeX.Tests/Util/DateUtilTests.cs @@ -1,9 +1,4 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PKHeX.Tests.Util { From a28de6b8b502c3d53d48816fa7feee5251becc90 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 10 Aug 2016 19:43:27 -0700 Subject: [PATCH 54/67] Fix hyperspace fury legality Thanks RanEncounter! --- PKHeX/Legality/Tables.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/PKHeX/Legality/Tables.cs b/PKHeX/Legality/Tables.cs index 8bb92c9bb..6d9a2a1f6 100644 --- a/PKHeX/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 = { From 862c7b6cd6ffcf829c1fdd129994cddb36fdbce3 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 10 Aug 2016 19:44:47 -0700 Subject: [PATCH 55/67] Fix database constant string Refer to the DatabasePath instead of a hardcoded string (if it is modified). --- PKHeX/MainWindow/Main.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index ba35fd652..7e3ae6ba9 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -300,11 +300,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) { From 08da41762731bfd99da92d7effcda29a8602ae1b Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 10 Aug 2016 21:10:21 -0700 Subject: [PATCH 56/67] Improve blank save loading Split openSAV to two methods, one to initialize it and another to load the save to the form. Indirectly fixes the non-loading of HaX ability menu. Also fixes unintended behavior with Quit hotkey (CTRL|Q isn't the modifierkey value when triggered, CTRL is) --- PKHeX/MainWindow/Main.cs | 100 +++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 47 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 7e3ae6ba9..4237f8d26 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -118,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. @@ -176,18 +176,7 @@ public Main() #region Path Variables - public static string WorkingDirectory - { - get - { - // This is how we'd do it with ClickOnce deployment (after importing System.Deployment) - // return ApplicationDeployment.IsNetworkDeployed ? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "PKHeX") : Environment.CurrentDirectory; - - // However, Mono and Wine don't implement this, so we're going to leave it like this, until ClickOnce deployment is a public feature. - return 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"); @@ -274,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(); } @@ -750,53 +739,75 @@ private void openSAV(byte[] input, string path) sav.Personal = drFRLG == DialogResult.Yes ? PersonalTable.FR : PersonalTable.LG; } } + } + 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]; @@ -810,7 +821,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; @@ -876,11 +887,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(); } From 5da06535d90f5c0629c2682801f0de34d3f03173 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 10 Aug 2016 21:40:09 -0700 Subject: [PATCH 57/67] Include missing method call --- PKHeX/MainWindow/Main.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 4237f8d26..0cee4f438 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -739,6 +739,7 @@ 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) { From 9831693a700f0d20f3eccda17bebbd6306c9a0f6 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 10 Aug 2016 21:41:01 -0700 Subject: [PATCH 58/67] Add FBI save detection Closes #167 Thanks @poutros ! --- PKHeX/Saves/SaveUtil.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/PKHeX/Saves/SaveUtil.cs b/PKHeX/Saves/SaveUtil.cs index 0a2b8aad4..9ad69d911 100644 --- a/PKHeX/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)) From 66e5794672568220574210addc48d50358d5179f Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 10 Aug 2016 21:43:55 -0700 Subject: [PATCH 59/67] =?UTF-8?q?Fix=20Pok=C3=A9=20Ball=20vivillon=20showd?= =?UTF-8?q?own=20import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #174 Thanks @sora10pls ! Intent of the 'replace' is to trim, but I'm hesitant to change any other occurrence. --- PKHeX/PKM/ShowdownSet.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX/PKM/ShowdownSet.cs b/PKHeX/PKM/ShowdownSet.cs index 4cc9df962..736bb93ec 100644 --- a/PKHeX/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]; } From d409c4e297e89330ab394e181dc224ad3d3bc41c Mon Sep 17 00:00:00 2001 From: easyworld Date: Thu, 11 Aug 2016 21:58:14 +0800 Subject: [PATCH 60/67] update Chinese translation --- PKHeX/Resources/text/zh/lang_zh.txt | 538 ++++++++++++++-------------- 1 file changed, 269 insertions(+), 269 deletions(-) diff --git a/PKHeX/Resources/text/zh/lang_zh.txt b/PKHeX/Resources/text/zh/lang_zh.txt index e177179ff..f9f41eee0 100644 --- a/PKHeX/Resources/text/zh/lang_zh.txt +++ b/PKHeX/Resources/text/zh/lang_zh.txt @@ -31,16 +31,16 @@ Menu_ShowdownExportPKM = 导出设置到剪贴板 Menu_ShowdownExportParty = 导出手持队伍到剪贴板 Menu_ShowdownExportBattleBox = 导出战斗箱到剪贴板 Menu_CyberGadget = CyberGadget -Menu_OpenTemp = 打开文件夹Temp -Menu_OpenCache = 打开文件夹Cache +Menu_OpenTemp = 打开Temp文件夹 +Menu_OpenCache = 打开Cache文件夹 Menu_Data = 数据 Menu_LoadBoxes = 加载箱子信息 Menu_DumpBoxes = 导出箱子信息 Menu_Report = 箱子数据报告 Menu_Database = PKM数据库 Menu_Other = 其他 -Menu_OpenSDF = 打开文件夹SaveDataFiler -Menu_OpenSDB = 打开文件夹SaveDataBackup +Menu_OpenSDF = 打开SaveDataFiler文件夹 +Menu_OpenSDB = 打开SaveDataBackup文件夹 -- Menu_Options = 设置 Menu_Language = 语言 @@ -50,10 +50,10 @@ Menu_ModifyPKM = 修改PKM信息 Menu_Unicode = Unicode Menu_About = 关于PKHeX --------------------Context Menus---------------------- -mnuView = 看 -mnuSet = 放置 +mnuView = 查看 +mnuSet = 设置 mnuDelete = 删除 -mnu2View = 看 +mnu2View = 查看 --------------------Main Tab Data---------------------- Tab_Main = 主界面 Label_PID = PID: @@ -156,29 +156,29 @@ B_OpenSecretBase = 秘密基地 --------------------Tab Internals----------------------- L_Party = 手持 L_BattleBox = 战斗箱 -L_ReadOnlyPBB = 这是只读的 +L_ReadOnlyPBB = 不可编辑 GB_Daycare = 饲育屋 GB_GTS = GTS GB_Fused = Fused GB_SUBE = SUBE DayCare_HasEgg = 拥有蛋 L_DaycareSeed = 种子 -L_ReadOnlyOther = 此选项卡是只读 +L_ReadOnlyOther = 此选项卡不可编辑 B_JPEG = 保存PGL.JPEG B_VerifyCHK = 校验 -B_SaveBoxBin = Save Box Data++ -L_GameSync = Game Sync ID: -L_Secure1 = Secure Value 1: -L_Secure2 = Secure Value 2: +B_SaveBoxBin = 保存箱子信息++ +L_GameSync = 游戏同步ID: +L_Secure1 = 安全值 1: +L_Secure2 = 安全值 2: ! End ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. ! RibbonEditor = Ribbon Editor - Change stuff below this line, not above. ----------------------Buttons-------------------------- -BTN_All = 准许全部 +BTN_All = 获得全部 BTN_None = 全部清除 -BTN_Cancel = 消除 +BTN_Cancel = 取消 BTN_Save = 保存 ----------------------Ribbons-------------------------- L_RibbonChampionKalos = 卡洛斯 冠军 @@ -286,8 +286,8 @@ L_RibbonCountG3Tough = 强壮 ! SuperTrainingEditor = Medal Editor - Change stuff below this line, not above. ----------------------Buttons-------------------------- -B_All = 给与所有 -B_None = 移除所有 +B_All = 获得全部 +B_None = 全部清除 B_Cancel = 取消 B_Save = 保存 ------------------Super Training----------------------- @@ -333,14 +333,14 @@ L_Hits = 剩余点数: ---------------------Bottom UI------------------------- BTN_Cancel = 取消 BTN_Save = 保存 -L_Handler = 现在的主人： +L_Handler = 现在的主人: - -Tab_OTMemory = 与原主人的记忆： -L_OT_Friendship = 友好度： +Tab_OTMemory = 与原主人的记忆: +L_OT_Friendship = 友好度: L_OT_Affection = 喜爱度: -Tab_CTMemory = 与现主人的记忆： -L_CT_Friendship = 友好度： -L_cT_Affection = 喜爱度： +Tab_CTMemory = 与现主人的记忆: +L_CT_Friendship = 友好度: +L_cT_Affection = 喜爱度: Tab_Residence = 居住地 -- L_Country = 国家 @@ -399,14 +399,14 @@ L_Ash = 火山灰: GB_Misc = 杂项 flag_0288 = 配合雕像 flag_0287 = 轮盘雕像 -flag_0286 = 三重雕像 +flag_0286 = 3v3雕像 flag_0293 = 超级配合 已解锁 flag_0292 = 超级轮盘 已解锁 -flag_0291 = 超级三重 已解锁 -flag_0290 = 超级双人 已解锁 -flag_0289 = 超级单人 已解锁 -flag_0285 = 双人雕像 -flag_0284 = 单人雕像 +flag_0291 = 超级3v3 已解锁 +flag_0290 = 超级2v2 已解锁 +flag_0289 = 超级单打 已解锁 +flag_0285 = 2v2雕像 +flag_0284 = 单打雕像 GB_Rebattle = 重新战斗 flag_2835 = (AS) 拉帝欧斯 已捕获 flag_0420 = (AS) 拉帝欧斯 已打败 @@ -481,305 +481,305 @@ B_Cancel = 取消 ! SAV_EventFlagsXY = Event Flag Editor (XY) - Change stuff below this line, not above. ------------------------------------------------------- -flag_2546 = Pokédex Obtained -GB_Misc = Misc -flag_0289 = Multi Statuette -flag_0288 = Rotation Statuette -flag_0287 = Triples Statuette -flag_0294 = Super Multi Unlocked -flag_0293 = Super Rotation Unlocked -flag_0292 = Super Triples Unlocked -flag_0291 = Super Doubles Unlocked -flag_0290 = Super Singles Unlocked -flag_0675 = 50: Beat Chatelaine -flag_0286 = Doubles Statuette -flag_0285 = Singles Statuette -GB_Rebattle = Rebattle -flag_0114 = Zygarde Captured -flag_0790 = Zygarde Defeated -flag_0115 = Mewtwo Captured -flag_0963 = Mewtwo Defeated -GB_Researcher = FlagDiff Researcher -L_UnSet = UnSet -L_IsSet = IsSet -B_LoadNew = Load New -B_LoadOld = Load Old +flag_2546 = 精灵图鉴已获得 +GB_Misc = 杂项 +flag_0289 = 配合雕像 +flag_0288 = 轮盘雕像 +flag_0287 = 3v3雕像 +flag_0294 = 超级配合 解锁 +flag_0293 = 超级轮盘 解锁 +flag_0292 = 超级3v3 解锁 +flag_0291 = 超级2v2 解锁 +flag_0290 = 超级单打 解锁 +flag_0675 = 50:打败女城主 +flag_0286 = 2v2雕像 +flag_0285 = 单打雕像 +GB_Rebattle = 重新战斗 +flag_0114 = 基格尔德 已捕获 +flag_0790 = 基格尔德 已打败 +flag_0115 = 梦幻 已捕获 +flag_0963 = 梦幻 已打败 +GB_Researcher = 标识差异研究 +L_UnSet = 未设置 +L_IsSet = 已设置 +B_LoadNew = 读新数据 +B_LoadOld = 读老数据 flag_2239 = 2239 flag_2238 = 2238 flag_2237 = 2237 B_Save = Save -flag_0005 = Flag5 -flag_0004 = Flag4 -flag_0003 = Flag3 -flag_0002 = Flag2 -flag_0001 = Flag1 -GB_FlagStatus = Check Flag Status -L_Flag = Flag: -CHK_CustomFlag = Status: -B_Cancel = Cancel +flag_0005 = 标识5 +flag_0004 = 标识4 +flag_0003 = 标识3 +flag_0002 = 标识2 +flag_0001 = 标识1 +GB_FlagStatus = 检查标识状态 +L_Flag = 标识: +CHK_CustomFlag = 状态: +B_Cancel = 取消 ! End ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. ! SAV_PokedexORAS = Pokédex Editor (ORAS) - Change stuff below this line, not above. ------------------------------------------------------ -L_goto = goto: -GB_Owned = Owned -CHK_P1 = Obtained -CHK_P2 = Male -CHK_P3 = Female -CHK_P4 = Shiny Male -CHK_P5 = Shiny Female -GB_Encountered = Encountered -CHK_P6 = Male -CHK_P7 = Female -CHK_P8 = Shiny Male -CHK_P9 = Shiny Female -L_DexNav = DexNav Lv: -GB_Language = Languages -CHK_L1 = Japanese -CHK_L2 = English -CHK_L3 = French -CHK_L4 = Italian -CHK_L5 = German -CHK_L6 = Spanish -CHK_L7 = Korean -B_Modify = Modify... -B_GiveAll = Check All -L_Spinda = Spinda: -B_Save = Save -B_Cancel = Cancel +L_goto = 转到: +GB_Owned = 拥有 +CHK_P1 = 已获得 +CHK_P2 = 公 +CHK_P3 = 母 +CHK_P4 = 闪光公 +CHK_P5 = 闪光母 +GB_Encountered = 已遇到 +CHK_P6 = 公 +CHK_P7 = 母 +CHK_P8 = 闪光公 +CHK_P9 = 闪光母 +L_DexNav = 图鉴导航 Lv: +GB_Language = 游戏语言 +CHK_L1 = 日语 +CHK_L2 = 英语 +CHK_L3 = 法语 +CHK_L4 = 意大利语 +CHK_L5 = 德语 +CHK_L6 = 西班牙语 +CHK_L7 = 韩语 +B_Modify = 修改 +B_GiveAll = 获得全部 +L_Spinda = 晃晃斑: +B_Save = 保存 +B_Cancel = 取消 ! End ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. ! SAV_PokedexXY = Pokédex Editor (XY) - Change stuff below this line, not above. ------------------------------------------------------- -L_goto = goto: -GB_Owned = Owned -CHK_F1 = Foreign (Pre) -CHK_P1 = Native (Kalos) -GB_Encountered = Encountered -CHK_P2 = Male -CHK_P3 = Female -CHK_P4 = Shiny Male -CHK_P5 = Shiny Female -GB_Displayed = Displayed -CHK_P6 = Male -CHK_P7 = Female -CHK_P8 = Shiny Male -CHK_P9 = Shiny Female -GB_Language = Languages -CHK_L1 = Japanese -CHK_L2 = English -CHK_L3 = French -CHK_L4 = Italian -CHK_L5 = German -CHK_L6 = Spanish -CHK_L7 = Korean -B_Modify = Modify... -B_GiveAll = Check All -L_Spinda = Spinda: -B_Save = Save -B_Cancel = Cancel +L_goto = 转到: +GB_Owned = 拥有 +CHK_F1 = 外国 (前作) +CHK_P1 = 本国 (卡洛斯地区) +GB_Encountered = 已遇到 +CHK_P2 = 公 +CHK_P3 = 母 +CHK_P4 = 闪光 公 +CHK_P5 = 闪光 母 +GB_Displayed = 展示的 +CHK_P6 = 公 +CHK_P7 = 母 +CHK_P8 = 闪光 公 +CHK_P9 = 闪光 母 +GB_Language = 游戏语言 +CHK_L1 = 日语 +CHK_L2 = 英语 +CHK_L3 = 法语 +CHK_L4 = 意大利语 +CHK_L5 = 德语 +CHK_L6 = 西班牙语 +CHK_L7 = 韩语 +B_Modify = 修改 +B_GiveAll = 获得全部 +L_Spinda = 晃晃斑: +B_Save = 保存 +B_Cancel = 取消 ! End ------------------------------------------------------- - DO NOT CHANGE THIS SECTION. ! SAV_HallOfFame = Hall of Fame Editor - Change stuff below this line, not above. ------------------------------------------------------- -B_CopyText = Copy txt -L_Level = Level: -L_Shiny = Shiny: -Label_Form = Form: -B_Cancel = Cancel -Label_MetDate = Date: -L_Victory = Victory Number: -GB_OT = Trainer Information +B_CopyText = 复制文本 +L_Level = 等级: +L_Shiny = 闪光: +Label_Form = 形态: +B_Cancel = 取消 +Label_MetDate = 日期: +L_Victory = 胜利数字: +GB_OT = 训练家信息 Label_OT = OT: Label_SID = SID: Label_TID = TID: -Label_HeldItem = Held Item: -GB_CurrentMoves = Current Moves -Label_EncryptionConstant = Encryption Constant: -CHK_Nicknamed = Nickname: -Label_Species = Species: -L_PartyNum = Party Index: -B_Close = Save +Label_HeldItem = 持有道具: +GB_CurrentMoves = 当前技能 +Label_EncryptionConstant = 加密常数: +CHK_Nicknamed = 昵称: +Label_Species = 种类: +L_PartyNum = 队伍排序: +B_Close = 保存 ! End ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. ! SAV_Inventory = Inventory Editor - Change stuff below this line, not above. ------------------------------------------------------- -GB_Pouch = Pouches -B_DisplayBerries = Berry -B_DisplayMedicine = Medicine -B_DisplayTMHM = TM/HM -B_DisplayKeyItems = Key Items -B_DisplayItems = Items -B_Save = Save -B_Cancel = Cancel +GB_Pouch = 背包 +B_DisplayBerries = 树果 +B_DisplayMedicine = 回复 +B_DisplayTMHM = 技能机器 +B_DisplayKeyItems = 重要道具 +B_DisplayItems = 道具 +B_Save = 保存 +B_Cancel = 取消 ! End ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. ! SAV_OPower = O-Power Editor - Change stuff below this line, not above. ------------------------------------------------------- -GB_Regular = Regular -B_MaxP = Give All -L_1 = Hatching: -L_2 = Bargain: -L_3 = ?Prize: -L_4 = EXP: -L_5 = Capture: -L_6 = ?Encounter -L_7 = ?Stealth: -L_8 = HP Restore: -L_9 = ?PP: -L_10 = ?Befriend: -L_11 = ?Attack: -L_12 = ?Defense: -L_13 = ?Sp. Atk: -L_14 = ?Sp. Def: -L_15 = ?Speed: -L_16 = ?Critical Hit: -L_17 = ?Accuracy: -GB_Event = Event -CHK_1 = ?Bargain MAX -CHK_2 = ?EXP MAX -CHK_3 = ?Prize MAX -CHK_4 = ?Hatch MAX -CHK_5 = ?Capture MAX -CHK_6 = ?Restore MAX -CHK_7 = ?Befriend MAX -CHK_8 = ?Unused -B_AllMax = Give All -B_Save = Save -B_Cancel = Cancel +GB_Regular = 常规 +B_MaxP = 获得全部 +L_1 = 孵化之力: +L_2 = 减价之力: +L_3 = ?零花钱之力: +L_4 = 经验之力: +L_5 = 收服之力: +L_6 = ?遭遇之力 +L_7 = ?潜入之力: +L_8 = HP回复之力: +L_9 = ?PP回复之力: +L_10 = ?亲密之力: +L_11 = ?攻击之力: +L_12 = ?防御之力: +L_13 = ?特攻之力: +L_14 = ?特防之力: +L_15 = ?速度之力: +L_16 = ?要害之力: +L_17 = ?命中之力: +GB_Event = 事件 +CHK_1 = ?减价之力MAX +CHK_2 = ?经验之力MAX +CHK_3 = ?零花钱之力MAX +CHK_4 = ?孵化之力MAX +CHK_5 = ?收服之力MAX +CHK_6 = ?回复之力MAX +CHK_7 = ?亲密之力MAX +CHK_8 = ?未使用 +B_AllMax = 获得全部 +B_Save = 保存 +B_Cancel = 取消 ! End ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. ! SAV_Pokepuff = ‎Poké Puffs Editor - Change stuff below this line, not above. ------------------------------------------------------- -L_Count = CNT: -B_None = None -B_Sort = Sort -B_All = All -B_Cancel = Cancel -B_Save = Save +L_Count = 计数: +B_None = 清空 +B_Sort = 排序 +B_All = 所有 +B_Cancel = 取消 +B_Save = 保存 ! End ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. ! SAV_SecretBase = Secret Base Editor - Change stuff below this line, not above. ------------------------------------------------------- -L_FlagsCaptured = Flags Captured: +L_FlagsCaptured = 已获得标识: B_FSave = < -B_GiveDecor = Give All Decorations -B_Cancel = Cancel -B_Save = Save +B_GiveDecor = 获得所有装饰 +B_Cancel = 取消 +B_Save = 保存 B_FDisplay = > -L_Favorite = Favorites: +L_Favorite = 喜爱的: -- -f_MAIN = Main -L_TrName = Trainer Name: -L_BaseLocation = Secret Base Location: -L_Happy = Happy: -L_Encourage = Encourage: -L_Blackboard = Blackboard: -L_Confetti = Confetti: -L_TeamName = Team Name: -L_TeamSlogan = Team Slogan: +f_MAIN = 主要信息 +L_TrName = 训练家名字: +L_BaseLocation = 秘密基地地点: +L_Happy = 高兴: +L_Encourage = 鼓励: +L_Blackboard = 黑板: +L_Confetti = 五彩纸屑: +L_TeamName = 队名: +L_TeamSlogan = 队伍口号: -- -GB_Object = Object Layout -L_Index = Index: -L_Decoration = Decoration: -L_Rotation = Rotation Val: -L_X = X Coordinate: -L_Y = Y Coordinate: +GB_Object = 物品布局 +L_Index = 编号: +L_Decoration = 装饰: +L_Rotation = 旋转值: +L_X = X 轴: +L_Y = Y 轴: -- -f_PKM = Trainer Pokémon -GB_PKM = PKM -L_Participant = Participant: +f_PKM = 训练家的宝可梦 +GB_PKM = 宝可梦 +L_Participant = 参与: L_EncryptionConstant = ENC: -L_IVs = IVs -L_EVs = EVs +L_IVs = 个体 +L_EVs = 努力 L_HP = HP -L_ATK = ATK -L_DEF = DEF -L_SpA = SpA -L_SpD = SpD -L_SPE = SPE -L_PKFriendship = Friendship: -L_PPUps = PPUps +L_ATK = 攻击 +L_DEF = 防御 +L_SpA = 特攻 +L_SpD = 特防 +L_SPE = 速度 +L_PKFriendship = 友谊: +L_PPUps = PP上升 ! End ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. ! SAV_Trainer = Trainer Data Editor - Change stuff below this line, not above. ------------------------------------------------------- -Tab_Multiplayer = Multiplayer -L_MultiplayerSprite = Multiplayer Sprite: -L_Style = Style: -Tab_BadgeMap = Badges/Map -GB_Map = Map Position -L_CurrentMap = Current Map: -L_X = X Coordinate: -L_Z = Z Coordinate: -L_Y = Y Coordinate: -L_Offset = (offset) -Tab_Appearance = Current Appearance (X/Y) -L_Outfit = Outfit Vals -B_GiveAccessories = Give All Accessories -L_Dress = Dress: -L_Accessory = Accessory: -L_Bag = Bag: -L_Socks = Socks: -L_Pants = Pants: -L_Shirt = Shirt: -L_Hat = Hat: -L_FacialHair = Facial Hair: -L_Hairstyle = Hairstyle: -L_HairColor = Hair Color: -L_SkinColor = Skin Color: -GB_MaisonCurrent = Maison Streaks (Current) -L_SuperC = Super -L_NormalC = Normal -L_MultiC = Multi: -L_RotationC = Rotation: -L_TriplesC = Triples: -L_DoublesC = Doubles: -L_SinglesC = Singles: -GB_MaisonBest = Maison Streaks (Best) -L_SuperB = Super -L_NormalB = Normal -L_MultiB = Multi: -L_RotationB = Rotation: -L_TriplesB = Triples: -L_DoublesB = Doubles: -L_SinglesB = Singles: -B_Save = Save -L_Stats = Stats -B_Cancel = Cancel -Tab_Overview = Overview -L_Seconds = Sec: -L_Minutes = Min: -L_Hours = Hrs: -L_Language = Language: -L_PM = PokéMiles: -L_Region = Region: +Tab_Multiplayer = 多人游戏 +L_MultiplayerSprite = 多人游戏头像: +L_Style = 风格: +Tab_BadgeMap = 徽章/地图 +GB_Map = 地图位置 +L_CurrentMap = 当前地图: +L_X = X 轴: +L_Z = Z 轴: +L_Y = Y 轴: +L_Offset = (偏移量) +Tab_Appearance = 当前形象 (X/Y) +L_Outfit = 服装的值 +B_GiveAccessories = 获得所有服装 +L_Dress = 穿着: +L_Accessory = 配饰: +L_Bag = 包: +L_Socks = 袜子: +L_Pants = 裤子: +L_Shirt = 裙子: +L_Hat = 帽子: +L_FacialHair = 胡须: +L_Hairstyle = 发型: +L_HairColor = 发色: +L_SkinColor = 肤色: +GB_MaisonCurrent = 对战宅第连胜数 (当前) +L_SuperC = 超级 +L_NormalC = 普通 +L_MultiC = 多人: +L_RotationC = 轮盘: +L_TriplesC = 3v3: +L_DoublesC = 2v2: +L_SinglesC = 单打: +GB_MaisonBest = 对战宅第连胜数 (最佳) +L_SuperB = 超级 +L_NormalB = 普通 +L_MultiB = 多人: +L_RotationB = 轮盘: +L_TriplesB = 3v3: +L_DoublesB = 2v2: +L_SinglesB = 单打: +B_Save = 保存 +L_Stats = 统计 +B_Cancel = 取消 +Tab_Overview = 概览 +L_Seconds = 秒: +L_Minutes = 分: +L_Hours = 时: +L_Language = 语言: +L_PM = 口袋里程: +L_Region = 区域: L_BP = BP: -L_Country = Country: +L_Country = 国家: B_MaxCash = + -L_3DSReg = 3DS Region: +L_3DSReg = 3DS区域: L_Money = $: -L_SID = SID: -L_TID = TID: -L_TrainerName = Trainer Name: -L_Value = Value -GB_Sayings = Saved Sayings +L_SID = 内ID: +L_TID = 外ID: +L_TrainerName = 训练家名字: +L_Value = 值 +GB_Sayings = 保存的招呼话 L_Saying1 = 1: L_Saying2 = 2: L_Saying3 = 3: @@ -791,10 +791,10 @@ L_Saying5 = 5: ! SAV_Wondercard = Wonder Card I/O - Change stuff below this line, not above. ------------------------------------------------------- -L_Details = Details: -L_Received = Received List: -B_Import = Import -B_Output = Export -B_Cancel = Cancel -B_Save = Save +L_Details = 说明: +L_Received = 收到的列表: +B_Import = 导入 +B_Output = 导出 +B_Cancel = 取消 +B_Save = 保存 ! End \ No newline at end of file From 794dd3739a9a6d121884c949bde0dd960c8d83bd Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Thu, 11 Aug 2016 20:01:08 -0700 Subject: [PATCH 61/67] Fix gen3 set PPUps Was missing bitshift. Thanks edvin! --- PKHeX/PKM/PK3.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PKHeX/PKM/PK3.cs b/PKHeX/PKM/PK3.cs index 7dc83b479..a17104367 100644 --- a/PKHeX/PKM/PK3.cs +++ b/PKHeX/PKM/PK3.cs @@ -64,10 +64,10 @@ public PK3(byte[] decryptedData = null, string ident = null) public override uint EXP { get { return BitConverter.ToUInt32(Data, 0x24); } set { BitConverter.GetBytes(value).CopyTo(Data, 0x24); } } private byte PPUps { get { return Data[0x28]; } set { Data[0x28] = value; } } - public override int Move1_PPUps { get { return (PPUps >> 0) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 0)) | value); } } - public override int Move2_PPUps { get { return (PPUps >> 2) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 2)) | value); } } - public override int Move3_PPUps { get { return (PPUps >> 4) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 4)) | value); } } - public override int Move4_PPUps { get { return (PPUps >> 6) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 6)) | value); } } + public override int Move1_PPUps { get { return (PPUps >> 0) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 0)) | value << 0); } } + public override int Move2_PPUps { get { return (PPUps >> 2) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 2)) | value << 2); } } + public override int Move3_PPUps { get { return (PPUps >> 4) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 4)) | value << 4); } } + public override int Move4_PPUps { get { return (PPUps >> 6) & 3; } set { PPUps = (byte)((PPUps & ~(3 << 6)) | value << 6); } } public override int OT_Friendship { get { return Data[0x29]; } set { Data[0x29] = (byte)value; } } // Unused 0x2A 0x2B #endregion From 9d9294ca7c95b61e65a829df84855e367bed872f Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Thu, 11 Aug 2016 20:02:13 -0700 Subject: [PATCH 62/67] Use same dragdrop method for tabs Boxes used a more flexible variant that allowed for drag&drop from browser downloads (chrome). --- PKHeX/MainWindow/Main.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 0cee4f438..43612ef0d 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -2421,7 +2421,10 @@ public PKM preparePKM(bool click = true) // Drag & Drop Events private void tabMain_DragEnter(object sender, DragEventArgs e) { - if (e.Data.GetDataPresent(DataFormats.FileDrop)) e.Effect = DragDropEffects.Move; + if (e.AllowedEffect == (DragDropEffects.Copy | DragDropEffects.Link)) // external file + e.Effect = DragDropEffects.Copy; + else if (e.Data != null) // within + e.Effect = DragDropEffects.Move; } private void tabMain_DragDrop(object sender, DragEventArgs e) { From 6d8f74060ee2b48b048b1d2ae30927513f97bf68 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 12 Aug 2016 17:16:03 -0700 Subject: [PATCH 63/67] Fix WC6/PGF dates Not offset by 2000 Resolves #179 --- PKHeX/MysteryGifts/PGF.cs | 12 ++++-------- PKHeX/MysteryGifts/WC6.cs | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/PKHeX/MysteryGifts/PGF.cs b/PKHeX/MysteryGifts/PGF.cs index 7645a89bc..f58b383e5 100644 --- a/PKHeX/MysteryGifts/PGF.cs +++ b/PKHeX/MysteryGifts/PGF.cs @@ -102,21 +102,17 @@ public override string CardTitle get { // Check to see if date is valid - if (!Util.IsDateValid(2000 + Year, Month, Day)) - { + if (!Util.IsDateValid(Year, Month, Day)) return null; - } - else - { - return new DateTime(2000 + Year, Month, Day); - } + + return new DateTime(Year, Month, Day); } set { if (value.HasValue) { // Only update the properties if a value is provided. - Year = (ushort)(value.Value.Year - 2000); + Year = (ushort)value.Value.Year; Month = (byte)value.Value.Month; Day = (byte)value.Value.Day; } diff --git a/PKHeX/MysteryGifts/WC6.cs b/PKHeX/MysteryGifts/WC6.cs index 3774d5d78..37305bb4e 100644 --- a/PKHeX/MysteryGifts/WC6.cs +++ b/PKHeX/MysteryGifts/WC6.cs @@ -52,21 +52,17 @@ public WC6(byte[] data = null) get { // Check to see if date is valid - if (!Util.IsDateValid(2000 + Year, Month, Day)) - { + if (!Util.IsDateValid(Year, Month, Day)) return null; - } - else - { - return new DateTime(2000 + (int)Year, (int)Month, (int)Day); - } + + return new DateTime((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); + Year = (ushort)value.Value.Year; Month = (byte)value.Value.Month; Day = (byte)value.Value.Day; } From 06628b99d4714c6aa1bbfe37ebfbe64413d86180 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 12 Aug 2016 17:18:05 -0700 Subject: [PATCH 64/67] Add gba save editing ref to readme #179 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3596503ad..ed94b5dfe 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ PKHeX ===== -Pokémon NDS/3DS save editor, programmed in [C#](https://en.wikipedia.org/wiki/C_Sharp_%28programming_language%29). +Pokémon GBA/NDS/3DS save editor, programmed in [C#](https://en.wikipedia.org/wiki/C_Sharp_%28programming_language%29). -Supports the following files originating from the Nintendo NDS & 3DS: +Supports the following files originating from the Nintendo GBA, NDS, & 3DS: * Save files ("main", .sav) * Individual Pokémon entity files (.pk*) * Mystery Gift files (.pgt, .pcd, .pgf, .wc6) including conversion to .pk* From 9c9ae18521689d4e60f7590abb7ad777c5c7f9f6 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 12 Aug 2016 18:29:31 -0700 Subject: [PATCH 65/67] Decrease form opening time Don't use linq for loading wc6db (took 400ms on my computer, keeps increasing as database grows) Don't validate comboboxes when setting datasources --- PKHeX/MainWindow/Main.cs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 43612ef0d..28f28416f 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -896,10 +896,18 @@ private static void refreshWC6DB() List wc6db = new List(); byte[] wc6bin = Properties.Resources.wc6; for (int i = 0; i < wc6bin.Length; i += WC6.Size) - wc6db.Add(new WC6(wc6bin.Skip(i).Take(WC6.Size).ToArray())); + { + byte[] data = new byte[WC6.Size]; + Array.Copy(wc6bin, i, data, 0, WC6.Size); + wc6db.Add(new WC6(data)); + } byte[] wc6full = Properties.Resources.wc6full; for (int i = 0; i < wc6full.Length; i += WC6.SizeFull) - wc6db.Add(new WC6(wc6full.Skip(i).Take(WC6.SizeFull).ToArray())); + { + byte[] data = new byte[WC6.SizeFull]; + Array.Copy(wc6bin, i, data, 0, WC6.SizeFull); + wc6db.Add(new WC6(data)); + } if (Directory.Exists(WC6DatabasePath)) wc6db.AddRange(from file in Directory.GetFiles(WC6DatabasePath, "*", SearchOption.AllDirectories) @@ -2191,6 +2199,8 @@ private void validateComboBox(object sender, EventArgs e) } private void validateComboBox2(object sender, EventArgs e) { + if (!fieldsInitialized) + return; validateComboBox(sender, e); if (sender == CB_Ability) TB_AbilityNumber.Text = (1 << CB_Ability.SelectedIndex).ToString(); @@ -2201,6 +2211,8 @@ private void validateComboBox2(object sender, EventArgs e) } private void validateMove(object sender, EventArgs e) { + if (!fieldsInitialized) + return; validateComboBox(sender); if (!fieldsLoaded) return; From 68f1dfa68cc28960b6ef719ea9d7f8788b83f0a8 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Sun, 14 Aug 2016 08:30:18 -0500 Subject: [PATCH 66/67] Changed "Batte Video" to "Battle Video --- PKHeX/MainWindow/Main.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 28f28416f..c3f70142a 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -615,7 +615,7 @@ private void openFile(byte[] input, string path, string ext) if (SAV.Generation < 6) { Util.Alert("Cannot load a Gen6 Battle Video to a past generation save file."); return; } - if (Util.Prompt(MessageBoxButtons.YesNo, "Load Batte Video Pokémon data to " + CB_BoxSelect.Text + "?", "The box will be overwritten.") != DialogResult.Yes) + if (Util.Prompt(MessageBoxButtons.YesNo, "Load Battle Video Pokémon data to " + CB_BoxSelect.Text + "?", "The box will be overwritten.") != DialogResult.Yes) return; bool? noSetb = getPKMSetOverride(); From d818eaec5f6d0753a17fc7a214a8785621719982 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 14 Aug 2016 09:55:58 -0700 Subject: [PATCH 67/67] Fix transfer PP Fixes #180 --- PKHeX/PKM/PK3.cs | 10 ++++++---- PKHeX/PKM/PK4.cs | 8 ++++---- PKHeX/PKM/PK5.cs | 11 ++++++----- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/PKHeX/PKM/PK3.cs b/PKHeX/PKM/PK3.cs index a17104367..ecbee516f 100644 --- a/PKHeX/PKM/PK3.cs +++ b/PKHeX/PKM/PK3.cs @@ -222,10 +222,6 @@ public PK4 convertToPK4() Move2_PPUps = Move2_PPUps, Move3_PPUps = Move3_PPUps, Move4_PPUps = Move4_PPUps, - Move1_PP = getMovePP(Move1, Move1_PPUps), - Move2_PP = getMovePP(Move2, Move2_PPUps), - Move3_PP = getMovePP(Move3, Move3_PPUps), - Move4_PP = getMovePP(Move4, Move4_PPUps), IV_HP = IV_HP, IV_ATK = IV_ATK, IV_DEF = IV_DEF, @@ -255,6 +251,12 @@ public PK4 convertToPK4() RibbonWorld = RibbonWorld, }; + // Fix PP + pk4.Move1_PP = pk4.getMovePP(pk4.Move1, pk4.Move1_PPUps); + pk4.Move2_PP = pk4.getMovePP(pk4.Move2, pk4.Move2_PPUps); + pk4.Move3_PP = pk4.getMovePP(pk4.Move3, pk4.Move3_PPUps); + pk4.Move4_PP = pk4.getMovePP(pk4.Move4, pk4.Move4_PPUps); + if (Met_Location == 0xFF) // Fateful pk4.FatefulEncounter = Met_Location == 0xFF || FatefulEncounter; // obedience flag diff --git a/PKHeX/PKM/PK4.cs b/PKHeX/PKM/PK4.cs index 535382a52..fb344daa9 100644 --- a/PKHeX/PKM/PK4.cs +++ b/PKHeX/PKM/PK4.cs @@ -415,10 +415,10 @@ public PK5 convertToPK5() }; // Fix PP - pk5.Move1_PP = getMovePP(pk5.Move1_PP, pk5.Move1_PPUps); - pk5.Move2_PP = getMovePP(pk5.Move2_PP, pk5.Move2_PPUps); - pk5.Move3_PP = getMovePP(pk5.Move3_PP, pk5.Move3_PPUps); - pk5.Move4_PP = getMovePP(pk5.Move4_PP, pk5.Move4_PPUps); + pk5.Move1_PP = pk5.getMovePP(pk5.Move1_PP, pk5.Move1_PPUps); + pk5.Move2_PP = pk5.getMovePP(pk5.Move2_PP, pk5.Move2_PPUps); + pk5.Move3_PP = pk5.getMovePP(pk5.Move3_PP, pk5.Move3_PPUps); + pk5.Move4_PP = pk5.getMovePP(pk5.Move4_PP, pk5.Move4_PPUps); // Disassociate Nature and PID pk5.Nature = (int)(pk5.PID % 25); diff --git a/PKHeX/PKM/PK5.cs b/PKHeX/PKM/PK5.cs index 65772c052..19529937a 100644 --- a/PKHeX/PKM/PK5.cs +++ b/PKHeX/PKM/PK5.cs @@ -370,16 +370,17 @@ public PK6 convertToPK6() pk6.Move3 = Move3; pk6.Move4 = Move4; - pk6.Move1_PP = getMovePP(Move1, Move1_PPUps); - pk6.Move2_PP = getMovePP(Move2, Move2_PPUps); - pk6.Move3_PP = getMovePP(Move3, Move3_PPUps); - pk6.Move4_PP = getMovePP(Move4, Move4_PPUps); - pk6.Move1_PPUps = Move1_PPUps; pk6.Move2_PPUps = Move2_PPUps; pk6.Move3_PPUps = Move3_PPUps; pk6.Move4_PPUps = Move4_PPUps; + // Fix PP + pk6.Move1_PP = pk6.getMovePP(pk6.Move1, pk6.Move1_PPUps); + pk6.Move2_PP = pk6.getMovePP(pk6.Move2, pk6.Move2_PPUps); + pk6.Move3_PP = pk6.getMovePP(pk6.Move3, pk6.Move3_PPUps); + pk6.Move4_PP = pk6.getMovePP(pk6.Move4, pk6.Move4_PPUps); + pk6.IV_HP = IV_HP; pk6.IV_ATK = IV_ATK; pk6.IV_DEF = IV_DEF;