From 5a23fda75291e5fc14fd40dad66607e296fb7ec0 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 24 Jan 2017 07:12:14 -0800 Subject: [PATCH] Add support for VC/Horohoro game ID markings --- PKHeX.WinForms/MainWindow/Main.Designer.cs | 100 +- PKHeX.WinForms/MainWindow/Main.cs | 5 +- PKHeX.WinForms/MainWindow/Main.resx | 384 ++- PKHeX/PKHeX.Core.csproj | 18 +- PKHeX/PKM/PKM.cs | 4 +- PKHeX/Properties/Resources.Designer.cs | 2052 ++++++++--------- PKHeX/Properties/Resources.resx | 18 +- .../img/misc/{else_icon.png => 6th.png} | Bin .../img/misc/{sanchi.png => alora.png} | Bin PKHeX/Resources/img/misc/horohoro.png | Bin 0 -> 2917 bytes PKHeX/Resources/img/misc/vc.png | Bin 0 -> 2885 bytes 11 files changed, 1495 insertions(+), 1086 deletions(-) rename PKHeX/Resources/img/misc/{else_icon.png => 6th.png} (100%) rename PKHeX/Resources/img/misc/{sanchi.png => alora.png} (100%) create mode 100644 PKHeX/Resources/img/misc/horohoro.png create mode 100644 PKHeX/Resources/img/misc/vc.png diff --git a/PKHeX.WinForms/MainWindow/Main.Designer.cs b/PKHeX.WinForms/MainWindow/Main.Designer.cs index f6772c1d0..b628c3030 100644 --- a/PKHeX.WinForms/MainWindow/Main.Designer.cs +++ b/PKHeX.WinForms/MainWindow/Main.Designer.cs @@ -443,6 +443,8 @@ public void InitializeComponent() this.mnuLSave = new System.Windows.Forms.ToolStripMenuItem(); this.PB_Legal = new System.Windows.Forms.PictureBox(); this.L_UpdateAvailable = new System.Windows.Forms.LinkLabel(); + this.PB_MarkVC = new System.Windows.Forms.PictureBox(); + this.PB_MarkHorohoro = new System.Windows.Forms.PictureBox(); this.tabMain.SuspendLayout(); this.Tab_Main.SuspendLayout(); this.FLP_Main.SuspendLayout(); @@ -609,6 +611,8 @@ public void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.dragout)).BeginInit(); this.mnuL.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.PB_Legal)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_MarkVC)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_MarkHorohoro)).BeginInit(); this.SuspendLayout(); // // tabMain @@ -3400,6 +3404,8 @@ public void InitializeComponent() // // GB_Markings // + this.GB_Markings.Controls.Add(this.PB_MarkHorohoro); + this.GB_Markings.Controls.Add(this.PB_MarkVC); this.GB_Markings.Controls.Add(this.PB_MarkAlola); this.GB_Markings.Controls.Add(this.PB_Mark6); this.GB_Markings.Controls.Add(this.PB_MarkPentagon); @@ -3419,9 +3425,9 @@ public void InitializeComponent() // // PB_MarkAlola // - this.PB_MarkAlola.Image = Core.Properties.Resources.sanchi; - this.PB_MarkAlola.InitialImage = Core.Properties.Resources.sanchi; - this.PB_MarkAlola.Location = new System.Drawing.Point(96, 15); + this.PB_MarkAlola.Image = ((System.Drawing.Image)(resources.GetObject("PB_MarkAlola.Image"))); + this.PB_MarkAlola.InitialImage = ((System.Drawing.Image)(resources.GetObject("PB_MarkAlola.InitialImage"))); + this.PB_MarkAlola.Location = new System.Drawing.Point(68, 15); this.PB_MarkAlola.Name = "PB_MarkAlola"; this.PB_MarkAlola.Size = new System.Drawing.Size(20, 20); this.PB_MarkAlola.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; @@ -3445,7 +3451,7 @@ public void InitializeComponent() // this.PB_MarkPentagon.Image = ((System.Drawing.Image)(resources.GetObject("PB_MarkPentagon.Image"))); this.PB_MarkPentagon.InitialImage = ((System.Drawing.Image)(resources.GetObject("PB_MarkPentagon.InitialImage"))); - this.PB_MarkPentagon.Location = new System.Drawing.Point(18, 15); + this.PB_MarkPentagon.Location = new System.Drawing.Point(47, 15); this.PB_MarkPentagon.Name = "PB_MarkPentagon"; this.PB_MarkPentagon.Size = new System.Drawing.Size(20, 20); this.PB_MarkPentagon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; @@ -3482,7 +3488,7 @@ public void InitializeComponent() // this.PB_MarkCured.Image = ((System.Drawing.Image)(resources.GetObject("PB_MarkCured.Image"))); this.PB_MarkCured.InitialImage = ((System.Drawing.Image)(resources.GetObject("PB_MarkCured.InitialImage"))); - this.PB_MarkCured.Location = new System.Drawing.Point(70, 15); + this.PB_MarkCured.Location = new System.Drawing.Point(26, 15); this.PB_MarkCured.Name = "PB_MarkCured"; this.PB_MarkCured.Size = new System.Drawing.Size(20, 20); this.PB_MarkCured.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; @@ -3506,7 +3512,7 @@ public void InitializeComponent() // this.PB_MarkShiny.Image = ((System.Drawing.Image)(resources.GetObject("PB_MarkShiny.Image"))); this.PB_MarkShiny.InitialImage = ((System.Drawing.Image)(resources.GetObject("PB_MarkShiny.InitialImage"))); - this.PB_MarkShiny.Location = new System.Drawing.Point(44, 15); + this.PB_MarkShiny.Location = new System.Drawing.Point(5, 15); this.PB_MarkShiny.Name = "PB_MarkShiny"; this.PB_MarkShiny.Size = new System.Drawing.Size(20, 20); this.PB_MarkShiny.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; @@ -3694,7 +3700,7 @@ public void InitializeComponent() // // Menu_Open // - this.Menu_Open.Image = Core.Properties.Resources.open; + this.Menu_Open.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Open.Image"))); this.Menu_Open.Name = "Menu_Open"; this.Menu_Open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.Menu_Open.ShowShortcutKeys = false; @@ -3704,7 +3710,7 @@ public void InitializeComponent() // // Menu_Save // - this.Menu_Save.Image = Core.Properties.Resources.savePKM; + this.Menu_Save.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Save.Image"))); this.Menu_Save.Name = "Menu_Save"; this.Menu_Save.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.Menu_Save.ShowShortcutKeys = false; @@ -3718,14 +3724,14 @@ public void InitializeComponent() this.Menu_ExportMAIN, this.Menu_ExportBAK}); this.Menu_ExportSAV.Enabled = false; - this.Menu_ExportSAV.Image = Core.Properties.Resources.saveSAV; + this.Menu_ExportSAV.Image = ((System.Drawing.Image)(resources.GetObject("Menu_ExportSAV.Image"))); this.Menu_ExportSAV.Name = "Menu_ExportSAV"; this.Menu_ExportSAV.Size = new System.Drawing.Size(139, 22); this.Menu_ExportSAV.Text = "&Export SAV..."; // // Menu_ExportMAIN // - this.Menu_ExportMAIN.Image = Core.Properties.Resources.main; + this.Menu_ExportMAIN.Image = ((System.Drawing.Image)(resources.GetObject("Menu_ExportMAIN.Image"))); this.Menu_ExportMAIN.Name = "Menu_ExportMAIN"; this.Menu_ExportMAIN.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); this.Menu_ExportMAIN.ShowShortcutKeys = false; @@ -3735,7 +3741,7 @@ public void InitializeComponent() // // Menu_ExportBAK // - this.Menu_ExportBAK.Image = Core.Properties.Resources.bak; + this.Menu_ExportBAK.Image = ((System.Drawing.Image)(resources.GetObject("Menu_ExportBAK.Image"))); this.Menu_ExportBAK.Name = "Menu_ExportBAK"; this.Menu_ExportBAK.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B))); this.Menu_ExportBAK.ShowShortcutKeys = false; @@ -3745,7 +3751,7 @@ public void InitializeComponent() // // Menu_Exit // - this.Menu_Exit.Image = Core.Properties.Resources.exit; + this.Menu_Exit.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Exit.Image"))); this.Menu_Exit.Name = "Menu_Exit"; this.Menu_Exit.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q))); this.Menu_Exit.ShowShortcutKeys = false; @@ -3771,14 +3777,14 @@ public void InitializeComponent() this.Menu_ShowdownExportPKM, this.Menu_ShowdownExportParty, this.Menu_ShowdownExportBattleBox}); - this.Menu_Showdown.Image = Core.Properties.Resources.showdown; + this.Menu_Showdown.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Showdown.Image"))); this.Menu_Showdown.Name = "Menu_Showdown"; this.Menu_Showdown.Size = new System.Drawing.Size(143, 22); this.Menu_Showdown.Text = "Showdown"; // // Menu_ShowdownImportPKM // - this.Menu_ShowdownImportPKM.Image = Core.Properties.Resources.import; + this.Menu_ShowdownImportPKM.Image = ((System.Drawing.Image)(resources.GetObject("Menu_ShowdownImportPKM.Image"))); this.Menu_ShowdownImportPKM.Name = "Menu_ShowdownImportPKM"; this.Menu_ShowdownImportPKM.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); this.Menu_ShowdownImportPKM.ShowShortcutKeys = false; @@ -3788,7 +3794,7 @@ public void InitializeComponent() // // Menu_ShowdownExportPKM // - this.Menu_ShowdownExportPKM.Image = Core.Properties.Resources.export; + this.Menu_ShowdownExportPKM.Image = ((System.Drawing.Image)(resources.GetObject("Menu_ShowdownExportPKM.Image"))); this.Menu_ShowdownExportPKM.Name = "Menu_ShowdownExportPKM"; this.Menu_ShowdownExportPKM.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.T))); @@ -3799,7 +3805,7 @@ public void InitializeComponent() // // Menu_ShowdownExportParty // - this.Menu_ShowdownExportParty.Image = Core.Properties.Resources.export; + this.Menu_ShowdownExportParty.Image = ((System.Drawing.Image)(resources.GetObject("Menu_ShowdownExportParty.Image"))); this.Menu_ShowdownExportParty.Name = "Menu_ShowdownExportParty"; this.Menu_ShowdownExportParty.Size = new System.Drawing.Size(231, 22); this.Menu_ShowdownExportParty.Text = "Export Party to Clipboard"; @@ -3807,7 +3813,7 @@ public void InitializeComponent() // // Menu_ShowdownExportBattleBox // - this.Menu_ShowdownExportBattleBox.Image = Core.Properties.Resources.export; + this.Menu_ShowdownExportBattleBox.Image = ((System.Drawing.Image)(resources.GetObject("Menu_ShowdownExportBattleBox.Image"))); this.Menu_ShowdownExportBattleBox.Name = "Menu_ShowdownExportBattleBox"; this.Menu_ShowdownExportBattleBox.Size = new System.Drawing.Size(231, 22); this.Menu_ShowdownExportBattleBox.Text = "Export Battle Box to Clipboard"; @@ -3818,14 +3824,14 @@ public void InitializeComponent() this.Menu_CyberGadget.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.Menu_OpenTemp, this.Menu_OpenCache}); - this.Menu_CyberGadget.Image = Core.Properties.Resources.other; + this.Menu_CyberGadget.Image = ((System.Drawing.Image)(resources.GetObject("Menu_CyberGadget.Image"))); this.Menu_CyberGadget.Name = "Menu_CyberGadget"; this.Menu_CyberGadget.Size = new System.Drawing.Size(143, 22); this.Menu_CyberGadget.Text = "CyberGadget"; // // Menu_OpenTemp // - this.Menu_OpenTemp.Image = Core.Properties.Resources.folder; + this.Menu_OpenTemp.Image = ((System.Drawing.Image)(resources.GetObject("Menu_OpenTemp.Image"))); this.Menu_OpenTemp.Name = "Menu_OpenTemp"; this.Menu_OpenTemp.Size = new System.Drawing.Size(175, 22); this.Menu_OpenTemp.Text = "Open Temp Folder"; @@ -3833,7 +3839,7 @@ public void InitializeComponent() // // Menu_OpenCache // - this.Menu_OpenCache.Image = Core.Properties.Resources.folder; + this.Menu_OpenCache.Image = ((System.Drawing.Image)(resources.GetObject("Menu_OpenCache.Image"))); this.Menu_OpenCache.Name = "Menu_OpenCache"; this.Menu_OpenCache.Size = new System.Drawing.Size(175, 22); this.Menu_OpenCache.Text = "Open Cache Folder"; @@ -3848,14 +3854,14 @@ public void InitializeComponent() this.Menu_Database, this.Menu_MGDatabase, this.Menu_BatchEditor}); - this.Menu_Data.Image = Core.Properties.Resources.data; + this.Menu_Data.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Data.Image"))); this.Menu_Data.Name = "Menu_Data"; this.Menu_Data.Size = new System.Drawing.Size(143, 22); this.Menu_Data.Text = "Data"; // // Menu_LoadBoxes // - this.Menu_LoadBoxes.Image = Core.Properties.Resources.load; + this.Menu_LoadBoxes.Image = ((System.Drawing.Image)(resources.GetObject("Menu_LoadBoxes.Image"))); this.Menu_LoadBoxes.Name = "Menu_LoadBoxes"; this.Menu_LoadBoxes.Size = new System.Drawing.Size(182, 22); this.Menu_LoadBoxes.Text = "Load Boxes"; @@ -3863,7 +3869,7 @@ public void InitializeComponent() // // Menu_DumpBoxes // - this.Menu_DumpBoxes.Image = Core.Properties.Resources.dump; + this.Menu_DumpBoxes.Image = ((System.Drawing.Image)(resources.GetObject("Menu_DumpBoxes.Image"))); this.Menu_DumpBoxes.Name = "Menu_DumpBoxes"; this.Menu_DumpBoxes.Size = new System.Drawing.Size(182, 22); this.Menu_DumpBoxes.Text = "Dump Boxes"; @@ -3871,7 +3877,7 @@ public void InitializeComponent() // // Menu_Report // - this.Menu_Report.Image = Core.Properties.Resources.report; + this.Menu_Report.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Report.Image"))); this.Menu_Report.Name = "Menu_Report"; this.Menu_Report.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); this.Menu_Report.ShowShortcutKeys = false; @@ -3881,7 +3887,7 @@ public void InitializeComponent() // // Menu_Database // - this.Menu_Database.Image = Core.Properties.Resources.database; + this.Menu_Database.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Database.Image"))); this.Menu_Database.Name = "Menu_Database"; this.Menu_Database.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); this.Menu_Database.ShowShortcutKeys = false; @@ -3891,7 +3897,7 @@ public void InitializeComponent() // // Menu_MGDatabase // - this.Menu_MGDatabase.Image = Core.Properties.Resources.gift; + this.Menu_MGDatabase.Image = ((System.Drawing.Image)(resources.GetObject("Menu_MGDatabase.Image"))); this.Menu_MGDatabase.Name = "Menu_MGDatabase"; this.Menu_MGDatabase.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); this.Menu_MGDatabase.ShowShortcutKeys = false; @@ -3901,7 +3907,7 @@ public void InitializeComponent() // // Menu_BatchEditor // - this.Menu_BatchEditor.Image = Core.Properties.Resources.settings; + this.Menu_BatchEditor.Image = ((System.Drawing.Image)(resources.GetObject("Menu_BatchEditor.Image"))); this.Menu_BatchEditor.Name = "Menu_BatchEditor"; this.Menu_BatchEditor.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.M))); this.Menu_BatchEditor.ShowShortcutKeys = false; @@ -3914,14 +3920,14 @@ public void InitializeComponent() this.Menu_Other.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.Menu_OpenSDF, this.Menu_OpenSDB}); - this.Menu_Other.Image = Core.Properties.Resources.other; + this.Menu_Other.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Other.Image"))); this.Menu_Other.Name = "Menu_Other"; this.Menu_Other.Size = new System.Drawing.Size(143, 22); this.Menu_Other.Text = "Other"; // // Menu_OpenSDF // - this.Menu_OpenSDF.Image = Core.Properties.Resources.folder; + this.Menu_OpenSDF.Image = ((System.Drawing.Image)(resources.GetObject("Menu_OpenSDF.Image"))); this.Menu_OpenSDF.Name = "Menu_OpenSDF"; this.Menu_OpenSDF.Size = new System.Drawing.Size(229, 22); this.Menu_OpenSDF.Text = "Open SaveDataFiler Folder"; @@ -3929,7 +3935,7 @@ public void InitializeComponent() // // Menu_OpenSDB // - this.Menu_OpenSDB.Image = Core.Properties.Resources.folder; + this.Menu_OpenSDB.Image = ((System.Drawing.Image)(resources.GetObject("Menu_OpenSDB.Image"))); this.Menu_OpenSDB.Name = "Menu_OpenSDB"; this.Menu_OpenSDB.Size = new System.Drawing.Size(229, 22); this.Menu_OpenSDB.Text = "Open SaveDataBackup Folder"; @@ -3950,7 +3956,7 @@ public void InitializeComponent() // this.Menu_Language.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.CB_MainLanguage}); - this.Menu_Language.Image = Core.Properties.Resources.language; + this.Menu_Language.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Language.Image"))); this.Menu_Language.Name = "Menu_Language"; this.Menu_Language.Size = new System.Drawing.Size(139, 22); this.Menu_Language.Text = "Language"; @@ -3969,7 +3975,7 @@ public void InitializeComponent() this.Menu_ModifyPKM, this.Menu_Undo, this.Menu_Redo}); - this.Menu_Modify.Image = Core.Properties.Resources.settings; + this.Menu_Modify.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Modify.Image"))); this.Menu_Modify.Name = "Menu_Modify"; this.Menu_Modify.Size = new System.Drawing.Size(139, 22); this.Menu_Modify.Text = "Set to SAV"; @@ -4026,7 +4032,7 @@ public void InitializeComponent() // // Menu_About // - this.Menu_About.Image = Core.Properties.Resources.about; + this.Menu_About.Image = ((System.Drawing.Image)(resources.GetObject("Menu_About.Image"))); this.Menu_About.Name = "Menu_About"; this.Menu_About.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); this.Menu_About.ShowShortcutKeys = false; @@ -4065,7 +4071,7 @@ public void InitializeComponent() // // PAN_Box // - this.PAN_Box.BackgroundImage = Core.Properties.Resources.box_wp16xy; + this.PAN_Box.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PAN_Box.BackgroundImage"))); this.PAN_Box.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.PAN_Box.Controls.Add(this.bpkx30); this.PAN_Box.Controls.Add(this.bpkx29); @@ -5713,6 +5719,28 @@ public void InitializeComponent() this.L_UpdateAvailable.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.L_UpdateAvailable.Visible = false; // + // PB_MarkVC + // + this.PB_MarkVC.Image = Core.Properties.Resources.vc; + this.PB_MarkVC.InitialImage = Core.Properties.Resources.vc; + this.PB_MarkVC.Location = new System.Drawing.Point(89, 15); + this.PB_MarkVC.Name = "PB_MarkVC"; + this.PB_MarkVC.Size = new System.Drawing.Size(20, 20); + this.PB_MarkVC.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.PB_MarkVC.TabIndex = 10; + this.PB_MarkVC.TabStop = false; + // + // PB_MarkHorohoro + // + this.PB_MarkHorohoro.Image = Core.Properties.Resources.horohoro; + this.PB_MarkHorohoro.InitialImage = Core.Properties.Resources.horohoro; + this.PB_MarkHorohoro.Location = new System.Drawing.Point(110, 15); + this.PB_MarkHorohoro.Name = "PB_MarkHorohoro"; + this.PB_MarkHorohoro.Size = new System.Drawing.Size(20, 20); + this.PB_MarkHorohoro.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.PB_MarkHorohoro.TabIndex = 11; + this.PB_MarkHorohoro.TabStop = false; + // // Main // this.AllowDrop = true; @@ -5941,6 +5969,8 @@ public void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.dragout)).EndInit(); this.mnuL.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.PB_Legal)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_MarkVC)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_MarkHorohoro)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -6360,6 +6390,8 @@ public void InitializeComponent() private System.Windows.Forms.FlowLayoutPanel FLP_BallLeft; private System.Windows.Forms.PictureBox PB_Ball; private System.Windows.Forms.Button B_OpenZygardeCells; + private System.Windows.Forms.PictureBox PB_MarkHorohoro; + private System.Windows.Forms.PictureBox PB_MarkVC; } } diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index c486c3808..eca5532d1 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -1035,7 +1035,7 @@ private void openSAV(SaveFile sav, string path) PB_Legal.Visible = PB_WarnMove1.Visible = PB_WarnMove2.Visible = PB_WarnMove3.Visible = PB_WarnMove4.Visible = SAV.Generation >= 6; PB_MarkPentagon.Visible = SAV.Generation >= 6; - PB_MarkAlola.Visible = SAV.Generation >= 7; + PB_MarkAlola.Visible = PB_MarkVC.Visible = PB_MarkHorohoro.Visible = SAV.Generation >= 7; TB_Secure1.Visible = TB_Secure2.Visible = L_Secure1.Visible = L_Secure2.Visible = SAV.Exportable && SAV.Generation >= 6; TB_GameSync.Visible = L_GameSync.Visible = SAV.Exportable && SAV.Generation >= 6; @@ -1603,6 +1603,9 @@ private void setMarkings() return; PB_MarkAlola.Image = ImageUtil.ChangeOpacity(PB_MarkAlola.InitialImage, pkm.Gen7 ? 1 : 0.1); + PB_MarkVC.Image = ImageUtil.ChangeOpacity(PB_MarkVC.InitialImage, pkm.VC ? 1 : 0.1); + PB_MarkHorohoro.Image = ImageUtil.ChangeOpacity(PB_MarkHorohoro.InitialImage, pkm.Horohoro ? 1 : 0.1); + for (int i = 0; i < pba.Length; i++) { switch (pkm.Markings[i]) diff --git a/PKHeX.WinForms/MainWindow/Main.resx b/PKHeX.WinForms/MainWindow/Main.resx index 1cbb3146b..6022b179b 100644 --- a/PKHeX.WinForms/MainWindow/Main.resx +++ b/PKHeX.WinForms/MainWindow/Main.resx @@ -699,6 +699,54 @@ True + + + iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC45bDN+TgAAAEpJREFUKFNjQAMB + QPwAikFsnACk4AMUg9g4wQUghikEsVEAzDqQBLpCEIY7A9k6XBjsDKIVEm01MkBXiBMgOwNsHS4Acwaa + dQwMAL/BNIG87NYcAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC45bDN+TgAAAEpJREFUKFNjQAMB + QPwAikFsnACk4AMUg9g4wQUghikEsVEAzDqQBLpCEIY7A9k6XBjsDKIVEm01MkBXiBMgOwNsHS4Acwaa + dQwMAL/BNIG87NYcAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC45bDN+TgAAAEpJREFUKFNjQAMB + QPwAikFsnACk4AMUg9g4wQUghikEsVEAzDqQBLpCEIY7A9k6XBjsDKIVEm01MkBXiBMgOwNsHS4Acwaa + dQwMAL/BNIG87NYcAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC45bDN+TgAAAEpJREFUKFNjQAMB + QPwAikFsnACk4AMUg9g4wQUghikEsVEAzDqQBLpCEIY7A9k6XBjsDKIVEm01MkBXiBMgOwNsHS4Acwaa + dQwMAL/BNIG87NYcAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC45bDN+TgAAAEpJREFUKFNjQAMB + QPwAikFsnACk4AMUg9g4wQUghikEsVEAzDqQBLpCEIY7A9k6XBjsDKIVEm01MkBXiBMgOwNsHS4Acwaa + dQwMAL/BNIG87NYcAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC45bDN+TgAAAEpJREFUKFNjQAMB + QPwAikFsnACk4AMUg9g4wQUghikEsVEAzDqQBLpCEIY7A9k6XBjsDKIVEm01MkBXiBMgOwNsHS4Acwaa + dQwMAL/BNIG87NYcAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -713,9 +761,6 @@ UwTDQMUuUKVgD8zEpgiIy6FKEACLYkxFMICkGLciGEBxE+mAgQEAw6cxLyPYHYMAAAAASUVORK5CYII= - - True - iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -764,9 +809,6 @@ BuWCAUgMqDAUyiUWMDAAALO6MzuvKR9eAAAAAElFTkSuQmCC - - True - iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -799,9 +841,6 @@ BxgYAGs4NknmoWGpAAAAAElFTkSuQmCC - - True - iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -886,12 +925,339 @@ True + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAFBJREFUOE9jAIJMIP4CxP9JxCA9GUAMZnwE4iMk4k9A/BmIwaaBBEgFJ4AYpHfU + ACgxasCQNwCUmUAZAyRACgZlJJA+cJYEcUCmkYKBmhlSASSQYfH4cGNHAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EgAACxIB0t1+/AAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC45bDN+TgAAAL9JREFUOE/V0j8L + AWEcwPFnoSQ2YrFbvA6Df29BmW1iFrm6ko3XYDBLRnkBymrwBsifkgHfn56rc911nAy+9eme4ff8uqtT + LpUwwBAjTc59FOFbFyfccNfkvEcbvv3hghpaMNDBElc4F1ywgMzIbBNVqBRMyID9kheZOaOHBJ5FUcEW + bpfsNigggpfCyGECGXR+gjzHyCIEzzJoQF7TWnBEHWm8VRxlrLFCHjF8XFL7bfLTBHHADmoe0AxTfJNS + DzmubKACFy9hAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAKlJREFUOE/V07sNwjAUheFMQMkymQcJJqBIywpswRwswAq0aQDRIfgPwtbJ5RIE + VBzpk2zH149IbsgCJ1w/pJo5vioujnga3GKFNfrH2JhBZ6kByxQ7+JyoNrRzlhZeENWGjv0qZ3iRqw3d + OcsEF3iRqw39MN05poMXRIOOfpjurGhnFWfZIF2g0J3LsbO8XcBl+bMFNDnao3z/6TEdcH+SelXZhDEU + N7MbRmG+g+WNbMUAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAQxJREFUOE+lk0tKA0EQhgcUH7fIUpBEUAleL6+ViEKiwVWukAuE3MKQLENWXiA+ + o9/XTMs4pAeJP3xMd01VdVVPTbZFZzCEObzCGyxyWx2KauXPoCN4hA18JfiEW9iHdm4LMngKGtZwA+dw + CAf5ug/voI/VxaRBnuxmCacaEroCD4jBIYE9W7YvqoJVB4rBIYGX48KyqxR7LvPTj32m5G2XAyPhU7nw + wnbSvxPEFi7Cbgc9gAkckL9qBMb03DTAz/gC5VHdJmfhAxzxmgZ1D2ZcgQlTuoRn0LerIcoLnIAvrOQO + dD4Gx7wJA/BUfcawB7+ko5VU/UyWfg3+TEl5D542A6uRJ7CqEygoy74BMMpgsfyc5z4AAAAASUVORK5C + YII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAK5JREFUOE+l080JwkAQxfG1C9ONB2vQCF4FrcNLwJN9WIYHO1B7UMEvkFz0P8EV + HR5Zow9+ITxmJ5dsIBNccP/SGm28YoePWCZsEJfYe4YqVthAKjnigo8lvy4wW/y1wFSPHRYJK/jDRpZN + yLIJWUZ7HFznyfKGHlpPA5RQs7KcwWcONSvLPnyGULOynMKngJqV5RkdxHRxhZqtvYn2v79fIu+EMIZ9 + UQ3U4XAYPQBTz8DAw6Q/uAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAL5JREFUOE+Vk00KwjAQRnsU8QaCBxC8ggsX4k7QO/h3OBceQ8G1+LdW3ze0Q0lD + 0nzwmmTIvFLKVGQDH/gVop412OYJp0Je8AazqVCaM6g3KRjXayxZwRK+cLRTNy6YwUSbIAO4gC7FJC5I + JSVxwS3DA3QxlLhAb0hxh0ZwgCa9PmEIV9DFvQqtuGAOU22CtJt3KgRxgR6x37gA/catnbrJCpRRvcbS + S5CKCzRMGgwVStAgqc9GUgfZSqC5Wv0Bu1d7m223me4AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAANCAYAAACgu+4kAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAASZJREFUOE+N07FLgkEcxvELSgozGwxdIgiMiKZGl4ZycnVoqKClf6AhcHCVlubA + CmzRwUEIAmkJg6CooCERnEQaiggCabP6Pnrvi5piD3x433u5u/fud+9rbBJ4RQMZTKJfxrCBTUT1QNlG + E5pkB284Rm8mcIEf1LCAVvTGm/ZtKymoQ2emUIIGVzALN3v4QgwrUIc7OJnBAzT40ba74kEW6iDf9nqI + EVza9jX8GJgQwojgAxp0inkcQTX4d7agwuaQh1Y5NHNYwio+oRXoWHUtwou+GUcB6tjpAKp22bZ1UtP4 + k33oTetYxjNu4SSAe2iSJwTRlTMM+w58uIImqULbdeMULIldvCON3mir59AkdSzCjbbxAhXvBIP+hVHE + of9hzRhjfgHiokgceKBC9QAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAAA0AAAAQCAYAAADNo/U5AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAI5JREFUOE/tzTsKg0AUheHBDQhimcLOOrgxixS2KUUb1xIEQXApgmAhSRdSSIjo + f2UCgnmIjY0HPhju3DOjPsRCjicymJjFQ4hYK3DHGQ/IA+872TtCNZClG3qthItqMrtC9mqMAx+OPn9z + wAkvjIPVJQP2D3I/Ky3JXtLZoNThgmCBFC1UAmnLj/+wp6IB3W9Xq5yYVfMAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAA0AAAAQCAYAAADNo/U5AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAI5JREFUOE/tzTsKg0AUheHBDQhimcLOOrgxixS2KUUb1xIEQXApgmAhSRdSSIjo + f2UCgnmIjY0HPhju3DOjPsRCjicymJjFQ4hYK3DHGQ/IA+872TtCNZClG3qthItqMrtC9mqMAx+OPn9z + wAkvjIPVJQP2D3I/Ky3JXtLZoNThgmCBFC1UAmnLj/+wp6IB3W9Xq5yYVfMAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAA0AAAAQCAYAAADNo/U5AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAI5JREFUOE/tzTsKg0AUheHBDQhimcLOOrgxixS2KUUb1xIEQXApgmAhSRdSSIjo + f2UCgnmIjY0HPhju3DOjPsRCjicymJjFQ4hYK3DHGQ/IA+872TtCNZClG3qthItqMrtC9mqMAx+OPn9z + wAkvjIPVJQP2D3I/Ky3JXtLZoNThgmCBFC1UAmnLj/+wp6IB3W9Xq5yYVfMAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAMxJREFUOE+l080KQUEYxvFZkFyC7JTE3kL5uAmxsZGdJTfATdhYcDmiFMnKQi6A + rSj832kmBzOdJk/9Or3nvM9mzjkqJkVzDU4aB3MNTg9PdPUUmDWkvNJTQCqQolWGM3nU0UQfYywRLS8w + gjyXPdmXnmrjiuhyHNlvQaeBC1yL386o4SMlnOAqWEd4330Wd7iKN2TgTQGuopWDN/JBuEpWB95MIUsP + zCDnMDf3xATe7LFFVU/vyOnusNGTI/IDDJDQ02+SGCKlp/+i1AtwGlQV1h1i3AAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAMCAYAAABr5z2BAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAFtJREFUOE+V0jsKgDAQRdHZhqXbtAqIK7TOQvyA3oBphif6Bk5zhyFNglmw40pW + DPicA/m4qygvJoyQh3+1B+TCIaNDRoeMDhkdMjpkdMSZgqN9wpixPcHBTZQbzSiwBf4Q1BwAAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAMCAYAAABr5z2BAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAFtJREFUOE+V0jsKgDAQRdHZhqXbtAqIK7TOQvyA3oBphif6Bk5zhyFNglmw40pW + DPicA/m4qygvJoyQh3+1B+TCIaNDRoeMDhkdMjpkdMSZgqN9wpixPcHBTZQbzSiwBf4Q1BwAAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAQhJREFUOE+dkTtqAlEUQEdt0igpLNxDOheQwgUIVtmASxAEU4vuIlU24QL8gI2V + kDaNrZ0iGs8ZHBhe3ozogQPz3sz9zL1JjiZO8QdPuMcZdvEubdzhHxq4wu3trF9YxShWNviMI3zBjDdc + o0nGXsSwbT8wOMYr/uIRW16E+M+2na8cMkCL9NNTgAPzn8vooAkm6SnA6g6sjB6a4DM9BbgqXzqwIr7R + b+zkH+7Zl07bgYV84AU3WPEihns2idN2YFaybSsb7Lsh1jFKDd2zq/LjvFY22OclNrAQ9+yqnLYDsxPb + trLBJllgaZIiDMqSzG/nhzHIDrIkhTMpwyQGH/Ddi2ewMsFJcgW3PELpOCYNqwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAYAAAB24g05AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAGxJREFUKFPFy1sKQFAURuHz5i4zNSlTUESUUoyKtXVOoZ3bi1Vf6di/ucmzPuWj + tOT7VQFqLFZl3x4VooUbOw3k32UxepzHTocIagkGaMM9uZHbQylGaAON3MpmK8MM7fDKBNmaHMVHsv01 + Y1byGD7MXA+ElgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAYAAAB24g05AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAG1JREFUKFPN0c0KQFAQxfH7ShailCKivP97yPeO/xGFJmHl1K9uc+esxhEP4Ufq + ugoT5pfUUXdNiRHWokW7BU7JMcAqHGkng5kUPayidEhwmxgtrmXN9PcoERrsZb01exWdqd4EGnyJv/lt + nFsAh1Q+oomAaSkAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EgAACxIB0t1+/AAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC45bDN+TgAAAJpJREFUOE+l0s0J + AkEMhuG04t2jDQhiCYsg/hZhJauIbCEqIogoomBDi+hLyEBOAckHz+HLYWAyI2SLr3lg7nrkBE36gB3K + 8ImF65EzNA3K8I2l65ELNEOszBhd1yMVND2MzAAd1yN9aNZozQ1T1yMHaNI7SB+QvkJ6ielnTO/Af+UX + /v7KG3zMHTPXI0doapTNXjFxPbIXEfkBDem2hzg90ewAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAERJREFUOE/FziEOACEAxED+/2kOUcw1JEXRZM2oHav52y67gLILKLuAbv1hp0vZ + BZRdQNkFdOsPO13KLqDsAsouoOBjfplmj3HG0msFAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAX9JREFUOE99 + kktKxEAQhvPojhlUFEQ8geBWENzOIlcR3IjPlSiOMoIeQdCFuhFXghcRPIDgYxaDiILLgfj9bTokM9GC + j0511V/VXemgYkvwAl9wDrPgbQ4u4RueYRFG7AZWYQZO4SlN0/lWK10Iw1CFuzANa3ANI6aEOxjPsnZo + rd2M4/gBHimw4jKCYALu4UCO8rR6G4ML6CeJvaLzrjHmHb8H66Br9eEMEonB8O3uru5dOh3T+RbhpzFx + jr/P/h7k8AE6ussj5yRJkmX8oANKyCUi4NZiz5v3yzyulkdRdKSgK4AzLBbeamLlKR9f2mCDIw2oOCA4 + wK/izfmKI67maTZumhZaELmNIdM+TMJUsdbz4jjaYXltwInp+mat6WkNwzK2pbi3cpBVJFbHhtkId39v + fxVwx24Qi/8LSCSxigzHCjrEypdYKyCxjl2cQAOrCh38uUNi7iXKygL6v8UjUQHfYaQAQ+0St3w700RV + tUS+i/xaTaw4TbazrG1+AM+bqdj5xQ7GAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAQxJREFUOE+V071KA0EUhuHRFMbGgIhRkFSmDYi1kBQGcifWFpJchk0aEZIyEUWw + EUkp3oGlIFaB1IKKRt9vObMsh11wP3hgOPOzM7uzoSDr+MCvWaBUWoiToy0UpoEz7GAN5/AL9FHBnrU1 + Ns0VNOgLb9bO84pva18iyRH8wP/4wQHCjRW8CTpoY2o17wJhGzMrRJrsc43smDtsIMkqsp9NT/Y5Ruz/ + xArS6O3GlyPatk8Xsf8dmpNkEw+InaIz+9wiO+YJ+whjK3g6s7atJ/vJ0SPCIZZWKKuHJCOooIv0Yu08 + umQ6v9r3SLOLU9ShLzKAnzxEFTWcoInC6J77BXRjS+UZc6Ot5/yNIfwBdF+Mwpmwi9MAAAAASUVORK5C + YII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAKCAYAAAC9vt6cAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAADNJREFUKFNjAIL/FGKGFRTiQQBuEIl7gRgruEIk7gbiQQrWYMEWQEw0+IMFBwEx + EYCBAQD1hzUT/KfSKgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAMCAYAAABr5z2BAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAFtJREFUOE+V0jsKgDAQRdHZhqXbtAqIK7TOQvyA3oBphif6Bk5zhyFNglmw40pW + DPicA/m4qygvJoyQh3+1B+TCIaNDRoeMDhkdMjpkdMSZgqN9wpixPcHBTZQbzSiwBf4Q1BwAAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAMCAYAAABr5z2BAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAFtJREFUOE+V0jsKgDAQRdHZhqXbtAqIK7TOQvyA3oBphif6Bk5zhyFNglmw40pW + DPicA/m4qygvJoyQh3+1B+TCIaNDRoeMDhkdMjpkdMSZgqN9wpixPcHBTZQbzSiwBf4Q1BwAAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAQhJREFUOE+dkTtqAlEUQEdt0igpLNxDOheQwgUIVtmASxAEU4vuIlU24QL8gI2V + kDaNrZ0iGs8ZHBhe3ozogQPz3sz9zL1JjiZO8QdPuMcZdvEubdzhHxq4wu3trF9YxShWNviMI3zBjDdc + o0nGXsSwbT8wOMYr/uIRW16E+M+2na8cMkCL9NNTgAPzn8vooAkm6SnA6g6sjB6a4DM9BbgqXzqwIr7R + b+zkH+7Zl07bgYV84AU3WPEihns2idN2YFaybSsb7Lsh1jFKDd2zq/LjvFY22OclNrAQ9+yqnLYDsxPb + trLBJllgaZIiDMqSzG/nhzHIDrIkhTMpwyQGH/Ddi2ewMsFJcgW3PELpOCYNqwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAVlJREFUOE+dkkkrR2EUh2/KlK9iWvgANsoHsVB2MsfKwtYsGzspIhY2JCtFiWwM + HwELxQILw/O8/3Ova9r8f/XUmd7xnOwPtcES3MBroL0IrfCvGmAZ3uENPuAx0DZmbgHq4ZtcfAgWrsJ4 + 2P0wEPYwmNM+ANcU8mQTY8nLsjO4A4sa4R6OQQ2Btd4kyTd7tRPogG6wYDN82Y5YV/hu5poWSB9mshrm + If3wNfQE+WmDpVhfxHZLsXO4gtSmFY3QFFhcm7wvPcFMxUyahheNnxtMghvUJa+iGniG4uNQsYFPkN5g + C9xgpBSzO8b2SrELuIQ0YSarYQ7SeNqSI2gHW2VyPXzZiVhn+LbcyWyGJN9mgUOiTuEWHNkmeIB8kPIp + nU1eyELH08QaTITtKI+G7cKNsPeh/MlJjq038Tlioa0TbWNe25N/LS7L8XTCHBLbJP62H1a8uaIs+wRz + uYzQHrOc0AAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAAQxJREFUOE+V071KA0EUhuHRFMbGgIhRkFSmDYi1kBQGcifWFpJchk0aEZIyEUWw + EUkp3oGlIFaB1IKKRt9vObMsh11wP3hgOPOzM7uzoSDr+MCvWaBUWoiToy0UpoEz7GAN5/AL9FHBnrU1 + Ns0VNOgLb9bO84pva18iyRH8wP/4wQHCjRW8CTpoY2o17wJhGzMrRJrsc43smDtsIMkqsp9NT/Y5Ruz/ + xArS6O3GlyPatk8Xsf8dmpNkEw+InaIz+9wiO+YJ+whjK3g6s7atJ/vJ0SPCIZZWKKuHJCOooIv0Yu08 + umQ6v9r3SLOLU9ShLzKAnzxEFTWcoInC6J77BXRjS+UZc6Ot5/yNIfwBdF+Mwpmwi9MAAAAASUVORK5C + YII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL + EwAACxMBAJqcGAAAARhJREFUOE+V0rsuBlEUhuGpcBcUdA6XJ0LhGhyj0lBIJC5A/igpEBVxJxQO3zMz + mZhtZsSXvMlaM3uvvU7VgDbCcXgN7y3so7AeRrUQTsJn+Ai34bTlrv3m32GYDz25fBO+wnlYDKWWwkVw + Zhbc6eRlPzZrb1o7wVmZ1FKz1Lxc6incN2ZPl8GdNY6GqW8o7e2w1Zg9LQcBDjg6rGH/1UN4YRiTTg9J + 04ZKo7PwxpgKMNYD6gIowZyHNBXgMTwzbJgmmnOpsQArQRP3OdaTo95SYwGugkdXay+yFJbDkvyl3eDs + Xu21stvW0w9LYs6lpO1lZ67DXOjJbstEOTBnnYaG+SZtL/+6/FPW04ZZEmOCbmtYV3OjqvoGetdSQFEa + zusAAAAASUVORK5CYII= + + True True + + + iVBORw0KGgoAAAANSUhEUgAAANwAAADSCAMAAAAWjl7DAAAABGdBTUEAALGPC/xhBQAAAwBQTFRFtays + uK+vu7KyvbW1v7a2vb21wrm5w7u7xby8xb29x7+/w8O7x8e/y8O7zcW9z8e/yMDAy8PDzcXFz8fH08vD + 1s3F18/H0srK08vL1c3N18/P3NPL2tLS3NPT3dXV3NzT3t7W4NfP4NfX5NzT49ra5Nzc5t3d5t7e4ODX + 4+Pa5OTc5ubd5ube6ODX6eHZ7OTc6ODg6eHh7OTk7ubm6Ojg6enh7Ozk8Ojg9Ozk8Ojo8+vr9Ozs9u7u + 8PDo+PDo+PDwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAs5hT+gAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABp0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAAONklEQVR4Xu2Z + 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 + + True diff --git a/PKHeX/PKHeX.Core.csproj b/PKHeX/PKHeX.Core.csproj index 3ee6bd901..cc7e00f99 100644 --- a/PKHeX/PKHeX.Core.csproj +++ b/PKHeX/PKHeX.Core.csproj @@ -156,6 +156,11 @@ + + True + True + Resources.resx + @@ -180,11 +185,6 @@ - - True - True - Resources.resx - @@ -1301,7 +1301,7 @@ - + @@ -2581,7 +2581,7 @@ - + @@ -3411,6 +3411,10 @@ + + + +